XStringToKeysym: Cope with 0x1234cafe-style input

If we get input in the style of 0xdeadbeef, just return that exact keysym. Introduces a dependency on strtoul, which I'm told is OK on all the systems we care about. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

XStringToKeysym: Cope with 0x1234cafe-style input
93b55eee · Daniel Stone · Ulrich Sibiller · b414bc2c · 93b55eee
Commit 93b55eee authored Jul 09, 2010 by Daniel Stone Committed by Ulrich Sibiller Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

StrKeysym.c nx-X11/lib/X11/StrKeysym.c +10 -0

No files found.
--- a/nx-X11/lib/X11/StrKeysym.c
+++ b/nx-X11/lib/X11/StrKeysym.c
@@ -27,6 +27,7 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <limits.h>
 #include "Xlibint.h"
 #include <nx-X11/Xresource.h>
 #include <nx-X11/keysymdef.h>
@@ -153,6 +154,15 @@ XStringToKeysym(_Xconst char *s)
        return val | 0x01000000;
    }

+    if (strlen(s) > 2 && s[0] == '0' && s[1] == 'x') {
+        char *tmp = NULL;
+        val = strtoul(s, &tmp, 16);
+        if (val == ULONG_MAX || (tmp && *tmp != '\0'))
+            return NoSymbol;
+        else
+            return val;
+    }
+
    /* Stupid inconsistency between the headers and XKeysymDB: the former has
     * no separating underscore, while some XF86* syms in the latter did.
     * As a last ditch effort, try without. */