X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ftranslate.c;h=a9ff3e264c0cf774588235766a7d3ebaab42fefe;hb=a71a98b667c298fef7895f4d9a07eccb06cc6090;hp=97066519f4b9f0cf73e53826e77a59e398cf5777;hpb=5d5be2ba2a6e0b3886e0076475ed9d7a2d4ac9ab;p=chaz%2Fopenbox

diff --git a/openbox/translate.c b/openbox/translate.c
index 97066519..a9ff3e26 100644
--- a/openbox/translate.c
+++ b/openbox/translate.c
@@ -19,6 +19,7 @@
 
 #include "openbox.h"
 #include "mouse.h"
+#include "modkeys.h"
 #include "gettext.h"
 #include <glib.h>
 #include <string.h>
@@ -26,20 +27,37 @@
 
 static guint translate_modifier(gchar *str)
 {
-    if (!g_ascii_strcasecmp("Mod1", str) ||
-        !g_ascii_strcasecmp("A", str)) return Mod1Mask;
-    else if (!g_ascii_strcasecmp("Mod2", str)) return Mod2Mask;
-    else if (!g_ascii_strcasecmp("Mod3", str) ||
-             !g_ascii_strcasecmp("M", str)) return Mod3Mask;
-    else if (!g_ascii_strcasecmp("Mod4", str) ||
-             !g_ascii_strcasecmp("W", str)) return Mod4Mask;
-    else if (!g_ascii_strcasecmp("Mod5", str)) return Mod5Mask;
+    guint mask = 0;
+
+    if (!g_ascii_strcasecmp("Mod1", str)) mask = Mod1Mask;
+    else if (!g_ascii_strcasecmp("Mod2", str)) mask = Mod2Mask;
+    else if (!g_ascii_strcasecmp("Mod3", str)) mask = Mod3Mask;
+    else if (!g_ascii_strcasecmp("Mod4", str)) mask = Mod4Mask;
+    else if (!g_ascii_strcasecmp("Mod5", str)) mask = Mod5Mask;
+
     else if (!g_ascii_strcasecmp("Control", str) ||
-             !g_ascii_strcasecmp("C", str)) return ControlMask;
+             !g_ascii_strcasecmp("C", str))
+        mask = modkeys_key_to_mask(OB_MODKEY_KEY_CONTROL);
+    else if (!g_ascii_strcasecmp("Alt", str) ||
+             !g_ascii_strcasecmp("A", str))
+        mask = modkeys_key_to_mask(OB_MODKEY_KEY_ALT);
+    else if (!g_ascii_strcasecmp("Meta", str) ||
+             !g_ascii_strcasecmp("M", str))
+        mask = modkeys_key_to_mask(OB_MODKEY_KEY_META);
+    /* W = windows key, is linked to the Super_L/R buttons */
+    else if (!g_ascii_strcasecmp("Super", str) ||
+             !g_ascii_strcasecmp("W", str))
+        mask = modkeys_key_to_mask(OB_MODKEY_KEY_SUPER);
     else if (!g_ascii_strcasecmp("Shift", str) ||
-             !g_ascii_strcasecmp("S", str)) return ShiftMask;
-    g_message(_("Invalid modifier key '%s' in key/pointer binding"), str);
-    return 0;
+             !g_ascii_strcasecmp("S", str))
+        mask = modkeys_key_to_mask(OB_MODKEY_KEY_SHIFT);
+    else if (!g_ascii_strcasecmp("Hyper", str) ||
+             !g_ascii_strcasecmp("H", str))
+        mask = modkeys_key_to_mask(OB_MODKEY_KEY_HYPER);
+    else
+        g_message(_("Invalid modifier key '%s' in key/mouse binding"), str);
+
+    return mask;
 }
 
 gboolean translate_button(const gchar *str, guint *state, guint *button)
@@ -73,10 +91,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;
 
@@ -149,3 +165,19 @@ const gchar *translate_keycode(guint keycode)
         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;
+}