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;
void obt_keyboard_shutdown(void)
{
+ GSList *it;
+
XFreeModifiermap(modmap);
modmap = NULL;
XFree(keymap);
keymap = NULL;
+ for (it = xic_all; it; it = g_slist_next(it)) {
+ ObtIC* ic = it->data;
+ if (ic->xic) {
+ XDestroyIC(ic->xic);
+ ic->xic = NULL;
+ }
+ }
if (xim) XCloseIM(xim);
xim = NULL;
xim_style = 0;
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);
}
-guint obt_keyboard_keycode_to_modmask(guint keycode)
+guint obt_keyboard_keyevent_to_modmask(XEvent *e)
{
- gint i, j;
- guint mask = 0;
+ gint i, masknum;
- if (keycode == NoSymbol) return 0;
+ g_return_val_if_fail(e->type == KeyPress || e->type == KeyRelease,
+ OBT_KEYBOARD_MODKEY_NONE);
- /* 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);
+ 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 mask;
+ 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;
}
void obt_keyboard_context_renew(ObtIC *ic)
{
- if (ic->xic) {
- XDestroyIC(ic->xic);
- ic->xic = NULL;
- }
-
if (xim) {
ic->xic = XCreateIC(xim,
XNInputStyle, xim_style,
g_return_val_if_fail(client != None && focus != None, NULL);
- ic = g_new(ObtIC, 1);
+ ic = g_slice_new(ObtIC);
ic->ref = 1;
ic->client = client;
ic->focus = focus;
{
if (--ic->ref < 1) {
xic_all = g_slist_remove(xic_all, ic);
- XDestroyIC(ic->xic);
- g_free(ic);
+ if (ic->xic)
+ XDestroyIC(ic->xic);
+ g_slice_free(ObtIC, ic);
}
}