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

Comparing rxvt-unicode/src/keyboard.C (file contents):
Revision 1.54 by sf-exg, Sat Dec 3 11:31:56 2011 UTC vs.
Revision 1.58 by sf-exg, Thu Jan 19 13:33:43 2012 UTC

 #include "../config.h"
 #include "rxvt.h"
 #ifdef KEYSYM_RESOURCE
-#include <cstring>
+#include <string.h>
 #include "rxvtperl.h"
 #include "keyboard.h"
-#include "command.h"
 /* an intro to the data structure:
  *
  * vector keymap[] is grouped.
  *
 {
   char *translation = rxvt_wcstoutf8 (ws);
   keysym_t *key = new keysym_t;
-  if (key && translation)
-    {
-      key->keysym = keysym;
+  key->keysym = keysym;
-      key->state  = state;
+  key->state  = state;
-      key->str    = translation;
+  key->str    = translation;
-      key->type   = keysym_t::STRING;
+  key->type   = keysym_t::STRING;
-      if (strncmp (translation, "builtin:", 8) == 0)
+  if (strncmp (translation, "builtin:", 8) == 0)
-        key->type = keysym_t::BUILTIN;
+    key->type = keysym_t::BUILTIN;
-      if (keymap.size () == keymap.capacity ())
+  if (keymap.size () == keymap.capacity ())
-        keymap.reserve (keymap.size () * 2);
+    keymap.reserve (keymap.size () * 2);
-      keymap.push_back (key);
+  keymap.push_back (key);
-      hash[0] = 3;
+  hash[0] = 3;
-    }
-  else
-    {
-      delete key;
-      free (translation);
-      rxvt_fatal ("memory allocation failure. aborting.\n");
-    }
 }
 bool
 keyboard_manager::dispatch (rxvt_term *term, KeySym keysym, unsigned int state)
 {

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