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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.107 by sf-exg, Mon Nov 1 14:29:33 2010 UTC vs.
Revision 1.121 by sf-exg, Fri Nov 19 23:29:30 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	{
275	char *ops;
276	new_flags \|= geometrySet;
277
278	memcpy (str, geom, n);	282	memcpy (str, geom, n);
279	str[n] = '\0';	283	str[n] = '\0';
		284	rxvt_strtrim (str);
		285
280	if (str[0] == ':')	286	if (str[0])
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
296	if (ops > str \|\| ops == NULL)
297	{	287	{
298	/* we have geometry string - let's handle it prior to applying ops */	288	/* we have geometry string - let's handle it prior to applying ops */
299	geom_flags = XParseGeometry (str, &x, &y, &w, &h);	289	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 */	290	} /* done parsing geometry string */
356	else if (!(flags & geometrySet))	291
		292	if (!update)
357	{	293	{
358	/* default geometry - scaled and centered */	294	if (!(geom_flags & XValue))
359	x = y = defaultAlign;	295	x = y = defaultAlign;
		296	else if (!(geom_flags & YValue))
		297	y = x;
		298
		299	if (!(geom_flags & (WidthValue\|HeightValue)))
360	w = h = defaultScale;	300	w = h = defaultScale;
361	}	301	else if (!(geom_flags & HeightValue))
		302	h = w;
		303	else if (!(geom_flags & WidthValue))
		304	w = h;
362		305
363	if (!(flags & geometrySet))
364	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	306	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
		307	}
365		308
366	if (ops)	309	if (ops)
367	{	310	{
368	while (*ops)	311	while (*ops)
369	{	312	{
…		…
416		359
417	while (ops != ':' && ops != '\0') ++ops;	360	while (ops != ':' && ops != '\0') ++ops;
418	} /* done parsing ops */	361	} /* done parsing ops */
419	}	362	}
420		363
421	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;	364	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;	365	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;	366	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;	367	if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425	}	368	}
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	}
…		…
729	return false;	665	return false;
730		666
731	if (!pixbuf)	667	if (!pixbuf)
732	return false;	668	return false;
733		669
734	#if !XRENDER
735	if (background_flags)	670	if (background_flags
		671	&& !(flags & HAS_RENDER))
736	return false;	672	return false;
737	#endif
738		673
739	GdkPixbuf *result;	674	GdkPixbuf *result;
740		675
741	int image_width = gdk_pixbuf_get_width (pixbuf);	676	int image_width = gdk_pixbuf_get_width (pixbuf);
742	int image_height = gdk_pixbuf_get_height (pixbuf);	677	int image_height = gdk_pixbuf_get_height (pixbuf);
…		…
793	new_pmap_width = min (image_width, target_width);	728	new_pmap_width = min (image_width, target_width);
794	new_pmap_height = min (image_height, target_height);	729	new_pmap_height = min (image_height, target_height);
795	}	730	}
796	}	731	}
797		732
798	if (pixmap)
799	{
800	if (pmap_width != new_pmap_width
801	\|\| pmap_height != new_pmap_height
802	\|\| pmap_depth != target->depth)
803	{
804	XFreePixmap (target->dpy, pixmap);
805	pixmap = None;
806	}
807	}
808
809	if (pixmap == None)	733	if (pixmap == None
		734	\|\| pmap_width != new_pmap_width
		735	\|\| pmap_height != new_pmap_height
		736	\|\| pmap_depth != target->depth)
