[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.198 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.202 by sasha, Tue Aug 7 22:43:33 2007 UTC

 #endif
 #ifdef KEEP_SCROLLCOLOR
     COLOR_SCROLLBAR,
     COLOR_SCROLLTROUGH,
 #endif                          /* KEEP_SCROLLCOLOR */
-#if TINTING
+#if ENABLE_TRANSPARENCY
     NULL,
 #endif
 #if OFF_FOCUS_FADING
     "rgb:00/00/00",
 #endif
   numpix_colors = TOTAL_COLORS;
   refresh_type = SLOW_REFRESH;
   oldcursor.row = oldcursor.col = -1;
-#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
+#ifdef HAVE_BG_PIXMAP
+#ifdef HAVE_AFTERIMAGE
+  bgPixmap.original_asim = NULL;
+#endif
+  /*  bgPixmap.w = bgPixmap.h = 0; */
 #ifdef XPM_BACKGROUND
-  bgPixmap.original_asim = NULL;
-#endif
-  /*  bgPixmap.w = bgPixmap.h = 0; */
-  bgPixmap.x = bgPixmap.y = 0;
+  bgPixmap.h_scale = bgPixmap.v_scale = 0;
+  bgPixmap.h_align = bgPixmap.v_align = 0;
+#endif
+  bgPixmap.flags = 0;
   bgPixmap.pixmap = None;
 #endif
   last_bot = last_state = -1;
       const char *p = rs[Rs_backgroundPixmap];
       if ((p = strchr (p, ';')) != NULL)
         {
           p++;
-          scale_pixmap (p);
+          bgPixmap.handle_geometry (p);
         }
+      else
+        bgPixmap.set_defaultGeometry ();
       set_bgPixmap (rs[Rs_backgroundPixmap]);
       scr_touch (true);
     }
 #endif

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines