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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.201 by sf-exg, Sat Feb 4 21:47:06 2012 UTC vs.
Revision 1.207 by sf-exg, Thu May 10 21:48:55 2012 UTC

 # ifdef BG_IMAGE_FROM_FILE
 static inline int
 make_align_position (int align, int window_size, int image_size)
 {
-  int diff = window_size - image_size;
-  int smaller = min (image_size, window_size);
   if (align >= 0 && align <= 100)
-    return diff * align / 100;
+    return lerp (0, window_size - image_size, align);
-  else if (align > 100 && align <= 200)
+  else if (align > 100)
-    return (align - 100) * smaller / 100 + window_size - smaller;
+    return lerp (window_size - image_size, window_size, align - 100);
-  else if (align >= -100 && align < 0)
+  else
-    return (align + 100) * smaller / 100 - image_size;
+    return lerp (-image_size, 0, align + 100);
-  return 0;
 }
 static inline int
 make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
 {
     {
       x = make_align_position (h_align, target_width, w);
       y = make_align_position (v_align, target_height, h);
     }
-  bg_flags &= ~BG_IS_SIZE_SENSITIVE;
   if (!(bg_flags & BG_TILE)
       || h_scale || v_scale
       || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
-      || w > target_width || h > target_height)
+      || image_width > target_width || image_height > target_height)
     bg_flags |= BG_IS_SIZE_SENSITIVE;
