--- rxvt-unicode/src/keyboard.C	2011/05/07 18:29:18	1.42
+++ rxvt-unicode/src/keyboard.C	2011/12/01 11:27:34	1.51
@@ -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,22 +100,11 @@
 
 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_translation that converts the input string
@@ -123,9 +112,9 @@
 void
 keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
 {
-  wchar_t *wc = rxvt_mbstowcs (trans);
-  char *translation = rxvt_wcstoutf8 (wc);
-  free (wc);
+  wchar_t *ws = rxvt_mbstowcs (trans);
+  char *translation = rxvt_wcstoutf8 (ws);
+  free (ws);
 
   if (strncmp (translation, "list", 4) == 0 && translation [4]
       && strlen (translation) < STRING_MAX)
@@ -153,7 +142,7 @@
           return;
         }
       else
-        rxvt_warn ("cannot parse list-type keysym '%s', processing as normal keysym.\n", translation);
+        rxvt_warn ("unable to parse list-type keysym '%s', processing as normal keysym.\n", translation);
     }
 
   register_translation (keysym, state, translation);
@@ -174,36 +163,24 @@
       if (strncmp (translation, "builtin:", 8) == 0)
         key->type = keysym_t::BUILTIN;
 
-      register_keymap (key);
+      if (keymap.size () == keymap.capacity ())
+        keymap.reserve (keymap.size () * 2);
+
+      keymap.push_back (key);
+      hash[0] = 3;
     }
   else
     {
       delete key;
-      free ((void *)translation);
-      rxvt_fatal ("out of memory, aborting.\n");
+      free (translation);
+      rxvt_fatal ("memory allocation failure. aborting.\n");
     }
 }
 
-void
-keyboard_manager::register_keymap (keysym_t *key)
-{
-  if (keymap.size () == keymap.capacity ())
-    keymap.reserve (keymap.size () * 2);
-
-  keymap.push_back (key);
-  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
 
@@ -218,21 +195,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);
 
@@ -244,7 +216,7 @@
 }
 
 void
-keyboard_manager::setup_hash ()
+keyboard_manager::register_done ()
 {
   unsigned int i, index, hashkey;
   vector <keysym_t *> sorted_keymap;