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;
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)
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;
}
return ret;
}
-gunichar obt_keyboard_keypress_to_unichar(ObtIC *ic, XKeyPressedEvent *ev)
+gunichar obt_keyboard_keypress_to_unichar(ObtIC *ic, XEvent *ev)
{
gunichar unikey = 0;
KeySym sym;
gint len, bufsz;
gboolean got_string = FALSE;
+ g_return_val_if_fail(ev->type == KeyPress, 0);
+
if (!ic)
g_warning("Using obt_keyboard_keypress_to_unichar() without an "
"Input Context. No i18n support!");
bufsz = sizeof(fixbuf);
#ifdef X_HAVE_UTF8_STRING
- len = Xutf8LookupString(ic->xic, ev, buf, bufsz, &sym, &status);
+ len = Xutf8LookupString(ic->xic, &ev->xkey, buf, bufsz, &sym, &status);
#else
- len = XmbLookupString(ic->xic, ev, buf, bufsz, &sym, &status);
+ len = XmbLookupString(ic->xic, &ev->xkey, buf, bufsz, &sym, &status);
#endif
if (status == XBufferOverflow) {
bufsz = len;
#ifdef X_HAVE_UTF8_STRING
- len = Xutf8LookupString(ic->xic, ev, buf, bufsz, &sym, &status);
+ len = Xutf8LookupString(ic->xic, &ev->xkey, buf, bufsz, &sym,
+ &status);
#else
- len = XmbLookupString(ic->xic, ev, buf, bufsz, &sym, &status);
+ len = XmbLookupString(ic->xic, &ev->xkey, buf, bufsz, &sym,
+ &status);
#endif
}
got_string = TRUE;
}
}
+ else if (status == XLookupKeySym)
+ /* this key doesn't have a text representation, it is a command
+ key of some sort */;
else
g_message("Bad keycode lookup. Keysym 0x%x Status: %s\n",
(guint) sym,
else {
buf = fixbuf;
bufsz = sizeof(fixbuf);
- len = XLookupString(ev, buf, bufsz, &sym, NULL);
+ len = XLookupString(&ev->xkey, buf, bufsz, &sym, NULL);
if ((guchar)buf[0] >= 32) /* not an ascii control character */
got_string = TRUE;
}
return unikey;
}
-void obt_keyboard_context_renew(ObtIC *ic)
+KeySym obt_keyboard_keypress_to_keysym(XEvent *ev)
{
- if (ic->xic) {
- XDestroyIC(ic->xic);
- ic->xic = NULL;
- }
+ KeySym sym;
+ gint r;
+
+ g_return_val_if_fail(ev->type == KeyPress, None);
+
+ sym = None;
+ r = XLookupString(&ev->xkey, NULL, 0, &sym, NULL);
+ return sym;
+}
+void obt_keyboard_context_renew(ObtIC *ic)
+{
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);
+ g_slice_free(ObtIC, ic);
}
}