- /* 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_HYPER;
+ case XK_Meta_L:
+ case XK_Meta_R: return OBT_KEYBOARD_MODKEY_META;
+ 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;