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 */
+/*! This is a bitmask of the different masks for each modifier key */
static guchar modkeys_keys[OBT_KEYBOARD_NUM_MODKEYS];
static gboolean alt_l = FALSE;
if (g_ascii_islower(aclass[0]))
aclass[0] = g_ascii_toupper(aclass[0]);
- g_print("Opening Input Method for %s %s\n", aname, aclass);
xim = XOpenIM(obt_display, NULL, aname, aclass);
if (!xim)
g_free(aname);
}
-ObtModkeysKey obt_keyboard_keyevent_to_modkey(XEvent *e)
+guint obt_keyboard_keyevent_to_modmask(XEvent *e)
{
- KeySym sym;
+ gint i, masknum;
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;
- }
-}
-
-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));
+ for (masknum = 0; masknum < NUM_MASKS; ++masknum)
+ for (i = 0; i < modmap->max_keypermod; ++i) {
+ KeyCode c = modmap->modifiermap[masknum*modmap->max_keypermod + i];
+ if (c == e->xkey.keycode)
+ return 1<<masknum;
+ }
+ return 0;
}
guint obt_keyboard_only_modmasks(guint mask)
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 = g_renew(KeyCode, ret, ++n + 1);
ret[n-1] = i;
ret[n] = 0;
}
KeySym obt_keyboard_keypress_to_keysym(XEvent *ev)
{
KeySym sym;
- gint r;
g_return_val_if_fail(ev->type == KeyPress, None);
sym = None;
- r = XLookupString(&ev->xkey, NULL, 0, &sym, NULL);
+ XLookupString(&ev->xkey, NULL, 0, &sym, NULL);
return sym;
}
{
if (--ic->ref < 1) {
xic_all = g_slist_remove(xic_all, ic);
- XDestroyIC(ic->xic);
+ if (ic->xic)
+ XDestroyIC(ic->xic);
g_slice_free(ObtIC, ic);
}
}