--- rxvt-unicode/src/xdefaults.C	2004/04/02 18:00:01	1.23
+++ rxvt-unicode/src/xdefaults.C	2004/08/13 03:36:57	1.30
@@ -1,12 +1,12 @@
 /*--------------------------------*-C-*---------------------------------*
- * File:	xdefaults.c
+ * File:	xdefaults.C
  *----------------------------------------------------------------------*
- * $Id: xdefaults.C,v 1.23 2004/04/02 18:00:01 pcg Exp $
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1994      Robert Nation <nation@rocket.sanders.lockheed.com>
  *				- original version
  * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
+ * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
  *
  * 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
@@ -111,6 +111,12 @@
               STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
 #endif
 #endif
+#ifdef OFF_FOCUS_FADING
+              STRG (Rs_fade, "fading", "fade", "%", "make colors x% darker when urxvt is losing focus."),
+#endif
+#ifdef TINTING
+              STRG (Rs_shade, "shading", "sh", "%", "shade background by x% when tinting."),
+#endif
               BOOL (Rs_utmpInhibit, "utmpInhibit", "ut", Opt_utmpInhibit, "utmp inhibit"),
 #ifndef NO_BELL
               BOOL (Rs_visualBell, "visualBell", "vb", Opt_visualBell, "visual bell"),
@@ -155,6 +161,7 @@
               RSTRG (Rs_color + minBrightCOLOR + 7, "color15", "color"),
 #endif				/* NO_BRIGHTCOLOR */
 #ifndef NO_BOLD_UNDERLINE_REVERSE
+              BOOL (Rs_realBold, "realBold", "rb", Opt_realBold, "use bold fonts for bold text"),
               RSTRG (Rs_color + Color_BD, "colorBD", "color"),
               RSTRG (Rs_color + Color_UL, "colorUL", "color"),
               RSTRG (Rs_color + Color_RV, "colorRV", "color"),
@@ -202,6 +209,7 @@
               STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
               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, "borderless window"),
 #endif
 #ifndef NO_LINESPACE
               STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
@@ -246,27 +254,53 @@
 
 static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";
 static const char optionsstring[] = "Options: "
+#if XFT
+                                    "xft,"
+#endif
+#if UNICODE_3
+                                    "unicode3,"
+#endif
+                                    "encodings=eu+vn"
+#if ENCODING_JP
+                                    "+jp"
+#endif
+#if ENCODING_JP_EXT
+                                    "+jp-ext"
+#endif
+#if ENCODING_KR
+                                    "+kr"
+#endif
+#if ENCODING_CN
+                                    "+cn"
+#endif
+#if ENCODING_CN_EXT
+                                    "+cn-ext"
+#endif
+                                    ","
+#if ENABLE_COMBINING
+                                    "combining,"
+#endif
+#if TEXT_BLINK
+                                    "blink,"
+#endif
+#if OFF_FOCUS_FADING
+                                    "fade,"
+#endif
 #if defined(XPM_BACKGROUND)
                                     "XPM,"
 #endif
 #if defined(TRANSPARENT)
                                     "transparent,"
 #endif
+#if TINTING
+                                    "tint,"
+#endif
 #if defined(UTMP_SUPPORT)
                                     "utmp,"
 #endif
 #if defined(MENUBAR)
                                     "menubar,"
 #endif
-#if !defined(NO_FRILLS)
-                                    "frills,"
-#endif
-#if !defined(NO_LINESPACE)
-                                    "linespace,"
-#endif
-#if defined(PREFER_24BIT)
-                                    "24bit,"
-#endif
 #if defined(USE_XIM)
                                     "XIM,"
 #endif
@@ -303,12 +337,42 @@
 #if defined(NO_DELETE_KEY)
                                     "no_delete,"
 #endif
+#if EIGHT_BIT_CONTROLS
+                                    "8bitctrls,"
+#endif
 #if !defined(NO_STRINGS)
                                     "strings,"
 #endif
+#if !defined(NO_FRILLS)
+                                    "frills,"
+#endif
+#if !defined(NO_LINESPACE)
+                                    "linespace,"
+#endif
+#if defined(PREFER_24BIT)
+                                    "24bit,"
+#endif
+#if defined(SELECTION_SCROLLING)
+                                    "selectionscrolling,"
+#endif
+#if MOUSE_WHEEL
+                                    "wheel,"
+#endif
+#if MOUSE_SLIP_WHEELING
+                                    "slipwheel,"
+#endif
+#if defined(SMART_RESIZE)
+                                    "smart-resize,"
+#endif
 #if defined(TTY_256COLOR)
                                     "256colour,"
 #endif
+#if defined(CURSOR_BLINK)
+                                    "cursorBlink,"
+#endif
+#if defined(POINTER_BLANK)
+                                    "pointerBlank,"
+#endif
 #if defined(NO_RESOURCES)
                                     "NoResources"
 #else
@@ -463,32 +527,18 @@
         {
           if (optList_isReverse (entry))
             flag = flag == On ? Off : On;
-          if (optList_strlen (entry))
-            {	/* string value */
-              const char *str = argv[++i];
-
-#ifdef DEBUG_RESOURCES
-              fprintf (stderr, "string (%s,%s) = ",
-                      optList[entry].opt ? optList[entry].opt : "nil",
-                      optList[entry].kw ? optList[entry].kw : "nil");
-#endif
-              if (flag == On && str && (optList[entry].doff != -1))
-                {
-#ifdef DEBUG_RESOURCES
-                  fprintf (stderr, "\"%s\"\n", str);
-#endif
-                  rs[optList[entry].doff] = str;
-                  /*
-                   * special cases are handled in main.c:main () to allow
-                   * X resources to set these values before we settle for
-                   * default values
-                   */
-                }
-#ifdef DEBUG_RESOURCES
-              else
-                fprintf (stderr, "???\n");
-#endif
 
+          if (optList_strlen (entry))
+            {
+              /*
+               * special cases are handled in main.c:main () to allow
+               * X resources to set these values before we settle for
+               * default values
+               */
+
+              if (optList[entry].doff != -1)
+                rs[optList[entry].doff] = flag == On && argv[i+1]
+                                          ? argv[++i] : 0;
             }
           else
             {		/* boolean value */