--- rxvt-unicode/src/screen.C	2007/05/02 23:06:32	1.269
+++ rxvt-unicode/src/screen.C	2007/08/10 23:52:12	1.272
@@ -163,6 +163,7 @@
   scr_overlay_off ();
 #endif
 
+  rvideo_mode = false;
   view_start = 0;
   num_scr = 0;
 
@@ -239,7 +240,6 @@
       selection.op = SELECTION_CLEAR;
       selection.screen = PRIMARY;
       selection.clicks = 0;
-      rvideo_state = rvideo_mode = false;
     }
   else
     {
@@ -1650,10 +1650,10 @@
       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 ENABLE_TRANSPARENCY
         if (!option (Opt_transparent) || am_transparent == 0)
 #endif
           XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
@@ -1916,7 +1916,6 @@
     }
   else
     XBell (dpy, 0);
-
 #endif
 }
 
@@ -2007,10 +2006,10 @@
   have_bg = 0;
   refresh_count = 0;
 
-#if XPM_BACKGROUND
+#ifdef HAVE_BG_PIXMAP
   have_bg |= bgPixmap.pixmap != None;
 #endif
-#if TRANSPARENT
+#if ENABLE_TRANSPARENCY
   have_bg |= option (Opt_transparent) && am_transparent;
 #endif
   ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
@@ -2484,10 +2483,10 @@
 rxvt_term::scr_recolour () NOTHROW
 {
   if (1
-#if TRANSPARENT
+#if ENABLE_TRANSPARENCY
       && !am_transparent
 #endif
-#if XPM_BACKGROUND
+#ifdef HAVE_BG_PIXMAP
       && !bgPixmap.pixmap
 #endif
       )