--- rxvt-unicode/src/xdefaults.C	2007/06/26 00:40:19	1.108
+++ rxvt-unicode/src/xdefaults.C	2007/10/11 16:01:27	1.116
@@ -112,17 +112,13 @@
 #if ENABLE_TRANSPARENCY
               BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
               SWCH ("tr", Opt_transparent, 0, NULL),
-# if TINTING
               STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
-# endif
+              STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."),
 #endif
 #if OFF_FOCUS_FADING
               STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
               STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
 #endif
-#if TINTING
-              STRG (Rs_shade, "shading", "sh", "%", "shade background by x % when tinting."),
-#endif
               BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
 #ifndef NO_BELL
 # if ENABLE_FRILLS
@@ -192,7 +188,7 @@
               STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
               STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
               STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
-#ifdef XPM_BACKGROUND
+#ifdef BG_IMAGE_FROM_FILE
               RSTRG (Rs_path, "path", "search path"),
               STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
 #endif
@@ -267,7 +263,7 @@
 #endif
 #ifdef HAVE_AFTERIMAGE
               STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
-              STRG (Rs_blurradius, "blurRadius", "blr", "number", "Gaussian Blur radius to apply to the root background"),
+              STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
 #endif
 #ifndef NO_RESOURCES
               INFO ("xrm", "string", "X resource"),
@@ -324,15 +320,13 @@
 #if OFF_FOCUS_FADING
                                     "fade,"
 #endif
-#if defined(XPM_BACKGROUND)
-                                    "XPM,"
-#endif
 #if defined(ENABLE_TRANSPARENCY)
                                     "transparent,"
-#endif
-#if TINTING
                                     "tint,"
 #endif
+#if HAVE_AFTERIMAGE
+                                    "afterimage,"
+#endif
 #if defined(USE_XIM)
                                     "XIM,"
 #endif
@@ -555,7 +549,7 @@
 
               if (optList[entry].doff != -1)
                 {
-                  if (flag == resval_on && !argv [i+1])
+                  if (flag == resval_on && i+1 == argc)
                     rxvt_fatal ("option '%s' needs an argument, aborting.\n", argv [i]);
 
                   rs[optList[entry].doff] = flag == resval_on ? argv[++i] : resval_undef;
@@ -571,13 +565,10 @@
         }
       else
 #ifdef KEYSYM_RESOURCE
-        /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
-        if (rxvt_Str_match (opt, "keysym."))
+        if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
           {
-            const char *str = argv[++i];
-
-            if (str != NULL)
-              parse_keysym (opt + sizeof ("keysym.") - 1, str);
+            if (i+1 < argc)
+              parse_keysym (opt + sizeof ("keysym.") - 1, argv[++i]);
           }
         else
 #endif
@@ -678,7 +669,8 @@
 
   if (arg == NULL)
     {
-      if ((n = rxvt_Str_match (str, "keysym.")) == 0)
+      n = sizeof ("keysym.") - 1;
+      if (strncmp (str, "keysym.", n))
         return 0;
 
       str += n;		/* skip `keysym.' */
@@ -761,8 +753,7 @@
       newarg = newargstr;
     }
 
-  rxvt_Str_trim (newarg);
-  if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
+  if (*newarg == '\0')
     return -1;
 
   keyboard->register_user_translation (sym, state, newarg);
@@ -785,8 +776,8 @@
   return result.addr;
 }
 
-const char *
-rxvt_term::x_resource (const char *name)
+static const char *
+x_resource (const char *name)
 {
   XrmDatabase database = XrmGetDatabase (dpy);