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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.253 by sf-exg, Sun Dec 30 15:52:37 2012 UTC vs.
Revision 1.258 by root, Thu May 22 18:54:32 2014 UTC

  * Copyright (c) 2007      Sasha Vasko <sasha@aftercode.net>
  * Copyright (c) 2010-2012 Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 bool
 rxvt_term::bg_window_size_sensitive ()
 {
 # if BG_IMAGE_FROM_ROOT
-  if (option (Opt_transparent))
+  if (root_img)
     return true;
 # endif
 # if BG_IMAGE_FROM_FILE
   if (fimage.img)
 bool
 rxvt_term::bg_window_position_sensitive ()
 {
 # if BG_IMAGE_FROM_ROOT
-  if (option (Opt_transparent))
+  if (root_img)
     return true;
 # endif
 # if BG_IMAGE_FROM_FILE
   if (fimage.img)
   return changed;
 }
 void
-rxvt_term::get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y)
+rxvt_term::render_image (rxvt_image &image)
 {
   int image_width = image.img->w;
   int image_height = image.img->h;
   int parent_width = szHint.width;
   int parent_height = szHint.height;
   int h_scale = min (image.h_scale, 32767 * 100 / parent_width);
   int v_scale = min (image.v_scale, 32767 * 100 / parent_height);
+  int w;
+  int h;
+  int x;
+  int y;
   w = h_scale * parent_width / 100;
   h = v_scale * parent_height / 100;
   if (image.flags & IM_KEEP_ASPECT)
     {
   else
     {
       x = make_align_position (image.h_align, parent_width, w);
       y = make_align_position (image.v_align, parent_height, h);
     }
-}
-bool
-rxvt_term::render_image (rxvt_image &image)
-{
-  int parent_width = szHint.width;
-  int parent_height = szHint.height;
-  int x = 0;
-  int y = 0;
-  int w = 0;
-  int h = 0;
-  get_image_geometry (image, w, h, x, y);
   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 :
    */
   int sx, sy;
   sx = parent_x;
   sy = parent_y;
-  if (!root_img)
-    return false;
   /* 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);
   if (root_effects.need_blur ())
     img->blur (root_effects.h_blurRadius, root_effects.v_blurRadius)->replace (img);
   if (root_effects.need_tint ())
-    tint_image (img, root_effects.tint, root_effects.tint_set, root_effects.shade);
+    {
+      rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
+      if (root_effects.tint_set)
+        root_effects.tint.get (c);
+      rxvt_img::nv factor = root_effects.shade / 100. - 1.;
+      img->shade (factor, c)->replace (img);
+    }
   XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
   img->convert_format (format, pix_colors [Color_bg])->replace (img);
   delete bg_img;
   bg_img = img;
-  return true;
-}
-void
-rxvt_term::bg_set_root_pixmap ()
-{
-  delete root_img;
-  root_img = rxvt_img::new_from_root (this);
 }
 # endif /* BG_IMAGE_FROM_ROOT */
 void
 rxvt_term::bg_render ()
   if (!mapped)
     return;
 # if BG_IMAGE_FROM_ROOT
-  if (option (Opt_transparent))
+  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);
         root_effects.set_tint (pix_colors_focused [Color_tint]);
       if (rs [Rs_shade])
         root_effects.set_shade (rs [Rs_shade]);
-      bg_set_root_pixmap ();
+      rxvt_img::new_from_root (this)->replace (root_img);
       XSelectInput (dpy, display->root, PropertyChangeMask);
       rootwin_ev.start (display, display->root);
     }
 #endif
         update_background ();
     }
 #endif
 }
-void
-rxvt_term::tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade)
-{
-  rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
-  if (tint_set)
-    tint.get (c);
-  if (shade > 100)
-    {
-      c.r = c.r * (200 - shade) / 100;
-      c.g = c.g * (200 - shade) / 100;
-      c.b = c.b * (200 - shade) / 100;
-    }
-  else
-    {
-      c.r = c.r * shade / 100;
-      c.g = c.g * shade / 100;
-      c.b = c.b * shade / 100;
-    }
-  img->contrast (c.r, c.g, c.b, c.a);
-  if (shade > 100)
-    {
-      c.a = 0xffff;
-      c.r =
-      c.g =
-      c.b = 0xffff * (shade - 100) / 100;
-      img->brightness (c.r, c.g, c.b, c.a);
-    }
-}
 #endif /* HAVE_BG_PIXMAP */

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.253 by sf-exg, Sun Dec 30 15:52:37 2012 UTC vs. Revision 1.258 by root, Thu May 22 18:54:32 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.253 by sf-exg, Sun Dec 30 15:52:37 2012 UTC vs.
Revision 1.258 by root, Thu May 22 18:54:32 2014 UTC