--- rxvt-unicode/src/keyboard.h	2011/04/30 18:45:38	1.14
+++ rxvt-unicode/src/keyboard.h	2014/05/02 20:35:00	1.27
@@ -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_BUCKETS     (1<<KEYSYM_HASH_BITS)
-#define KEYSYM_HASH_MASK        (KEYSYM_HASH_BUCKETS-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, BUILTIN,
+    STRING, BUILTIN, BUILTIN_STRING,
   };
 
   KeySym      keysym;
@@ -66,7 +59,7 @@
   /* which are mapped to corresponding lower bits at register time */
   uint16_t    state;    /* indicates each modifiers' DOWN/UP status         */
   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
@@ -75,14 +68,11 @@
   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
-  bool dispatch (rxvt_term *term, KeySym keysym, unsigned int state);
+  void register_action (KeySym keysym, unsigned int state, const wchar_t *ws);
+  void register_done ();        // call this to make newly registered key bindings take effect
+  bool dispatch (rxvt_term *term, KeySym keysym, unsigned int state, const char *kbuf, int len);
 
 private:
-  void register_keymap (keysym_t *key);
-  void setup_hash ();
   int find_keysym (KeySym keysym, unsigned int state);
 
 private: