X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ftranslate.c;h=a7cac55721328e0da76eeb14bfc272ccde86172e;hb=a6f52b90551621316a36f7cd7b20ef1d5dca0782;hp=1d5356a900fa26eef30ea9a91599448223b3f11a;hpb=e480937e278eaa8050b2bc26b1004b6f4993d8e6;p=chaz%2Fopenbox

diff --git a/openbox/translate.c b/openbox/translate.c
index 1d5356a9..a7cac557 100644
--- a/openbox/translate.c
+++ b/openbox/translate.c
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    translate.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,6 +19,7 @@
 
 #include "openbox.h"
 #include "mouse.h"
+#include "gettext.h"
 #include <glib.h>
 #include <string.h>
 #include <stdlib.h>
@@ -36,7 +38,7 @@ static guint translate_modifier(gchar *str)
              !g_ascii_strcasecmp("C", str)) return ControlMask;
     else if (!g_ascii_strcasecmp("Shift", str) ||
              !g_ascii_strcasecmp("S", str)) return ShiftMask;
-    g_warning("Invalid modifier '%s' in binding.", str);
+    g_message(_("Invalid modifier key '%s' in key/pointer binding"), str);
     return 0;
 }
 
@@ -72,7 +74,7 @@ gboolean translate_button(const gchar *str, guint *state, guint *button)
     else if (!g_ascii_strcasecmp("Down", l)) *button = 5;
     else if (!g_ascii_strncasecmp("Button", l, 6)) *button = atoi(l+6);
     if (!*button) {
-        g_warning("Invalid button '%s' in pointer binding.", l);
+        g_message(_("Invalid button '%s' in pointer binding"), l);
         goto translation_fail;
     }
 
@@ -114,20 +116,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_warning("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_warning("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_warning("Key '%s' does not exist on the display.", l); 
+        g_message(_("Requested key '%s' does not exist on the display"), l); 
         goto translation_fail;
     }
 
@@ -137,3 +139,29 @@ translation_fail:
     g_strfreev(parsed);
     return ret;
 }
+
+const gchar *translate_keycode(guint keycode)
+{
+    KeySym sym;
+    const gchar *ret = NULL;
+
+    if ((sym = XKeycodeToKeysym(ob_display, keycode, 0)) != NoSymbol)
+        ret = XKeysymToString(sym);
+    return g_locale_to_utf8(ret, -1, NULL, NULL, NULL);
+}
+
+gunichar translate_unichar(guint keycode)
+{
+    gunichar unikey = 0;
+
+    const char *key;
+    if ((key = translate_keycode(keycode)) != NULL &&
+        /* don't accept keys that aren't a single letter, like "space" */
+        key[1] == '\0')
+    {
+        unikey = g_utf8_get_char_validated(key, -1);
+        if (unikey == (gunichar)-1 || unikey == (gunichar)-2 || unikey == 0)
+            unikey = 0;
+    }
+    return unikey;
+}