810	{	737	{
		738	if (pixmap)
		739	XFreePixmap (target->dpy, pixmap);
811	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);
812	pmap_width = new_pmap_width;	741	pmap_width = new_pmap_width;
813	pmap_height = new_pmap_height;	742	pmap_height = new_pmap_height;
814	pmap_depth = target->depth;	743	pmap_depth = target->depth;
815	}	744	}
…		…
968	}	897	}
969		898
970	bool	899	bool
971	bgPixmap_t::set_blur_radius (const char *geom)	900	bgPixmap_t::set_blur_radius (const char *geom)
972	{	901	{
973	int changed = 0;	902	bool changed = false;
974	unsigned int hr, vr;	903	unsigned int hr, vr;
975	int junk;	904	int junk;
976	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);	905	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
977		906
978	if (!(geom_flags & WidthValue))	907	if (!(geom_flags & WidthValue))
…		…
983	min_it (hr, 128);	912	min_it (hr, 128);
984	min_it (vr, 128);	913	min_it (vr, 128);
985		914
986	if (h_blurRadius != hr)	915	if (h_blurRadius != hr)
987	{	916	{
988	++changed;	917	changed = true;
989	h_blurRadius = hr;	918	h_blurRadius = hr;
990	}	919	}
991		920
992	if (v_blurRadius != vr)	921	if (v_blurRadius != vr)
993	{	922	{
994	++changed;	923	changed = true;
995	v_blurRadius = vr;	924	v_blurRadius = vr;
996	}	925	}
997		926
998	if (v_blurRadius == 0 && h_blurRadius == 0)	927	if (v_blurRadius == 0 && h_blurRadius == 0)
999	flags &= ~blurNeeded;	928	flags &= ~blurNeeded;
1000	else	929	else
1001	flags \|= blurNeeded;	930	flags \|= blurNeeded;
1002		931
1003	#if XRENDER
1004	XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1005	if (filters)
1006	{
1007	for (int i = 0; i < filters->nfilter; i++)
1008	if (!strcmp (filters->filter[i], FilterConvolution))
1009	flags \|= bgPixmap_t::blurServerSide;
1010
1011	XFree (filters);
1012	}
1013	#endif
1014
1015	return (changed > 0);	932	return changed;
1016	}	933	}
1017		934
1018	static inline unsigned long	935	static inline unsigned long
1019	compute_tint_shade_flags (rxvt_color *tint, int shade)	936	compute_tint_shade_flags (rxvt_color *tint, int shade)
1020	{	937	{
…		…
1039	{	956	{
1040	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)	957	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)
1041	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))	958	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))
1042	{	959	{
1043	flags \|= bgPixmap_t::tintNeeded;	960	flags \|= bgPixmap_t::tintNeeded;
1044	}
1045	}
1046
1047	if (flags & bgPixmap_t::tintNeeded)
1048	{
1049	if (flags & bgPixmap_t::tintWholesome)
1050	flags \|= bgPixmap_t::tintServerSide;
1051	else
1052	{
1053	#if XRENDER
1054	flags \|= bgPixmap_t::tintServerSide;
1055	#endif
1056	}	961	}
1057	}	962	}
1058		963
1059	return flags;	964	return flags;
1060	}	965	}
…		…
1259		1164
1260	if (mask_pic && overlay_pic && back_pic)	1165	if (mask_pic && overlay_pic && back_pic)
1261	{	1166	{
1262	XRenderColor mask_c;	1167	XRenderColor mask_c;
1263		1168
1264	memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));	1169	mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1265	mask_c.alpha = 0xffff;	1170	mask_c.alpha = 0xffff;
1266	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);	1171	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1267		1172
1268	mask_c.alpha = 0;	1173	mask_c.alpha = 0;
1269	mask_c.red = 0xffff - c.r;	1174	mask_c.red = 0xffff - c.r;
…		…
1309	int window_height = target->szHint.height;	1214	int window_height = target->szHint.height;
1310	int sx, sy;	1215	int sx, sy;
1311	XGCValues gcv;	1216	XGCValues gcv;
1312	GC gc;	1217	GC gc;
1313		1218
1314	target->get_window_origin (sx, sy);	1219	sx = target_x;
		1220	sy = target_y;
