--- rxvt-unicode/src/xdefaults.C	2007/12/17 23:52:45	1.127
+++ rxvt-unicode/src/xdefaults.C	2008/01/18 23:14:05	1.131
@@ -7,6 +7,7 @@
  *				- original version
  * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
  * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2007      Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -495,20 +496,21 @@
   for (i = 1; i < argc; i++)
     {
       unsigned int entry, longopt = 0;
-      const char *flag, *opt;
+      const char *opt;
+      int flag;
 
       opt = argv[i];
 
       if (*opt == '-')
         {
-          flag = resval_on;
+          flag = 1;
 
           if (*++opt == '-')
             longopt = *opt++;	/* long option */
         }
       else if (*opt == '+')
         {
-          flag = resval_off;
+          flag = 0;
 
           if (*++opt == '+')
             longopt = *opt++;	/* long option */
@@ -536,7 +538,7 @@
       if (entry < optList_size)
         {
           if (optList_isReverse (entry))
-            flag = flag == resval_on ? resval_off : resval_on;
+            flag = !flag;
 
           if (optList_strlen (entry))
             {
@@ -548,19 +550,19 @@
 
               if (optList[entry].doff != -1)
                 {
-                  if (flag == resval_on && i+1 == argc)
+                  if (flag && i+1 == argc)
                     rxvt_fatal ("option '%s' requires an argument, aborting.\n", argv [i]);
 
-                  rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
+                  rs[optList[entry].doff] = flag ? argv[++i] : resval_undef;
                 }
             }
           else
             {
               /* boolean value */
-              set_option (optList[entry].index, flag == resval_on);
+              set_option (optList[entry].index, flag);
 
               if (optList[entry].doff != -1)
-                rs[optList[entry].doff] = flag;
+                rs[optList[entry].doff] = flag ? resval_on : resval_off;
             }
         }
 #ifndef NO_RESOURCES
@@ -627,12 +629,7 @@
 /*
  * look for something like this (XK_Delete)
  * rxvt*keysym.0xFFFF: "\177"
- *
- * arg will be
- *      NULL for ~/.Xdefaults and
- *      non-NULL for command-line options (need to allocate)
  */
-#define NEWARGLIM	500	/* `reasonable' size */
 
 struct keysym_vocabulary_t
 {
@@ -640,7 +637,7 @@
   unsigned short len;
   unsigned short value;
 };
-keysym_vocabulary_t keysym_vocabulary[] =
+static const keysym_vocabulary_t keysym_vocabulary[] =
 {
   { "ISOLevel3", 9, Level3Mask    },
   { "AppKeypad", 9, AppKeypadMask },
@@ -672,30 +669,21 @@
 int
 rxvt_term::parse_keysym (const char *str, const char *arg)
 {
-  int n, sym;
+  int sym;
   unsigned int state = 0;
-  const char *pmodend = NULL;
-  char *newarg = NULL;
-  char newargstr[NEWARGLIM];
-
-  if (arg == NULL)
-    {
-      n = sizeof ("keysym.") - 1;
-      if (strncmp (str, "keysym.", n))
-        return 0;
+  const char *key = strrchr (str, '-');
 
-      str += n;		/* skip `keysym.' */
-      if (!(pmodend = strchr (str, ':')))
-        return -1;
-    }
+  if (!key)
+    key = str;
   else
-    pmodend = str + strlen(str);
+    key++;
 
-  for (--pmodend; str < pmodend; --pmodend)
-    if (*pmodend == '-')
-      break;
+  // string or key is empty
+  if (*arg == '\0' || *key == '\0')
+    return -1;
 
-  while (str < pmodend)
+  // parse modifiers
+  while (str < key)
     {
       unsigned int i;
 
@@ -716,58 +704,17 @@
         ++str;
     }
 
-  /* some scanf () have trouble with a 0x prefix */
-  if (str[0] == '0' && toupper (str[1]) == 'X')
+  // convert keysym name to keysym number
+  if ((sym = XStringToKeysym (str)) == None)
     {
-      str += 2;
-
-      if (arg)
-        {
-          if (sscanf (str, (strchr (str, ':') ? "%x:" : "%x"), &sym) != 1)
-            return -1;
-        }
-      else
-        {
-          if (sscanf (str, "%x:", &sym) != 1)
-            return -1;
-
-          /* cue to ':', it's there since sscanf () worked */
-          strncpy (newargstr, strchr (str, ':') + 1, NEWARGLIM - 1);
-          newargstr[NEWARGLIM - 1] = '\0';
-          newarg = newargstr;
-        }
-    }
-  else
-    {
-      /*
-       * convert keysym name to keysym number
-       */
-      strncpy (newargstr, str, NEWARGLIM - 1);
-      newargstr[NEWARGLIM - 1] = '\0';
-
-      if (arg == NULL)
-        {
-          if ((newarg = strchr (newargstr, ':')) == NULL)
-            return -1;
-
-          *newarg++ = '\0';	/* terminate keysym name */
-        }
-
-      if ((sym = XStringToKeysym (newargstr)) == None)
+      // fallback on hexadecimal parsing
+      char *end;
+      sym = strtol (str, &end, 16);
+      if (*end)
         return -1;
-    }
-
-  if (newarg == NULL)
-    {
-      strncpy (newargstr, arg, NEWARGLIM - 1);
-      newargstr[NEWARGLIM - 1] = '\0';
-      newarg = newargstr;
-    }
-
-  if (*newarg == '\0')
-    return -1;
+    }  
 
-  keyboard->register_user_translation (sym, state, newarg);
+  keyboard->register_user_translation (sym, state, arg);
   return 1;
 }