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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.60 by sf-exg, Sun Oct 3 20:41:32 2010 UTC vs.
Revision 1.80 by sf-exg, Wed Oct 13 23:04:57 2010 UTC

…		…
19	* You should have received a copy of the GNU General Public License	19	* You should have received a copy of the GNU General Public License
20	* along with this program; if not, write to the Free Software	20	* along with this program; if not, write to the Free Software
21	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	21	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22	---------------------------------------------------------------------/	22	---------------------------------------------------------------------/
23		23
		24	#include <cmath>
24	#include "../config.h" /* NECESSARY */	25	#include "../config.h" /* NECESSARY */
25	#include "rxvt.h" /* NECESSARY */	26	#include "rxvt.h" /* NECESSARY */
26		27
27	#define DO_TIMING_TEST 0	28	#define DO_TIMING_TEST 0
28		29
…		…
104	#ifdef BG_IMAGE_FROM_FILE	105	#ifdef BG_IMAGE_FROM_FILE
105	have_image = false;	106	have_image = false;
106	h_scale = v_scale = 0;	107	h_scale = v_scale = 0;
107	h_align = v_align = 0;	108	h_align = v_align = 0;
108	#endif	109	#endif
		110	#ifdef ENABLE_TRANSPARENCY
		111	shade = 100;
		112	#endif
