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

Comparing rxvt-unicode/src/keyboard.C (file contents):
Revision 1.11 by root, Sun Feb 6 15:18:01 2005 UTC vs.
Revision 1.12 by root, Sat Feb 12 18:55:04 2005 UTC

 #include <cstring>
 #include "keyboard.h"
 #include "command.h"
+#if STOCK_KEYMAP
 ////////////////////////////////////////////////////////////////////////////////
 // default keycode translation map and keyevent handlers
 keysym_t keyboard_manager::stock_keymap[] = {
   /* examples */
 //{            '.',          ControlMask,     1,      keysym_t::NORMAL,        "\033<C-.>"},
 //{            '0',          ControlMask,    10,       keysym_t::RANGE,   "0" "\033<C-%c>"},
 //{            '0', MetaMask|ControlMask,    10,       keysym_t::RANGE, "0" "\033<M-C-%c>"},
 //{            'a', MetaMask|ControlMask,    26,       keysym_t::RANGE, "a" "\033<M-C-%c>"},
 };
+#endif
 static void
 output_string (rxvt_term *rt, const char *str)
 {
   if (strncmp (str, "command:", 8) == 0)
 }
 void
 keyboard_manager::register_done ()
 {
+#if STOCK_KEYMAP
-  unsigned int i, n = sizeof (stock_keymap) / sizeof (keysym_t);
+  int n = sizeof (stock_keymap) / sizeof (keysym_t);
+  //TODO: shield against repeated calls and empty keymap
-  if (keymap.back () != &stock_keymap[n - 1])
+  //if (keymap.back () != &stock_keymap[n - 1])
-    for (i = 0; i < n; ++i)
+    for (int i = 0; i < n; ++i)
       register_keymap (&stock_keymap[i]);
+#endif
   purge_duplicate_keymap ();
   setup_hash ();
 }

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