--- rxvt-unicode/src/rxvttoolkit.h	2006/01/31 19:53:31	1.20
+++ rxvt-unicode/src/rxvttoolkit.h	2006/02/02 18:04:46	1.23
@@ -123,7 +123,7 @@
 
 struct rxvt_screen {
   rxvt_display *display;
-  Display *xdisp;
+  Display *dpy;
   int depth;
   Visual *visual;
   Colormap cmap;
@@ -147,7 +147,7 @@
 #endif
 
 //public
-  Display   *display;
+  Display   *dpy;
   int       screen;
   Window    root;
   rxvt_term *selection_owner;
@@ -160,7 +160,7 @@
 #endif
 
   rxvt_display (const char *id);
-  XrmDatabase get_resources ();
+  XrmDatabase get_resources (bool refresh);
   bool ref_init ();
   void ref_next ();
   ~rxvt_display ();
@@ -253,6 +253,7 @@
   void free (rxvt_screen *screen);
 
   void get (rgba &color);
+  void get (XColor &color);
  
   bool set (rxvt_screen *screen, const char *name);
   bool set (rxvt_screen *screen, const rgba &color);