[ViewVC] Diff of: cvs/rxvt-unicode/src/keyboard.C

Comparing rxvt-unicode/src/keyboard.C (file contents):
Revision 1.46 by sf-exg, Sun Nov 27 10:14:51 2011 UTC vs.
Revision 1.47 by sf-exg, Sun Nov 27 10:49:25 2011 UTC

   hash [0] = 1;			// hash[0] != 0 indicates uninitialized data
 }
 keyboard_manager::~keyboard_manager ()
 {
-  clear ();
-}
-void
-keyboard_manager::clear ()
-{
   hash [0] = 2;
   for (unsigned int i = 0; i < keymap.size (); ++i)
     {
       free (keymap [i]->str);
       key->type   = keysym_t::STRING;
       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 (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)
 {
   return false;
 }
 void
-keyboard_manager::setup_hash ()
+keyboard_manager::register_done ()
 {
   unsigned int i, index, hashkey;
   vector <keysym_t *> sorted_keymap;
   uint16_t hash_bucket_size[KEYSYM_HASH_BUCKETS];	// size of each bucket

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines