Fix some memleaks.

[chaz/openbox] / openbox / modkeys.c

diff --git a/openbox/modkeys.c b/openbox/modkeys.c
index 34446726a66b49f583d3342a1daa462b6edba852..9e8da321b2adad407012375fce99e996bdb69428 100644 (file)
--- a/openbox/modkeys.c
+++ b/openbox/modkeys.c
@@ -36,14 +36,19 @@
 static void set_modkey_mask(guchar mask, KeySym sym);
 
 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 */
 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)
 {
-    KeySym *keymap;
     gint i, j, k;
-    gint min_keycode, max_keycode, keysyms_per_keycode;
 
     /* reset the keys to not be bound to any masks */
     for (i = 0; i < OB_MODKEY_NUM_KEYS; ++i)
@@ -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 */
@@ -77,12 +84,17 @@ void modkeys_startup(gboolean reconfigure)
             }
         }
     }
-    XFree(keymap);
+
+    /* CapsLock, Shift, and Control are special and hard-coded */
+    modkeys_keys[OB_MODKEY_KEY_CAPSLOCK] = LockMask;
+    modkeys_keys[OB_MODKEY_KEY_SHIFT] = ShiftMask;
+    modkeys_keys[OB_MODKEY_KEY_CONTROL] = ControlMask;
 }
 
 void modkeys_shutdown(gboolean reconfigure)
 {
     XFreeModifiermap(modmap);
+    XFree(keymap);
 }
 
 guint modkeys_keycode_to_mask(guint keycode)
@@ -108,7 +120,10 @@ guint modkeys_only_modifier_masks(guint mask)
 {
     mask &= ALL_MASKS;
     /* strip off these lock keys. they shouldn't affect key bindings */
-    mask &= ~modkeys_key_to_mask(OB_MODKEY_KEY_CAPSLOCK);
+    mask &= ~LockMask; /* use the LockMask, not what capslock is bound to,
+                          because you could bind it to something else and it
+                          should work as that modifier then. i think capslock
+                          is weird in xkb. */
     mask &= ~modkeys_key_to_mask(OB_MODKEY_KEY_NUMLOCK);
     mask &= ~modkeys_key_to_mask(OB_MODKEY_KEY_SCROLLLOCK);
     return mask;
@@ -127,18 +142,49 @@ 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_Caps_Lock)
-        modkeys_keys[OB_MODKEY_KEY_CAPSLOCK] |= mask;
-    else if (sym == XK_Shift_L || sym == XK_Shift_R)
-        modkeys_keys[OB_MODKEY_KEY_SHIFT] |= mask;
-    else if (sym == XK_Control_L || sym == XK_Control_R)
-        modkeys_keys[OB_MODKEY_KEY_CONTROL] |= mask;
-    else if (sym == XK_Super_L || sym == XK_Super_R)
+
+    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)
+
+    else if (sym == XK_Hyper_L && hyper_l)
         modkeys_keys[OB_MODKEY_KEY_HYPER] |= mask;
-    else if (sym == XK_Alt_L || sym == XK_Alt_R)
+    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 && alt_l)
         modkeys_keys[OB_MODKEY_KEY_ALT] |= mask;
-    else if (sym == XK_Meta_L || sym == XK_Meta_R)
+    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 && 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)
+{
+    gint i, j;
+
+    /* 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;
 }
+