diff options
author | fluxgen <fluxgen> | 2003-12-30 18:16:51 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-12-30 18:16:51 (GMT) |
commit | 5febf6c902516a578004a2df336a16c98bcc45f7 (patch) | |
tree | 5e0668006d7c6195e8352c91eafcf3b24e3946eb | |
parent | 35e2057fb77b89ed1726b53b598b27781516d001 (diff) | |
download | fluxbox_paul-5febf6c902516a578004a2df336a16c98bcc45f7.zip fluxbox_paul-5febf6c902516a578004a2df336a16c98bcc45f7.tar.bz2 |
minor cleaning
-rw-r--r-- | src/Workspace.cc | 7 | ||||
-rw-r--r-- | src/WorkspaceCmd.cc | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc index 74c5850..8e8df5b 100644 --- a/src/Workspace.cc +++ b/src/Workspace.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Workspace.cc,v 1.88 2003/12/18 18:03:22 fluxgen Exp $ | 25 | // $Id: Workspace.cc,v 1.89 2003/12/30 18:16:51 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Workspace.hh" | 27 | #include "Workspace.hh" |
28 | 28 | ||
@@ -32,8 +32,8 @@ | |||
32 | #include "Window.hh" | 32 | #include "Window.hh" |
33 | #include "WinClient.hh" | 33 | #include "WinClient.hh" |
34 | #include "FbWinFrame.hh" | 34 | #include "FbWinFrame.hh" |
35 | #include "MenuItem.hh" | ||
36 | 35 | ||
36 | #include "FbTk/MenuItem.hh" | ||
37 | #include "FbTk/StringUtil.hh" | 37 | #include "FbTk/StringUtil.hh" |
38 | 38 | ||
39 | // use GNU extensions | 39 | // use GNU extensions |
@@ -143,8 +143,7 @@ void Workspace::setLastFocusedWindow(FluxboxWindow *win) { | |||
143 | 143 | ||
144 | void Workspace::addWindow(FluxboxWindow &w, bool place) { | 144 | void Workspace::addWindow(FluxboxWindow &w, bool place) { |
145 | // we don't need to add a window that already exist in our list | 145 | // we don't need to add a window that already exist in our list |
146 | if (find(m_windowlist.begin(), m_windowlist.end(), &w) != | 146 | if (find(m_windowlist.begin(), m_windowlist.end(), &w) != m_windowlist.end()) |
147 | m_windowlist.end()) | ||
148 | return; | 147 | return; |
149 | 148 | ||
150 | w.setWorkspace(m_id); | 149 | w.setWorkspace(m_id); |
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc index 40c1053..a0132ee 100644 --- a/src/WorkspaceCmd.cc +++ b/src/WorkspaceCmd.cc | |||
@@ -20,7 +20,7 @@ | |||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
22 | 22 | ||
23 | // $Id: WorkspaceCmd.cc,v 1.8 2003/12/03 17:55:13 fluxgen Exp $ | 23 | // $Id: WorkspaceCmd.cc,v 1.9 2003/12/30 18:15:55 fluxgen Exp $ |
24 | 24 | ||
25 | #include "WorkspaceCmd.hh" | 25 | #include "WorkspaceCmd.hh" |
26 | 26 | ||
@@ -34,6 +34,7 @@ | |||
34 | #include <cmath> | 34 | #include <cmath> |
35 | #include <algorithm> | 35 | #include <algorithm> |
36 | #include <functional> | 36 | #include <functional> |
37 | #include <iostream> | ||
37 | 38 | ||
38 | void NextWindowCmd::execute() { | 39 | void NextWindowCmd::execute() { |
39 | 40 | ||
@@ -42,7 +43,7 @@ void NextWindowCmd::execute() { | |||
42 | Fluxbox *fb = Fluxbox::instance(); | 43 | Fluxbox *fb = Fluxbox::instance(); |
43 | // special case for commands from key events | 44 | // special case for commands from key events |
44 | if (fb->lastEvent().type == KeyPress) { | 45 | if (fb->lastEvent().type == KeyPress) { |
45 | unsigned int mods = FbTk::KeyUtil::cleanMods(fb->lastEvent().xkey.state); | 46 | unsigned int mods = FbTk::KeyUtil::instance().cleanMods(fb->lastEvent().xkey.state); |
46 | if (mods == 0) // can't stacked cycle unless there is a mod to grab | 47 | if (mods == 0) // can't stacked cycle unless there is a mod to grab |
47 | screen->nextFocus(m_option | BScreen::CYCLELINEAR); | 48 | screen->nextFocus(m_option | BScreen::CYCLELINEAR); |
48 | else { | 49 | else { |
@@ -63,7 +64,7 @@ void PrevWindowCmd::execute() { | |||
63 | Fluxbox *fb = Fluxbox::instance(); | 64 | Fluxbox *fb = Fluxbox::instance(); |
64 | // special case for commands from key events | 65 | // special case for commands from key events |
65 | if (fb->lastEvent().type == KeyPress) { | 66 | if (fb->lastEvent().type == KeyPress) { |
66 | unsigned int mods = FbTk::KeyUtil::cleanMods(fb->lastEvent().xkey.state); | 67 | unsigned int mods = FbTk::KeyUtil::instance().cleanMods(fb->lastEvent().xkey.state); |
67 | if (mods == 0) // can't stacked cycle unless there is a mod to grab | 68 | if (mods == 0) // can't stacked cycle unless there is a mod to grab |
68 | screen->prevFocus(m_option | BScreen::CYCLELINEAR); | 69 | screen->prevFocus(m_option | BScreen::CYCLELINEAR); |
69 | else { | 70 | else { |