1315		1221
1316	/* check if we are outside of the visible part of the virtual screen : */	1222	/* check if we are outside of the visible part of the virtual screen : */
1317	if (sx + window_width <= 0 \|\| sy + window_height <= 0	1223	if (sx + window_width <= 0 \|\| sy + window_height <= 0
1318	\|\| sx >= root_width \|\| sy >= root_height)	1224	\|\| sx >= root_width \|\| sy >= root_height)
1319	return 0;	1225	return 0;
…		…
1336	Pixmap recoded_root_pmap = root_pixmap;	1242	Pixmap recoded_root_pmap = root_pixmap;
1337		1243
1338	if (root_pixmap != None && root_depth != target->depth)	1244	if (root_pixmap != None && root_depth != target->depth)
1339	{	1245	{
1340	#if XRENDER	1246	#if XRENDER
		1247	if (flags & HAS_RENDER)
		1248	{
1341	XRenderPictureAttributes pa;	1249	XRenderPictureAttributes pa;
1342		1250
1343	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));	1251	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1344	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);	1252	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1345		1253
1346	recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);	1254	recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1347	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);	1255	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1348	Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);	1256	Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1349		1257
1350	if (src && dst)	1258	if (src && dst)
1351	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);	1259	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
		1260	else
		1261	{
		1262	XFreePixmap (dpy, recoded_root_pmap);
		1263	root_pixmap = None;
		1264	}
		1265
		1266	XRenderFreePicture (dpy, src);
		1267	XRenderFreePicture (dpy, dst);
		1268	}
1352	else	1269	else
1353	{	1270	#endif
1354	XFreePixmap (dpy, recoded_root_pmap);
1355	root_pixmap = None;
1356	}
1357
1358	XRenderFreePicture (dpy, src);
1359	XRenderFreePicture (dpy, dst);
1360	#else
1361	root_pixmap = None;	1271	root_pixmap = None;
1362	#endif
1363	}	1272	}
1364		1273
1365	if (root_pixmap == None)	1274	if (root_pixmap == None)
1366	return 0;	1275	return 0;
1367		1276
…		…
1384	if (gc)	1293	if (gc)
1385	{	1294	{
1386	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);	1295	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1387	result \|= transpPmapTiled;	1296	result \|= transpPmapTiled;
1388	XFreeGC (dpy, gc);	1297	XFreeGC (dpy, gc);
1389	}
1390		1298
1391	if (tiled_root_pmap != None)
1392	{
1393	if (!need_client_side_rendering ())	1299	if (!need_client_side_rendering ())
1394	{	1300	{
1395	if ((flags & blurNeeded)	1301	if ((flags & blurNeeded)
1396	&& (flags & blurServerSide))	1302	&& (flags & HAS_RENDER_CONV))
1397	{	1303	{
1398	if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))	1304	if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1399	result \|= transpPmapBlurred;	1305	result \|= transpPmapBlurred;
1400	}	1306	}
1401	if ((flags & tintNeeded)	1307	if ((flags & tintNeeded)
1402	&& (flags & tintServerSide))	1308	&& (flags & (tintWholesome \| HAS_RENDER)))
1403	{	1309	{
1404	if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))	1310	if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1405	result \|= transpPmapTinted;	1311	result \|= transpPmapTinted;
1406	}	1312	}
1407	} /* server side rendering completed */	1313	} /* server side rendering completed */
…		…
1412	pixmap = tiled_root_pmap;	1318	pixmap = tiled_root_pmap;
1413	pmap_width = window_width;	1319	pmap_width = window_width;
1414	pmap_height = window_height;	1320	pmap_height = window_height;
1415	pmap_depth = target->depth;	1321	pmap_depth = target->depth;
1416	}	1322	}
		1323	else
		1324	XFreePixmap (dpy, tiled_root_pmap);
