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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.40 by sf-exg, Sat Aug 21 09:25:31 2010 UTC vs.
Revision 1.48 by sf-exg, Tue Aug 31 14:12:20 2010 UTC

  * 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
- * affects on the background image :
+ * 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.
     {
       flags = new_flags;
       changed++;
     }
-//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
+  //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
-//         flags, h_scale, v_scale, h_align, v_align);
+  //         flags, h_scale, v_scale, h_align, v_align);
   return (changed > 0);
 }
 #  ifdef HAVE_AFTERIMAGE
 bool
-bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)
+bgPixmap_t::render_asim (unsigned long background_flags)
 {
   if (target == NULL)
     return false;
   target->init_asv ();
+  ASImage *background = NULL;
+  ARGB32 background_tint = TINT_LEAVE_SAME;
+#   ifdef ENABLE_TRANSPARENCY
+  if (background_flags)
+    background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
+  if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
+    {
+      ShadingInfo as_shade;
+      as_shade.shading = (shade == 0) ? 100 : shade;
+      rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
+      if (flags & tintSet)
+        tint.get (c);
+      as_shade.tintColor.red = c.r;
+      as_shade.tintColor.green = c.g;
+      as_shade.tintColor.blue = c.b;
+      background_tint = shading2tint32 (&as_shade);
+    }
+  if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
+    {
+      ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
+                                         (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
+                                         100, ASIMAGE_QUALITY_DEFAULT);
+      if (tmp)
+        {
+          destroy_asimage (&background);
+          background = tmp;
+        }
+    }
+#   endif
   ASImage *result = 0;
   int target_width    = target->szHint.width;
   int target_height   = target->szHint.height;
   if (original_asim)
     {
       if (h_align == rootAlign || v_align == rootAlign)
         {
-          target->get_window_origin(x, y);
+          target->get_window_origin (x, y);
           x = -x;
           y = -y;
         }
       if (h_align != rootAlign)
         }
       else
         {
           /* if blending background and image - pixmap has to be sized same as target window */
           ASImageLayer *layers = create_image_layers (2);
-          ASImage *merged_im = NULL;
           layers[0].im = background;
           layers[0].clip_width = target_width;
           layers[0].clip_height = target_height;
           layers[0].tint = background_tint;
           pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
           pmap_width = new_pmap_width;
           pmap_height = new_pmap_height;
           pmap_depth = target->depth;
         }
-      /* fill with background color ( if result's not completely overlapping it)*/
+      /* fill with background color (if result's not completely overlapping it) */
       gcv.foreground = target->pix_colors[Color_bg];
       gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
       int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
       int dst_width = result->width, dst_height = result->height;
       XFreeGC (target->dpy, gc);
       TIMING_TEST_PRINT_RESULT (asim);
     }
+  if (background)
+    destroy_asimage (&background);
   return true;
 }
 #  endif /* HAVE_AFTERIMAGE */
 bool
 {
   assert (file);
   if (*file)
     {
+      if (const char *p = strchr (file, ';'))
+        {
+          size_t len = p - file;
+          char *f = rxvt_temp_buf<char> (len + 1);
+          memcpy (f, file, len);
+          f[len] = '\0';
+          file = f;
+        }
 #  ifdef HAVE_AFTERIMAGE
       if (!target->asimman)
         target->asimman = create_generic_imageman (target->rs[Rs_path]);
-      if (const char *p = strchr (file, ';'))
-        {
-          size_t len = p - file;
-          char *f = (char *)malloc (len + 1);
-          memcpy (f, file, len);
-          f[len] = '\0';
-          original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
-          free (f);
-        }
-      else
-        original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
+      original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
       return original_asim;
 #  endif
     }
   return false;
     flags |= bgPixmap_t::tintNeeded;
   else if (tint)
     {
       if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
           && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
-      {
+        {
-        flags |= bgPixmap_t::tintNeeded;
+          flags |= bgPixmap_t::tintNeeded;
-      }
+        }
     }
   if (flags & bgPixmap_t::tintNeeded)
     {
       if (flags & bgPixmap_t::tintWholesome)
 {
   unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
   if (new_flags != (flags & tintFlags))
     {
-     flags = (flags&~tintFlags)|new_flags;
+      flags = (flags&~tintFlags)|new_flags;
-     return true;
+      return true;
     }
   return false;
 }
       attr.background_pixmap = ParentRelative;
       attr.backing_store = Always;
       attr.event_mask = ExposureMask;
       attr.override_redirect = True;
-  	  src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
+      src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
                            CopyFromParent, CopyFromParent, CopyFromParent,
                            CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
                            &attr);
       if (src != None)
           XDestroyWindow (dpy, src);
           XUngrabServer (dpy);
           //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
         }
