--- rxvt-unicode/src/rxvt.h	2007/07/29 08:56:36	1.280
+++ rxvt-unicode/src/rxvt.h	2007/08/03 05:33:04	1.282
@@ -79,12 +79,6 @@
 #  include <afterimage.h>
 #undef min
 #undef max
-#elif defined(XPM_BACKGROUND)
-# ifdef XPM_INC_X11
-#  include <X11/xpm.h>
-# else
-#  include <xpm.h>
-# endif
 #endif
 
 #ifndef STDIN_FILENO
@@ -178,11 +172,16 @@
 # undef KEEP_SCROLLCOLOR
 #endif
 
-#ifdef XPM_BACKGROUND
+#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
 typedef struct {
+#ifdef  XPM_BACKGROUND
+  ASImage  *original_asim;
   short w, h, x, y;
-  bool auto_resize ; 
+  bool auto_resize;
+#endif  
   Pixmap pixmap;
+  unsigned int pmap_width, pmap_height;
+  unsigned int pmap_depth;
 } bgPixmap_t;
 #endif
 
@@ -758,12 +757,6 @@
 #define scrollbar_size()                (scrollBar.end - scrollBar.beg \
                                          - scrollbar_minheight ())
 
-#ifdef XPM_BACKGROUND
-# define XPMClearArea(a, b, c, d, e, f, g)      XClearArea((a), (b), (c), (d), (e), (f), (g))
-#else
-# define XPMClearArea(a, b, c, d, e, f, g)
-#endif
-
 typedef callback<void (const char *)> log_callback;
 typedef callback<int (int)> getfd_callback;
 
@@ -1018,16 +1011,12 @@
   XComposeStatus  compose;
   ttymode_t       tio;
   row_col_t       oldcursor;
-#ifdef XPM_BACKGROUND
+#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
   bgPixmap_t      bgPixmap;
-#ifdef HAVE_AFTERIMAGE  
+#endif 
+#ifdef XPM_BACKGROUND
   struct ASVisual  *asv;
   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
@@ -1450,7 +1439,7 @@
   // xpm.C
   int scale_pixmap (const char *geom);
   void resize_pixmap ();
-  Pixmap set_bgPixmap (const char *file);
+  void set_bgPixmap (const char *file);
 };
 
 /*