1417		1325
1418	if (recoded_root_pmap != root_pixmap)	1326	if (recoded_root_pmap != root_pixmap)
1419	XFreePixmap (dpy, recoded_root_pmap);	1327	XFreePixmap (dpy, recoded_root_pmap);
1420		1328
1421	return result;	1329	return result;
…		…
1430		1338
1431	root_pixmap = new_root_pixmap;	1339	root_pixmap = new_root_pixmap;
1432	}	1340	}
1433	# endif /* ENABLE_TRANSPARENCY */	1341	# endif /* ENABLE_TRANSPARENCY */
1434		1342
1435	# ifndef HAVE_AFTERIMAGE	1343	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1436	static void ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm);	1344	static void ShadeXImage(Visual visual, XImage srcImage, int shade, const rgba &c);
1437	# endif	1345	# endif
1438		1346
1439	bool	1347	bool
1440	bgPixmap_t::render ()	1348	bgPixmap_t::render ()
1441	{	1349	{
…		…
1464	if (render_image (background_flags))	1372	if (render_image (background_flags))
1465	flags = flags & ~isInvalid;	1373	flags = flags & ~isInvalid;
1466	}	1374	}
1467	# endif	1375	# endif
1468		1376
		1377	# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1469	XImage *result = NULL;	1378	XImage *result = NULL;
1470		1379
1471	if (background_flags && (flags & isInvalid))	1380	if (background_flags && (flags & isInvalid))
1472	{	1381	{
1473	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);	1382	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1474	}	1383	}
1475		1384
1476	if (result)	1385	if (result)
1477	{	1386	{
1478	# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1479	/* our own client-side tinting */	1387	/* our own client-side tinting */
1480	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1388	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1481	{	1389	{
1482	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1390	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1483	if (flags & tintSet)	1391	if (flags & tintSet)
1484	tint.get (c);	1392	tint.get (c);
1485	ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);	1393	ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1486	}	1394	}
1487	# endif
1488		1395
1489	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1396	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1490		1397
1491	if (gc)	1398	if (gc)
1492	{	1399	{
…		…
1496	flags = flags & ~isInvalid;	1403	flags = flags & ~isInvalid;
1497	}	1404	}
1498		1405
1499	XDestroyImage (result);	1406	XDestroyImage (result);
1500	}	1407	}
		1408	# endif
