mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-20 21:08:08 +01:00
fixed user whining bug
This commit is contained in:
23
src/event.c
23
src/event.c
@@ -1313,6 +1313,8 @@ doWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
|
|||||||
WWindow *oldFocused;
|
WWindow *oldFocused;
|
||||||
int modifiers;
|
int modifiers;
|
||||||
XModifierKeymap *keymap;
|
XModifierKeymap *keymap;
|
||||||
|
Bool somethingElse = False;
|
||||||
|
XEvent ev;
|
||||||
|
|
||||||
if (!wwin)
|
if (!wwin)
|
||||||
return;
|
return;
|
||||||
@@ -1346,8 +1348,6 @@ doWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
while (!done) {
|
while (!done) {
|
||||||
XEvent ev;
|
|
||||||
|
|
||||||
WMMaskEvent(dpy,KeyPressMask|KeyReleaseMask|ExposureMask, &ev);
|
WMMaskEvent(dpy,KeyPressMask|KeyReleaseMask|ExposureMask, &ev);
|
||||||
|
|
||||||
if (ev.type != KeyRelease && ev.type != KeyPress) {
|
if (ev.type != KeyRelease && ev.type != KeyPress) {
|
||||||
@@ -1390,20 +1390,9 @@ doWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
|
|||||||
UpdateSwitchMenu(scr, newFocused, ACTION_CHANGE_STATE);
|
UpdateSwitchMenu(scr, newFocused, ACTION_CHANGE_STATE);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
handleKeyPress(&ev);
|
somethingElse = True;
|
||||||
|
done = True;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
else if (wKeyBindings[WKBD_LOWER].keycode == ev.xkey.keycode
|
|
||||||
&& wKeyBindings[WKBD_LOWER].modifier == modifiers) {
|
|
||||||
|
|
||||||
wLowerFrame(newFocused->frame->core);
|
|
||||||
|
|
||||||
} else if (wKeyBindings[WKBD_RAISE].keycode == ev.xkey.keycode
|
|
||||||
&& wKeyBindings[WKBD_RAISE].modifier == modifiers) {
|
|
||||||
|
|
||||||
wRaiseFrame(newFocused->frame->core);
|
|
||||||
}*/
|
|
||||||
} else if (ev.type == KeyRelease) {
|
} else if (ev.type == KeyRelease) {
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
@@ -1430,6 +1419,10 @@ doWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
|
|||||||
scr->flags.doing_alt_tab = 0;
|
scr->flags.doing_alt_tab = 0;
|
||||||
if (openedSwitchMenu)
|
if (openedSwitchMenu)
|
||||||
OpenSwitchMenu(scr, scr->scr_width/2, scr->scr_height/2, False);
|
OpenSwitchMenu(scr, scr->scr_width/2, scr->scr_height/2, False);
|
||||||
|
|
||||||
|
if (somethingElse) {
|
||||||
|
handleKeyPress(&ev);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user