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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.108 by sf-exg, Mon Nov 1 14:58:44 2010 UTC vs.
Revision 1.125 by sf-exg, Tue Nov 23 18:31:13 2010 UTC

…		…
24		24
25	#include <cmath>	25	#include <cmath>
26	#include "../config.h" /* NECESSARY */	26	#include "../config.h" /* NECESSARY */
27	#include "rxvt.h" /* NECESSARY */	27	#include "rxvt.h" /* NECESSARY */
28		28
		29	#if XRENDER
		30	# include <X11/extensions/Xrender.h>
		31	#endif
		32
		33	#ifndef FilterConvolution
		34	#define FilterConvolution "convolution"
		35	#endif
		36
29	#define DO_TIMING_TEST 0	37	#define DO_TIMING_TEST 0
30		38
31	#if DO_TIMING_TEST	39	#if DO_TIMING_TEST
32	# include <sys/time.h>	40	# include <sys/time.h>
33	#define TIMING_TEST_START(id) \	41	#define TIMING_TEST_START(id) \
…		…
58	*	66	*
59	* WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.	67	* WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
60	* W and H are percentages of the terminal window size.	68	* W and H are percentages of the terminal window size.
61	* X and Y are also percentages; e.g., +50+50 centers	69	* X and Y are also percentages; e.g., +50+50 centers
62	* the image in the window.	70	* the image in the window.
63	* WxH+X Assumes Y == X
64	* WxH Assumes Y == X == 50 (centers the image)
65	* W+X+Y Assumes H == W
66	* W+X Assumes H == W and Y == X
67	* W Assumes H == W and Y == X == 50
68	*
69	* Adjusting position only :
70	* =+X+Y Set position to X% by Y% (absolute).
71	* =+X Set position to X% by X%.
72	* +X+Y Adjust position horizontally X% and vertically Y%
73	* from current position (relative).
74	* +X Adjust position horizontally X% and vertically X%
75	* from current position.
76	*
77	* Adjusting scale only :
78	* Wx0 Multiply horizontal scaling factor by W%
79	* 0xH Multiply vertical scaling factor by H%
80	* 0x0 No scaling (show image at normal size).
81	*	71	*
82	* Pixmap Operations : (should be prepended by a colon)	72	* Pixmap Operations : (should be prepended by a colon)
83	* tile Tile image. Scaling/position modifiers above will affect	73	* tile Tile image. Scaling/position modifiers above will affect
84	* the tile size and origin.	74	* the tile size and origin.
85	* propscale When scaling, scale proportionally. That is, maintain the	75	* propscale When scaling, scale proportionally. That is, maintain the
…		…
113	#endif	103	#endif
114	flags = 0;	104	flags = 0;
115	pixmap = None;	105	pixmap = None;
116	valid_since = invalid_since = 0;	106	valid_since = invalid_since = 0;
117	target = 0;	107	target = 0;
		108	target_x = target_y = 0;
118	}	109	}
119		110
120	void	111	void
121	bgPixmap_t::destroy ()	112	bgPixmap_t::destroy ()
122	{	113	{
…		…
133	if (pixmap && target)	124	if (pixmap && target)
134	XFreePixmap (target->dpy, pixmap);	125	XFreePixmap (target->dpy, pixmap);
135	}	126	}
136		127
137	bool	128	bool
		129	bgPixmap_t::set_position (int x, int y)
		130	{
		131
		132	if (target_x != x
		133	\|\| target_y != y)
		134	{
		135	target_x = x;
		136	target_y = y;
		137	return true;
		138	}
		139	return false;
		140	}
		141
		142	bool
138	bgPixmap_t::window_size_sensitive ()	143	bgPixmap_t::window_size_sensitive ()
139	{	144	{
140	# ifdef ENABLE_TRANSPARENCY	145	# ifdef ENABLE_TRANSPARENCY
141	if (flags & isTransparent)	146	if (flags & isTransparent)
142	return true;	147	return true;
…		…
168	return true;	173	return true;
169	}	174	}
170	# endif	175	# endif
171		176
172	return false;	177	return false;
173	};	178	}
174		179
175	bool bgPixmap_t::need_client_side_rendering ()	180	bool bgPixmap_t::need_client_side_rendering ()
176	{	181	{
177	# ifdef HAVE_AFTERIMAGE	182	# ifdef HAVE_AFTERIMAGE
178	if (original_asim)	183	if (original_asim)
…		…
248	dst_size = target_size - dst_pos;	253	dst_size = target_size - dst_pos;
249	return src_pos;	254	return src_pos;
250	}	255	}
251		256
252	bool	257	bool
253	bgPixmap_t::set_geometry (const char *geom)	258	bgPixmap_t::set_geometry (const char *geom, bool update)
254	{	259	{
		260	bool changed = false;
255	int geom_flags = 0, changed = 0;	261	int geom_flags = 0;
256	int x = 0, y = 0;	262	int x = 0, y = 0;
257	unsigned int w = 0, h = 0;	263	unsigned int w = 0, h = 0;
258	unsigned int n;	264	unsigned int n;
259	unsigned long new_flags = (flags & (~geometryFlags));	265	unsigned long new_flags = (flags & (~geometryFlags));
260	const char *p;	266	const char *ops;
261	# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */	267	# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262		268
263	if (geom == NULL)	269	if (geom == NULL)
264	return false;	270	return false;
265		271
266	char str[MAXLEN_GEOM];	272	char str[MAXLEN_GEOM];
267		273
268	while (isspace(*geom)) ++geom;
269	if ((p = strchr (geom, ';')) == NULL)
270	p = strchr (geom, '\0');	274	ops = strchr (geom, ':');
271		275	if (ops == NULL)
		276	n = strlen (geom);
		277	else
272	n = (p - geom);	278	n = ops - geom;
		279
273	if (n < MAXLEN_GEOM)	280	if (n >= MAXLEN_GEOM)
274	{	281	return false;
275	char *ops;
276	new_flags \|= geometrySet;
277		282
278	memcpy (str, geom, n);	283	memcpy (str, geom, n);
279	str[n] = '\0';	284	str[n] = '\0';
280	if (str[0] == ':')	285	rxvt_strtrim (str);
281	ops = &str[0];
282	else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283	ops = &str[0];
284	else
285	{
286	char *tmp;
287	ops = strchr (str, ':');
288	if (ops != NULL)
289	{
290	for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
291	*(++tmp) = '\0';
292	if (ops == tmp) ++ops;
293	}
294	}
295		286
296	if (ops > str \|\| ops == NULL)	287	if (str[0])
297	{	288	{
298	/* we have geometry string - let's handle it prior to applying ops */	289	/* we have geometry string - let's handle it prior to applying ops */
299	geom_flags = XParseGeometry (str, &x, &y, &w, &h);	290	geom_flags = XParseGeometry (str, &x, &y, &w, &h);
300
301	if ((geom_flags & XValue) && !(geom_flags & YValue))
302	{
303	y = x;
304	geom_flags \|= YValue;
305	}
306
307	if (flags & geometrySet)
308	{
309	/* new geometry is an adjustment to the old one ! */
310	if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
311	{
312	if (w == 0 && h != 0)
313	{
314	w = h_scale;
315	h = (v_scale * h) / 100;
316	}
317	else if (h == 0 && w != 0)
318	{
319	w = (h_scale * w) / 100;
320	h = v_scale;
321	}
322	}
323	if (geom_flags & XValue)
324	{
325	if (str[0] != '=')
326	{
327	y += v_align;
328	x += h_align;
329	}
330	}
331	}
332	else /* setting up geometry from scratch */
333	{
334	if (!(geom_flags & XValue))
335	{
336	/* use default geometry - centered */
337	x = y = defaultAlign;
338	}
339	else if (!(geom_flags & YValue))
340	y = x;
341
342	if ((geom_flags & (WidthValue\|HeightValue)) == 0)
343	{
344	/* use default geometry - scaled */
345	w = h = defaultScale;
346	}
347	else if (geom_flags & WidthValue)
348	{
349	if (!(geom_flags & HeightValue))
350	h = w;
351	}
352	else
353	w = h;
354	}
355	} /* done parsing geometry string */	291	} /* done parsing geometry string */
356	else if (!(flags & geometrySet))	292
357	{	293	if (!update)
358	/* default geometry - scaled and centered */	294	{
		295	if (!(geom_flags & XValue))
359	x = y = defaultAlign;	296	x = y = defaultAlign;
		297	else if (!(geom_flags & YValue))
		298	y = x;
		299
		300	if (!(geom_flags & (WidthValue\|HeightValue)))
360	w = h = defaultScale;	301	w = h = defaultScale;
361	}	302	else if (!(geom_flags & HeightValue))
		303	h = w;
		304	else if (!(geom_flags & WidthValue))
		305	w = h;
362		306
363	if (!(flags & geometrySet))
364	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	307	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
		308	}
365		309
366	if (ops)	310	if (ops)
367	{	311	{
368	while (*ops)	312	while (*ops)
369	{	313	{
370	while (ops == ':' \|\| isspace(ops)) ++ops;	314	while (ops == ':' \|\| isspace(ops)) ++ops;
371		315
372	# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)	316	# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
373	if (CHECK_GEOM_OPS ("tile"))	317	if (CHECK_GEOM_OPS ("tile"))
374	{	318	{
375	w = h = noScale;	319	w = h = noScale;
376	geom_flags \|= WidthValue\|HeightValue;	320	geom_flags \|= WidthValue\|HeightValue;
377	}	321	}
378	else if (CHECK_GEOM_OPS ("propscale"))	322	else if (CHECK_GEOM_OPS ("propscale"))
379	{	323	{
380	new_flags \|= propScale;	324	new_flags \|= propScale;
381	}	325	}
382	else if (CHECK_GEOM_OPS ("hscale"))	326	else if (CHECK_GEOM_OPS ("hscale"))
383	{	327	{
384	if (w == 0) w = windowScale;	328	if (w == 0) w = windowScale;
385		329
386	h = noScale;	330	h = noScale;
387	geom_flags \|= WidthValue\|HeightValue;	331	geom_flags \|= WidthValue\|HeightValue;
388	}	332	}
389	else if (CHECK_GEOM_OPS ("vscale"))	333	else if (CHECK_GEOM_OPS ("vscale"))
390	{	334	{
391	if (h == 0) h = windowScale;	335	if (h == 0) h = windowScale;
392		336
393	w = noScale;	337	w = noScale;
394	geom_flags \|= WidthValue\|HeightValue;	338	geom_flags \|= WidthValue\|HeightValue;
395	}	339	}
396	else if (CHECK_GEOM_OPS ("scale"))	340	else if (CHECK_GEOM_OPS ("scale"))
397	{	341	{
398	if (h == 0) h = windowScale;	342	if (h == 0) h = windowScale;
399	if (w == 0) w = windowScale;	343	if (w == 0) w = windowScale;
400		344
401	geom_flags \|= WidthValue\|HeightValue;	345	geom_flags \|= WidthValue\|HeightValue;
402	}	346	}
403	else if (CHECK_GEOM_OPS ("auto"))	347	else if (CHECK_GEOM_OPS ("auto"))
404	{	348	{
405	w = h = windowScale;	349	w = h = windowScale;
406	x = y = centerAlign;	350	x = y = centerAlign;
407	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	351	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
408	}	352	}
409	else if (CHECK_GEOM_OPS ("root"))	353	else if (CHECK_GEOM_OPS ("root"))
410	{	354	{
411	new_flags \|= rootAlign;	355	new_flags \|= rootAlign;
412	w = h = noScale;	356	w = h = noScale;
413	geom_flags \|= WidthValue\|HeightValue;	357	geom_flags \|= WidthValue\|HeightValue;
414	}	358	}
415	# undef CHECK_GEOM_OPS	359	# undef CHECK_GEOM_OPS
416		360
417	while (ops != ':' && ops != '\0') ++ops;	361	while (ops != ':' && ops != '\0') ++ops;
418	} /* done parsing ops */	362	} /* done parsing ops */
419	}	363	}
420		364
421	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;	365	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
422	if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;	366	if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
423	if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;	367	if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
424	if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;	368	if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425	}
426		369
427	if (new_flags != flags)	370	if (new_flags != flags)
428	{	371	{
429	flags = new_flags;	372	flags = new_flags;
430	changed++;	373	changed = true;
431	}	374	}
432		375
433	return (changed > 0);	376	return changed;
434	}	377	}
435		378
436	void	379	void
437	bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)	380	bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
438	{	381	{
…		…
455	if (!w) w = image_width;	398	if (!w) w = image_width;
456	if (!h) h = image_height;	399	if (!h) h = image_height;
457		400
458	if (flags & rootAlign)	401	if (flags & rootAlign)
459	{	402	{
460	target->get_window_origin (x, y);
461	x = -x;	403	x = -target_x;
462	y = -y;	404	y = -target_y;
463	}	405	}
464	else	406	else
465	{	407	{
466	x = make_align_position (h_align, target_width, w);	408	x = make_align_position (h_align, target_width, w);
467	y = make_align_position (v_align, target_height, h);	409	y = make_align_position (v_align, target_height, h);
…		…
661	if (result)	603	if (result)
662	{	604	{
663	XGCValues gcv;	605	XGCValues gcv;
664	GC gc;	606	GC gc;
665		607
666	if (pixmap)
667	{
668	if (pmap_width != new_pmap_width
669	\|\| pmap_height != new_pmap_height
670	\|\| pmap_depth != target->depth)
671	{
672	XFreePixmap (target->dpy, pixmap);
673	pixmap = None;
674	}
675	}
676
677	/* create Pixmap */	608	/* create Pixmap */
678	if (pixmap == None)	609	if (pixmap == None
		610	\|\| pmap_width != new_pmap_width
		611	\|\| pmap_height != new_pmap_height
		612	\|\| pmap_depth != target->depth)
679	{	613	{
		614	if (pixmap)
		615	XFreePixmap (target->dpy, pixmap);
680	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);	616	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
681	pmap_width = new_pmap_width;	617	pmap_width = new_pmap_width;
682	pmap_height = new_pmap_height;	618	pmap_height = new_pmap_height;
683	pmap_depth = target->depth;	619	pmap_depth = target->depth;
684	}	620	}
…		…
792	new_pmap_width = min (image_width, target_width);	728	new_pmap_width = min (image_width, target_width);
793	new_pmap_height = min (image_height, target_height);	729	new_pmap_height = min (image_height, target_height);
794	}	730	}
795	}	731	}
796		732
797	if (pixmap)
798	{
799	if (pmap_width != new_pmap_width
800	\|\| pmap_height != new_pmap_height
801	\|\| pmap_depth != target->depth)
802	{
803	XFreePixmap (target->dpy, pixmap);
804	pixmap = None;
805	}
806	}
807
808	if (pixmap == None)	733	if (pixmap == None
		734	\|\| pmap_width != new_pmap_width
		735	\|\| pmap_height != new_pmap_height
		736	\|\| pmap_depth != target->depth)
809	{	737	{
		738	if (pixmap)
		739	XFreePixmap (target->dpy, pixmap);
810	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);	740	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
811	pmap_width = new_pmap_width;	741	pmap_width = new_pmap_width;
812	pmap_height = new_pmap_height;	742	pmap_height = new_pmap_height;
813	pmap_depth = target->depth;	743	pmap_depth = target->depth;
814	}	744	}
…		…
967	}	897	}
968		898
969	bool	899	bool
970	bgPixmap_t::set_blur_radius (const char *geom)	900	bgPixmap_t::set_blur_radius (const char *geom)
971	{	901	{
972	int changed = 0;	902	bool changed = false;
973	unsigned int hr, vr;	903	unsigned int hr, vr;
974	int junk;	904	int junk;
975	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);	905	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
976		906
977	if (!(geom_flags & WidthValue))	907	if (!(geom_flags & WidthValue))
…		…
982	min_it (hr, 128);	912	min_it (hr, 128);
983	min_it (vr, 128);	913	min_it (vr, 128);
984		914
985	if (h_blurRadius != hr)	915	if (h_blurRadius != hr)
986	{	916	{
987	++changed;	917	changed = true;
988	h_blurRadius = hr;	918	h_blurRadius = hr;
989	}	919	}
990		920
991	if (v_blurRadius != vr)	921	if (v_blurRadius != vr)
992	{	922	{
993	++changed;	923	changed = true;
994	v_blurRadius = vr;	924	v_blurRadius = vr;
995	}	925	}
996		926
997	if (v_blurRadius == 0 && h_blurRadius == 0)	927	if (v_blurRadius == 0 && h_blurRadius == 0)
998	flags &= ~blurNeeded;	928	flags &= ~blurNeeded;
999	else	929	else
1000	flags \|= blurNeeded;	930	flags \|= blurNeeded;
1001		931
1002	return (changed > 0);	932	return changed;
1003	}	933	}
1004		934
1005	static inline unsigned long	935	static inline unsigned long
1006	compute_tint_shade_flags (rxvt_color *tint, int shade)	936	compute_tint_shade_flags (rxvt_color *tint, int shade)
1007	{	937	{
…		…
1010	bool has_shade = shade != 100;	940	bool has_shade = shade != 100;
1011		941
1012	if (tint)	942	if (tint)
1013	{	943	{
1014	tint->get (c);	944	tint->get (c);
1015	# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 \|\| (cmp) >= 0x00f700)	945	# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff \|\| (cmp) >= 0xff00)
		946	if (!has_shade
1016	if (!has_shade && IS_COMPONENT_WHOLESOME (c.r)	947	&& IS_COMPONENT_WHOLESOME (c.r)
1017	&& IS_COMPONENT_WHOLESOME (c.g)	948	&& IS_COMPONENT_WHOLESOME (c.g)
1018	&& IS_COMPONENT_WHOLESOME (c.b))	949	&& IS_COMPONENT_WHOLESOME (c.b))
1019	flags \|= bgPixmap_t::tintWholesome;	950	flags \|= bgPixmap_t::tintWholesome;
1020	# undef IS_COMPONENT_WHOLESOME	951	# undef IS_COMPONENT_WHOLESOME
1021	}	952	}
1022		953
1023	if (has_shade)	954	if (has_shade \|\| tint)
1024	flags \|= bgPixmap_t::tintNeeded;	955	flags \|= bgPixmap_t::tintNeeded;
1025	else if (tint)
1026	{
1027	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)
1028	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))
1029	{
1030	flags \|= bgPixmap_t::tintNeeded;
1031	}
1032	}
1033		956
1034	return flags;	957	return flags;
1035	}	958	}
1036		959
1037	bool	960	bool
…		…
1208	c.g = (c.g * shade) / 100;	1131	c.g = (c.g * shade) / 100;
1209	c.b = (c.b * shade) / 100;	1132	c.b = (c.b * shade) / 100;
1210	}	1133	}
1211	else	1134	else
1212	{	1135	{
1213	c.r = ((0xffff - c.r) * (200 - shade)) / 100;	1136	c.r = (c.r * (200 - shade)) / 100;
1214	c.g = ((0xffff - c.g) * (200 - shade)) / 100;	1137	c.g = (c.g * (200 - shade)) / 100;
1215	c.b = ((0xffff - c.b) * (200 - shade)) / 100;	1138	c.b = (c.b * (200 - shade)) / 100;
1216	}	1139	}
1217		1140
1218	XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);	1141	XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1219	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	1142	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1220	XRenderPictureAttributes pa;	1143	XRenderPictureAttributes pa;
…		…
1234		1157
1235	if (mask_pic && overlay_pic && back_pic)	1158	if (mask_pic && overlay_pic && back_pic)
1236	{	1159	{
1237	XRenderColor mask_c;	1160	XRenderColor mask_c;
1238		1161
1239	memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));	1162	mask_c.red = mask_c.green = mask_c.blue = 0;
1240	mask_c.alpha = 0xffff;	1163	mask_c.alpha = 0xffff;
1241	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);	1164	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1242		1165
1243	mask_c.alpha = 0;	1166	mask_c.alpha = 0;
1244	mask_c.red = 0xffff - c.r;	1167	mask_c.red = 0xffff - c.r;
1245	mask_c.green = 0xffff - c.g;	1168	mask_c.green = 0xffff - c.g;
1246	mask_c.blue = 0xffff - c.b;	1169	mask_c.blue = 0xffff - c.b;
1247	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);	1170	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1248	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);	1171	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
		1172
		1173	if (shade > 100)
		1174	{
		1175	mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
		1176	mask_c.alpha = 0;
		1177	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
		1178
		1179	XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
		1180	}
		1181
