--- rxvt-unicode/src/background.h 2010/10/13 23:04:57 1.28 +++ rxvt-unicode/src/background.h 2010/11/01 14:58:44 1.34 @@ -31,16 +31,15 @@ tintSet = 1 << 8, tintNeeded = 1 << 9, tintWholesome = 1 << 10, - tintServerSide = 1 << 11, - tintFlags = tintSet | tintServerSide | tintNeeded | tintWholesome, + tintFlags = tintSet | tintNeeded | tintWholesome, - blurNeeded = 1 << 12, - blurServerSide = 1 << 13, + blurNeeded = 1 << 11, + + HAS_RENDER = 1 << 12, + HAS_RENDER_CONV = 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, }; @@ -54,13 +53,6 @@ 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; @@ -101,10 +93,9 @@ # endif /* BG_IMAGE_FROM_FILE */ rxvt_term *target; - bool set_target (rxvt_term *new_target); + void set_target (rxvt_term *new_target); # ifdef ENABLE_TRANSPARENCY - int root_depth; /* obtained when target is set */ Pixmap root_pixmap; /* current root pixmap set */ rxvt_color tint; int shade; @@ -117,7 +108,7 @@ bool set_shade (const char *shade_str); bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height); bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height); - bool set_root_pixmap (); + void set_root_pixmap (); unsigned long make_transparency_pixmap ();/* returns combination of the transpTransformations flags */ # endif @@ -130,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 ();