1501		1409
1502	if (flags & isInvalid)	1410	if (flags & isInvalid)
1503	{	1411	{
1504	if (pixmap != None)	1412	if (pixmap != None)
1505	{	1413	{
…		…
1517		1425
1518	void	1426	void
1519	bgPixmap_t::set_target (rxvt_term *new_target)	1427	bgPixmap_t::set_target (rxvt_term *new_target)
1520	{	1428	{
1521	target = new_target;	1429	target = new_target;
		1430
		1431	flags &= ~(HAS_RENDER \| HAS_RENDER_CONV);
		1432	#if XRENDER
		1433	int major, minor;
		1434	if (XRenderQueryVersion (target->dpy, &major, &minor))
		1435	flags \|= HAS_RENDER;
		1436	XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
		1437	if (filters)
		1438	{
		1439	for (int i = 0; i < filters->nfilter; i++)
		1440	if (!strcmp (filters->filter[i], FilterConvolution))
		1441	flags \|= HAS_RENDER_CONV;
		1442
		1443	XFree (filters);
		1444	}
		1445	#endif
1522	}	1446	}
1523		1447
1524	void	1448	void
1525	bgPixmap_t::apply ()	1449	bgPixmap_t::apply ()
1526	{	1450	{
…		…
1575	flags \|= hasChanged;	1499	flags \|= hasChanged;
1576	}	1500	}
1577		1501
1578	#endif /* HAVE_BG_PIXMAP */	1502	#endif /* HAVE_BG_PIXMAP */
1579		1503
1580	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER	1504	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1581	/* taken from aterm-0.4.2 */	1505	/* taken from aterm-0.4.2 */
1582		1506
1583	static void	1507	static void
1584	ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm)	1508	ShadeXImage(Visual visual, XImage srcImage, int shade, const rgba &c)
1585	{	1509	{
1586	int sh_r, sh_g, sh_b;	1510	int sh_r, sh_g, sh_b;
1587	uint32_t mask_r, mask_g, mask_b;	1511	uint32_t mask_r, mask_g, mask_b;
1588	uint32_t lookup, lookup_r, lookup_g, lookup_b;	1512	uint32_t lookup, lookup_r, lookup_g, lookup_b;
1589	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	1513	rgba low;
1590	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	1514	rgba high;
1591	int i;	1515	int i;
1592	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;	1516	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1593		1517
1594	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;	1518	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;
1595		1519
…		…
1660	/* prepare limits for color transformation (each channel is handled separately) */	1584	/* prepare limits for color transformation (each channel is handled separately) */
1661	if (shade > 100)	1585	if (shade > 100)
1662	{	1586	{
1663	shade = 200 - shade;	1587	shade = 200 - shade;
1664		1588
1665	lower_lim_r = 65535-rm;	1589	high.r = (65535 - c.r) * shade / 100;
1666	lower_lim_g = 65535-gm;	1590	high.g = (65535 - c.g) * shade / 100;
1667	lower_lim_b = 65535-bm;	1591	high.b = (65535 - c.b) * shade / 100;
1668		1592
1669	lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);	1593	low.r = 65535 - high.r;
1670	lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);	1594	low.g = 65535 - high.g;
1671	lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);	1595	low.b = 65535 - high.b;
1672
1673	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1674	}	1596	}
1675	else	1597	else
1676	{	1598	{
		1599	high.r = c.r * shade / 100;
		1600	high.g = c.g * shade / 100;
		1601	high.b = c.b * shade / 100;
1677		1602
1678	lower_lim_r = lower_lim_g = lower_lim_b = 0;	1603	low.r = low.g = low.b = 0;
1679
1680	upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1681	upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1682	upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1683	}	1604	}
1684		1605
1685	/* fill our lookup tables */	1606	/* fill our lookup tables */
1686	for (i = 0; i <= mask_r>>sh_r; i++)	1607	for (i = 0; i <= mask_r>>sh_r; i++)
1687	{	1608	{
1688	uint32_t tmp;	1609	uint32_t tmp;
1689	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));	1610	tmp = i * high.r;
1690	tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);	1611	tmp += (mask_r>>sh_r) * low.r;
1691	lookup_r[i] = (tmp/65535)<<sh_r;	1612	lookup_r[i] = (tmp/65535)<<sh_r;
1692	}	1613	}
1693	for (i = 0; i <= mask_g>>sh_g; i++)	1614	for (i = 0; i <= mask_g>>sh_g; i++)
1694	{	1615	{
1695	uint32_t tmp;	1616	uint32_t tmp;
1696	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));	1617	tmp = i * high.g;
1697	tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);	1618	tmp += (mask_g>>sh_g) * low.g;
1698	lookup_g[i] = (tmp/65535)<<sh_g;	1619	lookup_g[i] = (tmp/65535)<<sh_g;
1699	}	1620	}
1700	for (i = 0; i <= mask_b>>sh_b; i++)	1621	for (i = 0; i <= mask_b>>sh_b; i++)
1701	{	1622	{
1702	uint32_t tmp;	1623	uint32_t tmp;
1703	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));	1624	tmp = i * high.b;
1704	tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);	1625	tmp += (mask_b>>sh_b) * low.b;
1705	lookup_b[i] = (tmp/65535)<<sh_b;	1626	lookup_b[i] = (tmp/65535)<<sh_b;
1706	}	1627	}
1707		1628
1708	/* apply table to input image (replacing colors by newly calculated ones) */	1629	/* apply table to input image (replacing colors by newly calculated ones) */
1709	if (srcImage->bits_per_pixel == 32	1630	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.107 by sf-exg, Mon Nov 1 14:29:33 2010 UTC vs. Revision 1.121 by sf-exg, Fri Nov 19 23:29:30 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.107 by sf-exg, Mon Nov 1 14:29:33 2010 UTC vs.
Revision 1.121 by sf-exg, Fri Nov 19 23:29:30 2010 UTC