--- rxvt-unicode/src/rxvt.h	2007/01/20 00:45:30	1.266
+++ rxvt-unicode/src/rxvt.h	2007/07/12 22:33:16	1.277
@@ -75,7 +75,11 @@
 #include <termios.h>
 typedef struct termios ttymode_t;
 
-#ifdef XPM_BACKGROUND
+#ifdef HAVE_AFTERIMAGE
+#  include <afterimage.h>
+#undef min
+#undef max
+#elif defined(XPM_BACKGROUND)
 # ifdef XPM_INC_X11
 #  include <X11/xpm.h>
 # else
@@ -132,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;
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -179,6 +182,7 @@
 #ifdef XPM_BACKGROUND
 typedef struct {
   short w, h, x, y;
+  bool auto_resize ; 
   Pixmap pixmap;
 } bgPixmap_t;
 #endif
@@ -689,15 +693,6 @@
 #define Width2Pixel(n)          ((int32_t)(n) * (int32_t)fwidth)
 #define Height2Pixel(n)         ((int32_t)(n) * (int32_t)fheight)
 
-#define OPTION(opt)		(options & (opt))
-#define DEFAULT_OPTIONS		(Opt_scrollBar		\
-                                | Opt_scrollTtyOutput	\
-				| Opt_jumpScroll	\
-                                | Opt_secondaryScreen	\
-                                | Opt_secondaryScroll	\
-				| Opt_pastableTabs	\
-                                | Opt_intensityStyles)
-
 // for m >= -n, ensure remainder lies between 0..n-1
 #define MOD(m,n) (((m) + (n)) % (n))
 
@@ -905,10 +900,8 @@
   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      */
-#endif
-#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
                   am_transparent:1,	/* is a transparent term             */
                   am_pixmap_trans:1, 	/* transparency w/known root pixmap  */
 #endif
@@ -961,7 +954,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                      */
@@ -1029,7 +1021,17 @@
   row_col_t       oldcursor;
 #ifdef XPM_BACKGROUND
   bgPixmap_t      bgPixmap;
+#ifdef HAVE_AFTERIMAGE  
+  struct ASVisual  *asv;
+  /* 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;})
+  ASImageManager *asimman;
+  ASImage        *original_asim;
+  struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
+#else
   XpmAttributes   xpmAttr;    /* originally loaded pixmap and its scaling */
+#endif  
 #endif
 
 #if ENABLE_OVERLAY
@@ -1097,10 +1099,15 @@
     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_parents_ev;
+#endif
 
   void x_cb (XEvent &xev);
   void flush ();
@@ -1227,7 +1234,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);
@@ -1298,7 +1304,7 @@
 #ifndef NO_BRIGHTCOLOR
     if (r & RS_Bold
 # if ENABLE_STYLES
-        && OPTION (Opt_intensityStyles)
+        && option (Opt_intensityStyles)
 # endif
         && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
       base += minBrightCOLOR - minCOLOR;
@@ -1312,7 +1318,7 @@
 #ifndef NO_BRIGHTCOLOR
     if (r & RS_Blink
 # if ENABLE_STYLES
-        && OPTION (Opt_intensityStyles)
+        && option (Opt_intensityStyles)
 # endif
         && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
       base += minBrightCOLOR - minCOLOR;
@@ -1320,17 +1326,17 @@
     return base;
   }
 
-  bool option (uint32_t opt) const NOTHROW
+  bool option (uint8_t opt) const NOTHROW
   {
-    return OPTION (opt);
+    return options[opt >> 3] & (1 << (opt & 7));
   }
 
-  void set_option (uint32_t opt, bool set) NOTHROW
+  void set_option (uint8_t opt, bool set = true) NOTHROW
   {
     if (set)
-      options |= opt;
+      options[opt >> 3] |= (1 << (opt & 7));
     else
-      options &= ~opt;
+      options[opt >> 3] &= ~(1 << (opt & 7));
   }
 
   void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;