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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.164 by sf-exg, Sun Aug 14 22:01:25 2011 UTC vs.
Revision 1.180 by sf-exg, Sat Dec 24 09:44:23 2011 UTC

 #ifndef FilterConvolution
 #define FilterConvolution "convolution"
 #endif
-/*
- * Pixmap geometry string interpretation :
- * Each geometry string contains zero or one scale/position
- * adjustment and may optionally be followed by a colon and one or more
- * colon-delimited pixmap operations.
- * The following table shows the valid geometry strings and their
- * effects on the background image :
- *
- * WxH+X+Y    Set scaling to W% by H%, and position to X% by Y%.
- *            W and H are percentages of the terminal window size.
- *            X and Y are also percentages; e.g., +50+50 centers
- *            the image in the window.
- *
- * Pixmap Operations : (should be prepended by a colon)
- */
 #ifdef HAVE_BG_PIXMAP
 void
 rxvt_term::bg_destroy ()
 {
 #ifdef HAVE_AFTERIMAGE
   int smaller = min (image_size, window_size);
   if (align >= 0 && align <= 100)
     return diff * align / 100;
   else if (align > 100 && align <= 200)
-    return ((align - 100) * smaller / 100) + window_size - smaller;
+    return (align - 100) * smaller / 100 + window_size - smaller;
   else if (align >= -100 && align < 0)
-    return ((align + 100) * smaller / 100) - image_size;
+    return (align + 100) * smaller / 100 - image_size;
   return 0;
 }
 static inline int
 make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
 {
   bool changed = false;
   int geom_flags = 0;
   int x = 0, y = 0;
   unsigned int w = 0, h = 0;
-  unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
+  unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
   if (geom == NULL)
     return false;
   if (geom[0])
     {
       char **arr = rxvt_strsplit (':', geom);
       for (int i = 0; arr[i]; i++)
         {
           if (!strcasecmp (arr[i], "style=tiled"))
             {
               new_flags = BG_TILE;
               w = h = noScale;
               x = y = 0;
               geom_flags = WidthValue|HeightValue|XValue|YValue;
             }
           else if (!strcasecmp (arr[i], "style=aspect-stretched"))
             {
-              new_flags = BG_PROP_SCALE;
+              new_flags = BG_KEEP_ASPECT;
               w = h = windowScale;
               x = y = centerAlign;
               geom_flags = WidthValue|HeightValue|XValue|YValue;
             }
           else if (!strcasecmp (arr[i], "style=stretched"))
               w = h = noScale;
               geom_flags = WidthValue|HeightValue;
             }
           else if (!strcasecmp (arr[i], "op=tile"))
             new_flags |= BG_TILE;
-          else if (!strcasecmp (arr[i], "op=pscale"))
+          else if (!strcasecmp (arr[i], "op=keep-aspect"))
-            new_flags |= BG_PROP_SCALE;
+            new_flags |= BG_KEEP_ASPECT;
-          else if (!strcasecmp (arr[i], "op=root"))
+          else if (!strcasecmp (arr[i], "op=root-align"))
             new_flags |= BG_ROOT_ALIGN;
           // deprecated
           else if (!strcasecmp (arr[i], "tile"))
             {
               w = h = noScale;
               geom_flags |= WidthValue|HeightValue;
             }
           else if (!strcasecmp (arr[i], "propscale"))
             {
-              new_flags |= BG_PROP_SCALE;
+              new_flags |= BG_KEEP_ASPECT;
+              w = h = windowScale;
+              geom_flags |= WidthValue|HeightValue;
             }
           else if (!strcasecmp (arr[i], "hscale"))
             {
               new_flags |= BG_TILE;
               w = windowScale;
   int target_height = szHint.height;
   w = h_scale * target_width / 100;
   h = v_scale * target_height / 100;
-  if (bg_flags & BG_PROP_SCALE)
+  if (bg_flags & BG_KEEP_ASPECT)
     {
       float scale = (float)w / image_width;
       min_it (scale, (float)h / image_height);
       w = image_width * scale + 0.5;
       h = image_height * scale + 0.5;
     }
   if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
     {
       ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
-                                         (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
+                                         ASA_XImage,
                                          100, ASIMAGE_QUALITY_DEFAULT);
       if (tmp)
         {
           destroy_asimage (&background);
           background = tmp;
   if (!original_asim
       || (!(bg_flags & BG_ROOT_ALIGN)
           && (x >= target_width
               || y >= target_height
-              || (x + w <= 0)
+              || x + w <= 0
-              || (y + h <= 0))))
+              || y + h <= 0)))
     {
       if (background)
         {
           new_pmap_width = background->width;
           new_pmap_height = background->height;
     }
   else
     {
       result = original_asim;
-      if ((w != original_asim->width)
+      if (w != original_asim->width
-          || (h != original_asim->height))
+          || h != original_asim->height)
         {
           result = scale_asimage (asv, original_asim,
                                   w, h,
-                                  background ? ASA_ASImage : ASA_XImage,
+                                  ASA_XImage,
                                   100, ASIMAGE_QUALITY_DEFAULT);
         }
       if (background == NULL)
         {
   get_image_geometry (image_width, image_height, w, h, x, y);
   if (!(bg_flags & BG_ROOT_ALIGN)
       && (x >= target_width
           || y >= target_height
-          || (x + w <= 0)
+          || x + w <= 0
-          || (y + h <= 0)))
+          || y + h <= 0))
     return false;
   result = pixbuf;
-  if ((w != image_width)
+  if (w != image_width
-      || (h != image_height))
+      || h != image_height)
     {
       result = gdk_pixbuf_scale_simple (pixbuf,
                                         w, h,
                                         GDK_INTERP_BILINEAR);
     }
 rxvt_term::bg_set_file (const char *file)
 {
   if (!file || !*file)
     return false;
+  bool ret = false;
-  if (const char *p = strchr (file, ';'))
+  const char *p = strchr (file, ';');
+  if (p)
     {
       size_t len = p - file;
       char *f = rxvt_temp_buf<char> (len + 1);
       memcpy (f, file, len);
       f[len] = '\0';
     {
       if (original_asim)
         safe_asimage_destroy (original_asim);
       original_asim = image;
       bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
-      return true;
+      ret = true;
     }
 #  endif
 #  ifdef HAVE_PIXBUF
   GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
     {
       if (pixbuf)
         g_object_unref (pixbuf);
       pixbuf = image;
       bg_flags |= BG_IS_FROM_FILE;
-      return true;
+      ret = true;
     }
 #  endif
+  if (ret)
+    {
+      if (p)
+        bg_set_geometry (p + 1);
+      else
+        bg_set_default_geometry ();
+    }
-  return false;
+  return ret;
 }
 # endif /* BG_IMAGE_FROM_FILE */
 # ifdef ENABLE_TRANSPARENCY
       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;
     {
       /*  we need to re-generate transparency pixmap in that case ! */
       tr_flags = make_transparency_pixmap ();
       if (tr_flags == 0)
         return false;
-      else if (!(tr_flags & BG_EFFECTS_FLAGS))
-        bg_flags |= BG_IS_VALID;
+      bg_flags |= BG_IS_VALID;
     }
 # endif
 # ifdef BG_IMAGE_FROM_FILE
   if ((bg_flags & BG_IS_FROM_FILE)
 # endif
 # if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
   XImage *result = NULL;
-  if (tr_flags && !(bg_flags & BG_IS_VALID))
+  if (tr_flags & BG_NEEDS_TINT)
     {
       result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
     }
   if (result)
     {
       /* our own client-side tinting */
-      if (tr_flags & BG_NEEDS_TINT)
+      //if (tr_flags & BG_NEEDS_TINT)
+      if (1)
         {
           rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
           if (bg_flags & BG_TINT_SET)
             tint.get (c);
           shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
       if (gc)
         {
           XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
           XFreeGC (dpy, gc);
-          bg_flags |= BG_IS_VALID;
         }
       XDestroyImage (result);
     }
 # endif
 }
 #endif /* HAVE_BG_PIXMAP */
 #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
-/* taken from aterm-0.4.2 */
+/* 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.164 by sf-exg, Sun Aug 14 22:01:25 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.164 by sf-exg, Sun Aug 14 22:01:25 2011 UTC vs.
Revision 1.180 by sf-exg, Sat Dec 24 09:44:23 2011 UTC