--- rxvt-unicode/src/rxvttoolkit.h	2006/01/31 19:53:31	1.20
+++ rxvt-unicode/src/rxvttoolkit.h	2006/02/18 15:48:23	1.25
@@ -107,6 +107,33 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
+struct rxvt_screen;
+
+struct rxvt_drawable {
+  rxvt_screen *screen;
+  Drawable drawable;
+  operator Drawable() { return drawable; }
+
+#if XFT
+  XftDraw *xftdrawable;
+  operator XftDraw *();
+#endif
+
+  rxvt_drawable (rxvt_screen *screen, Drawable drawable)
+  : screen(screen),
+#if XFT
+    xftdrawable(0),
+#endif
+    drawable(drawable)
+  { }
+
+#if XFT
+  ~rxvt_drawable ();
+#endif
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
 #ifdef USE_XIM
 struct rxvt_xim : refcounted {
   void destroy ();
@@ -123,11 +150,21 @@
 
 struct rxvt_screen {
   rxvt_display *display;
-  Display *xdisp;
+  Display *dpy;
   int depth;
   Visual *visual;
   Colormap cmap;
 
+#if XFT
+  // scratch pixmap
+  rxvt_drawable *scratch_area;
+  int scratch_w, scratch_h;
+
+  rxvt_drawable &scratch_drawable (int w, int h);
+
+  rxvt_screen ();
+#endif
+
   void set (rxvt_display *disp);
   void set (rxvt_display *disp, int bitdepth);
   void clear ();
@@ -147,20 +184,18 @@
 #endif
 
 //public
-  Display   *display;
+  Display   *dpy;
   int       screen;
   Window    root;
   rxvt_term *selection_owner;
   Atom      xa[NUM_XA];
-#ifndef NO_SLOW_LINK_SUPPORT
   bool      is_local;
-#endif
 #ifdef POINTER_BLANK
   Cursor    blank_cursor;
 #endif
 
   rxvt_display (const char *id);
-  XrmDatabase get_resources ();
+  XrmDatabase get_resources (bool refresh);
   bool ref_init ();
   void ref_next ();
   ~rxvt_display ();
@@ -253,6 +288,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);