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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.248 by sf-exg, Sun Dec 30 11:34:43 2012 UTC vs.
Revision 1.253 by sf-exg, Sun Dec 30 15:52:37 2012 UTC

     img->repeat_mode (RepeatNormal);
   else
     img->repeat_mode (RepeatNone);
   img->sub_rect (-x, -y, parent_width, parent_height)->replace (img);
-  if (bg_flags & BG_IS_VALID)
+  if (bg_img)
     img->draw (bg_img, PictOpOver, image.alpha * 1. / 0xffff);
   XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
   img->convert_format (format, pix_colors [Color_bg])->replace (img);
 rxvt_term::bg_render ()
 {
   if (bg_flags & BG_INHIBIT_RENDER)
     return;
-  bg_invalidate ();
+  delete bg_img;
+  bg_img = 0;
+  bg_flags = 0;
+  if (!mapped)
+    return;
 # if BG_IMAGE_FROM_ROOT
   if (option (Opt_transparent))
-    {
-      /*  we need to re-generate transparency pixmap in that case ! */
-      if (render_root_image ())
+    if (render_root_image ())
-        bg_flags |= BG_IS_VALID | BG_IS_TRANSPARENT;
+      bg_flags |= BG_IS_TRANSPARENT;
-    }
 # endif
 # if BG_IMAGE_FROM_FILE
   if (fimage.img)
-    {
-      if (render_image (fimage))
+    render_image (fimage);
-        bg_flags |= BG_IS_VALID;
-    }
 # endif
-  if (!(bg_flags & BG_IS_VALID))
-    {
-      delete bg_img;
-      bg_img = 0;
-    }
   scr_recolour (false);
   bg_flags |= BG_NEEDS_REFRESH;
   bg_valid_since = ev::now ();

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