X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmodkeys.c;h=e897ccb379b144bc29de2c6e762d8950aab435f2;hb=bafd9e9edcff0e18a03ef6f4e73d673e12a7c7ed;hp=18875d75074c8088833a1157265dc201f10824a4;hpb=a97f6faba501a3e934510e9d1c27e331d2c48301;p=chaz%2Fopenbox

diff --git a/openbox/modkeys.c b/openbox/modkeys.c
index 18875d75..e897ccb3 100644
--- a/openbox/modkeys.c
+++ b/openbox/modkeys.c
@@ -41,6 +41,11 @@ static gint min_keycode, max_keycode, keysyms_per_keycode;
 /* This is a bitmask of the different masks for each modifier key */
 static guchar modkeys_keys[OB_MODKEY_NUM_KEYS];
 
+static gboolean alt_l = FALSE;
+static gboolean meta_l = FALSE;
+static gboolean super_l = FALSE;
+static gboolean hyper_l = FALSE;
+
 void modkeys_startup(gboolean reconfigure)
 {
     gint i, j, k;
@@ -57,6 +62,8 @@ void modkeys_startup(gboolean reconfigure)
                                  max_keycode - min_keycode + 1,
                                  &keysyms_per_keycode);
 
+    alt_l = meta_l = super_l = hyper_l = FALSE;
+
     /* go through each of the modifier masks (eg ShiftMask, CapsMask...) */
     for (i = 0; i < NUM_MASKS; ++i) {
         /* go through each keycode that is bound to the mask */
@@ -135,30 +142,56 @@ static void set_modkey_mask(guchar mask, KeySym sym)
         modkeys_keys[OB_MODKEY_KEY_NUMLOCK] |= mask;
     else if (sym == XK_Scroll_Lock)
         modkeys_keys[OB_MODKEY_KEY_SCROLLLOCK] |= mask;
-    else if (sym == XK_Super_L ||
-             (sym == XK_Super_R && !modkeys_keys[OB_MODKEY_KEY_SUPER]))
+
+    else if (sym == XK_Super_L && super_l)
+        modkeys_keys[OB_MODKEY_KEY_SUPER] |= mask;
+    else if (sym == XK_Super_L && !super_l)
+        /* left takes precident over right, so erase any masks the right
+           key may have set */
+        modkeys_keys[OB_MODKEY_KEY_SUPER] = mask, super_l = TRUE;
+    else if (sym == XK_Super_R && !super_l)
         modkeys_keys[OB_MODKEY_KEY_SUPER] |= mask;
-    else if (sym == XK_Hyper_L ||
-             (sym == XK_Hyper_R && !modkeys_keys[OB_MODKEY_KEY_HYPER]))
+
+    else if (sym == XK_Hyper_L && hyper_l)
+        modkeys_keys[OB_MODKEY_KEY_HYPER] |= mask;
+    else if (sym == XK_Hyper_L && !hyper_l)
+        modkeys_keys[OB_MODKEY_KEY_HYPER] = mask, hyper_l = TRUE;
+    else if (sym == XK_Hyper_R && !hyper_l)
         modkeys_keys[OB_MODKEY_KEY_HYPER] |= mask;
-    else if (sym == XK_Alt_L ||
-             (sym == XK_Alt_R && !modkeys_keys[OB_MODKEY_KEY_ALT]))
+
+    else if (sym == XK_Alt_L && alt_l)
+        modkeys_keys[OB_MODKEY_KEY_ALT] |= mask;
+    else if (sym == XK_Alt_L && !alt_l)
+        modkeys_keys[OB_MODKEY_KEY_ALT] = mask, alt_l = TRUE;
+    else if (sym == XK_Alt_R && !alt_l)
         modkeys_keys[OB_MODKEY_KEY_ALT] |= mask;
-    else if (sym == XK_Meta_L ||
-             (sym == XK_Meta_R && !modkeys_keys[OB_MODKEY_KEY_META]))
+
+    else if (sym == XK_Meta_L && meta_l)
+        modkeys_keys[OB_MODKEY_KEY_META] |= mask;
+    else if (sym == XK_Meta_L && !meta_l)
+        modkeys_keys[OB_MODKEY_KEY_META] = mask, meta_l = TRUE;
+    else if (sym == XK_Meta_R && !meta_l)
         modkeys_keys[OB_MODKEY_KEY_META] |= mask;
+
     /* CapsLock, Shift, and Control are special and hard-coded */
 }
 
-KeyCode modkeys_sym_to_code(KeySym sym)
+KeyCode* modkeys_sym_to_code(KeySym sym)
 {
-    gint i, j;
+    KeyCode *ret;
+    gint i, j, n;
+
+    ret = g_new(KeyCode, 1);
+    n = 0;
+    ret[n] = 0;
 
     /* go through each keycode and look for the keysym */
     for (i = min_keycode; i <= max_keycode; ++i)
         for (j = 0; j < keysyms_per_keycode; ++j)
-            if (sym == keymap[(i-min_keycode) * keysyms_per_keycode + j])
-                return i;
-    return 0;
+            if (sym == keymap[(i-min_keycode) * keysyms_per_keycode + j]) {
+                ret = g_renew(KeyCode, ret, ++n);
+                ret[n-1] = i;
+                ret[n] = 0;
+            }
+    return ret;
 }
-