gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

StartWindozeCycle uses ease variable

Browse Source 
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) <kix@kix.es>
This commit is contained in:
Rodolfo García Peñas (kix)
2013-10-04 23:12:28 +02:00
committed by Carlos R. Mafra
parent e0697c9162
commit 1d09b9fdcd
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cycling.c
View File

@@ -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);