--- rxvt-unicode/src/keyboard.C	2011/04/30 18:45:38	1.41
+++ rxvt-unicode/src/keyboard.C	2011/12/05 12:22:50	1.56
@@ -65,14 +65,14 @@
  */
 
 static void
-output_string (rxvt_term *rt, const char *str)
+output_string (rxvt_term *term, const char *str)
 {
   if (strncmp (str, "command:", 8) == 0)
-    rt->cmdbuf_append (str + 8, strlen (str) - 8);
+    term->cmdbuf_append (str + 8, strlen (str) - 8);
   else if (strncmp (str, "perl:", 5) == 0)
-    HOOK_INVOKE((rt, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
+    HOOK_INVOKE((term, HOOK_USER_COMMAND, DT_STR, str + 5, DT_END));
   else
-    rt->tt_write (str, strlen (str));
+    term->tt_write (str, strlen (str));
 }
 
 // return: priority_of_a - priority_of_b
@@ -80,8 +80,8 @@
 compare_priority (keysym_t *a, keysym_t *b)
 {
   // (the more '1's in state; the less range): the greater priority
-  int ca = rxvt_popcount (a->state /* & OtherModMask */);
-  int cb = rxvt_popcount (b->state /* & OtherModMask */);
+  int ca = ecb_popcount32 (a->state /* & OtherModMask */);
+  int cb = ecb_popcount32 (b->state /* & OtherModMask */);
 
   if (ca != cb)
     return ca - cb;
@@ -100,60 +100,28 @@
 
 keyboard_manager::~keyboard_manager ()
 {
-  clear ();
-}
-
-void
-keyboard_manager::clear ()
-{
-  hash [0] = 2;
-
   for (unsigned int i = 0; i < keymap.size (); ++i)
     {
-      free ((void *)keymap [i]->str);
+      free (keymap [i]->str);
       delete keymap [i];
-      keymap [i] = 0;
     }
-
-  keymap.clear ();
 }
 
-// a wrapper for register_keymap,
-// so that outside codes don't have to know so much details.
-//
-// the string 'trans' is copied to an internal managed buffer,
-// so the caller can free memory of 'trans' at any time.
 void
-keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
+keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const wchar_t *ws)
 {
-  keysym_t *key = new keysym_t;
-  wchar_t *wc = rxvt_mbstowcs (trans);
-  char *translation = rxvt_wcstoutf8 (wc);
-  free (wc);
+  char *translation = rxvt_wcstoutf8 (ws);
 
-  if (key && translation)
-    {
-      key->keysym = keysym;
-      key->state  = state;
-      key->str    = translation;
-      key->type   = keysym_t::STRING;
+  keysym_t *key = new keysym_t;
 
-      if (strncmp (translation, "builtin:", 8) == 0)
-        key->type = keysym_t::BUILTIN;
+  key->keysym = keysym;
+  key->state  = state;
+  key->str    = translation;
+  key->type   = keysym_t::STRING;
 
-      register_keymap (key);
-    }
-  else
-    {
-      delete key;
-      free ((void *)translation);
-      rxvt_fatal ("out of memory, aborting.\n");
-    }
-}
+  if (strncmp (translation, "builtin:", 8) == 0)
+    key->type = keysym_t::BUILTIN;
 
-void
-keyboard_manager::register_keymap (keysym_t *key)
-{
   if (keymap.size () == keymap.capacity ())
     keymap.reserve (keymap.size () * 2);
 
@@ -161,16 +129,10 @@
   hash[0] = 3;
 }
 
-void
-keyboard_manager::register_done ()
-{
-  setup_hash ();
-}
-
 bool
 keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
 {
-  assert (hash[0] == 0 && "register_done() need to be called");
+  assert (("register_done() need to be called", hash[0] == 0));
 
   state &= OtherModMask; // mask out uninteresting modifiers
 
@@ -185,21 +147,16 @@
 
   if (index >= 0)
     {
-      const keysym_t &key = *keymap [index];
+      keysym_t *key = keymap [index];
 
-      if (key.type != keysym_t::BUILTIN)
+      if (key->type != keysym_t::BUILTIN)
         {
-          wchar_t *wc = rxvt_utf8towcs (key.str);
-          char *str = rxvt_wcstombs (wc);
+          wchar_t *ws = rxvt_utf8towcs (key->str);
+          char *str = rxvt_wcstombs (ws);
           // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
-          free (wc);
+          free (ws);
 
-          switch (key.type)
-            {
-              case keysym_t::STRING:
-                output_string (term, str);
-                break;
-            }
+          output_string (term, str);
 
           free (str);
 
@@ -211,7 +168,7 @@
 }
 
 void
-keyboard_manager::setup_hash ()
+keyboard_manager::register_done ()
 {
   unsigned int i, index, hashkey;
   vector <keysym_t *> sorted_keymap;