--- rxvt-unicode/src/keyboard.h	2005/01/16 18:05:37	1.2
+++ rxvt-unicode/src/keyboard.h	2006/01/09 22:41:41	1.6
@@ -1,13 +1,13 @@
 #ifndef KEYBOARD_H_
 #define KEYBOARD_H_
 
+#ifdef KEYSYM_RESOURCE
+
 #include <inttypes.h>
 
 #include "feature.h"
 #include "rxvtutil.h"
 
-#ifdef KEYSYM_RESOURCE
-
 #define KEYSYM_HASH_BITS        4       /* lowest #bits of keysym is used as hash key */
 #define KEYSYM_HASH_BUDGETS     (1<<KEYSYM_HASH_BITS)
 #define KEYSYM_HASH_MASK        (KEYSYM_HASH_BUDGETS-1)
@@ -15,11 +15,12 @@
 #define MetaMask                0x0100
 #define NumLockMask             0x0200
 #define AppKeypadMask           0x0400
+#define Level3Mask              0x0800 // currently not supported
 #define OtherModMask            (ShiftMask | LockMask | ControlMask \
                                 | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask)
 
-#if (OtherModMask & (MetaMask | NumLockMask | AppKeypadMask)) != 0
-# error FATAL: MetaMask, NumLockMask and/or AppKeypadMask clashes with X modifiers!
+#if OtherModMask > 0xff
+# error FATAL: X modifiers might clash with rxvt-unicode ones
 #endif
 
 struct rxvt_term;
@@ -33,7 +34,7 @@
 struct keysym_t
 {
   enum keysym_type {
-    NORMAL, RANGE, RANGE_META8, LIST
+    STRING, RANGE, RANGE_META8, LIST, BUILTIN,
   };
 
   KeySym      keysym;
@@ -75,5 +76,5 @@
 };
 
 #endif /* KEYSYM_RESOURCE */
+
 #endif /* KEYBOARD_H_ */
-// vim:et:sw=2