Use NoSymbol as the error code

This is how the X11 API does things, so it's clearer if we use
the same principle.

diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index cd8b1bc3d19e845a61f12a56b3fcf8d4e63b7a15..7d55168200f947194741dce3ab0b5fc5fef626ab 100644 (file)
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -39,6 +39,10 @@
 #include <rfb/XF86keysym.h>
 #endif
 
+#ifndef NoSymbol
+#define NoSymbol 0
+#endif
+
 #include "Viewport.h"
 #include "CConn.h"
 #include "OptionsDialog.h"
@@ -702,7 +706,7 @@ rdr::U32 Viewport::translateKeyEvent(int keyCode, int origKeyCode, const char *k
   // Unknown special key?
   if (keyText[0] == '\0') {
     vlog.error(_("Unknown FLTK key code %d (0x%04x)"), keyCode, keyCode);
-    return XK_VoidSymbol;
+    return NoSymbol;
   }
 
   // Look up the symbol the key produces and translate that from Unicode
@@ -710,7 +714,7 @@ rdr::U32 Viewport::translateKeyEvent(int keyCode, int origKeyCode, const char *k
   if (fl_utf_nb_char((const unsigned char*)keyText, strlen(keyText)) != 1) {
     vlog.error(_("Multiple characters given for key code %d (0x%04x): '%s'"),
                keyCode, keyCode, keyText);
-    return XK_VoidSymbol;
+    return NoSymbol;
   }
 
   ucs = fl_utf8decode(keyText, NULL, NULL);
@@ -754,7 +758,7 @@ void Viewport::handleKeyEvent(int keyCode, int origKeyCode, const char *keyText,
   }
 
   keySym = translateKeyEvent(keyCode, origKeyCode, keyText);
-  if (keySym == XK_VoidSymbol)
+  if (keySym == NoSymbol)
     return;
 
 #ifdef WIN32

diff --git a/vncviewer/keysym2ucs.c b/vncviewer/keysym2ucs.c
index 4e3dca25a00efc05955b7c23e33aab501dc74072..2fd5870655591c00d9e1b10a3c563c46e00535f0 100644 (file)
--- a/vncviewer/keysym2ucs.c
+++ b/vncviewer/keysym2ucs.c
@@ -34,6 +34,8 @@
 
 #include "keysym2ucs.h"
 
+#define NoSymbol 0
+
 struct codepair {
   unsigned short keysym;
   unsigned short ucs;
@@ -886,5 +888,5 @@ unsigned ucs2keysym(unsigned ucs)
     return ucs | 0x01000000;
 
   /* no matching keysym value found */
-  return 0xFFFFFF;
+  return NoSymbol;
 }