--- rxvt-unicode/src/rxvttoolkit.h	2006/02/18 14:14:43	1.24
+++ rxvt-unicode/src/rxvttoolkit.h	2007/06/08 20:04:12	1.30
@@ -1,6 +1,25 @@
-/*
- * rxvttoolkit.h - provide toolkit-functionality for rxvt.
- */
+/*----------------------------------------------------------------------*
+ * File:	rxvttoolkit.h - provide toolkit-functionality for rxvt.
+ *----------------------------------------------------------------------*
+ *
+ * All portions of code are copyright by their respective author/s.
+ * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *----------------------------------------------------------------------*/
+
 #ifndef RXVT_TOOLKIT_H
 #define RXVT_TOOLKIT_H
 
@@ -166,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;
 
@@ -187,11 +210,12 @@
   Display   *dpy;
   int       screen;
   Window    root;
+#ifdef HAVE_AFTERIMAGE  
+  struct ASVisual  *asv;
+#endif
   rxvt_term *selection_owner;
   Atom      xa[NUM_XA];
-#ifndef NO_SLOW_LINK_SUPPORT
   bool      is_local;
-#endif
 #ifdef POINTER_BLANK
   Cursor    blank_cursor;
 #endif
@@ -219,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)
@@ -236,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)