allow the use of keycodes directly in key bindings

diff --git a/openbox/translate.c b/openbox/translate.c
index 2903bf3c6ec727bf1a31b2571776c08d86698fcb..b9b2f2af5fc703b16ce4a21b5c3e14963ea7eb96 100644 (file)
--- a/openbox/translate.c
+++ b/openbox/translate.c
@@ -89,13 +89,24 @@ gboolean translate_key(char *str, guint *state, guint *keycode)
        *state |= m;
     }
 
-    /* figure out the keycode */
-    sym = XStringToKeysym(l);
-    if (sym == NoSymbol) {
-       g_warning("Invalid key name '%s' in key binding.", l);
-       goto translation_fail;
+    if (!g_ascii_strncasecmp("0x", l, 2)) {
+        gchar *end;
+
+        /* take it directly */
+        *keycode = strtol(l, &end, 16);
+        if (*l == '\0' || *end != '\0') {
+            g_warning("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);
+            goto translation_fail;
+        }
+        *keycode = XKeysymToKeycode(ob_display, sym);
     }
-    *keycode = XKeysymToKeycode(ob_display, sym);
     if (!*keycode) {
        g_warning("Key '%s' does not exist on the display.", l); 
        goto translation_fail;