-        if (!success)
+      if (!success)
-          {
+        {
-            XFreePixmap (dpy, tiled_root_pmap);
+          XFreePixmap (dpy, tiled_root_pmap);
-            tiled_root_pmap = None;
+          tiled_root_pmap = None;
-          }
+        }
-        else
+      else
-          result |= transpPmapTiled;
+        result |= transpPmapTiled;
     }
   else
     {
       /* straightforward pixmap copy */
       gcv.tile = root_pixmap;
 #   if DO_TIMING_TEST
                   XSync (dpy, False);
 #   endif
 #  endif
                 }
-             }
+            }
         } /* server side rendering completed */
       if (pixmap)
         XFreePixmap (dpy, pixmap);
       /*  we need to re-generate transparency pixmap in that case ! */
       background_flags = make_transparency_pixmap ();
       if (background_flags == 0)
         return false;
       else if ((background_flags & transpTransformations) == (flags & transpTransformations)
-                && pmap_depth == target->depth)
+               && pmap_depth == target->depth)
         flags = flags & ~isInvalid;
     }
 # endif
-  XImage *result = NULL;
 # ifdef HAVE_AFTERIMAGE
   if (original_asim
       || (background_flags & transpTransformations) != (flags & transpTransformations))
     {
-      target->init_asv ();
-      ASImage *background = NULL;
-      ARGB32 as_tint = TINT_LEAVE_SAME;
-      if (background_flags)
-        background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
-#  ifdef ENABLE_TRANSPARENCY
-      if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
-        {
-          ShadingInfo as_shade;
-          as_shade.shading = (shade == 0) ? 100 : shade;
-          rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
-          if (flags & tintSet)
-            tint.get (c);
-          as_shade.tintColor.red = c.r;
-          as_shade.tintColor.green = c.g;
-          as_shade.tintColor.blue = c.b;
-          as_tint = shading2tint32 (&as_shade);
-        }
-      if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
-        {
-          ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
-                                             (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
-                                             100, ASIMAGE_QUALITY_DEFAULT);
-          if (tmp)
-            {
-              destroy_asimage (&background);
-              background = tmp;
-            }
-        }
-#  endif
-      if (render_asim (background, as_tint))
+      if (render_asim (background_flags))
         flags = flags & ~isInvalid;
-      if (background)
-        destroy_asimage (&background);
     }
-  else if (background_flags && pmap_depth != target->depth)
+# endif
-    result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
-# elif !XFT /* our own client-side tinting */
+  XImage *result = NULL;
-  /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
-     This may need to be changed in need_client_side_rendering() logic is altered !!! */
   if (background_flags && (flags & isInvalid))
     {
       result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
+#  if !defined(HAVE_AFTERIMAGE) && !XFT
+      /* our own client-side tinting */
+      /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
+         This may need to be changed in need_client_side_rendering() logic is altered !!! */
       if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
         {
           rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
           if (flags & tintSet)
             tint.get (c);
           ShadeXImage (target, result, shade, c.r, c.g, c.b);
         }
+#  endif
     }
-# endif /* HAVE_AFTERIMAGE */
   if (result)
     {
       GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
           XFreeGC (target->dpy, gc);
           flags = flags & ~isInvalid;
         }
-        XDestroyImage (result);
+      XDestroyImage (result);
     }
   if (flags & isInvalid)
     {
       if (pixmap != None)

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.40 by sf-exg, Sat Aug 21 09:25:31 2010 UTC vs. Revision 1.48 by sf-exg, Tue Aug 31 14:12:20 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.40 by sf-exg, Sat Aug 21 09:25:31 2010 UTC vs.
Revision 1.48 by sf-exg, Tue Aug 31 14:12:20 2010 UTC