1249	ret = true;	1182	ret = true;
1250	}	1183	}
1251		1184
1252	XRenderFreePicture (dpy, mask_pic);	1185	XRenderFreePicture (dpy, mask_pic);
1253	XRenderFreePicture (dpy, overlay_pic);	1186	XRenderFreePicture (dpy, overlay_pic);
…		…
1284	int window_height = target->szHint.height;	1217	int window_height = target->szHint.height;
1285	int sx, sy;	1218	int sx, sy;
1286	XGCValues gcv;	1219	XGCValues gcv;
1287	GC gc;	1220	GC gc;
1288		1221
1289	target->get_window_origin (sx, sy);	1222	sx = target_x;
		1223	sy = target_y;
1290		1224
1291	/* check if we are outside of the visible part of the virtual screen : */	1225	/* check if we are outside of the visible part of the virtual screen : */
1292	if (sx + window_width <= 0 \|\| sy + window_height <= 0	1226	if (sx + window_width <= 0 \|\| sy + window_height <= 0
1293	\|\| sx >= root_width \|\| sy >= root_height)	1227	\|\| sx >= root_width \|\| sy >= root_height)
1294	return 0;	1228	return 0;
…		…
1347		1281
1348	if (tiled_root_pmap == None) /* something really bad happened - abort */	1282	if (tiled_root_pmap == None) /* something really bad happened - abort */
1349	return 0;	1283	return 0;
1350		1284
1351	/* straightforward pixmap copy */	1285	/* straightforward pixmap copy */
		1286	while (sx < 0) sx += (int)root_width;
		1287	while (sy < 0) sy += (int)root_height;
		1288
