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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.137 by sf-exg, Sat Jan 15 17:41:43 2011 UTC vs.
Revision 1.141 by sf-exg, Sun Jan 23 12:54:42 2011 UTC

 #   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))
+  if (background_flags & tintNeeded)
     {
       ShadingInfo as_shade;
       as_shade.shading = shade;
       rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
       as_shade.tintColor.blue = c.b;
       background_tint = shading2tint32 (&as_shade);
     }
-  if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
+  if ((background_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)
   if (new_shade != shade)
     {
       unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
       shade = new_shade;
-      flags = (flags & (~tintFlags | tintSet)) | new_flags;
+      flags = (flags & ~tintFlags) | new_flags;
       return true;
     }
   return false;
 }
   gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
   if (gc)
     {
       XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
-      result |= transpPmapTiled;
+      result |= isValid | (flags & effectsFlags);
       XFreeGC (dpy, gc);
       if (!(flags & CLIENT_RENDER))
         {
           if ((flags & blurNeeded)
               && (flags & HAS_RENDER_CONV))
             {
               if (blur_pixmap (pixmap, target->visual, window_width, window_height))
-                result |= transpPmapBlurred;
+                result &= ~blurNeeded;
             }
           if ((flags & tintNeeded)
               && (flags & (tintWholesome | HAS_RENDER)))
             {
               if (tint_pixmap (pixmap, target->visual, window_width, window_height))
-                result |= transpPmapTinted;
+                result &= ~tintNeeded;
             }
         } /* server side rendering completed */
     }
   if (recoded_root_pmap != root_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))
+      else if (!(background_flags & effectsFlags))
-        flags &= ~isInvalid;
+        flags |= isValid;
     }
 # endif
 # ifdef BG_IMAGE_FROM_FILE
   if (have_image
-      || (background_flags & transpTransformations) != (flags & transpTransformations))
+      || (background_flags & effectsFlags))
     {
       if (render_image (background_flags))
-        flags &= ~isInvalid;
+        flags |= isValid;
     }
 # endif
 # if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
   XImage *result = NULL;
-  if (background_flags && (flags & isInvalid))
+  if (background_flags && !(flags & isValid))
     {
       result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
     }
   if (result)
     {
       /* our own client-side tinting */
-      if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
+      if (background_flags & tintNeeded)
         {
           rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
           if (flags & tintSet)
             tint.get (c);
           shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
       if (gc)
         {
           XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
           XFreeGC (target->dpy, gc);
-          flags &= ~isInvalid;
+          flags |= isValid;
         }
       XDestroyImage (result);
     }
 # endif
-  if (flags & isInvalid)
+  if (!(flags & isValid))
     {
       if (pixmap != None)
         {
           XFreePixmap (target->dpy, pixmap);
           pixmap = None;
         }
     }
-  apply ();
+  target->scr_recolour (false);
+  flags |= hasChanged;
   valid_since = ev::now ();
   return true;
 }
           flags |= HAS_RENDER_CONV;
       XFree (filters);
     }
 #endif
-}
-void
-bgPixmap_t::apply ()
-{
-  if (target == NULL)
-    return;
-  if (pixmap != None)
-    {
-      /* set target's background to pixmap */
-# ifdef ENABLE_TRANSPARENCY
-      if (flags & isTransparent)
-        {
-          XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
-          XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
-          if (target->scrollBar.win)
-            XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
-        }
-      else
-# endif
-        {
-          /* force old pixmap dereference in case it was transparent before :*/
-          XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
-          XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
-          /* do we also need to set scrollbar's background here ? */
-          if (target->scrollBar.win)
-            XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
-        }
-    }
-  else
-    {
-      /* set target background to a pixel */
-      XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
-      XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
-      /* do we also need to set scrollbar's background here ? */
-      if (target->scrollBar.win)
-        XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
-    }
-  /* don't want Expose on the parent or vt. It is better to use
-     scr_touch or we get a great deal of flicker otherwise: */
-  XClearWindow (target->dpy, target->parent[0]);
-  if (target->scrollBar.state && target->scrollBar.win)
-    {
-      target->scrollBar.state = STATE_IDLE;
-      target->scrollBar.show (0);
-    }
-  target->want_refresh = 1;
-  flags |= hasChanged;
 }
 #endif /* HAVE_BG_PIXMAP */
 #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.137 by sf-exg, Sat Jan 15 17:41:43 2011 UTC vs. Revision 1.141 by sf-exg, Sun Jan 23 12:54:42 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.137 by sf-exg, Sat Jan 15 17:41:43 2011 UTC vs.
Revision 1.141 by sf-exg, Sun Jan 23 12:54:42 2011 UTC