mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-26 00:12:31 +01:00
Correct check for modifier in class-specific cycle.
The hasModifier flag was set if the FocusNextKey or FocusPrevKey shortcuts had modifiers, depending on which shortcut was used to open the switchpanel. The switchpanel can also be opened with the GroupNextKey or GroupPrevKey shortcuts, so we should account for those when setting hasModifier.
This commit is contained in:
committed by
Carlos R. Mafra
parent
6fb2b13ec7
commit
8cb6a78726
@@ -105,10 +105,17 @@ void StartWindozeCycle(WWindow * wwin, XEvent * event, Bool next, Bool class_onl
|
||||
if (!wwin)
|
||||
return;
|
||||
|
||||
if (next)
|
||||
hasModifier = (wKeyBindings[WKBD_FOCUSNEXT].modifier != 0);
|
||||
else
|
||||
hasModifier = (wKeyBindings[WKBD_FOCUSPREV].modifier != 0);
|
||||
if (next) {
|
||||
if (class_only)
|
||||
hasModifier = (wKeyBindings[WKBD_GROUPNEXT].modifier != 0);
|
||||
else
|
||||
hasModifier = (wKeyBindings[WKBD_FOCUSNEXT].modifier != 0);
|
||||
} else {
|
||||
if (class_only)
|
||||
hasModifier = (wKeyBindings[WKBD_GROUPPREV].modifier != 0);
|
||||
else
|
||||
hasModifier = (wKeyBindings[WKBD_FOCUSPREV].modifier != 0);
|
||||
}
|
||||
|
||||
if (hasModifier) {
|
||||
keymap = XGetModifierMapping(dpy);
|
||||
|
||||
Reference in New Issue
Block a user