gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-01 11:32:34 +01:00
Code Issues Projects Releases Wiki Activity

Clean up StartWindozeCycle()

Browse Source 
We can get rid of one overall tab by moving the

   if(swpanel)

test -- which was done everytime in each individual case --
to the beginning, therefore encompassing all cases.
This commit is contained in:
Carlos R. Mafra
2009-08-20 04:07:15 +02:00
parent 688a56e8ab
commit 4a041b6f0a
1 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/cycling.c
View File

@@ -131,66 +131,60 @@ void StartWindozeCycle(WWindow * wwin, XEvent * event, Bool next)
switch (ev.type) { switch (ev.type) {
case KeyPress: case KeyPress:
#ifdef DEBUG
printf("Got key press\n"); if (!swpanel) {
#endif done = True;
break;
}
if ((wKeyBindings[WKBD_FOCUSNEXT].keycode == ev.xkey.keycode if ((wKeyBindings[WKBD_FOCUSNEXT].keycode == ev.xkey.keycode
&& wKeyBindings[WKBD_FOCUSNEXT].modifier == modifiers) && wKeyBindings[WKBD_FOCUSNEXT].modifier == modifiers)
|| ev.xkey.keycode == rightKey) { || ev.xkey.keycode == rightKey) {
if (swpanel) { newFocused = wSwitchPanelSelectNext(swpanel, False);
newFocused = wSwitchPanelSelectNext(swpanel, False); if (newFocused) {
if (newFocused) { wWindowFocus(newFocused, oldFocused);
wWindowFocus(newFocused, oldFocused); oldFocused = newFocused;
oldFocused = newFocused;
if (wPreferences.circ_raise) { if (wPreferences.circ_raise) {
CommitStacking(scr); CommitStacking(scr);
raiseWindow(swpanel, newFocused); raiseWindow(swpanel, newFocused);
}
} }
} }
} else if ((wKeyBindings[WKBD_FOCUSPREV].keycode == ev.xkey.keycode } else if ((wKeyBindings[WKBD_FOCUSPREV].keycode == ev.xkey.keycode
&& wKeyBindings[WKBD_FOCUSPREV].modifier == modifiers) && wKeyBindings[WKBD_FOCUSPREV].modifier == modifiers)
|| ev.xkey.keycode == leftKey) { || ev.xkey.keycode == leftKey) {
if (swpanel) { newFocused = wSwitchPanelSelectNext(swpanel, True);
newFocused = wSwitchPanelSelectNext(swpanel, True); if (newFocused) {
if (newFocused) { wWindowFocus(newFocused, oldFocused);
wWindowFocus(newFocused, oldFocused); oldFocused = newFocused;
oldFocused = newFocused;
if (wPreferences.circ_raise) { if (wPreferences.circ_raise) {
CommitStacking(scr); CommitStacking(scr);
raiseWindow(swpanel, newFocused); raiseWindow(swpanel, newFocused);
}
} }
} }
} else if (ev.xkey.keycode == homeKey || ev.xkey.keycode == endKey) { } else if (ev.xkey.keycode == homeKey || ev.xkey.keycode == endKey) {
if (swpanel) {
newFocused = wSwitchPanelSelectFirst(swpanel, ev.xkey.keycode != homeKey);
if (newFocused) {
wWindowFocus(newFocused, oldFocused);
oldFocused = newFocused;
if (wPreferences.circ_raise) { newFocused = wSwitchPanelSelectFirst(swpanel, ev.xkey.keycode != homeKey);
CommitStacking(scr); if (newFocused) {
raiseWindow(swpanel, newFocused); wWindowFocus(newFocused, oldFocused);
} oldFocused = newFocused;
if (wPreferences.circ_raise) {
CommitStacking(scr);
raiseWindow(swpanel, newFocused);
} }
} }
} else if (ev.xkey.keycode != shiftLKey && ev.xkey.keycode != shiftRKey) { } else if (ev.xkey.keycode != shiftLKey && ev.xkey.keycode != shiftRKey) {
#ifdef DEBUG
printf("Got something else\n");
#endif
somethingElse = True; somethingElse = True;
done = True; done = True;
} }
break; break;
case KeyRelease: case KeyRelease:
#ifdef DEBUG
printf("Got key release\n");
#endif
for (i = 0; i < 8 * keymap->max_keypermod; i++) { for (i = 0; i < 8 * keymap->max_keypermod; i++) {
if (keymap->modifiermap[i] == ev.xkey.keycode && if (keymap->modifiermap[i] == ev.xkey.keycode &&
wKeyBindings[WKBD_FOCUSNEXT].modifier & 1 << (i / keymap->max_keypermod)) { wKeyBindings[WKBD_FOCUSNEXT].modifier & 1 << (i / keymap->max_keypermod)) {
@@ -233,9 +227,7 @@ void StartWindozeCycle(WWindow * wwin, XEvent * event, Bool next)
XFreeModifiermap(keymap); XFreeModifiermap(keymap);
if (hasModifier) { if (hasModifier) {
#ifdef DEBUG
printf("Ungrabbing keyboard\n");
#endif
XUngrabKeyboard(dpy, CurrentTime); XUngrabKeyboard(dpy, CurrentTime);
} }