X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ftranslate.c;h=b2ae7d677eca6a619df161bba1eca8b7d2a10ea5;hb=df73dfa049b9d0bb81e09b27ecf678dce9b46301;hp=5b2b4ebee056ff60d3ffd6580dfa74a7d4db5303;hpb=77baf26a7f2f64ddf1274035fd4991ab17345904;p=chaz%2Fopenbox diff --git a/openbox/translate.c b/openbox/translate.c index 5b2b4ebe..b2ae7d67 100644 --- a/openbox/translate.c +++ b/openbox/translate.c @@ -111,6 +111,8 @@ gboolean translate_key(const gchar *str, guint *state, guint *keycode) parsed = g_strsplit(str, "-", -1); + *state = *keycode = 0; + /* first, find the key (last token) */ l = NULL; for (i = 0; parsed[i] != NULL; ++i) @@ -156,7 +158,7 @@ translation_fail: return ret; } -const gchar *translate_keycode(guint keycode) +gchar *translate_keycode(guint keycode) { KeySym sym; const gchar *ret = NULL; @@ -170,7 +172,7 @@ gunichar translate_unichar(guint keycode) { gunichar unikey = 0; - const char *key; + char *key; if ((key = translate_keycode(keycode)) != NULL && /* don't accept keys that aren't a single letter, like "space" */ key[1] == '\0') @@ -179,5 +181,6 @@ gunichar translate_unichar(guint keycode) if (unikey == (gunichar)-1 || unikey == (gunichar)-2 || unikey == 0) unikey = 0; } + g_free(key); return unikey; }