aboutsummaryrefslogtreecommitdiff
path: root/src/WorkspaceCmd.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/WorkspaceCmd.cc')
-rw-r--r--src/WorkspaceCmd.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index ede790a..70044c8 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -50,17 +50,17 @@ void NextWindowCmd::execute() {
50 unsigned int mods = FbTk::KeyUtil::instance().cleanMods(fb->lastEvent().xkey.state); 50 unsigned int mods = FbTk::KeyUtil::instance().cleanMods(fb->lastEvent().xkey.state);
51 mods = FbTk::KeyUtil::instance().isolateModifierMask(mods); 51 mods = FbTk::KeyUtil::instance().isolateModifierMask(mods);
52 if (mods == 0) // can't stacked cycle unless there is a mod to grab 52 if (mods == 0) // can't stacked cycle unless there is a mod to grab
53 screen->nextFocus(m_option | BScreen::CYCLELINEAR); 53 screen->focusControl().nextFocus(m_option | FocusControl::CYCLELINEAR);
54 else { 54 else {
55 // if stacked cycling, then set a watch for 55 // if stacked cycling, then set a watch for
56 // the release of exactly these modifiers 56 // the release of exactly these modifiers
57 if (!fb->watchingScreen() && 57 if (!fb->watchingScreen() &&
58 !(m_option & BScreen::CYCLELINEAR)) 58 !(m_option & FocusControl::CYCLELINEAR))
59 Fluxbox::instance()->watchKeyRelease(*screen, mods); 59 Fluxbox::instance()->watchKeyRelease(*screen, mods);
60 screen->nextFocus(m_option); 60 screen->focusControl().nextFocus(m_option);
61 } 61 }
62 } else 62 } else
63 screen->nextFocus(m_option); 63 screen->focusControl().nextFocus(m_option);
64 } 64 }
65} 65}
66 66
@@ -73,17 +73,17 @@ void PrevWindowCmd::execute() {
73 unsigned int mods = FbTk::KeyUtil::instance().cleanMods(fb->lastEvent().xkey.state); 73 unsigned int mods = FbTk::KeyUtil::instance().cleanMods(fb->lastEvent().xkey.state);
74 mods = FbTk::KeyUtil::instance().isolateModifierMask(mods); 74 mods = FbTk::KeyUtil::instance().isolateModifierMask(mods);
75 if (mods == 0) // can't stacked cycle unless there is a mod to grab 75 if (mods == 0) // can't stacked cycle unless there is a mod to grab
76 screen->prevFocus(m_option | BScreen::CYCLELINEAR); 76 screen->focusControl().prevFocus(m_option | FocusControl::CYCLELINEAR);
77 else { 77 else {
78 // if stacked cycling, then set a watch for 78 // if stacked cycling, then set a watch for
79 // the release of exactly these modifiers 79 // the release of exactly these modifiers
80 if (!fb->watchingScreen() 80 if (!fb->watchingScreen()
81 && !(m_option & BScreen::CYCLELINEAR)) 81 && !(m_option & FocusControl::CYCLELINEAR))
82 Fluxbox::instance()->watchKeyRelease(*screen, mods); 82 Fluxbox::instance()->watchKeyRelease(*screen, mods);
83 screen->prevFocus(m_option); 83 screen->focusControl().prevFocus(m_option);
84 } 84 }
85 } else 85 } else
86 screen->nextFocus(m_option); 86 screen->focusControl().nextFocus(m_option);
87 } 87 }
88} 88}
89 89
@@ -96,7 +96,7 @@ void DirFocusCmd::execute() {
96 if (client == 0 || client->fbwindow() == 0) 96 if (client == 0 || client->fbwindow() == 0)
97 return; 97 return;
98 98
99 screen->dirFocus(*client->fbwindow(), m_dir); 99 screen->focusControl().dirFocus(*client->fbwindow(), m_dir);
100} 100}
101 101
102void NextWorkspaceCmd::execute() { 102void NextWorkspaceCmd::execute() {