X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ftranslate.c;h=bd8b88f69922112e0008bf022b2d48437bbab6ca;hb=bafd9e9edcff0e18a03ef6f4e73d673e12a7c7ed;hp=1ef8e7d58ed4b17dd81a268bc4e1818c8d5800f1;hpb=7e946f68d9f8ec7c880664b437edbbaa5d49ac10;p=chaz%2Fopenbox

diff --git a/openbox/translate.c b/openbox/translate.c
index 1ef8e7d5..bd8b88f6 100644
--- a/openbox/translate.c
+++ b/openbox/translate.c
@@ -20,6 +20,7 @@
 #include "openbox.h"
 #include "mouse.h"
 #include "modkeys.h"
+#include "translate.h"
 #include "gettext.h"
 #include <glib.h>
 #include <string.h>
@@ -55,7 +56,7 @@ static guint translate_modifier(gchar *str)
              !g_ascii_strcasecmp("H", str))
         mask = modkeys_key_to_mask(OB_MODKEY_KEY_HYPER);
     else
-        g_message(_("Invalid modifier key '%s' in key/pointer binding"), str);
+        g_message(_("Invalid modifier key \"%s\" in key/mouse binding"), str);
 
     return mask;
 }
@@ -68,7 +69,7 @@ gboolean translate_button(const gchar *str, guint *state, guint *button)
     gboolean ret = FALSE;
 
     parsed = g_strsplit(str, "-", -1);
-    
+
     /* first, find the button (last token) */
     l = NULL;
     for (i = 0; parsed[i] != NULL; ++i)
@@ -91,10 +92,8 @@ gboolean translate_button(const gchar *str, guint *state, guint *button)
     else if (!g_ascii_strcasecmp("Up", l)) *button = 4;
     else if (!g_ascii_strcasecmp("Down", l)) *button = 5;
     else if (!g_ascii_strncasecmp("Button", l, 6)) *button = atoi(l+6);
-    if (!*button) {
-        g_message(_("Invalid button '%s' in pointer binding"), l);
+    if (!*button)
         goto translation_fail;
-    }
 
     ret = TRUE;
 
@@ -112,7 +111,9 @@ gboolean translate_key(const gchar *str, guint *state, guint *keycode)
     KeySym sym;
 
     parsed = g_strsplit(str, "-", -1);
-    
+
+    *state = *keycode = 0;
+
     /* first, find the key (last token) */
     l = NULL;
     for (i = 0; parsed[i] != NULL; ++i)
@@ -134,20 +135,20 @@ gboolean translate_key(const gchar *str, guint *state, guint *keycode)
         /* take it directly */
         *keycode = strtol(l, &end, 16);
         if (*l == '\0' || *end != '\0') {
-            g_message(_("Invalid key code '%s' in key binding"), l);
+            g_message(_("Invalid key code \"%s\" in key binding"), l);
             goto translation_fail;
         }
     } else {
         /* figure out the keycode */
         sym = XStringToKeysym(l);
         if (sym == NoSymbol) {
-            g_message(_("Invalid key name '%s' in key binding"), l);
+            g_message(_("Invalid key name \"%s\" in key binding"), l);
             goto translation_fail;
         }
         *keycode = XKeysymToKeycode(ob_display, sym);
     }
     if (!*keycode) {
-        g_message(_("Requested key '%s' does not exist on the display"), l); 
+        g_message(_("Requested key \"%s\" does not exist on the display"), l);
         goto translation_fail;
     }
 
@@ -158,7 +159,7 @@ translation_fail:
     return ret;
 }
 
-const gchar *translate_keycode(guint keycode)
+gchar *translate_keycode(guint keycode)
 {
     KeySym sym;
     const gchar *ret = NULL;
@@ -172,7 +173,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')
@@ -181,5 +182,6 @@ gunichar translate_unichar(guint keycode)
         if (unikey == (gunichar)-1 || unikey == (gunichar)-2 || unikey == 0)
             unikey = 0;
     }
+    g_free(key);
     return unikey;
 }