aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2006-02-18 20:19:22 (GMT)
committerfluxgen <fluxgen>2006-02-18 20:19:22 (GMT)
commit5ceacc65925f597180c918fcaa2a8171c42cbcdd (patch)
tree1cee0d151c5368ee69bf4e0e432d0f7f6af37b38 /src/Screen.cc
parentf53c93e5e0add69771204056550d07b4fee4efef (diff)
downloadfluxbox_pavel-5ceacc65925f597180c918fcaa2a8171c42cbcdd.zip
fluxbox_pavel-5ceacc65925f597180c918fcaa2a8171c42cbcdd.tar.bz2
moved all focus handling to FocusControl
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 402142e..ccee94c 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -925,7 +925,7 @@ void BScreen::changeWorkspaceID(unsigned int id) {
925 925
926 FbTk::App::instance()->sync(false); 926 FbTk::App::instance()->sync(false);
927 927
928 WinClient *focused_client = Fluxbox::instance()->getFocusedWindow(); 928 WinClient *focused_client = FocusControl::focusedWindow();
929 FluxboxWindow *focused = 0; 929 FluxboxWindow *focused = 0;
930 if (focused_client) 930 if (focused_client)
931 focused = focused_client->fbwindow(); 931 focused = focused_client->fbwindow();
@@ -966,7 +966,7 @@ void BScreen::changeWorkspaceID(unsigned int id) {
966 if (focused && (focused->isStuck() || focused->isMoving())) 966 if (focused && (focused->isStuck() || focused->isMoving()))
967 focused->setInputFocus(); 967 focused->setInputFocus();
968 else 968 else
969 Fluxbox::instance()->revertFocus(*this); 969 FocusControl::revertFocus(*this);
970 970
971 if (focused && focused->isMoving()) 971 if (focused && focused->isMoving())
972 focused->resumeMoving(); 972 focused->resumeMoving();
@@ -982,7 +982,7 @@ void BScreen::sendToWorkspace(unsigned int id, FluxboxWindow *win, bool changeWS
982 return; 982 return;
983 983
984 if (!win) { 984 if (!win) {
985 WinClient *client = Fluxbox::instance()->getFocusedWindow(); 985 WinClient *client = FocusControl::focusedWindow();
986 if (client) 986 if (client)
987 win = client->fbwindow(); 987 win = client->fbwindow();
988 } 988 }
@@ -1039,8 +1039,8 @@ void BScreen::addNetizen(Window win) {
1039 } 1039 }
1040 } 1040 }
1041 1041
1042 Window f = ((Fluxbox::instance()->getFocusedWindow()) ? 1042 Window f = ((FocusControl::focusedWindow()) ?
1043 Fluxbox::instance()->getFocusedWindow()->window() : None); 1043 FocusControl::focusedWindow()->window() : None);
1044 net->sendWindowFocus(f); 1044 net->sendWindowFocus(f);
1045} 1045}
1046 1046
@@ -1075,8 +1075,8 @@ void BScreen::updateNetizenWorkspaceCount() {
1075 1075
1076 1076
1077void BScreen::updateNetizenWindowFocus() { 1077void BScreen::updateNetizenWindowFocus() {
1078 Window f = ((Fluxbox::instance()->getFocusedWindow()) ? 1078 Window f = ((FocusControl::focusedWindow()) ?
1079 Fluxbox::instance()->getFocusedWindow()->window() : None); 1079 FocusControl::focusedWindow()->window() : None);
1080 for_each(m_netizen_list.begin(), 1080 for_each(m_netizen_list.begin(),
1081 m_netizen_list.end(), 1081 m_netizen_list.end(),
1082 bind2nd(mem_fun(&Netizen::sendWindowFocus), f)); 1082 bind2nd(mem_fun(&Netizen::sendWindowFocus), f));