--- rxvt-unicode/src/keyboard.h	2008/01/10 00:44:43	1.8
+++ rxvt-unicode/src/keyboard.h	2011/11/30 19:52:15	1.21
@@ -4,7 +4,7 @@
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 2005      WU Fengguang
- * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
+ * 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
@@ -28,12 +28,11 @@
 
 #include <inttypes.h>
 
-#include "feature.h"
 #include "rxvtutil.h"
 
 #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
@@ -47,17 +46,11 @@
 #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 {
-    STRING, RANGE, RANGE_META8, LIST, BUILTIN,
+    STRING, BUILTIN,
   };
 
   KeySym      keysym;
@@ -65,9 +58,8 @@
   /* 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 */
+  char        *str;      /* the key's definition encoded in UTF-8 */
 };
 
 class keyboard_manager
@@ -76,28 +68,17 @@
   keyboard_manager ();
   ~keyboard_manager ();
 
-  void clear ();
   void register_user_translation (KeySym keysym, unsigned int state, const char *trans);
-  void register_done ();        // call this to make newly registered keymaps take effect
+  void register_translation (KeySym keysym, unsigned int state, char *translation);
+  void register_done ();        // call this to make newly registered key bindings 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;
-
-#if STOCK_KEYMAP
-  // stock keymaps are all static data
-  static keysym_t stock_keymap[];
-#endif
-  // user keymaps and their .string are dynamically allocated and freed
-  vector<keysym_t *> user_keymap;
-  vector<const char *> user_translations;
 };
 
 #endif /* KEYSYM_RESOURCE */