X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmodkeys.c;h=9e8da321b2adad407012375fce99e996bdb69428;hb=5ae93282f93ecafc491202a363f944d9604d3437;hp=4f0ddca94c078fae96cdc1ae8c5195d762e5dea2;hpb=7e946f68d9f8ec7c880664b437edbbaa5d49ac10;p=chaz%2Fopenbox diff --git a/openbox/modkeys.c b/openbox/modkeys.c index 4f0ddca9..9e8da321 100644 --- a/openbox/modkeys.c +++ b/openbox/modkeys.c @@ -20,6 +20,7 @@ #include "openbox.h" #include +#include /* These masks are constants and the modifier keys are bound to them as anyone sees fit: @@ -27,7 +28,7 @@ Mod2Mask (1<<4), Mod3Mask (1<<5), Mod4Mask (1<<6), Mod5Mask (1<<7) */ #define NUM_MASKS 8 -#define ALL_MASKS 0xf /* an or'ing of all 8 keyboard masks */ +#define ALL_MASKS 0xff /* an or'ing of all 8 keyboard masks */ /* Get the bitflag for the n'th modifier mask */ #define nth_mask(n) (1 << n) @@ -35,21 +36,34 @@ 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) { - /* keycodes for the modifier keys which will be bound to the masks */ gint i, j, k; - modmap = XGetModifierMapping(ob_display); - g_assert(modmap->max_keypermod > 0); - /* reset the keys to not be bound to any masks */ for (i = 0; i < OB_MODKEY_NUM_KEYS; ++i) modkeys_keys[i] = 0; + modmap = XGetModifierMapping(ob_display); + g_assert(modmap->max_keypermod > 0); + + XDisplayKeycodes(ob_display, &min_keycode, &max_keycode); + keymap = XGetKeyboardMapping(ob_display, min_keycode, + 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 */ @@ -57,21 +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) { - sym = XKeycodeToKeysym(ob_display, keycode, k); - if (sym == NoSymbol) break; - - /* 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); + } + } } } } + + /* 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) @@ -97,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; @@ -116,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_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) +{ + 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; +} +