--- rxvt-unicode/src/xdefaults.C	2006/01/20 10:27:08	1.82
+++ rxvt-unicode/src/xdefaults.C	2006/01/25 21:09:22	1.86
@@ -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
@@ -220,6 +218,7 @@
               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),
@@ -321,9 +320,6 @@
 #if TINTING
                                     "tint,"
 #endif
-#if defined(UTMP_SUPPORT)
-                                    "utmp,"
-#endif
 #if defined(USE_XIM)
                                     "XIM,"
 #endif
@@ -366,9 +362,6 @@
 #if defined(ENABLE_FRILLS)
                                     "frills,"
 #endif
-#if defined(PREFER_24BIT)
-                                    "24bit,"
-#endif
 #if defined(SELECTION_SCROLLING)
                                     "selectionscrolling,"
 #endif
@@ -497,9 +490,7 @@
       const char *flag, *opt;
 
       opt = argv[i];
-#ifdef DEBUG_RESOURCES
-      fprintf (stderr, "argv[%d] = %s: ", i, opt);
-#endif
+
       if (*opt == '-')
         {
           flag = On;
@@ -550,10 +541,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)
@@ -779,7 +766,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);
@@ -841,7 +828,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];