+  else
+    bg_flags &= ~BG_IS_SIZE_SENSITIVE;
 }
 #  ifdef HAVE_PIXBUF
 bool
 rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
                              unsigned int width, unsigned int height)
 {
   XImage *ximage;
   char *data, *line;
   int bytes_per_pixel;
-  int width_r, width_g, width_b;
+  int width_r, width_g, width_b, width_a;
-  int sh_r, sh_g, sh_b;
+  int sh_r, sh_g, sh_b, sh_a;
+  uint32_t alpha_mask;
   int rowstride;
   int channels;
   unsigned char *row;
   if (visual->c_class != TrueColor)
     return false;
+#if XRENDER
+  XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
+  if (format)
+    alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
+  else
+#endif
+    alpha_mask = 0;
   if (depth == 24 || depth == 32)
     bytes_per_pixel = 4;
   else if (depth == 15 || depth == 16)
     bytes_per_pixel = 2;
     return false;
   width_r = ecb_popcount32 (visual->red_mask);
   width_g = ecb_popcount32 (visual->green_mask);
   width_b = ecb_popcount32 (visual->blue_mask);
+  width_a = ecb_popcount32 (alpha_mask);
-  if (width_r > 8 || width_g > 8 || width_b > 8)
+  if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
     return false;
   sh_r = ecb_ctz32 (visual->red_mask);
   sh_g = ecb_ctz32 (visual->green_mask);
   sh_b = ecb_ctz32 (visual->blue_mask);
+  sh_a = ecb_ctz32 (alpha_mask);
   if (width > INT_MAX / height / bytes_per_pixel)
     return false;
   data = (char *)malloc (width * height * bytes_per_pixel);
   rowstride = gdk_pixbuf_get_rowstride (pixbuf);
   channels = gdk_pixbuf_get_n_channels (pixbuf);
   row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
   line = data;
+  rgba c (0, 0, 0);
+  if (channels == 4 && alpha_mask == 0)
+    {
+      pix_colors[Color_bg].get (c);
+      c.r >>= 8;
+      c.g >>= 8;
+      c.b >>= 8;
+    }
   for (int y = 0; y < height; y++)
     {
       for (int x = 0; x < width; x++)
         {
           unsigned char *pixel = row + x * channels;
           uint32_t value;
+          unsigned char r, g, b, a;
+          if (channels == 4)
+            {
+              a = pixel[3];
+              r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
+              g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
+              b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
+            }
+          else
+            {
+              a = 0xff;
+              r = pixel[0];
+              g = pixel[1];
+              b = pixel[2];
+            }
-          value  = ((pixel[0] >> (8 - width_r)) << sh_r)
+          value  = ((r >> (8 - width_r)) << sh_r)
-                 | ((pixel[1] >> (8 - width_g)) << sh_g)
+                 | ((g >> (8 - width_g)) << sh_g)
-                 | ((pixel[2] >> (8 - width_b)) << sh_b);
+                 | ((b >> (8 - width_b)) << sh_b)
+                 | ((a >> (8 - width_a)) << sh_a);
           if (bytes_per_pixel == 4)
             ((uint32_t *)line)[x] = value;
           else
             ((uint16_t *)line)[x] = value;
   XDestroyImage (ximage);
   return true;
 }
 bool
-rxvt_term::render_image (unsigned long tr_flags)
+rxvt_term::render_image (bool transparent)
 {
   if (!pixbuf)
     return false;
-  if (tr_flags
+  if (transparent
       && !(bg_flags & BG_HAS_RENDER))
     return false;
   GdkPixbuf *result;
   Pixmap root_pmap;
   image_width = gdk_pixbuf_get_width (result);
   image_height = gdk_pixbuf_get_height (result);
-  if (tr_flags)
+  if (transparent)
     {
       root_pmap = bg_pixmap;
       bg_pixmap = None;
     }
   else
                               dst_x, dst_y,
                               dst_width, dst_height);
         }
 #if XRENDER
-      if (tr_flags)
+      if (transparent)
         {
           XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
           Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
     }
   if (result != pixbuf)
     g_object_unref (result);
-  if (tr_flags)
+  if (transparent)
     XFreePixmap (dpy, root_pmap);
   return ret;
 }
 #  endif /* HAVE_PIXBUF */
     {
       changed = true;
       v_blurRadius = vr;
     }
-  if (h_blurRadius == 0 || v_blurRadius == 0)
+  if (h_blurRadius && v_blurRadius)
+    bg_flags |= BG_NEEDS_BLUR;
+  else
     bg_flags &= ~BG_NEEDS_BLUR;
-  else
-    bg_flags |= BG_NEEDS_BLUR;
   return changed;
 }
 void
 rxvt_term::set_tint_shade_flags ()
 {
+  if (shade != 100 || (bg_flags & BG_TINT_SET))
+    bg_flags |= BG_NEEDS_TINT;
+  else
+    bg_flags &= ~BG_NEEDS_TINT;
+}
+bool
+rxvt_term::bg_set_tint (rxvt_color &new_tint)
+{
+  if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
+    {
+      tint = new_tint;
+      bg_flags |= BG_TINT_SET;
-  rgba c;
+      rgba c;
-  bool has_shade = shade != 100;
-  bg_flags &= ~BG_TINT_FLAGS;
-  if (bg_flags & BG_TINT_SET)
-    {
       tint.get (c);
-      if (!has_shade
-          && (c.r <= 0x00ff || c.r >= 0xff00)
+      if ((c.r <= 0x00ff || c.r >= 0xff00)
           && (c.g <= 0x00ff || c.g >= 0xff00)
           && (c.b <= 0x00ff || c.b >= 0xff00))
         bg_flags |= BG_TINT_BITAND;
-    }
+      else
-  if (has_shade || (bg_flags & BG_TINT_SET))
-    bg_flags |= BG_NEEDS_TINT;
-}
-bool
-rxvt_term::bg_set_tint (rxvt_color &new_tint)
-{
-  if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
-    {
-      tint = new_tint;
-      bg_flags |= BG_TINT_SET;
+        bg_flags &= ~BG_TINT_BITAND;
       set_tint_shade_flags ();
       return true;
     }
   return false;
 bool
 rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
 {
   bool ret = false;
-  if (bg_flags & BG_TINT_BITAND)
+  if (shade == 100 && (bg_flags & BG_TINT_BITAND))
     {
       XGCValues gcv;
       GC gc;
       /* In this case we can tint image server-side getting significant
 /*
  * 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.
  */
-unsigned long
+bool
 rxvt_term::make_transparency_pixmap ()
 {
-  unsigned long result = 0;
+  bool ret = false;
   /* root dimensions may change from call to call - but Display structure should
    * be always up-to-date, so let's use it :
    */
   int screen = display->screen;
   gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
   if (gc)
     {
       XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
-      result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
+      ret = true;
+      unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS;
       if (!(bg_flags & BG_CLIENT_RENDER))
         {
           if (bg_flags & BG_NEEDS_BLUR)
             {
               if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
-                result &= ~BG_NEEDS_BLUR;
+                tr_flags &= ~BG_NEEDS_BLUR;
             }
           if (bg_flags & BG_NEEDS_TINT)
             {
               if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
-                result &= ~BG_NEEDS_TINT;
+                tr_flags &= ~BG_NEEDS_TINT;
             }
-          if (result & BG_NEEDS_TINT)
+          if (tr_flags & BG_NEEDS_TINT)
             {
               XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
               if (ximage)
                 {
                   /* our own client-side tinting */
     }
   if (recoded_root_pmap != root_pixmap)
     XFreePixmap (dpy, recoded_root_pmap);
-  return result;
+  return ret;
 }
 void
 rxvt_term::bg_set_root_pixmap ()
 {
 # endif /* ENABLE_TRANSPARENCY */
 bool
 rxvt_term::bg_render ()
 {
-  unsigned long tr_flags = 0;
+  bool transparent = false;
   bg_invalidate ();
 # ifdef ENABLE_TRANSPARENCY
   if (bg_flags & BG_IS_TRANSPARENT)
     {
       /*  we need to re-generate transparency pixmap in that case ! */
-      tr_flags = make_transparency_pixmap ();
+      transparent = make_transparency_pixmap ();
-      if (tr_flags)
+      if (transparent)
         bg_flags |= BG_IS_VALID;
     }
 # endif
 # ifdef BG_IMAGE_FROM_FILE
-  if ((bg_flags & BG_IS_FROM_FILE)
+  if (bg_flags & BG_IS_FROM_FILE)
-      || (tr_flags & BG_EFFECTS_FLAGS))
     {
-      if (render_image (tr_flags))
+      if (render_image (transparent))
         bg_flags |= BG_IS_VALID;
     }
 # endif
   if (!(bg_flags & BG_IS_VALID))

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.201 by sf-exg, Sat Feb 4 21:47:06 2012 UTC vs. Revision 1.207 by sf-exg, Thu May 10 21:48:55 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.201 by sf-exg, Sat Feb 4 21:47:06 2012 UTC vs.
Revision 1.207 by sf-exg, Thu May 10 21:48:55 2012 UTC