From 851bfe6ec3cdcce13e0c8914c711ba8e4758fa9f Mon Sep 17 00:00:00 2001
From: ayin <ayin>
Date: Thu, 2 Aug 2007 15:01:30 +0000
Subject: [PATCH] *** empty log message ***

---
 src/init.C |  6 +-----
 src/rxvt.h | 16 ----------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/init.C b/src/init.C
index 5dac46e0..993e0579 100644
--- a/src/init.C
+++ b/src/init.C
@@ -1040,11 +1040,7 @@ rxvt_term::create_windows (int argc, const char *const *argv)
   vt_ev.start (display, vt);
 
 #ifdef XPM_BACKGROUND
-  if (rs[Rs_backgroundPixmap] != NULL
-#ifndef HAVE_AFTERIMAGE  
-      && !option (Opt_transparent)
-#endif	  
-    )
+  if (rs[Rs_backgroundPixmap] != NULL)
     {
       const char *p = rs[Rs_backgroundPixmap];
 
diff --git a/src/rxvt.h b/src/rxvt.h
index c2f19985..5b563943 100644
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -79,12 +79,6 @@ typedef struct termios ttymode_t;
 #  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
@@ -758,12 +752,6 @@ enum {
 #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;
 
@@ -1020,14 +1008,10 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
   row_col_t       oldcursor;
 #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 */
-#else
-  XpmAttributes   xpmAttr;    /* originally loaded pixmap and its scaling */
-#endif  
 #endif
 
 #if ENABLE_OVERLAY
-- 
2.34.1