109	flags = 0;	113	flags = 0;
110	pixmap = None;	114	pixmap = None;
111	valid_since = invalid_since = 0;	115	valid_since = invalid_since = 0;
112	target = 0;	116	target = 0;
113	}	117	}
…		…
138	# endif	142	# endif
139		143
140	# ifdef BG_IMAGE_FROM_FILE	144	# ifdef BG_IMAGE_FROM_FILE
141	if (have_image)	145	if (have_image)
142	{	146	{
143	if (h_scale != 0 \|\| v_scale != 0	147	if (flags & sizeSensitive)
144	\|\| h_align != 0 \|\| v_align != 0)
145	return true;	148	return true;
146	}	149	}
147	# endif	150	# endif
148		151
149	return false;	152	return false;
…		…
158	# endif	161	# endif
159		162
160	# ifdef BG_IMAGE_FROM_FILE	163	# ifdef BG_IMAGE_FROM_FILE
161	if (have_image)	164	if (have_image)
162	{	165	{
163	if (h_align == rootAlign \|\| v_align == rootAlign)	166	if (flags & rootAlign)
164	return true;	167	return true;
165	}	168	}
166	# endif	169	# endif
167		170
168	return false;	171	return false;
…		…
175	return true;	178	return true;
176	# endif	179	# endif
177	# ifdef ENABLE_TRANSPARENCY	180	# ifdef ENABLE_TRANSPARENCY
178	if (flags & isTransparent)	181	if (flags & isTransparent)
179	{	182	{
180	# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways	183	# ifdef HAVE_AFTERIMAGE
181	if ((flags & blurNeeded) && !(flags & blurServerSide))	184	if ((flags & blurNeeded) && !(flags & blurServerSide))
182	return true;	185	return true;
183	# endif	186	# endif
184	if ((flags & tintNeeded) && !(flags & tintServerSide))	187	if ((flags & tintNeeded) && !(flags & tintServerSide))
185	return true;	188	return true;
…		…
208	static inline bool	211	static inline bool
209	check_set_align_value (int geom_flags, int flag, int &align, int new_value)	212	check_set_align_value (int geom_flags, int flag, int &align, int new_value)
210	{	213	{
211	if (geom_flags & flag)	214	if (geom_flags & flag)
212	{	215	{
213	if (new_value != bgPixmap_t::rootAlign)
214	{
215	if (new_value < -100)	216	if (new_value < -100)
216	new_value = -100;	217	new_value = -100;
217	else if (new_value > 200)	218	else if (new_value > 200)
218	new_value = 200;	219	new_value = 200;
219	}
220	if (new_value != align)	220	if (new_value != align)
221	{	221	{
222	align = new_value;	222	align = new_value;
223	return true;	223	return true;
224	}	224	}
…		…
230	make_align_position (int align, int window_size, int image_size)	230	make_align_position (int align, int window_size, int image_size)
231	{	231	{
232	int diff = window_size - image_size;	232	int diff = window_size - image_size;
233	int smaller = min (image_size, window_size);	233	int smaller = min (image_size, window_size);
234		234
235	if (align >= 0 && align <= 50)	235	if (align >= 0 && align <= 100)
236	return diff * align / 100;	236	return diff * align / 100;
237	else if (align > 50 && align <= 100)
238	return window_size - image_size - diff * (100 - align) / 100;
239	else if (align > 100 && align <= 200 )	237	else if (align > 100 && align <= 200 )
240	return ((align - 100) * smaller / 100) + window_size - smaller;	238	return ((align - 100) * smaller / 100) + window_size - smaller;
241	else if (align > -100 && align < 0)	239	else if (align >= -100 && align < 0)
242	return ((align + 100) * smaller / 100) - image_size;	240	return ((align + 100) * smaller / 100) - image_size;
243	return 0;	241	return 0;
244	}	242	}
245		243
246	static inline int	244	static inline int
247	make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)	245	make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
248	{	246	{
249	int src_pos = 0;	247	int src_pos = 0;
250	dst_pos = 0;	248	dst_pos = pos;
251	dst_size = size;	249	dst_size = size;
252	if (pos < 0)	250	if (pos < 0)
253	{	251	{
254	src_pos = -pos;	252	src_pos = -pos;
		253	dst_pos = 0;
255	dst_size += pos;	254	dst_size += pos;
256	}	255	}
257	else if (pos > 0)
258	dst_pos = pos;
259		256
260	if (dst_pos + dst_size > target_size)	257	if (dst_pos + dst_size > target_size)
261	dst_size = target_size - dst_pos;	258	dst_size = target_size - dst_pos;
262	return src_pos;	259	return src_pos;
263	}	260	}
…		…
388	w = h = noScale;	385	w = h = noScale;
389	geom_flags \|= WidthValue\|HeightValue;	386	geom_flags \|= WidthValue\|HeightValue;
390	}	387	}
391	else if (CHECK_GEOM_OPS ("propscale"))	388	else if (CHECK_GEOM_OPS ("propscale"))
392	{	389	{
393	if (w == 0 && h == 0)
394	{
395	w = windowScale;
396	geom_flags \|= WidthValue;
397	}
398	new_flags \|= propScale;	390	new_flags \|= propScale;
399	}	391	}
400	else if (CHECK_GEOM_OPS ("hscale"))	392	else if (CHECK_GEOM_OPS ("hscale"))
401	{	393	{
402	if (w == 0) w = windowScale;	394	if (w == 0) w = windowScale;
…		…
424	x = y = centerAlign;	416	x = y = centerAlign;
425	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	417	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
426	}	418	}
427	else if (CHECK_GEOM_OPS ("root"))	419	else if (CHECK_GEOM_OPS ("root"))
428	{	420	{
		421	new_flags \|= rootAlign;
429	w = h = noScale;	422	w = h = noScale;
430	x = y = rootAlign;
431	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	423	geom_flags \|= WidthValue\|HeightValue;
432	}	424	}
433	# undef CHECK_GEOM_OPS	425	# undef CHECK_GEOM_OPS
434		426
435	while (ops != ':' && ops != '\0') ++ops;	427	while (ops != ':' && ops != '\0') ++ops;
436	} /* done parsing ops */	428	} /* done parsing ops */
…		…
457	bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)	449	bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
458	{	450	{
459	int target_width = target->szHint.width;	451	int target_width = target->szHint.width;
460	int target_height = target->szHint.height;	452	int target_height = target->szHint.height;
461		453
		454	if (flags & propScale)
		455	{
		456	float scale = (float)target_width / image_width;
		457	min_it (scale, (float)target_height / image_height);
		458	w = image_width * scale + 0.5;
		459	h = image_height * scale + 0.5;
		460	}
		461	else
		462	{
462	w = h_scale * target_width / 100;	463	w = h_scale * target_width / 100;
463	h = v_scale * target_height / 100;	464	h = v_scale * target_height / 100;
		465	}
464		466
465	if (h_align == rootAlign \|\| v_align == rootAlign)	467	if (!w) w = image_width;
		468	if (!h) h = image_height;
		469
		470	if (flags & rootAlign)
466	{	471	{
467	target->get_window_origin (x, y);	472	target->get_window_origin (x, y);
468	x = -x;	473	x = -x;
469	y = -y;	474	y = -y;
470	}	475	}
471		476	else
472	if (h_align != rootAlign)	477	{
473	x = make_align_position (h_align, target_width, w > 0 ? w : image_width);	478	x = make_align_position (h_align, target_width, w);
474
475	if (v_align != rootAlign)
476	y = make_align_position (v_align, target_height, h > 0 ? h : image_height);	479	y = make_align_position (v_align, target_height, h);
		480	}
		481
		482	flags &= ~sizeSensitive;
		483	if (h_scale != 0 \|\| v_scale != 0
		484	\|\| h_align != 0 \|\| v_align != 0
		485	\|\| w > target_width \|\| h > target_height)
		486	flags \|= sizeSensitive;
477	}	487	}
478		488
479	# ifdef HAVE_AFTERIMAGE	489	# ifdef HAVE_AFTERIMAGE
480	bool	490	bool
481	bgPixmap_t::render_image (unsigned long background_flags)	491	bgPixmap_t::render_image (unsigned long background_flags)
…		…
493	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);	503	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
494		504
495	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	505	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
496	{	506	{
497	ShadingInfo as_shade;	507	ShadingInfo as_shade;
498	as_shade.shading = (shade == 0) ? 100 : shade;	508	as_shade.shading = shade;
499		509
500	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	510	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
501	if (flags & tintSet)	511	if (flags & tintSet)
502	tint.get (c);	512	tint.get (c);
503	as_shade.tintColor.red = c.r;	513	as_shade.tintColor.red = c.r;
…		…
505	as_shade.tintColor.blue = c.b;	515	as_shade.tintColor.blue = c.b;
506		516
507	background_tint = shading2tint32 (&as_shade);	517	background_tint = shading2tint32 (&as_shade);
508	}	518	}
509		519
510	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)	520	if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
511	{	521	{
512	ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,	522	ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
513	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,	523	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
514	100, ASIMAGE_QUALITY_DEFAULT);	524	100, ASIMAGE_QUALITY_DEFAULT);
515	if (tmp)	525	if (tmp)
…		…
536		546
537	if (original_asim)	547	if (original_asim)
538	get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);	548	get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
539		549
540	if (!original_asim	550	if (!original_asim
		551	\|\| (!(flags & rootAlign)
541	\|\| x >= target_width	552	&& (x >= target_width
542	\|\| y >= target_height	553	\|\| y >= target_height
543	\|\| (w > 0 && x + w <= 0)	554	\|\| (x + w <= 0)
544	\|\| (h > 0 && y + h <= 0))	555	\|\| (y + h <= 0))))
545	{	556	{
546	if (background)	557	if (background)
547	{	558	{
548	new_pmap_width = background->width;	559	new_pmap_width = background->width;
549	new_pmap_height = background->height;	560	new_pmap_height = background->height;
…		…
563	}	574	}
564	else	575	else
565	{	576	{
566	result = original_asim;	577	result = original_asim;
567		578
568	if ((w > 0 && w != original_asim->width)	579	if ((w != original_asim->width)
569	\|\| (h > 0 && h != original_asim->height))	580	\|\| (h != original_asim->height))
570	{	581	{
571	result = scale_asimage (target->asv, original_asim,	582	result = scale_asimage (target->asv, original_asim,
572	w > 0 ? w : original_asim->width,	583	w, h,
573	h > 0 ? h : original_asim->height,
574	background ? ASA_ASImage : ASA_XImage,	584	background ? ASA_ASImage : ASA_XImage,
575	100, ASIMAGE_QUALITY_DEFAULT);	585	100, ASIMAGE_QUALITY_DEFAULT);
576	}	586	}
577		587
578	if (background == NULL)	588	if (background == NULL)
…		…
610	layers[0].clip_width = target_width;	620	layers[0].clip_width = target_width;
611	layers[0].clip_height = target_height;	621	layers[0].clip_height = target_height;
612	layers[0].tint = background_tint;	622	layers[0].tint = background_tint;
613	layers[1].im = result;	623	layers[1].im = result;
614		624
615	if (w <= 0)	625	if (h_scale == 0 \|\| v_scale == 0)
616	{	626	{
617	/* tile horizontally */	627	/* tile horizontally */
618	while (x > 0) x -= (int)result->width;	628	while (x > 0) x -= (int)result->width;
619	layers[1].dst_x = x;	629	layers[1].dst_x = x;
620	layers[1].clip_width = result->width+target_width;	630	layers[1].clip_width = result->width+target_width;
…		…
624	/* clip horizontally */	634	/* clip horizontally */
625	layers[1].dst_x = x;	635	layers[1].dst_x = x;
626	layers[1].clip_width = result->width;	636	layers[1].clip_width = result->width;
627	}	637	}
628		638
629	if (h <= 0)	639	if (h_scale == 0 \|\| v_scale == 0)
630	{	640	{
631	while (y > 0) y -= (int)result->height;	641	while (y > 0) y -= (int)result->height;
632	layers[1].dst_y = y;	642	layers[1].dst_y = y;
633	layers[1].clip_height = result->height + target_height;	643	layers[1].clip_height = result->height + target_height;
634	}	644	}
…		…
735	return false;	745	return false;
736		746
737	if (!pixbuf)	747	if (!pixbuf)
738	return false;	748	return false;
739		749
740	// TODO: add alpha blending	750	#if !XFT
741	if (background_flags)	751	if (background_flags)
742	return false;	752	return false;
		753	#endif
743		754
744	GdkPixbuf *result;	755	GdkPixbuf *result;
745		756
746	int image_width = gdk_pixbuf_get_width (pixbuf);	757	int image_width = gdk_pixbuf_get_width (pixbuf);
747	int image_height = gdk_pixbuf_get_height (pixbuf);	758	int image_height = gdk_pixbuf_get_height (pixbuf);
…		…
756	int w = 0;	767	int w = 0;
757	int h = 0;	768	int h = 0;
758		769
759	get_image_geometry (image_width, image_height, w, h, x, y);	770	get_image_geometry (image_width, image_height, w, h, x, y);
760		771
		772	if (!(flags & rootAlign)
761	if (x >= target_width	773	&& (x >= target_width
762	\|\| y >= target_height	774	\|\| y >= target_height
763	\|\| (w > 0 && x + w <= 0)	775	\|\| (x + w <= 0)
764	\|\| (h > 0 && y + h <= 0))	776	\|\| (y + h <= 0)))
765	return false;	777	return false;
766		778
767	result = pixbuf;	779	result = pixbuf;
768		780
769	if ((w > 0 && w != image_width)	781	if ((w != image_width)
770	\|\| (h > 0 && h != image_height))	782	\|\| (h != image_height))
771	{	783	{
772	result = gdk_pixbuf_scale_simple (pixbuf,	784	result = gdk_pixbuf_scale_simple (pixbuf,
773	w > 0 ? w : image_width,	785	w, h,
774	h > 0 ? h : image_height,
775	GDK_INTERP_BILINEAR);	786	GDK_INTERP_BILINEAR);
776	}	787	}
777		788
778	bool ret = false;	789	bool ret = false;
779		790
780	if (result)	791	if (result)
781	{	792	{
782	XGCValues gcv;	793	XGCValues gcv;
783	GC gc;	794	GC gc;
		795	Pixmap root_pmap;
784		796
785	image_width = gdk_pixbuf_get_width (result);	797	image_width = gdk_pixbuf_get_width (result);
786	image_height = gdk_pixbuf_get_height (result);	798	image_height = gdk_pixbuf_get_height (result);
787		799
		800	if (background_flags)
		801	{
		802	root_pmap = pixmap;
		803	pixmap = None;
		804	}
		805	else
		806	{
788	if (h_scale == 0 \|\| v_scale == 0)	807	if (h_scale == 0 \|\| v_scale == 0)
789	{	808	{
790	new_pmap_width = min (image_width, target_width);	809	new_pmap_width = min (image_width, target_width);
791	new_pmap_height = min (image_height, target_height);	810	new_pmap_height = min (image_height, target_height);
		811	}
792	}	812	}
793		813
794	if (pixmap)	814	if (pixmap)
795	{	815	{
796	if (pmap_width != new_pmap_width	816	if (pmap_width != new_pmap_width
…		…
851	dst_x, dst_y,	871	dst_x, dst_y,
852	dst_width, dst_height,	872	dst_width, dst_height,
853	XLIB_RGB_DITHER_NONE,	873	XLIB_RGB_DITHER_NONE,
854	0, 0);	874	0, 0);
855	}	875	}
		876
		877	#if XFT
		878	if (background_flags)
		879	{
		880	Display *dpy = target->dpy;
		881	XRenderPictureAttributes pa;
		882
		883	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
		884	Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
		885
		886	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
		887	Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
		888
		889	pa.repeat = True;
		890	Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
		891	XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
		892	Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
		893	XFreePixmap (dpy, mask_pmap);
		894
		895	if (src && dst && mask)
		896	{
		897	XRenderColor mask_c;
		898
		899	mask_c.alpha = 0x8000;
		900	mask_c.red = 0;
		901	mask_c.green = 0;
		902	mask_c.blue = 0;
		903	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		904	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
		905	}
		906
		907	XRenderFreePicture (dpy, src);
		908	XRenderFreePicture (dpy, dst);
		909	XRenderFreePicture (dpy, mask);
		910
		911	XFreePixmap (dpy, root_pmap);
		912	}
		913	#endif
856		914
857	if (result != pixbuf)	915	if (result != pixbuf)
858	g_object_unref (result);	916	g_object_unref (result);
859		917
860	XFreeGC (target->dpy, gc);	918	XFreeGC (target->dpy, gc);
…		…
928	if (!(geom_flags & WidthValue))	986	if (!(geom_flags & WidthValue))
929	hr = 1;	987	hr = 1;
930	if (!(geom_flags & HeightValue))	988	if (!(geom_flags & HeightValue))
931	vr = hr;	989	vr = hr;
932		990
		991	min_it (hr, 128);
		992	min_it (vr, 128);
		993
933	if (h_blurRadius != hr)	994	if (h_blurRadius != hr)
934	{	995	{
935	++changed;	996	++changed;
936	h_blurRadius = hr;	997	h_blurRadius = hr;
937	}	998	}
…		…
945	if (v_blurRadius == 0 && h_blurRadius == 0)	1006	if (v_blurRadius == 0 && h_blurRadius == 0)
946	flags &= ~blurNeeded;	1007	flags &= ~blurNeeded;
947	else	1008	else
948	flags \|= blurNeeded;	1009	flags \|= blurNeeded;
949		1010
		1011	#if XFT
		1012	XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
		1013	if (filters)
		1014	{
		1015	for (int i = 0; i < filters->nfilter; i++)
		1016	if (!strcmp (filters->filter[i], FilterConvolution))
		1017	flags \|= bgPixmap_t::blurServerSide;
		1018
		1019	XFree (filters);
		1020	}
		1021	#endif
		1022
950	return (changed > 0);	1023	return (changed > 0);
951	}	1024	}
952		1025
953	static inline unsigned long	1026	static inline unsigned long
954	compute_tint_shade_flags (rxvt_color *tint, int shade)	1027	compute_tint_shade_flags (rxvt_color *tint, int shade)
955	{	1028	{
956	unsigned long flags = 0;	1029	unsigned long flags = 0;
957	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1030	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
958	bool has_shade = (shade > 0 && shade < 100) \|\| (shade > 100 && shade < 200);	1031	bool has_shade = shade != 100;
959		1032
960	if (tint)	1033	if (tint)
961	{	1034	{
962	tint->get (c);	1035	tint->get (c);
963	# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 \|\| (cmp) >= 0x00f700)	1036	# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 \|\| (cmp) >= 0x00f700)
…		…
995	}	1068	}
996		1069
997	bool	1070	bool
998	bgPixmap_t::set_tint (rxvt_color &new_tint)	1071	bgPixmap_t::set_tint (rxvt_color &new_tint)
999	{	1072	{
1000	if (tint != new_tint)	1073	if (!(flags & tintSet) \|\| tint != new_tint)
1001	{	1074	{
1002	unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);	1075	unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1003	tint = new_tint;	1076	tint = new_tint;
1004	flags = (flags & ~tintFlags) \| new_flags \| tintSet;	1077	flags = (flags & ~tintFlags) \| new_flags \| tintSet;
1005	return true;	1078	return true;
…		…
1023	}	1096	}
1024		1097
1025	bool	1098	bool
1026	bgPixmap_t::set_shade (const char *shade_str)	1099	bgPixmap_t::set_shade (const char *shade_str)
1027	{	1100	{
1028	int new_shade = (shade_str) ? atoi (shade_str) : 0;	1101	int new_shade = (shade_str) ? atoi (shade_str) : 100;
1029		1102
1030	if (new_shade < 0 && new_shade > -100)	1103	clamp_it (new_shade, -100, 200);
		1104	if (new_shade < 0)
1031	new_shade = 200 - (100 + new_shade);	1105	new_shade = 200 - (100 + new_shade);
1032	else if (new_shade == 100)
1033	new_shade = 0;
1034		1106
1035	if (new_shade != shade)	1107	if (new_shade != shade)
1036	{	1108	{
1037	unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);	1109	unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1038	shade = new_shade;	1110	shade = new_shade;
1039	flags = (flags & (~tintFlags \| tintSet)) \| new_flags;	1111	flags = (flags & (~tintFlags \| tintSet)) \| new_flags;
1040	return true;	1112	return true;
1041	}	1113	}
1042		1114
1043	return false;	1115	return false;
		1116	}
		1117
		1118	static void
		1119	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)
		1120	{
		1121	double sigma = radius / 2.0;
		1122	double scale = sqrt (2.0 * M_PI) * sigma;
		1123	double sum = 0.0;
		1124
		1125	for (int i = 0; i < width; i++)
		1126	{
		1127	double x = i - width / 2;
		1128	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
		1129	sum += kernel[i];
		1130	}
		1131
		1132	params[0] = XDoubleToFixed (width);
		1133	params[1] = XDoubleToFixed (1);
		1134
		1135	for (int i = 0; i < width; i++)
		1136	params[i+2] = XDoubleToFixed (kernel[i] / sum);
		1137	}
		1138
		1139	bool
		1140	bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
		1141	{
		1142	bool ret = false;
		1143	#if XFT
		1144	int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
		1145	double kernel = (double )malloc (size * sizeof (double));
		1146	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
		1147
		1148	Display *dpy = target->dpy;
		1149	XRenderPictureAttributes pa;
		1150	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual);
		1151
		1152	Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
		1153	Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
		1154
		1155	if (kernel && params && src && dst)
		1156	{
		1157	if (h_blurRadius)
		1158	{
		1159	size = h_blurRadius * 2 + 1;
		1160	get_gaussian_kernel (h_blurRadius, size, kernel, params);
		1161
		1162	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
		1163	XRenderComposite (dpy,
		1164	PictOpSrc,
		1165	src,
		1166	None,
		1167	dst,
		1168	0, 0,
		1169	0, 0,
		1170	0, 0,
		1171	width, height);
		1172	}
		1173
		1174	if (v_blurRadius)
		1175	{
		1176	size = v_blurRadius * 2 + 1;
		1177	get_gaussian_kernel (v_blurRadius, size, kernel, params);
		1178	swap (params[0], params[1]);
		1179
		1180	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
		1181	XRenderComposite (dpy,
		1182	PictOpSrc,
		1183	src,
		1184	None,
		1185	dst,
		1186	0, 0,
		1187	0, 0,
		1188	0, 0,
		1189	width, height);
		1190	}
		1191
		1192	ret = true;
		1193	}
		1194
		1195	free (kernel);
		1196	free (params);
		1197	XRenderFreePicture (dpy, src);
		1198	XRenderFreePicture (dpy, dst);
		1199	#endif
		1200	return ret;
		1201	}
		1202
		1203	bool
		1204	bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
		1205	{
		1206	Display *dpy = target->dpy;
		1207	bool ret = false;
		1208
		1209	if (flags & tintWholesome)
		1210	{
		1211	XGCValues gcv;
		1212	GC gc;
		1213
		1214	/* In this case we can tint image server-side getting significant
		1215	* performance improvements, as we eliminate XImage transfer
		1216	*/
		1217	gcv.foreground = Pixel (tint);
		1218	gcv.function = GXand;
		1219	gcv.fill_style = FillSolid;
		1220	gc = XCreateGC (dpy, pixmap, GCFillStyle \| GCForeground \| GCFunction, &gcv);
		1221	if (gc)
		1222	{
		1223	XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
		1224	ret = true;
		1225	XFreeGC (dpy, gc);
		1226	}
		1227	}
		1228	else
		1229	{
		1230	# if XFT
		1231	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
		1232
		1233	if (flags & tintSet)
		1234	tint.get (c);
		1235
		1236	if (shade <= 100)
		1237	{
		1238	c.r = (c.r * shade) / 100;
		1239	c.g = (c.g * shade) / 100;
		1240	c.b = (c.b * shade) / 100;
		1241	}
		1242	else
		1243	{
		1244	c.r = ((0xffff - c.r) * (200 - shade)) / 100;
		1245	c.g = ((0xffff - c.g) * (200 - shade)) / 100;
		1246	c.b = ((0xffff - c.b) * (200 - shade)) / 100;
		1247	}
		1248
		1249	XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
		1250	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
		1251	XRenderPictureAttributes pa;
		1252
		1253	Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
		1254
		1255	pa.repeat = True;
		1256
		1257	Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
		1258	Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
		1259	XFreePixmap (dpy, overlay_pmap);
		1260
		1261	pa.component_alpha = True;
		1262	Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
		1263	Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat\|CPComponentAlpha, &pa);
		1264	XFreePixmap (dpy, mask_pmap);
		1265
		1266	if (mask_pic && overlay_pic && back_pic)
		1267	{
		1268	XRenderColor mask_c;
		1269
		1270	memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
		1271	mask_c.alpha = 0xffff;
		1272	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
		1273
		1274	mask_c.alpha = 0;
		1275	mask_c.red = 0xffff - c.r;
		1276	mask_c.green = 0xffff - c.g;
		1277	mask_c.blue = 0xffff - c.b;
		1278	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
		1279	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
		1280	ret = true;
		1281	}
		1282
		1283	XRenderFreePicture (dpy, mask_pic);
		1284	XRenderFreePicture (dpy, overlay_pic);
		1285	XRenderFreePicture (dpy, back_pic);
		1286	# if DO_TIMING_TEST
		1287	XSync (dpy, False);
		1288	# endif
		1289	# endif
		1290	}
		1291
		1292	return ret;
1044	}	1293	}
1045		1294
1046	/* make_transparency_pixmap()	1295	/* make_transparency_pixmap()
1047	* Builds a pixmap sized the same as terminal window, with depth same as the root window	1296	* Builds a pixmap sized the same as terminal window, with depth same as the root window
1048	* that pixmap contains tiled portion of the root pixmap that is supposed to be covered by	1297	* that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
…		…
1078	\|\| sx >= root_width \|\| sy >= root_height)	1327	\|\| sx >= root_width \|\| sy >= root_height)
1079	return 0;	1328	return 0;
1080		1329
1081	if (root_pixmap != None)	1330	if (root_pixmap != None)
1082	{	1331	{
1083	/* we want to validate the pixmap and get it's size at the same time : */	1332	/* we want to validate the pixmap and get its size at the same time : */
1084	int junk;	1333	int junk;
1085	unsigned int ujunk;	1334	unsigned int ujunk;
1086	/* root pixmap may be bad - allow a error */	1335	/* root pixmap may be bad - allow a error */
1087	target->allowedxerror = -1;	1336	target->allowedxerror = -1;
1088		1337
…		…
1176		1425
1177	if (tiled_root_pmap != None)	1426	if (tiled_root_pmap != None)
1178	{	1427	{
1179	if (!need_client_side_rendering ())	1428	if (!need_client_side_rendering ())
1180	{	1429	{
		1430	if ((flags & blurNeeded))
		1431	{
		1432	if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
		1433	result \|= transpPmapBlurred;
		1434	}
1181	if ((flags & tintNeeded))	1435	if ((flags & tintNeeded))
1182	{	1436	{
1183	if (flags & tintWholesome)	1437	if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
1184	{
1185	/* In this case we can tint image server-side getting significant
1186	* performance improvements, as we eliminate XImage transfer
1187	*/
1188	gcv.foreground = Pixel (tint);
1189	gcv.function = GXand;
1190	gcv.fill_style = FillSolid;
1191	if (gc)
1192	XChangeGC (dpy, gc, GCFillStyle \| GCForeground \| GCFunction, &gcv);
1193	else
1194	gc = XCreateGC (dpy, root, GCFillStyle \| GCForeground \| GCFunction, &gcv);
1195	if (gc)
1196	{
1197	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1198	result \|= transpPmapTinted;	1438	result \|= transpPmapTinted;
1199	}
1200	}
1201	else
1202	{
1203	# if XFT
1204	Picture back_pic = 0;
1205	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1206
1207	if (flags & tintSet)
1208	tint.get (c);
1209
1210	if (shade > 0 && shade < 100)
1211	{
1212	c.r = (c.r * shade) / 100;
1213	c.g = (c.g * shade) / 100;
1214	c.b = (c.b * shade) / 100;
1215	}
1216	else if (shade > 100 && shade < 200)
1217	{
1218	c.r = (c.r * (200 - shade)) / 100;
1219	c.g = (c.g * (200 - shade)) / 100;
1220	c.b = (c.b * (200 - shade)) / 100;
1221	}
1222
1223	XRenderPictFormat pf;
1224	pf.type = PictTypeDirect;
1225	pf.depth = 32;
1226	pf.direct.redMask = 0xff;
1227	pf.direct.greenMask = 0xff;
1228	pf.direct.blueMask = 0xff;
1229	pf.direct.alphaMask = 0xff;
1230
1231	XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1232	(PictFormatType\|
1233	PictFormatDepth\|
1234	PictFormatRedMask\|
1235	PictFormatGreenMask\|
1236	PictFormatBlueMask\|
1237	PictFormatAlphaMask),
1238	&pf,
1239	0);
1240	XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1241	XRenderPictureAttributes pa ;
1242
1243	back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1244
1245	pa.repeat = True;
1246
1247	Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1248	Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1249	XFreePixmap (dpy, overlay_pmap);
1250
1251	pa.component_alpha = True;
1252	Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1253	Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat\|CPComponentAlpha, &pa);
1254	XFreePixmap (dpy, mask_pmap);
1255
1256	if (mask_pic && overlay_pic && back_pic)
1257	{
1258	XRenderColor mask_c;
1259
1260	memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1261	mask_c.alpha = 0xffff;
1262	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1263
1264	mask_c.alpha = 0;
1265	mask_c.red = 0xffff - c.r;
1266	mask_c.green = 0xffff - c.g;
1267	mask_c.blue = 0xffff - c.b;
1268	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1269	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1270	result \|= transpPmapTinted;
1271	}
1272
1273	XRenderFreePicture (dpy, mask_pic);
1274	XRenderFreePicture (dpy, overlay_pic);
1275	XRenderFreePicture (dpy, back_pic);
1276	# if DO_TIMING_TEST
1277	XSync (dpy, False);
1278	# endif
1279	# endif
1280	}
1281	}	1439	}
1282	} /* server side rendering completed */	1440	} /* server side rendering completed */
1283		1441
1284	if (pixmap)	1442	if (pixmap)
1285	XFreePixmap (dpy, pixmap);	1443	XFreePixmap (dpy, pixmap);
…		…
1525	int i;	1683	int i;
1526		1684
1527	Visual *visual = term->visual;	1685	Visual *visual = term->visual;
1528		1686
1529	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return ;	1687	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return ;
1530
1531	if (shade == 0)
1532	shade = 100;
1533		1688
1534	/* for convenience */	1689	/* for convenience */
1535	mask_r = visual->red_mask;	1690	mask_r = visual->red_mask;
1536	mask_g = visual->green_mask;	1691	mask_g = visual->green_mask;
1537	mask_b = visual->blue_mask;	1692	mask_b = visual->blue_mask;
…		…
1593	default:	1748	default:
1594	return; /* we do not support this color depth */	1749	return; /* we do not support this color depth */
1595	}	1750	}
1596		1751
1597	/* prepare limits for color transformation (each channel is handled separately) */	1752	/* prepare limits for color transformation (each channel is handled separately) */
1598	if (shade < 0) {	1753	if (shade > 100) {
1599	shade = -shade;	1754	shade = 200 - shade;
1600	if (shade < 0) shade = 0;
1601	if (shade > 100) shade = 100;
1602		1755
1603	lower_lim_r = 65535-rm;	1756	lower_lim_r = 65535-rm;
1604	lower_lim_g = 65535-gm;	1757	lower_lim_g = 65535-gm;
1605	lower_lim_b = 65535-bm;	1758	lower_lim_b = 65535-bm;
1606		1759
…		…
1608	lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);	1761	lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1609	lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);	1762	lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1610		1763
1611	upper_lim_r = upper_lim_g = upper_lim_b = 65535;	1764	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1612	} else {	1765	} else {
1613	if (shade < 0) shade = 0;
1614	if (shade > 100) shade = 100;
1615		1766
1616	lower_lim_r = lower_lim_g = lower_lim_b = 0;	1767	lower_lim_r = lower_lim_g = lower_lim_b = 0;
1617		1768
1618	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);	1769	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1619	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);	1770	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.60 by sf-exg, Sun Oct 3 20:41:32 2010 UTC vs. Revision 1.80 by sf-exg, Wed Oct 13 23:04:57 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.60 by sf-exg, Sun Oct 3 20:41:32 2010 UTC vs.
Revision 1.80 by sf-exg, Wed Oct 13 23:04:57 2010 UTC