--- rxvt-unicode/src/xdefaults.C	2007/11/22 15:07:10	1.122
+++ rxvt-unicode/src/xdefaults.C	2007/12/31 01:16:47	1.128
@@ -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
@@ -113,10 +114,10 @@
               BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
               BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
               STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
-              STRG (Rs_shade, "shading", "sh", "%", "shade background by x %."),
+              STRG (Rs_shade, "shading", "sh", "number", "shade background by number %."),
 #endif
 #if OFF_FOCUS_FADING
-              STRG (Rs_fade, "fading", "fade", "%", "fade colors x% percent when rxvt-unicode is losing focus"),
+              STRG (Rs_fade, "fading", "fade", "number", "fade colors by number % when losing focus"),
               STRG (Rs_color + Color_fade, "fadeColor", "fadecolor", "color", "target color for off-focus fading"),
 #endif
               BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, 0, "utmp inhibit"),
@@ -227,9 +228,11 @@
               STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
               STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
               BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
-              BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
               STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
 #endif
+#ifdef BUILTIN_GLYPHS
+              BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
+#endif
 #ifdef POINTER_BLANK
               RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
 #endif
@@ -239,7 +242,6 @@
 #ifndef NO_DELETE_KEY
               RSTRG (Rs_delete_key, "deletekey", "string"),
 #endif
-              RSTRG (Rs_selectstyle, "selectstyle", "mode"),
 #ifdef PRINTPIPE
               RSTRG (Rs_print_pipe, "print-pipe", "string"),
 #endif
@@ -265,9 +267,6 @@
               STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
               STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
 #endif
-#ifndef NO_RESOURCES
-              INFO ("xrm", "string", "X resource"),
-#endif
               INFO ("e", "command arg ...", "command to execute")
             };
 
@@ -428,7 +427,8 @@
               len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
               col += len;
               if (col > 79)
-                {	/* assume regular width */
+                {
+                  /* assume regular width */
                   rxvt_log ("\n");
                   col = 1 + len;
                 }
@@ -556,13 +556,21 @@
                 }
             }
           else
-            {		/* boolean value */
+            {
+              /* boolean value */
               set_option (optList[entry].index, flag == resval_on);
 
               if (optList[entry].doff != -1)
                 rs[optList[entry].doff] = flag;
             }
         }
+#ifndef NO_RESOURCES
+      else if (!strcmp (opt, "xrm"))
+        {
+          if (i+1 < argc)
+            XrmPutLineResource (&option_db, argv[++i]);
+        }
+#endif
 #ifdef KEYSYM_RESOURCE
       else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
         {