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) <k...@kix.es>
---
src/cycling.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/cycling.c b/src/cycling.c
index 291a28a..2cba22b 100644
--- a/src/cycling.c
+++ b/src/cycling.c
@@ -79,10 +79,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);
@@ -108,16 +109,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);
--
1.8.4.rc3
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
