--- rxvt-unicode/src/rxvttoolkit.h	2006/02/20 22:42:01	1.27
+++ rxvt-unicode/src/rxvttoolkit.h	2007/06/08 20:04:12	1.30
@@ -185,10 +185,14 @@
 #endif
 
   void set (rxvt_display *disp);
-  void set (rxvt_display *disp, int bitdepth);
+  void select_visual (int bitdepth);
   void clear ();
 };
 
+#ifdef HAVE_AFTERIMAGE  
+struct ASVisual;
+#endif
+
 struct rxvt_display : refcounted {
   io_manager_vec<xevent_watcher> xw;
 
@@ -206,6 +210,9 @@
   Display   *dpy;
   int       screen;
   Window    root;
+#ifdef HAVE_AFTERIMAGE  
+  struct ASVisual  *asv;
+#endif
   rxvt_term *selection_owner;
   Atom      xa[NUM_XA];
   bool      is_local;
@@ -236,10 +243,10 @@
 };
 
 #ifdef USE_XIM
-struct im_watcher : watcher, callback0<void> {
-  template<class O1, class O2>
-  im_watcher (O1 *object, void (O2::*method) ())
-  : callback0<void> (object,method)
+struct im_watcher : watcher, callback<void (void)> {
+  template<class O, class M>
+  im_watcher (O object, M method)
+  : callback<void (void)> (object, method)
   { }
 
   void start (rxvt_display *display)
@@ -253,12 +260,12 @@
 };
 #endif
 
-struct xevent_watcher : watcher, callback1<void, XEvent &> {
+struct xevent_watcher : watcher, callback<void (XEvent &)> {
   Window window;
 
-  template<class O1, class O2>
-  xevent_watcher (O1 *object, void (O2::*method) (XEvent &))
-  : callback1<void, XEvent &> (object,method)
+  template<class O, class M>
+  xevent_watcher (O object, M method)
+  : callback<void (XEvent &)> (object, method)
   { }
 
   void start (rxvt_display *display, Window window)