--- rxvt-unicode/src/xdefaults.C	2006/01/06 05:37:59	1.73
+++ rxvt-unicode/src/xdefaults.C	2006/01/08 07:55:36	1.75
@@ -406,7 +406,7 @@
                                     "NoResources"
 #else
 # if defined(USE_XGETDEFAULT)
-                                    "XGetDefaults"
+                                    "XGetDefault"
 # else
                                     ".Xdefaults"
 # endif
@@ -575,10 +575,7 @@
               fprintf (stderr, "boolean (%s,%s) = %s\n",
                       optList[entry].opt, optList[entry].kw, flag);
 #endif
-              if (flag == On)
-                SET_OPTION (optList[entry].flag & Optflag_mask);
-              else
-                CLR_OPTION (optList[entry].flag & Optflag_mask);
+              set_option (optList[entry].flag & Optflag_mask, flag == On);
 
               if (optList[entry].doff != -1)
                 rs[optList[entry].doff] = flag;
@@ -869,10 +866,7 @@
                         if (optList_isReverse (entry))
                           s = !s;
 
-                        if (s)
-                          SET_OPTION (optList[entry].flag & Optflag_mask);
-                        else
-                          CLR_OPTION (optList[entry].flag & Optflag_mask);
+                        set_option (optList[entry].flag & Optflag_mask, s);
                       }
                   }
 
@@ -888,6 +882,20 @@
 # endif				/* ! USE_XGETDEFAULT */
 #endif				/* NO_RESOURCES */
 
+#ifdef USE_XGETDEFAULT
+char *get_res (XrmDatabase database, const char *program, const char *option)
+{
+  char resource[512];
+  char *type;
+  XrmValue result;
+
+  snprintf (resource, sizeof (resource), "%s.%s", program, option);
+  XrmGetResource (database, resource, resource, &type, &result);
+
+  return result.addr;
+}
+#endif
+
 /*{{{ read the resources files */
 /*
  * using XGetDefault () or the hand-rolled replacement
@@ -921,13 +929,11 @@
    */
   int entry;
 
-#  ifdef XrmEnumOneLevel
   char *displayResource, *xe;
   XrmName name_prefix[3];
   XrmClass class_prefix[3];
   XrmDatabase database, rdb1;
 
-  XrmInitialize ();
   database = NULL;
 
   // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
@@ -998,8 +1004,7 @@
         }
     }
 
-  XrmSetDatabase (disp, database);
-#  endif
+  xrmdatabase = database;
 
   /*
    * Query resources for options that affect us
@@ -1013,14 +1018,14 @@
       if (kw == NULL || rs[optList[entry].doff] != NULL)
         continue;		/* previously set */
 
-      p = XGetDefault (disp, rs[Rs_name], kw);
-      p0 = XGetDefault (disp, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
+      p = get_res (database, rs[Rs_name], kw);
+      p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
       if (p == NULL || (p0 && strcmp (p, p0) == 0))
         {
-          p = XGetDefault (disp, RESCLASS, kw);
+          p = get_res (database, RESCLASS, kw);
 #ifdef RESFALLBACK
           if (p == NULL || (p0 && strcmp (p, p0) == 0))
-            p = XGetDefault (disp, RESFALLBACK, kw);
+            p = get_res (database, RESFALLBACK, kw);
 #endif
         }
 
@@ -1041,10 +1046,7 @@
               if (optList_isReverse (entry))
                 s = !s;
 
-              if (s)
-                SET_OPTION (optList[entry].flag & Optflag_mask);
-              else
-                CLR_OPTION (optList[entry].flag & Optflag_mask);
+              set_option (optList[entry].flag & Optflag_mask, s);
             }
         }
     }
@@ -1060,7 +1062,7 @@
   class_prefix[1] = XrmStringToName ("Keysym");
   class_prefix[2] = NULLQUARK;
   /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
-  XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
+  XrmEnumerateDatabase (database, name_prefix, class_prefix,
                         XrmEnumOneLevel, rxvt_define_key, NULL);
 #   ifdef RESFALLBACK
   name_prefix[0] = XrmStringToName (RESFALLBACK);
@@ -1068,7 +1070,7 @@
   class_prefix[0] = XrmStringToName (RESFALLBACK);
   class_prefix[1] = XrmStringToName ("Keysym");
   /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */
-  XrmEnumerateDatabase (XrmGetDatabase (disp), name_prefix, class_prefix,
+  XrmEnumerateDatabase (database, name_prefix, class_prefix,
                         XrmEnumOneLevel, rxvt_define_key, NULL);
 #   endif
 #  endif