diff options
Diffstat (limited to 'obt')
| -rw-r--r-- | obt/keyboard.c | 45 | ||||
| -rw-r--r-- | obt/keyboard.h | 11 |
2 files changed, 39 insertions, 17 deletions
diff --git a/obt/keyboard.c b/obt/keyboard.c index 2d3a0553..30aa7f93 100644 --- a/obt/keyboard.c +++ b/obt/keyboard.c @@ -191,23 +191,40 @@ void xim_init(void) g_free(aname); } -guint obt_keyboard_keycode_to_modmask(guint keycode) +ObtModkeysKey obt_keyboard_keyevent_to_modkey(XEvent *e) { - gint i, j; - guint mask = 0; - - if (keycode == NoSymbol) return 0; + KeySym sym; - /* 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 */ - for (j = 0; j < modmap->max_keypermod; ++j) { - /* compare with a keycode that is bound to the mask (i) */ - if (modmap->modifiermap[i*modmap->max_keypermod + j] == keycode) - mask |= nth_mask(i); - } + 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_SUPER; + case XK_Meta_L: + case XK_Meta_R: return OBT_KEYBOARD_MODKEY_SUPER; + 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; } - return mask; +} + +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)); } guint obt_keyboard_only_modmasks(guint mask) diff --git a/obt/keyboard.h b/obt/keyboard.h index 143921ff..868cccf4 100644 --- a/obt/keyboard.h +++ b/obt/keyboard.h @@ -28,6 +28,7 @@ G_BEGIN_DECLS /*! These keys are bound to the modifier masks in any fashion, except for CapsLock, Shift, and Control. */ typedef enum { + OBT_KEYBOARD_MODKEY_NONE, OBT_KEYBOARD_MODKEY_CAPSLOCK, OBT_KEYBOARD_MODKEY_NUMLOCK, OBT_KEYBOARD_MODKEY_SCROLLLOCK, @@ -45,9 +46,10 @@ typedef struct _ObtIC ObtIC; void obt_keyboard_reload(void); -/*! Get the modifier mask(s) for a KeyCode. (eg. a keycode bound to Alt_L could - return a mask of (Mod1Mask | Mask3Mask)) */ -guint obt_keyboard_keycode_to_modmask(guint keycode); +/*! Get the modifier mask(s) for a keyboard event. + (eg. a keycode bound to Alt_L could return a mask of (Mod1Mask | Mask3Mask)) +*/ +guint obt_keyboard_keyevent_to_modmask(XEvent *e); /*! Strip off all modifiers except for the modifier keys. This strips stuff like Button1Mask, and also LockMask, NumlockMask, and ScrolllockMask */ @@ -57,6 +59,9 @@ 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); |