nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rather than making you hit both Key_L and Key_R if they are bound to different things, make Key_L take precidence. But if only Key_R is bound then use that. If Key_L is bound to multiple masks it'll use them all, but that won't work for Key_R right now.

Browse source
This commit is contained in:
Dana Jansens 2007-06-07 04:48:53 +00:00
parent 94140a4b35
commit a97f6faba5
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
openbox/modkeys.c
View file

@ -135,13 +135,17 @@ static void set_modkey_mask(guchar mask, KeySym sym)
modkeys_keys[OB_MODKEY_KEY_NUMLOCK] |= mask; modkeys_keys[OB_MODKEY_KEY_NUMLOCK] |= mask;
else if (sym == XK_Scroll_Lock) else if (sym == XK_Scroll_Lock)
modkeys_keys[OB_MODKEY_KEY_SCROLLLOCK] |= mask; modkeys_keys[OB_MODKEY_KEY_SCROLLLOCK] |= mask;
else if (sym == XK_Super_L || sym == XK_Super_R) else if (sym == XK_Super_L ||
(sym == XK_Super_R && !modkeys_keys[OB_MODKEY_KEY_SUPER]))
modkeys_keys[OB_MODKEY_KEY_SUPER] |= mask; modkeys_keys[OB_MODKEY_KEY_SUPER] |= mask;
else if (sym == XK_Hyper_L || sym == XK_Hyper_R) else if (sym == XK_Hyper_L ||
(sym == XK_Hyper_R && !modkeys_keys[OB_MODKEY_KEY_HYPER]))
modkeys_keys[OB_MODKEY_KEY_HYPER] |= mask; modkeys_keys[OB_MODKEY_KEY_HYPER] |= mask;
else if (sym == XK_Alt_L || sym == XK_Alt_R) else if (sym == XK_Alt_L ||
(sym == XK_Alt_R && !modkeys_keys[OB_MODKEY_KEY_ALT]))
modkeys_keys[OB_MODKEY_KEY_ALT] |= mask; modkeys_keys[OB_MODKEY_KEY_ALT] |= mask;
else if (sym == XK_Meta_L || sym == XK_Meta_R) else if (sym == XK_Meta_L ||
(sym == XK_Meta_R && !modkeys_keys[OB_MODKEY_KEY_META]))
modkeys_keys[OB_MODKEY_KEY_META] |= mask; modkeys_keys[OB_MODKEY_KEY_META] |= mask;
/* CapsLock, Shift, and Control are special and hard-coded */ /* CapsLock, Shift, and Control are special and hard-coded */
} }