gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-28 17:32:29 +01:00
Code Issues Projects Releases Wiki Activity

reverted the last test commit (duh)

Browse Source
This commit is contained in:
dan
2004-07-16 18:50:58 +00:00
parent 109bb540ec
commit 474c4caf94
42 changed files with 1668 additions and 2053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/cycling.c
View File

@@ -198,9 +198,7 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
if (hasModifier) {
keymap = XGetModifierMapping(dpy);
#ifdef DEBUG
printf("Grabbing keyboard\n");
#endif
XGrabKeyboard(dpy, scr->root_win, False, GrabModeAsync, GrabModeAsync,
CurrentTime);
}
@@ -225,6 +223,11 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
wWindowFocus(newFocused, scr->focused_window);
oldFocused = newFocused;
if (hasModifier)
done = False;
else
done = True;
#if 0
if (wPreferences.popup_switchmenu &&
(!scr->switch_menu || !scr->switch_menu->flags.mapped)) {
@@ -233,9 +236,8 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
openedSwitchMenu = True;
}
#endif
while (hasModifier && !done) {
WMMaskEvent(dpy, KeyPressMask|KeyReleaseMask|ExposureMask, &ev);
while (!done) {
WMMaskEvent(dpy,KeyPressMask|KeyReleaseMask|ExposureMask, &ev);
if (ev.type != KeyRelease && ev.type != KeyPress) {
WMHandleEvent(&ev);
@@ -245,10 +247,7 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
modifiers = ev.xkey.state & ValidModMask;
if (ev.type == KeyPress) {
#ifdef DEBUG
printf("Got key press\n");
#endif
if (wKeyBindings[WKBD_FOCUSNEXT].keycode == ev.xkey.keycode
if (wKeyBindings[WKBD_FOCUSNEXT].keycode == ev.xkey.keycode
&& wKeyBindings[WKBD_FOCUSNEXT].modifier == modifiers) {
newFocused = nextToFocusAfter(newFocused);
@@ -275,18 +274,12 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
}
} else {
#ifdef DEBUG
printf("Got something else\n");
#endif
somethingElse = True;
done = True;
}
} else if (ev.type == KeyRelease) {
int i;
#ifdef DEBUG
printf("Got key release\n");
#endif
for (i = 0; i < 8 * keymap->max_keypermod; i++) {
if (keymap->modifiermap[i] == ev.xkey.keycode &&
wKeyBindings[WKBD_FOCUSNEXT].modifier
@@ -301,9 +294,6 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
XFreeModifiermap(keymap);
if (hasModifier) {
#ifdef DEBUG
printf("Ungrabbing keyboard\n");
#endif
XUngrabKeyboard(dpy, CurrentTime);
}
wSetFocusTo(scr, newFocused);