--- rxvt-unicode/src/screen.C	2007/05/02 23:06:32	1.269
+++ rxvt-unicode/src/screen.C	2007/08/15 22:41:52	1.275
@@ -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!
@@ -163,6 +161,7 @@
   scr_overlay_off ();
 #endif
 
+  rvideo_mode = false;
   view_start = 0;
   num_scr = 0;
 
@@ -239,7 +238,6 @@
       selection.op = SELECTION_CLEAR;
       selection.screen = PRIMARY;
       selection.clicks = 0;
-      rvideo_state = rvideo_mode = false;
     }
   else
     {
@@ -1650,12 +1648,9 @@
       rvideo_state = on;
 
       ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
-#if XPM_BACKGROUND
+#ifdef HAVE_BG_PIXMAP
       if (bgPixmap.pixmap == None)
 #endif
-#if TRANSPARENT
-        if (!option (Opt_transparent) || am_transparent == 0)
-#endif
           XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
 
       XGCValues gcvalue;
@@ -1808,7 +1803,7 @@
       min_it (rc[i].col, ncol - 1);
       min_it (rc[i].row, nrow - 1);
     }
-
+// TODO: this line somehow causes segfault if scr_expose() is called just after resize
   for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
     fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
 
@@ -1916,7 +1911,6 @@
     }
   else
     XBell (dpy, 0);
-
 #endif
 }
 
@@ -2007,12 +2001,9 @@
   have_bg = 0;
   refresh_count = 0;
 
-#if XPM_BACKGROUND
+#ifdef HAVE_BG_PIXMAP
   have_bg |= bgPixmap.pixmap != None;
 #endif
-#if TRANSPARENT
-  have_bg |= option (Opt_transparent) && am_transparent;
-#endif
   ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
 
   /*
@@ -2483,28 +2474,22 @@
 void
 rxvt_term::scr_recolour () NOTHROW
 {
-  if (1
-#if TRANSPARENT
-      && !am_transparent
-#endif
-#if XPM_BACKGROUND
-      && !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);
-        }
+#ifdef HAVE_BG_PIXMAP
+  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;