--- rxvt-unicode/src/main.C	2007/05/01 21:30:01	1.232
+++ rxvt-unicode/src/main.C	2007/08/03 22:40:10	1.239
@@ -150,9 +150,12 @@
 
 rxvt_term::rxvt_term ()
     :
-#if TRANSPARENT || ENABLE_PERL
+#if ENABLE_TRANSPARENCY || ENABLE_PERL
     rootwin_ev (this, &rxvt_term::rootwin_cb),
 #endif
+#if ENABLE_TRANSPARENCY
+    check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
+#endif
 #ifdef HAVE_SCROLLBARS
     scrollbar_ev (this, &rxvt_term::x_cb),
 #endif
@@ -333,7 +336,7 @@
 #if HAVE_SCROLLBARS
       scrollbar_ev.stop (display);
 #endif
-#if TRANSPARENT || ENABLE_PERL
+#if ENABLE_TRANSPARENCY || ENABLE_PERL
       rootwin_ev.stop (display);
 #endif
       incr_ev.stop ();
@@ -503,7 +506,7 @@
   if (option (Opt_scrollBar))
     resize_scrollbar ();      /* create and map scrollbar */
 #endif
-#ifdef TRANSPARENT
+#ifdef ENABLE_TRANSPARENCY
   if (option (Opt_transparent))
     {
       XSelectInput (dpy, display->root, PropertyChangeMask);
@@ -629,7 +632,7 @@
 
 /*----------------------------------------------------------------------*/
 /*
- * window size/position calculcations for XSizeHint and other storage.
+ * window size/position calculations for XSizeHint and other storage.
  * if width/height are non-zero then override calculated width/height
  */
 void
@@ -1119,8 +1122,8 @@
   // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
   //scr_touch (false);
 
-#ifdef XPM_BACKGROUND
-  if (pixmap)
+#ifdef HAVE_BG_PIXMAP
+  if (bgPixmap.pixmap)
     scr_touch (false);
 #endif