1352	gcv.tile = recoded_root_pmap;	1289	gcv.tile = recoded_root_pmap;
1353	gcv.fill_style = FillTiled;	1290	gcv.fill_style = FillTiled;
1354
1355	while (sx < 0) sx += (int)root_width;
1356	while (sy < 0) sy += (int)root_height;
1357
1358	gcv.ts_x_origin = -sx;	1291	gcv.ts_x_origin = -sx;
1359	gcv.ts_y_origin = -sy;	1292	gcv.ts_y_origin = -sy;
1360	gc = XCreateGC (dpy, target->vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);	1293	gc = XCreateGC (dpy, target->vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
1361		1294
1362	if (gc)	1295	if (gc)
1363	{	1296	{
1364	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);	1297	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1365	result \|= transpPmapTiled;	1298	result \|= transpPmapTiled;
1366	XFreeGC (dpy, gc);	1299	XFreeGC (dpy, gc);
1367	}
1368		1300
1369	if (tiled_root_pmap != None)
1370	{
1371	if (!need_client_side_rendering ())	1301	if (!need_client_side_rendering ())
1372	{	1302	{
1373	if ((flags & blurNeeded)	1303	if ((flags & blurNeeded)
1374	&& (flags & HAS_RENDER_CONV))	1304	&& (flags & HAS_RENDER_CONV))
1375	{	1305	{
…		…
1390	pixmap = tiled_root_pmap;	1320	pixmap = tiled_root_pmap;
1391	pmap_width = window_width;	1321	pmap_width = window_width;
1392	pmap_height = window_height;	1322	pmap_height = window_height;
1393	pmap_depth = target->depth;	1323	pmap_depth = target->depth;
1394	}	1324	}
		1325	else
		1326	XFreePixmap (dpy, tiled_root_pmap);
1395		1327
1396	if (recoded_root_pmap != root_pixmap)	1328	if (recoded_root_pmap != root_pixmap)
1397	XFreePixmap (dpy, recoded_root_pmap);	1329	XFreePixmap (dpy, recoded_root_pmap);
1398		1330
1399	return result;	1331	return result;
…		…
1408		1340
1409	root_pixmap = new_root_pixmap;	1341	root_pixmap = new_root_pixmap;
1410	}	1342	}
1411	# endif /* ENABLE_TRANSPARENCY */	1343	# endif /* ENABLE_TRANSPARENCY */
1412		1344
1413	# ifndef HAVE_AFTERIMAGE	1345	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1414	static void ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm);	1346	static void ShadeXImage(Visual visual, XImage srcImage, int shade, const rgba &c);
1415	# endif	1347	# endif
1416		1348
1417	bool	1349	bool
1418	bgPixmap_t::render ()	1350	bgPixmap_t::render ()
1419	{	1351	{
…		…
1429	/* we need to re-generate transparency pixmap in that case ! */	1361	/* we need to re-generate transparency pixmap in that case ! */
1430	background_flags = make_transparency_pixmap ();	1362	background_flags = make_transparency_pixmap ();
1431	if (background_flags == 0)	1363	if (background_flags == 0)
1432	return false;	1364	return false;
1433	else if ((background_flags & transpTransformations) == (flags & transpTransformations))	1365	else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1434	flags = flags & ~isInvalid;	1366	flags &= ~isInvalid;
1435	}	1367	}
1436	# endif	1368	# endif
1437		1369
1438	# ifdef BG_IMAGE_FROM_FILE	1370	# ifdef BG_IMAGE_FROM_FILE
1439	if (have_image	1371	if (have_image
1440	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))	1372	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))
1441	{	1373	{
1442	if (render_image (background_flags))	1374	if (render_image (background_flags))
1443	flags = flags & ~isInvalid;	1375	flags &= ~isInvalid;
1444	}	1376	}
1445	# endif	1377	# endif
1446		1378
		1379	# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1447	XImage *result = NULL;	1380	XImage *result = NULL;
