--- rxvt-unicode/src/background.h 2010/10/03 20:48:34 1.22 +++ rxvt-unicode/src/background.h 2010/10/30 10:57:53 1.30 @@ -25,7 +25,8 @@ enum { geometrySet = 1 << 0, propScale = 1 << 1, - geometryFlags = geometrySet | propScale, + rootAlign = 1 << 2, + geometryFlags = geometrySet | propScale | rootAlign, tintSet = 1 << 8, tintNeeded = 1 << 9, @@ -34,12 +35,10 @@ tintFlags = tintSet | tintServerSide | tintNeeded | tintWholesome, blurNeeded = 1 << 12, - blurServerSide = 1 << 13, /* this doesn't work yet */ + blurServerSide = 1 << 13, isTransparent = 1 << 16, isInvalid = 1 << 17, - isVtOrigin = 1 << 18, /* if set pixmap has origin at corner of - vt window instead of parent[0]! */ hasChanged = 1 << 19, sizeSensitive = 1 << 20, }; @@ -49,17 +48,10 @@ enum { transpPmapTiled = 1 << 0, transpPmapTinted = tintNeeded, - transpPmapBlured = blurNeeded, + transpPmapBlurred = blurNeeded, transpTransformations = tintNeeded | blurNeeded, }; /* these flags are returned by make_transparency_pixmap if called */ - bool check_clearChanged () - { - bool r = flags & hasChanged; - flags &= ~hasChanged; - return r; - }; - # ifdef BG_IMAGE_FROM_FILE # ifdef HAVE_AFTERIMAGE ASImage *original_asim; @@ -79,7 +71,6 @@ defaultScale = windowScale, centerAlign = 50, defaultAlign = centerAlign, - rootAlign = -10000 }; unsigned int h_scale, v_scale;/* percents of the window size */ @@ -115,7 +106,9 @@ bool set_tint (rxvt_color &new_tint); bool unset_tint (); bool set_shade (const char *shade_str); - bool set_root_pixmap (); + bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height); + bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height); + void set_root_pixmap (); unsigned long make_transparency_pixmap ();/* returns combination of the transpTransformations flags */ # endif @@ -128,11 +121,6 @@ bool window_size_sensitive (); bool window_position_sensitive (); - bool is_parentOrigin () - { - return !(flags & isVtOrigin); - }; - bool need_client_side_rendering (); void apply (); bool render ();