--- rxvt-unicode/src/init.C	2007/07/24 14:38:59	1.192
+++ rxvt-unicode/src/init.C	2007/08/03 23:32:14	1.201
@@ -1,4 +1,4 @@
- /*----------------------------------------------------------------------*
+/*----------------------------------------------------------------------*
  * File:        init.C
  *----------------------------------------------------------------------*
  *
@@ -168,7 +168,7 @@
     COLOR_SCROLLBAR,
     COLOR_SCROLLTROUGH,
 #endif                          /* KEEP_SCROLLCOLOR */
-#if TINTING
+#if ENABLE_TRANSPARENCY
     NULL,
 #endif
 #if OFF_FOCUS_FADING
@@ -185,9 +185,6 @@
   pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
 #endif
 
-#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
-  pixmap = None;
-#endif
 
   MEvent.time = CurrentTime;
   MEvent.button = AnyButton;
@@ -204,9 +201,16 @@
   refresh_type = SLOW_REFRESH;
 
   oldcursor.row = oldcursor.col = -1;
-#ifdef XPM_BACKGROUND
+#ifdef HAVE_BG_PIXMAP
+#ifdef HAVE_AFTERIMAGE
+  bgPixmap.original_asim = NULL;
+#endif
   /*  bgPixmap.w = bgPixmap.h = 0; */
-  bgPixmap.x = bgPixmap.y = 0;
+#ifdef XPM_BACKGROUND
+  bgPixmap.h_scale = bgPixmap.v_scale = 0;
+  bgPixmap.h_align = bgPixmap.v_align = 0;
+#endif
+  bgPixmap.flags = 0;
   bgPixmap.pixmap = None;
 #endif
 
@@ -319,9 +323,7 @@
 #endif
 
 #ifdef HAVE_AFTERIMAGE
-  //TODO: is this neccessary for future versions who check the global var whern the macro doesn'T set it?
-  ::dpy = NULL ; /* init global var from libAfter... */
-  asv = AFTERIMAGE_DPY_OP (create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL));
+  asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
 #endif
   free (r_argv);
 
@@ -886,7 +888,7 @@
   XClassHint classHint;
   XWMHints wmHint;
 #if ENABLE_FRILLS
-  MWMHints mwmhints;
+  MWMHints mwmhints = { };
 #endif
   XGCValues gcvalue;
   XSetWindowAttributes attributes;
@@ -1042,18 +1044,14 @@
   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];
 
       if ((p = strchr (p, ';')) != NULL)
         {
           p++;
-          scale_pixmap (p);
+          bgPixmap.handle_geometry (p);
         }
 
       set_bgPixmap (rs[Rs_backgroundPixmap]);