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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.202 by sf-exg, Sat Feb 25 22:20:47 2012 UTC vs.
Revision 1.203 by sf-exg, Tue Apr 10 15:08:47 2012 UTC

 }
 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

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