--- rxvt-unicode/src/rxvttoolkit.h	2004/08/15 00:37:04	1.1
+++ rxvt-unicode/src/rxvttoolkit.h	2005/08/11 02:05:07	1.8
@@ -18,6 +18,7 @@
 #include "callback.h"
 
 struct rxvt_term;
+struct rxvt_display;
 
 struct im_watcher;
 struct xevent_watcher;
@@ -35,7 +36,12 @@
 struct refcache : vector<T *> {
   T *get (const char *id);
   void put (T *obj);
-  ~refcache ();
+  void clear ();
+
+  ~refcache ()
+  {
+    clear ();
+  }
 };
 
 /////////////////////////////////////////////////////////////////////////////
@@ -66,26 +72,32 @@
   vector<im_watcher *> imw;
 
   void im_change_cb ();
+  void im_change_check ();
 #endif
 
 //public
-  Display  *display;
-  int      depth;
-  int      screen;
-  Visual   *visual;
-  Colormap cmap;
-  Window   root;
+  Display   *display;
+  int       depth;
+  int       screen;
+  Visual    *visual;
+  Colormap  cmap;
+  Window    root;
   rxvt_term *selection_owner;
 #ifndef NO_SLOW_LINK_SUPPORT
-  bool     is_local;
+  bool      is_local;
+#endif
+#ifdef POINTER_BLANK
+  Cursor    blank_cursor;
 #endif
 
   rxvt_display (const char *id);
   bool init ();
   ~rxvt_display ();
 
-  void flush ();
+  operator Display *() const { return display; }
 
+  void flush ();
+  Atom atom (const char *name);
   void set_selection_owner (rxvt_term *owner);
 
   void reg (xevent_watcher *w);
@@ -98,8 +110,6 @@
   rxvt_xim *get_xim (const char *locale, const char *modifiers);
   void put_xim (rxvt_xim *xim);
 #endif
-
-  Atom atom (const char *name);
 };
 
 #ifdef USE_XIM
@@ -163,7 +173,8 @@
   bool set (rxvt_display *display, const char *name);
   bool set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb);
 
-  rxvt_color fade (rxvt_display *, int percent);
+  rxvt_color fade (rxvt_display *, int percent); // fades to black
+  rxvt_color fade (rxvt_display *, int percent, rxvt_color &fadeto);
 
   void free (rxvt_display *display);
 };