aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-09-06 14:05:32 (GMT)
committerfluxgen <fluxgen>2003-09-06 14:05:32 (GMT)
commit12532042f5d6f1245ba308d7db024c8970c57df8 (patch)
treeb5db128831efdf51bf51495bf982dfd0df65ffa6
parent85316137bacf8a5c8a3ee4b48e7b7253615ba60c (diff)
downloadfluxbox-12532042f5d6f1245ba308d7db024c8970c57df8.zip
fluxbox-12532042f5d6f1245ba308d7db024c8970c57df8.tar.bz2
using KeyUtil cleanMods
-rw-r--r--src/WorkspaceCmd.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index ac71112..143f90b 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -20,14 +20,17 @@
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.3 2003/07/19 13:51:24 rathnor Exp $ 23// $Id: WorkspaceCmd.cc,v 1.4 2003/09/06 14:05:32 fluxgen Exp $
24 24
25#include "WorkspaceCmd.hh" 25#include "WorkspaceCmd.hh"
26
26#include "Workspace.hh" 27#include "Workspace.hh"
27#include "Window.hh" 28#include "Window.hh"
28#include "Screen.hh" 29#include "Screen.hh"
29#include "fluxbox.hh" 30#include "fluxbox.hh"
30#include "Keys.hh" 31
32#include "FbTk/KeyUtil.hh"
33
31#include <algorithm> 34#include <algorithm>
32#include <functional> 35#include <functional>
33 36
@@ -38,7 +41,7 @@ void NextWindowCmd::execute() {
38 Fluxbox *fb = Fluxbox::instance(); 41 Fluxbox *fb = Fluxbox::instance();
39 // special case for commands from key events 42 // special case for commands from key events
40 if (fb->lastEvent().type == KeyPress) { 43 if (fb->lastEvent().type == KeyPress) {
41 unsigned int mods = Keys::cleanMods(fb->lastEvent().xkey.state); 44 unsigned int mods = FbTk::KeyUtil::cleanMods(fb->lastEvent().xkey.state);
42 if (mods == 0) // can't stacked cycle unless there is a mod to grab 45 if (mods == 0) // can't stacked cycle unless there is a mod to grab
43 screen->nextFocus(m_option | BScreen::CYCLELINEAR); 46 screen->nextFocus(m_option | BScreen::CYCLELINEAR);
44 else { 47 else {
@@ -59,7 +62,7 @@ void PrevWindowCmd::execute() {
59 Fluxbox *fb = Fluxbox::instance(); 62 Fluxbox *fb = Fluxbox::instance();
60 // special case for commands from key events 63 // special case for commands from key events
61 if (fb->lastEvent().type == KeyPress) { 64 if (fb->lastEvent().type == KeyPress) {
62 unsigned int mods = Keys::cleanMods(fb->lastEvent().xkey.state); 65 unsigned int mods = FbTk::KeyUtil::cleanMods(fb->lastEvent().xkey.state);
63 if (mods == 0) // can't stacked cycle unless there is a mod to grab 66 if (mods == 0) // can't stacked cycle unless there is a mod to grab
64 screen->prevFocus(m_option | BScreen::CYCLELINEAR); 67 screen->prevFocus(m_option | BScreen::CYCLELINEAR);
65 else { 68 else {