Use the KeyCode to directly find the modifier mask. (Fix bug 5173)

We were finding the KeySym first, and then converting back to a modifier mask.
But KeySym on a key's release can differ from on its press, and we don't need
them to determine the modmask from the keycode.

[setxkbmap -option "grp:shifts_toggle"] turns Shift_L into XK_ISO_Prev_Group on
key release, and Shift_R into XK_ISO_Next_Group.

diff --git a/obt/keyboard.c b/obt/keyboard.c
index ef2678b529f15a8ab9811e798a8ceb06621d0d7f..4e84f4819e24a8b872cbbbcf52a4b72a477461aa 100644 (file)
--- a/obt/keyboard.c
+++ b/obt/keyboard.c
@@ -49,7 +49,7 @@ void obt_keyboard_context_renew(ObtIC *ic);
 static XModifierKeymap *modmap;
 static KeySym *keymap;
 static gint min_keycode, max_keycode, keysyms_per_keycode;
-/* This is a bitmask of the different masks for each modifier key */
+/*! This is a bitmask of the different masks for each modifier key */
 static guchar modkeys_keys[OBT_KEYBOARD_NUM_MODKEYS];
 
 static gboolean alt_l = FALSE;
@@ -190,40 +190,20 @@ void xim_init(void)
     g_free(aname);
 }
 
-ObtModkeysKey obt_keyboard_keyevent_to_modkey(XEvent *e)
+guint obt_keyboard_keyevent_to_modmask(XEvent *e)
 {
-    KeySym sym;
+    gint i, masknum;
 
     g_return_val_if_fail(e->type == KeyPress || e->type == KeyRelease,
                          OBT_KEYBOARD_MODKEY_NONE);
 
-    XLookupString(&e->xkey, NULL, 0, &sym, NULL);
-
-    switch (sym) {
-    case XK_Num_Lock: return OBT_KEYBOARD_MODKEY_NUMLOCK;
-    case XK_Scroll_Lock: return OBT_KEYBOARD_MODKEY_SCROLLLOCK;
-    case XK_Caps_Lock: return OBT_KEYBOARD_MODKEY_SHIFT;
-    case XK_Alt_L:
-    case XK_Alt_R: return OBT_KEYBOARD_MODKEY_ALT;
-    case XK_Super_L:
-    case XK_Super_R: return OBT_KEYBOARD_MODKEY_SUPER;
-    case XK_Hyper_L:
-    case XK_Hyper_R: return OBT_KEYBOARD_MODKEY_HYPER;
-    case XK_Meta_L:
-    case XK_Meta_R: return OBT_KEYBOARD_MODKEY_META;
-    case XK_Control_L:
-    case XK_Control_R: return OBT_KEYBOARD_MODKEY_CONTROL;
-    case XK_Shift_L:
-    case XK_Shift_R: return OBT_KEYBOARD_MODKEY_SHIFT;
-    default: return OBT_KEYBOARD_MODKEY_NONE;
-    }
-}
-
-guint obt_keyboard_keyevent_to_modmask(XEvent *e)
-{
-    g_return_val_if_fail(e->type == KeyPress || e->type == KeyRelease, 0);
-
-    return obt_keyboard_modkey_to_modmask(obt_keyboard_keyevent_to_modkey(e));
+    for (masknum = 0; masknum < NUM_MASKS; ++masknum)
+        for (i = 0; i < modmap->max_keypermod; ++i) {
+            KeyCode c = modmap->modifiermap[masknum*modmap->max_keypermod + i];
+            if (c == e->xkey.keycode)
+                return 1<<masknum;
+        }
+    return 0;
 }
 
 guint obt_keyboard_only_modmasks(guint mask)

diff --git a/obt/keyboard.h b/obt/keyboard.h
index 868cccf48d9922afbbc69fbb6c6723de609ceccf..8f2badf8a6db0f16204dc1149741960e10c15cfe 100644 (file)
--- a/obt/keyboard.h
+++ b/obt/keyboard.h
@@ -59,9 +59,6 @@ guint obt_keyboard_only_modmasks(guint mask);
   right keys when there are both. */
 guint obt_keyboard_modkey_to_modmask(ObtModkeysKey key);
 
-/*! Get the modifier key which was pressed or released in a keyboard event */
-ObtModkeysKey obt_keyboard_keyevent_to_modkey(XEvent *e);
-
 /*! Convert a KeySym to all the KeyCodes which generate it. */
 KeyCode* obt_keyboard_keysym_to_keycode(KeySym sym);
 

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 70d807dbc6699172994abb8a1c4b7707b78febf2..8dadf550af3b2ea2787015be50528e48ce8c7a2d 100644 (file)
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -352,7 +352,7 @@ static gboolean i_input_func(guint initial_state,
 static gboolean i_pre_func(guint initial_state, gpointer options)
 {
     guint initial_mods = obt_keyboard_only_modmasks(initial_state);
-    if (!inital_mods) {
+    if (!initial_mods) {
         Options *o = options;
         o->interactive = FALSE;
         return FALSE;