From 1d09b9fdcd7def30f409a7f05fb81998f018745a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?= Date: Fri, 4 Oct 2013 23:12:28 +0200 Subject: [PATCH] StartWindozeCycle uses ease variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The function StartWindozeCycle() uses now the variable WShortKey to store the shortcut key. The code is the same, but now the hasModifier variable is calculated in only one place. Signed-off-by: Rodolfo García Peñas (kix) --- src/cycling.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/cycling.c b/src/cycling.c index 4955e3f4..0ee39dbc 100644 --- a/src/cycling.c +++ b/src/cycling.c @@ -77,10 +77,11 @@ static WWindow *change_focus_and_raise(WWindow *newFocused, WWindow *oldFocused, return oldFocused; } -void StartWindozeCycle(WWindow * wwin, XEvent * event, Bool next, Bool class_only) +void StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next, Bool class_only) { XModifierKeymap *keymap = NULL; + WShortKey binding; WSwitchPanel *swpanel = NULL; WScreen *scr = wScreenForRootWindow(event->xkey.root); KeyCode leftKey = XKeysymToKeycode(dpy, XK_Left); @@ -106,16 +107,17 @@ void StartWindozeCycle(WWindow * wwin, XEvent * event, Bool next, Bool class_onl if (next) { if (class_only) - hasModifier = (wKeyBindings[WKBD_GROUPNEXT].modifier != 0); + binding = wKeyBindings[WKBD_GROUPNEXT]; else - hasModifier = (wKeyBindings[WKBD_FOCUSNEXT].modifier != 0); + binding = wKeyBindings[WKBD_FOCUSNEXT]; } else { if (class_only) - hasModifier = (wKeyBindings[WKBD_GROUPPREV].modifier != 0); + binding = wKeyBindings[WKBD_GROUPPREV]; else - hasModifier = (wKeyBindings[WKBD_FOCUSPREV].modifier != 0); + binding = wKeyBindings[WKBD_FOCUSPREV]; } + hasModifier = (binding.modifier != 0); if (hasModifier) { keymap = XGetModifierMapping(dpy); XGrabKeyboard(dpy, scr->root_win, False, GrabModeAsync, GrabModeAsync, CurrentTime);