i learnt what xkb does with the state.

use the state from keyrelease events directly, rather than query the state (which is not as accurate!)

the xkb state (as opposed to the normally sent compat state) contains extra info like the keyboard group, the pointer buttons, etc.  so we can just strip that stuff out. (See section 2.2.2 of the XKB proto document)

1 files changed, 7 insertions, 17 deletions

diff --git a/openbox/event.c b/openbox/event.c
index 51cfc658..bd33b489 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -260,10 +260,6 @@ static void event_set_curtime(XEvent *e)
 
 static void event_hack_mods(XEvent *e)
 {
-#ifdef XKB
-    XkbStateRec xkb_state;
-#endif
-
     switch (e->type) {
     case ButtonPress:
     case ButtonRelease:
@@ -274,20 +270,14 @@ static void event_hack_mods(XEvent *e)
         break;
     case KeyRelease:
 #ifdef XKB
-        /* If XKB is present, then the modifiers are all strange from its
-           magic.  Our X core protocol stuff won't work, so we use this to
-           find what the modifier state is instead. */
-        if (XkbGetState(obt_display, XkbUseCoreKbd, &xkb_state) == Success)
-            e->xkey.state =
-                obt_keyboard_only_modmasks(xkb_state.compat_state);
-        else
+        /* keep only the keyboard modifiers.  xkb includes other things here.
+           (see XKBProto.pdf document: section 2.2.2) */
+        e->xkey.state &= 0xf;
 #endif
-        {
-            e->xkey.state = obt_keyboard_only_modmasks(e->xkey.state);
-            /* remove from the state the mask of the modifier key being
-               released, if it is a modifier key being released that is */
-            e->xkey.state &= ~obt_keyboard_keycode_to_modmask(e->xkey.keycode);
-        }
+        e->xkey.state = obt_keyboard_only_modmasks(e->xkey.state);
+        /* remove from the state the mask of the modifier key being
+           released, if it is a modifier key being released that is */
+        e->xkey.state &= ~obt_keyboard_keycode_to_modmask(e->xkey.keycode);
         break;
     case MotionNotify:
         e->xmotion.state = obt_keyboard_only_modmasks(e->xmotion.state);