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

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.181 by sf-exg, Wed Sep 3 18:20:37 2014 UTC vs.
Revision 1.182 by sf-exg, Wed Sep 3 18:47:16 2014 UTC

   { "4",         1, Mod4Mask      },
   { "5",         1, Mod5Mask      },
 };
 int
-rxvt_term::bind_action (const char *str, const char *arg)
+rxvt_term::parse_keysym (const char *str, unsigned int &state)
 {
   int sym;
-  unsigned int state = 0;
   const char *key = strrchr (str, '-');
+  state = 0;
   if (!key)
     key = str;
   else
     key++;
   // string or key is empty
-  if (*arg == '\0' || *key == '\0')
+  if (*key == '\0')
     return -1;
   // parse modifiers
   while (str < key)
     {
       char *end;
       sym = strtol (str, &end, 16);
       if (*end)
         return -1;
     }
+  return sym;
+}
+int
+rxvt_term::bind_action (const char *str, const char *arg)
+{
+  int sym;
+  unsigned int state;
+  if (*arg == '\0' || (sym = parse_keysym (str, state)) == -1)
+    return -1;
   wchar_t *ws = rxvt_mbstowcs (arg);
   keyboard->register_action (sym, state, ws);
   free (ws);

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