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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.177 by sf-exg, Wed Dec 14 12:07:12 2011 UTC vs.
Revision 1.180 by sf-exg, Sat Dec 24 09:44:23 2011 UTC

       bg_pmap_width = window_width;
       bg_pmap_height = window_height;
     }
   /* straightforward pixmap copy */
-  while (sx < 0) sx += root_width;
+  while (sx < 0) sx += root_pmap_width;
-  while (sy < 0) sy += root_height;
+  while (sy < 0) sy += root_pmap_height;
   gcv.tile = recoded_root_pmap;
   gcv.fill_style = FillTiled;
   gcv.ts_x_origin = -sx;
   gcv.ts_y_origin = -sy;
 #endif /* HAVE_BG_PIXMAP */
 #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
 /* based on code from aterm-0.4.2 */
+static inline void
+fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
+{
+  for (int i = 0; i <= mask >> sh; i++)
+    {
+      uint32_t tmp;
+      tmp = i * high;
+      tmp += (mask >> sh) * low;
+      lookup[i] = (tmp / 0xffff) << sh;
+    }
+}
 static void
 shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
 {
   int sh_r, sh_g, sh_b;
   uint32_t mask_r, mask_g, mask_b;
   uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
-  rgba low;
+  unsigned short low;
   rgba high;
-  int i;
   int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
   if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
   /* for convenience */
       high.r = c.r * shade / 100;
       high.g = c.g * shade / 100;
       high.b = c.b * shade / 100;
-      low.r = 65535 * (100 - shade) / 100;
+      low = 0xffff * (100 - shade) / 100;
-      low.g = 65535 * (100 - shade) / 100;
-      low.b = 65535 * (100 - shade) / 100;
     }
   else
     {
       high.r = c.r * shade / 100;
       high.g = c.g * shade / 100;
       high.b = c.b * shade / 100;
-      low.r = low.g = low.b = 0;
+      low = 0;
     }
   /* fill our lookup tables */
-  for (i = 0; i <= mask_r>>sh_r; i++)
+  fill_lut (lookup_r, mask_r, sh_r, low, high.r);
-    {
+  fill_lut (lookup_g, mask_g, sh_g, low, high.g);
-      uint32_t tmp;
+  fill_lut (lookup_b, mask_b, sh_b, low, high.b);
-      tmp = i * high.r;
-      tmp += (mask_r>>sh_r) * low.r;
-      lookup_r[i] = (tmp/65535)<<sh_r;
-    }
-  for (i = 0; i <= mask_g>>sh_g; i++)
-    {
-      uint32_t tmp;
-      tmp = i * high.g;
-      tmp += (mask_g>>sh_g) * low.g;
-      lookup_g[i] = (tmp/65535)<<sh_g;
-    }
-  for (i = 0; i <= mask_b>>sh_b; i++)
-    {
-      uint32_t tmp;
-      tmp = i * high.b;
-      tmp += (mask_b>>sh_b) * low.b;
-      lookup_b[i] = (tmp/65535)<<sh_b;
-    }
   /* apply table to input image (replacing colors by newly calculated ones) */
   if (ximage->bits_per_pixel == 32
       && (ximage->depth == 24 || ximage->depth == 32)
       && ximage->byte_order == host_byte_order)

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.177 by sf-exg, Wed Dec 14 12:07:12 2011 UTC vs. Revision 1.180 by sf-exg, Sat Dec 24 09:44:23 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.177 by sf-exg, Wed Dec 14 12:07:12 2011 UTC vs.
Revision 1.180 by sf-exg, Sat Dec 24 09:44:23 2011 UTC