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

Comparing rxvt-unicode/src/keyboard.C (file contents):
Revision 1.70 by sf-exg, Fri May 23 22:25:34 2014 UTC vs.
Revision 1.71 by sf-exg, Thu Jan 15 14:30:04 2015 UTC

       delete keymap [i];
     }
 }
 void
+keyboard_manager::unregister_action (KeySym keysym, unsigned int state)
+{
+  for (unsigned int i = 0; i < keymap.size (); ++i)
+    if (keymap [i]->keysym == keysym
+        && keymap [i]->state == state)
+      {
+        free (keymap [i]->str);
+        delete keymap [i];
+        if (i < keymap.size () - 1)
+          keymap [i] = keymap [keymap.size () - 1];
+        keymap.pop_back ();
+        break;
+      }
+}
+void
 keyboard_manager::register_action (KeySym keysym, unsigned int state, const wchar_t *ws)
 {
   char *action = rxvt_wcstoutf8 (ws);
   keysym_t *key = new keysym_t;
   if (strncmp (action, "builtin:", 8) == 0)
     key->type = keysym_t::BUILTIN;
   else if (strncmp (action, "builtin-string:", 15) == 0)
     key->type = keysym_t::BUILTIN_STRING;
+  unregister_action (keysym, state);
   if (keymap.size () == keymap.capacity ())
     keymap.reserve (keymap.size () * 2);
   keymap.push_back (key);

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