--- rxvt-unicode/src/keyboard.h	2005/01/16 18:05:37	1.2
+++ rxvt-unicode/src/keyboard.h	2011/06/02 17:43:43	1.17
@@ -1,39 +1,56 @@
+/*----------------------------------------------------------------------*
+ * File:	keyboard.h
+ *----------------------------------------------------------------------*
+ *
+ * All portions of code are copyright by their respective author/s.
+ * Copyright (c) 2005      WU Fengguang
+ * Copyright (c) 2005-2006 Marc Lehmann <schmorp@schmorp.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *----------------------------------------------------------------------*/
+
 #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)
+#define KEYSYM_HASH_BUCKETS     (1<<KEYSYM_HASH_BITS)
+#define KEYSYM_HASH_MASK        (KEYSYM_HASH_BUCKETS-1)
 
 #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;
-struct keysym_t;
-
-typedef void (keyevent_handler) (rxvt_term *rt,
-                                 keysym_t *key,
-                                 KeySym keysym,
-                                 unsigned int state);
 
 struct keysym_t
 {
   enum keysym_type {
-    NORMAL, RANGE, RANGE_META8, LIST
+    STRING, BUILTIN,
   };
 
   KeySym      keysym;
@@ -41,7 +58,6 @@
   /* the higher bits are preserved for Meta/NumLock keys */
   /* which are mapped to corresponding lower bits at register time */
   uint16_t    state;    /* indicates each modifiers' DOWN/UP status         */
-  uint16_t    range;    /* =1: single keysym; >1: a of range keysyms        */
   keysym_type type;
   const char  *str;      /* would normally be a keycode translation in UTF-8 */
 };
@@ -54,26 +70,20 @@
 
   void clear ();
   void register_user_translation (KeySym keysym, unsigned int state, const char *trans);
+  void register_translation (KeySym keysym, unsigned int state, char *translation);
   void register_done ();        // call this to make newly registered keymaps take effect
   bool dispatch (rxvt_term *term, KeySym keysym, unsigned int state);
 
 private:
   void register_keymap (keysym_t *key);
-  void purge_duplicate_keymap ();
   void setup_hash ();
   int find_keysym (KeySym keysym, unsigned int state);
 
 private:
-  uint16_t hash[KEYSYM_HASH_BUDGETS];
+  uint16_t hash[KEYSYM_HASH_BUCKETS];
   vector<keysym_t *> keymap;
-
-  // stock keymaps are all static data
-  static keysym_t stock_keymap[];
-  // user keymaps and their .string are dynamicaly allocated and freed
-  vector<keysym_t *> user_keymap;
-  vector<const char *> user_translations;
 };
 
 #endif /* KEYSYM_RESOURCE */
+
 #endif /* KEYBOARD_H_ */
-// vim:et:sw=2