X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obt%2Fkeyboard.c;h=710a94c23b33ccad97af9421f514214a71b474e8;hb=d81339c9cf6592fc86dc05428ee6e70ac573afe5;hp=397504fb6b4af493af2425012804b407f19715c2;hpb=759e9f58a8cc02b78bc85b4454f133544e3ac36e;p=chaz%2Fopenbox diff --git a/obt/keyboard.c b/obt/keyboard.c index 397504fb..710a94c2 100644 --- a/obt/keyboard.c +++ b/obt/keyboard.c @@ -197,21 +197,20 @@ KeyCode obt_keyboard_keysym_to_keycode(KeySym sym) return 0; } -const gchar *obt_keyboard_keycode_to_string(guint keycode) +gchar *obt_keyboard_keycode_to_string(guint keycode) { KeySym sym; - const gchar *ret = NULL; if ((sym = XKeycodeToKeysym(obt_display, keycode, 0)) != NoSymbol) - ret = XKeysymToString(sym); - return g_locale_to_utf8(ret, -1, NULL, NULL, NULL); + return g_locale_to_utf8(XKeysymToString(sym), -1, NULL, NULL, NULL); + return NULL; } gunichar obt_keyboard_keycode_to_unichar(guint keycode) { gunichar unikey = 0; + char *key; - const char *key; if ((key = obt_keyboard_keycode_to_string(keycode)) != NULL && /* don't accept keys that aren't a single letter, like "space" */ key[1] == '\0')