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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.255 by sf-exg, Mon Dec 31 12:05:34 2012 UTC vs.
Revision 1.256 by sf-exg, Mon Dec 31 12:05:46 2012 UTC

     flags &= ~IM_IS_SIZE_SENSITIVE;
   return changed;
 }
-bool
+void
 rxvt_term::render_image (rxvt_image &image)
 {
   int image_width = image.img->w;
   int image_height = image.img->h;
   int parent_width = szHint.width;
   if (!(image.flags & IM_ROOT_ALIGN)
       && (x >= parent_width
           || y >= parent_height
           || x + w <= 0
           || y + h <= 0))
-    return false;
+    return;
   rxvt_img *img = image.img->scale (w, h);
   if (image.flags & IM_TILE)
     img->repeat_mode (RepeatNormal);
   XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
   img->convert_format (format, pix_colors [Color_bg])->replace (img);
   delete bg_img;
   bg_img = img;
-  return true;
 }
 rxvt_image::rxvt_image ()
 {
   alpha = 0xffff;
 /*
  * Builds a pixmap of the same size as the terminal window that contains
  * the tiled portion of the root pixmap that is supposed to be covered by
  * our window.
  */
-bool
+void
 rxvt_term::render_root_image ()
 {
   /* root dimensions may change from call to call - but Display structure should
    * be always up-to-date, so let's use it :
    */
   sy = parent_y;
   /* check if we are outside of the visible part of the virtual screen : */
   if (sx + parent_width <= 0 || sy + parent_height <= 0
       || sx >= root_width || sy >= root_height)
-    return 0;
+    return;
   while (sx < 0) sx += root_img->w;
   while (sy < 0) sy += root_img->h;
   rxvt_img *img = root_img->sub_rect (sx, sy, parent_width, parent_height);
   XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
   img->convert_format (format, pix_colors [Color_bg])->replace (img);
   delete bg_img;
   bg_img = img;
-  return true;
 }
 # endif /* BG_IMAGE_FROM_ROOT */
 void
 rxvt_term::bg_render ()
   if (!mapped)
     return;
 # if BG_IMAGE_FROM_ROOT
   if (root_img)
+    {
-    if (render_root_image ())
+      render_root_image ();
       bg_flags |= BG_IS_TRANSPARENT;
+    }
 # endif
 # if BG_IMAGE_FROM_FILE
   if (fimage.img)
     render_image (fimage);

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.255 by sf-exg, Mon Dec 31 12:05:34 2012 UTC vs. Revision 1.256 by sf-exg, Mon Dec 31 12:05:46 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.255 by sf-exg, Mon Dec 31 12:05:34 2012 UTC vs.
Revision 1.256 by sf-exg, Mon Dec 31 12:05:46 2012 UTC