repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: 53019e3f39832ec38a4c563429613d85af22b5e7:
path_to: 
revision_to: 

commit 53019e3f39832ec38a4c563429613d85af22b5e7
Author: Emanuele Giaquinta 
Date:   Sun Nov 27 10:49:25 2011 +0000

    Merge some keyboard_manager methods in their only caller.

diff --git a/src/keyboard.C b/src/keyboard.C

--- a/src/keyboard.C
+++ b/src/keyboard.C
@@ -99,12 +99,6 @@ keyboard_manager::keyboard_manager ()
 }

 keyboard_manager::~keyboard_manager ()
-{
-  clear ();
-}
-
-void
-keyboard_manager::clear ()
 {
   hash [0] = 2;

@@ -174,7 +168,11 @@ keyboard_manager::register_translation (KeySym keysym, unsigned int state, char
       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
     {
@@ -184,22 +182,6 @@ keyboard_manager::register_translation (KeySym keysym, unsigned int state, char
     }
 }

-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)
 {
@@ -239,7 +221,7 @@ keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
 }

 void
-keyboard_manager::setup_hash ()
+keyboard_manager::register_done ()
 {
   unsigned int i, index, hashkey;
   vector  sorted_keymap;
diff --git a/src/keyboard.h b/src/keyboard.h

--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -68,15 +68,12 @@ public:
   keyboard_manager ();
   ~keyboard_manager ();

-  void clear ();
   void register_user_translation (KeySym keysym, unsigned int state, const char *trans);
   void register_translation (KeySym keysym, unsigned int state, char *translation);
   void register_done ();        // call this to make newly registered keymaps take effect
   bool dispatch (rxvt_term *term, KeySym keysym, unsigned int state);

 private:
-  void register_keymap (keysym_t *key);
-  void setup_hash ();
   int find_keysym (KeySym keysym, unsigned int state);

 private:

-----END OF PAGE-----