X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmodkeys.c;h=e897ccb379b144bc29de2c6e762d8950aab435f2;hb=d3a01a40f35cb3ae6c5ad8329291e86e2e599691;hp=4eb836e5114548527f2c7bb3a4c71a88ef1031cd;hpb=1e4215c5c63c53c199a3a5a177607de308c8a3f1;p=chaz%2Fopenbox diff --git a/openbox/modkeys.c b/openbox/modkeys.c index 4eb836e5..e897ccb3 100644 --- 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 */ @@ -64,22 +71,30 @@ void modkeys_startup(gboolean reconfigure) KeySym sym; /* get a keycode that is bound to the mask (i) */ KeyCode keycode = modmap->modifiermap[i*modmap->max_keypermod + j]; - /* go through each keysym bound to the given keycode */ - for (k = 0; k < keysyms_per_keycode; ++k) { - sym = keymap[(keycode-min_keycode) * keysyms_per_keycode + k]; - if (sym != NoSymbol) { - /* bind the key to the mask (e.g. Alt_L => Mod1Mask) */ - set_modkey_mask(nth_mask(i), sym); + if (keycode) { + /* go through each keysym bound to the given keycode */ + for (k = 0; k < keysyms_per_keycode; ++k) { + sym = keymap[(keycode-min_keycode) * keysyms_per_keycode + + k]; + if (sym != NoSymbol) { + /* bind the key to the mask (e.g. Alt_L => Mod1Mask) */ + set_modkey_mask(nth_mask(i), sym); + } } } } } - 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) @@ -105,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; @@ -124,18 +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_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_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) + + 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) + + 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 *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]) { + ret = g_renew(KeyCode, ret, ++n); + ret[n-1] = i; + ret[n] = 0; + } + return ret; }