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

Comparing rxvt-unicode/src/keyboard.C (file contents):
Revision 1.49 by sf-exg, Sun Nov 27 12:12:49 2011 UTC vs.
Revision 1.51 by sf-exg, Thu Dec 1 11:27:34 2011 UTC

   hash [0] = 1;			// hash[0] != 0 indicates uninitialized data
 }
 keyboard_manager::~keyboard_manager ()
 {
-  hash [0] = 2;
   for (unsigned int i = 0; i < keymap.size (); ++i)
     {
       free (keymap [i]->str);
       delete keymap [i];
-      keymap [i] = 0;
     }
-  keymap.clear ();
 }
 // a wrapper for register_translation that converts the input string
 // to utf-8 and expands 'list' syntax.
 void
 keyboard_manager::register_user_translation (KeySym keysym, unsigned int state, const char *trans)
 {
-  wchar_t *wc = rxvt_mbstowcs (trans);
+  wchar_t *ws = rxvt_mbstowcs (trans);
-  char *translation = rxvt_wcstoutf8 (wc);
+  char *translation = rxvt_wcstoutf8 (ws);
-  free (wc);
+  free (ws);
   if (strncmp (translation, "list", 4) == 0 && translation [4]
       && strlen (translation) < STRING_MAX)
     {
       char *prefix = translation + 4;
     {
       keysym_t *key = keymap [index];
       if (key->type != keysym_t::BUILTIN)
         {
-          wchar_t *wc = rxvt_utf8towcs (key->str);
+          wchar_t *ws = rxvt_utf8towcs (key->str);
-          char *str = rxvt_wcstombs (wc);
+          char *str = rxvt_wcstombs (ws);
           // TODO: do (some) translations, unescaping etc, here (allow \u escape etc.)
-          free (wc);
+          free (ws);
           output_string (term, str);
           free (str);

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