--- rxvt-unicode/src/rxvt.h	2007/06/08 20:04:12	1.270
+++ rxvt-unicode/src/rxvt.h	2007/07/24 14:38:59	1.278
@@ -136,7 +136,6 @@
 int              rxvt_Str_escaped                 (char *str) NOTHROW;
 char          ** rxvt_splitcommastring            (const char *cs) NOTHROW;
 void             rxvt_freecommastring             (char **cs) NOTHROW;
-char           * rxvt_File_find                   (const char *file, const char *ext, const char *path) NOTHROW;
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -886,6 +885,10 @@
 class keyboard_manager;
 #endif
 
+/* to get libAfterImage to work with multiple displays we use that hack :  */
+/* should not need that with libAfterImage  version >= 1.15 */
+#define AFTERIMAGE_DPY_OP(op) ((::dpy = dpy), (op))
+
 struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
 
   // special markers with magic addresses
@@ -901,7 +904,7 @@
   struct mbstate  mbstate;              // current input multibyte state
 
   unsigned char   want_refresh:1,
-#ifdef TRANSPARENT
+#ifdef ENABLE_TRANSPARENCY
                   want_full_refresh:1,	/* awaiting full screen refresh      */
                   am_transparent:1,	/* is a transparent term             */
                   am_pixmap_trans:1, 	/* transparency w/known root pixmap  */
@@ -955,7 +958,6 @@
                   mouse_slip_wheel_speed,
 #endif
                   refresh_count,
-                  refresh_limit,
                   last_bot,   /* scrollbar last bottom position            */
                   last_top,   /* scrollbar last top position               */
                   last_state, /* scrollbar last state                      */
@@ -1024,6 +1026,7 @@
 #ifdef XPM_BACKGROUND
   bgPixmap_t      bgPixmap;
 #ifdef HAVE_AFTERIMAGE  
+  struct ASVisual  *asv;
   ASImageManager *asimman;
   ASImage        *original_asim;
   struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
@@ -1097,11 +1100,14 @@
     XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
   }
 
-#if TRANSPARENT || ENABLE_PERL
+#if ENABLE_TRANSPARENCY || ENABLE_PERL
   void rootwin_cb (XEvent &xev);
   xevent_watcher rootwin_ev;
+#endif
+#if ENABLE_TRANSPARENCY
+  int check_our_parents ();
   void check_our_parents_cb (time_watcher &w);
-  time_watcher check_our_aprents_ev;
+  time_watcher check_our_parents_ev;
 #endif
 
   void x_cb (XEvent &xev);
@@ -1229,7 +1235,6 @@
   void focus_in ();
   void focus_out ();
   void update_fade_color (unsigned int idx);
-  int check_our_parents ();
 #ifdef PRINTPIPE
   FILE *popen_printer ();
   int pclose_printer (FILE *stream);