KeySym: Actually handle NoSymbol

Add NoSymbol into the keysym table, so keysym <-> string conversion works for
that, too; also eliminate special-casing of VoidSymbol.

This will require special-casing in libX11 to preserve its API.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/keysym.c b/src/keysym.c
index 4738fc2..3bcfd8f 100644
--- a/src/keysym.c
+++ b/src/keysym.c
@@ -42,13 +42,17 @@ XkbcKeysymToString(KeySym ks)
 {
     int i, n, h, idx;
     const unsigned char *entry;
+    static char ret[11];
     unsigned char val1, val2, val3, val4;
 
-    if (!ks || (ks & ((unsigned long) ~0x1fffffff)) != 0)
+    if ((ks & ((unsigned long) ~0x1fffffff)) != 0)
         return NULL;
 
-    if (ks == XK_VoidSymbol)
-        ks = 0;
+    /* Not listed in keysymdef.h for hysterical raisins. */
+    if (ks == NoSymbol) {
+        sprintf(ret, "NoSymbol");
+        return ret;
+    }
 
     if (ks <= 0x1fffffff) {
         val1 = ks >> 24;