From 12532042f5d6f1245ba308d7db024c8970c57df8 Mon Sep 17 00:00:00 2001 From: fluxgen <fluxgen> Date: Sat, 6 Sep 2003 14:05:32 +0000 Subject: using KeyUtil cleanMods --- src/WorkspaceCmd.cc | 11 +++++++---- 1 file 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 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: WorkspaceCmd.cc,v 1.3 2003/07/19 13:51:24 rathnor Exp $ +// $Id: WorkspaceCmd.cc,v 1.4 2003/09/06 14:05:32 fluxgen Exp $ #include "WorkspaceCmd.hh" + #include "Workspace.hh" #include "Window.hh" #include "Screen.hh" #include "fluxbox.hh" -#include "Keys.hh" + +#include "FbTk/KeyUtil.hh" + #include <algorithm> #include <functional> @@ -38,7 +41,7 @@ void NextWindowCmd::execute() { Fluxbox *fb = Fluxbox::instance(); // special case for commands from key events if (fb->lastEvent().type == KeyPress) { - unsigned int mods = Keys::cleanMods(fb->lastEvent().xkey.state); + unsigned int mods = FbTk::KeyUtil::cleanMods(fb->lastEvent().xkey.state); if (mods == 0) // can't stacked cycle unless there is a mod to grab screen->nextFocus(m_option | BScreen::CYCLELINEAR); else { @@ -59,7 +62,7 @@ void PrevWindowCmd::execute() { Fluxbox *fb = Fluxbox::instance(); // special case for commands from key events if (fb->lastEvent().type == KeyPress) { - unsigned int mods = Keys::cleanMods(fb->lastEvent().xkey.state); + unsigned int mods = FbTk::KeyUtil::cleanMods(fb->lastEvent().xkey.state); if (mods == 0) // can't stacked cycle unless there is a mod to grab screen->prevFocus(m_option | BScreen::CYCLELINEAR); else { -- cgit v0.11.2