--- rxvt-unicode/src/xdefaults.C	2006/01/16 09:28:17	1.79
+++ rxvt-unicode/src/xdefaults.C	2006/01/25 22:13:47	1.87
@@ -36,8 +36,6 @@
 #define Optflag_Boolean              0x80000000UL
 #define Optflag_mask                 0x3fffffffUL
 
-/* #define DEBUG_RESOURCES */
-
 /*{{{ monolithic option/resource structure: */
 /*
  * `string' options MUST have a usage argument
@@ -189,14 +187,9 @@
               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"),
-#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
-              RSTRG (Rs_path, "path", "search path"),
-#endif				/* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
 #ifdef XPM_BACKGROUND
+              RSTRG (Rs_path, "path", "search path"),
               STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
-#endif				/* XPM_BACKGROUND */
-#if (MENUBAR_MAX)
-              RSTRG (Rs_menu, "menu", "name[;tag]"),
 #endif
               /* fonts: command-line option = resource name */
               STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
@@ -222,8 +215,10 @@
 #endif
 #if ENABLE_FRILLS
               RSTRG (Rs_transient_for, "transient-for", "windowid"),
+              BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"),
               STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
               BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
+              STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
               STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
               STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
               STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
@@ -325,12 +320,6 @@
 #if TINTING
                                     "tint,"
 #endif
-#if defined(UTMP_SUPPORT)
-                                    "utmp,"
-#endif
-#if defined(MENUBAR)
-                                    "menubar,"
-#endif
 #if defined(USE_XIM)
                                     "XIM,"
 #endif
@@ -373,9 +362,6 @@
 #if defined(ENABLE_FRILLS)
                                     "frills,"
 #endif
-#if defined(PREFER_24BIT)
-                                    "24bit,"
-#endif
 #if defined(SELECTION_SCROLLING)
                                     "selectionscrolling,"
 #endif
@@ -395,8 +381,9 @@
                                     "pointerBlank,"
 #endif
 #if defined(NO_RESOURCES)
-                                    "NoResources"
+                                    "NoResources,"
 #endif
+                                    "v" VERSION
                                     "\nUsage: ";		/* Usage */
 
 #define INDENT 18
@@ -504,9 +491,7 @@
       const char *flag, *opt;
 
       opt = argv[i];
-#ifdef DEBUG_RESOURCES
-      fprintf (stderr, "argv[%d] = %s: ", i, opt);
-#endif
+
       if (*opt == '-')
         {
           flag = On;
@@ -557,10 +542,6 @@
             }
           else
             {		/* boolean value */
-#ifdef DEBUG_RESOURCES
-              fprintf (stderr, "boolean (%s,%s) = %s\n",
-                      optList[entry].opt, optList[entry].kw, flag);
-#endif
               set_option (optList[entry].flag & Optflag_mask, flag == On);
 
               if (optList[entry].doff != -1)
@@ -603,12 +584,12 @@
  */
 /* ARGSUSED */
 int
-rxvt_define_key (XrmDatabase *database __attribute__((unused)),
-                 XrmBindingList bindings __attribute__((unused)),
+rxvt_define_key (XrmDatabase *database UNUSED,
+                 XrmBindingList bindings UNUSED,
                  XrmQuarkList quarks,
-                 XrmRepresentation *type __attribute__((unused)),
+                 XrmRepresentation *type UNUSED,
                  XrmValue *value,
-                 XPointer closure __attribute__((unused)))
+                 XPointer closure UNUSED)
 {
   int last;
 
@@ -786,7 +767,7 @@
 const char *
 rxvt_term::x_resource (const char *name)
 {
-  XrmDatabase database = XrmGetDatabase (display->display);
+  XrmDatabase database = XrmGetDatabase (xdisp);
 
   const char *p = get_res (database, rs[Rs_name], name);
   const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
@@ -848,7 +829,7 @@
    * [R5 or later]: enumerate the resource database
    */
 #  ifdef KEYSYM_RESOURCE
-  XrmDatabase database = XrmGetDatabase (display->display);
+  XrmDatabase database = XrmGetDatabase (xdisp);
   XrmName name_prefix[3];
   XrmClass class_prefix[3];