--- rxvt-unicode/src/screen.C	2007/08/10 23:52:12	1.272
+++ rxvt-unicode/src/screen.C	2007/08/13 22:41:34	1.274
@@ -28,8 +28,6 @@
 #include "rxvt.h"               /* NECESSARY */
 #include "rxvtperl.h"           /* NECESSARY */
 
-#include <X11/Xmd.h>            /* get the typedef for CARD32 */
-
 #include <inttypes.h>
 
 #include "salloc.C" // HACK, should be a seperate compile!
@@ -1653,9 +1651,6 @@
 #ifdef HAVE_BG_PIXMAP
       if (bgPixmap.pixmap == None)
 #endif
-#if ENABLE_TRANSPARENCY
-        if (!option (Opt_transparent) || am_transparent == 0)
-#endif
           XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
 
       XGCValues gcvalue;
@@ -2009,9 +2004,6 @@
 #ifdef HAVE_BG_PIXMAP
   have_bg |= bgPixmap.pixmap != None;
 #endif
-#if ENABLE_TRANSPARENCY
-  have_bg |= option (Opt_transparent) && am_transparent;
-#endif
   ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
 
   /*
@@ -2482,28 +2474,22 @@
 void
 rxvt_term::scr_recolour () NOTHROW
 {
-  if (1
-#if ENABLE_TRANSPARENCY
-      && !am_transparent
-#endif
 #ifdef HAVE_BG_PIXMAP
-      && !bgPixmap.pixmap
-#endif
-      )
-    {
-      XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
-      XClearWindow (dpy, parent[0]);
-      XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
-#if HAVE_SCROLLBARS
-      if (scrollBar.win)
-        {
-          XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
-          scrollBar.setIdle ();
-          scrollbar_show (0);
-        }
+  bgPixmap.apply ();
+#else
+  XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
+  XClearWindow (dpy, parent[0]);
+  XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
+# if HAVE_SCROLLBARS
+  if (scrollBar.win)
+   {
+     XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
+     scrollBar.setIdle ();
+     scrollbar_show (0);
+   }
+# endif
 #endif
-    }
-
+  
   scr_clear ();
   scr_touch (true);
   want_refresh = 1;