--- rxvt-unicode/src/background.C 2010/11/02 22:01:47 1.109 +++ rxvt-unicode/src/background.C 2010/11/05 17:27:58 1.111 @@ -256,7 +256,8 @@ bool bgPixmap_t::set_geometry (const char *geom) { - int geom_flags = 0, changed = 0; + bool changed = false; + int geom_flags = 0; int x = 0, y = 0; unsigned int w = 0, h = 0; unsigned int n; @@ -422,19 +423,19 @@ } /* done parsing ops */ } - if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; - if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; - if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; - if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; + if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; + if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; + if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; + if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; } if (new_flags != flags) { flags = new_flags; - changed++; + changed = true; } - return (changed > 0); + return changed; } void @@ -973,7 +974,7 @@ bool bgPixmap_t::set_blur_radius (const char *geom) { - int changed = 0; + bool changed = false; unsigned int hr, vr; int junk; int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); @@ -988,13 +989,13 @@ if (h_blurRadius != hr) { - ++changed; + changed = true; h_blurRadius = hr; } if (v_blurRadius != vr) { - ++changed; + changed = true; v_blurRadius = vr; } @@ -1003,7 +1004,7 @@ else flags |= blurNeeded; - return (changed > 0); + return changed; } static inline unsigned long @@ -1448,6 +1449,7 @@ } # endif +# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER XImage *result = NULL; if (background_flags && (flags & isInvalid)) @@ -1457,7 +1459,6 @@ if (result) { -# if !defined(HAVE_AFTERIMAGE) && !XRENDER /* our own client-side tinting */ if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) { @@ -1466,7 +1467,6 @@ tint.get (c); ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); } -# endif GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); @@ -1480,6 +1480,7 @@ XDestroyImage (result); } +# endif if (flags & isInvalid) {