--- rxvt-unicode/src/background.C 2012/01/01 14:31:29 1.193 +++ rxvt-unicode/src/background.C 2012/01/01 17:43:47 1.194 @@ -394,8 +394,9 @@ ShadingInfo as_shade; as_shade.shading = shade; - rgba c; - tint.get (c); + rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); + if (bg_flags & BG_TINT_SET) + tint.get (c); as_shade.tintColor.red = c.r; as_shade.tintColor.green = c.g; as_shade.tintColor.blue = c.b; @@ -974,27 +975,27 @@ bg_flags &= ~BG_TINT_FLAGS; - tint.get (c); + if (bg_flags & BG_TINT_SET) + { + tint.get (c); + if (!has_shade + && (c.r <= 0x00ff || c.r >= 0xff00) + && (c.g <= 0x00ff || c.g >= 0xff00) + && (c.b <= 0x00ff || c.b >= 0xff00)) + bg_flags |= BG_TINT_BITAND; + } - if (!has_shade - && (c.r <= 0x00ff || c.r >= 0xff00) - && (c.g <= 0x00ff || c.g >= 0xff00) - && (c.b <= 0x00ff || c.b >= 0xff00)) - bg_flags |= BG_TINT_BITAND; - - if (has_shade - || c.r < 0xff00 - || c.g < 0xff00 - || c.b < 0xff00) + if (has_shade || (bg_flags & BG_TINT_SET)) bg_flags |= BG_NEEDS_TINT; } bool rxvt_term::bg_set_tint (rxvt_color &new_tint) { - if (tint != new_tint) + if (!(bg_flags & BG_TINT_SET) || tint != new_tint) { tint = new_tint; + bg_flags |= BG_TINT_SET; set_tint_shade_flags (); return true; } @@ -1130,9 +1131,10 @@ # if XRENDER else if (bg_flags & BG_HAS_RENDER) { - rgba c; + rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); - tint.get (c); + if (bg_flags & BG_TINT_SET) + tint.get (c); if (shade <= 100) { @@ -1389,8 +1391,6 @@ rxvt_term::bg_init () { #ifdef ENABLE_TRANSPARENCY - rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); - tint.set (this, c); shade = 100; #endif @@ -1503,9 +1503,10 @@ return; /* we do not support this color depth */ } - rgba c; + rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); - tint.get (c); + if (bg_flags & BG_TINT_SET) + tint.get (c); /* prepare limits for color transformation (each channel is handled separately) */ if (shade > 100)