1448		1381
1449	if (background_flags && (flags & isInvalid))	1382	if (background_flags && (flags & isInvalid))
1450	{	1383	{
1451	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);	1384	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1452	}	1385	}
1453		1386
1454	if (result)	1387	if (result)
1455	{	1388	{
1456	# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1457	/* our own client-side tinting */	1389	/* our own client-side tinting */
1458	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1390	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1459	{	1391	{
1460	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1392	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1461	if (flags & tintSet)	1393	if (flags & tintSet)
1462	tint.get (c);	1394	tint.get (c);
1463	ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);	1395	ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1464	}	1396	}
1465	# endif
1466		1397
1467	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1398	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1468		1399
1469	if (gc)	1400	if (gc)
1470	{	1401	{
1471	XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);	1402	XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1472		1403
1473	XFreeGC (target->dpy, gc);	1404	XFreeGC (target->dpy, gc);
1474	flags = flags & ~isInvalid;	1405	flags &= ~isInvalid;
1475	}	1406	}
1476		1407
1477	XDestroyImage (result);	1408	XDestroyImage (result);
1478	}	1409	}
		1410	# endif
1479		1411
1480	if (flags & isInvalid)	1412	if (flags & isInvalid)
1481	{	1413	{
1482	if (pixmap != None)	1414	if (pixmap != None)
1483	{	1415	{
…		…
1569	flags \|= hasChanged;	1501	flags \|= hasChanged;
1570	}	1502	}
1571		1503
1572	#endif /* HAVE_BG_PIXMAP */	1504	#endif /* HAVE_BG_PIXMAP */
1573		1505
1574	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER	1506	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1575	/* taken from aterm-0.4.2 */	1507	/* taken from aterm-0.4.2 */
1576		1508
1577	static void	1509	static void
1578	ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm)	1510	ShadeXImage(Visual visual, XImage srcImage, int shade, const rgba &c)
1579	{	1511	{
1580	int sh_r, sh_g, sh_b;	1512	int sh_r, sh_g, sh_b;
1581	uint32_t mask_r, mask_g, mask_b;	1513	uint32_t mask_r, mask_g, mask_b;
1582	uint32_t lookup, lookup_r, lookup_g, lookup_b;	1514	uint32_t lookup, lookup_r, lookup_g, lookup_b;
1583	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	1515	rgba low;
1584	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	1516	rgba high;
1585	int i;	1517	int i;
1586	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;	1518	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1587		1519
1588	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;	1520	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;
1589		1521
…		…
1654	/* prepare limits for color transformation (each channel is handled separately) */	1586	/* prepare limits for color transformation (each channel is handled separately) */
1655	if (shade > 100)	1587	if (shade > 100)
1656	{	1588	{
1657	shade = 200 - shade;	1589	shade = 200 - shade;
1658		1590
1659	lower_lim_r = 65535-rm;	1591	high.r = c.r * shade / 100;
1660	lower_lim_g = 65535-gm;	1592	high.g = c.g * shade / 100;
1661	lower_lim_b = 65535-bm;	1593	high.b = c.b * shade / 100;
1662		1594
1663	lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);	1595	low.r = 65535 * (100 - shade) / 100;
1664	lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);	1596	low.g = 65535 * (100 - shade) / 100;
1665	lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);	1597	low.b = 65535 * (100 - shade) / 100;
1666
1667	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1668	}	1598	}
1669	else	1599	else
1670	{	1600	{
		1601	high.r = c.r * shade / 100;
		1602	high.g = c.g * shade / 100;
		1603	high.b = c.b * shade / 100;
1671		1604
1672	lower_lim_r = lower_lim_g = lower_lim_b = 0;	1605	low.r = low.g = low.b = 0;
1673
1674	upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1675	upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1676	upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1677	}	1606	}
1678		1607
1679	/* fill our lookup tables */	1608	/* fill our lookup tables */
1680	for (i = 0; i <= mask_r>>sh_r; i++)	1609	for (i = 0; i <= mask_r>>sh_r; i++)
1681	{	1610	{
1682	uint32_t tmp;	1611	uint32_t tmp;
1683	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));	1612	tmp = i * high.r;
1684	tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);	1613	tmp += (mask_r>>sh_r) * low.r;
1685	lookup_r[i] = (tmp/65535)<<sh_r;	1614	lookup_r[i] = (tmp/65535)<<sh_r;
1686	}	1615	}
1687	for (i = 0; i <= mask_g>>sh_g; i++)	1616	for (i = 0; i <= mask_g>>sh_g; i++)
1688	{	1617	{
1689	uint32_t tmp;	1618	uint32_t tmp;
1690	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));	1619	tmp = i * high.g;
1691	tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);	1620	tmp += (mask_g>>sh_g) * low.g;
1692	lookup_g[i] = (tmp/65535)<<sh_g;	1621	lookup_g[i] = (tmp/65535)<<sh_g;
1693	}	1622	}
1694	for (i = 0; i <= mask_b>>sh_b; i++)	1623	for (i = 0; i <= mask_b>>sh_b; i++)
1695	{	1624	{
1696	uint32_t tmp;	1625	uint32_t tmp;
1697	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));	1626	tmp = i * high.b;
1698	tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);	1627	tmp += (mask_b>>sh_b) * low.b;
1699	lookup_b[i] = (tmp/65535)<<sh_b;	1628	lookup_b[i] = (tmp/65535)<<sh_b;
1700	}	1629	}
1701		1630
1702	/* apply table to input image (replacing colors by newly calculated ones) */	1631	/* apply table to input image (replacing colors by newly calculated ones) */
1703	if (srcImage->bits_per_pixel == 32	1632	if (srcImage->bits_per_pixel == 32

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.108 by sf-exg, Mon Nov 1 14:58:44 2010 UTC vs. Revision 1.125 by sf-exg, Tue Nov 23 18:31:13 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.108 by sf-exg, Mon Nov 1 14:58:44 2010 UTC vs.
Revision 1.125 by sf-exg, Tue Nov 23 18:31:13 2010 UTC