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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.2 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.49 by sf-exg, Tue Aug 31 15:12:49 2010 UTC

…		…
1	/----------------------------------------------------------------------	1	/----------------------------------------------------------------------
2	* File: background.C - former xmp.C	2	* File: background.C - former xpm.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
7	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
8	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
9	* Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
10	* Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>	7	* Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
11	*	8	*
12	* This program is free software; you can redistribute it and/or modify	9	* This program is free software; you can redistribute it and/or modify
13	* it under the terms of the GNU General Public License as published by	10	* it under the terms of the GNU General Public License as published by
14	* the Free Software Foundation; either version 2 of the License, or	11	* the Free Software Foundation; either version 2 of the License, or
28	#include "rxvt.h" /* NECESSARY */	25	#include "rxvt.h" /* NECESSARY */
29		26
30	#define DO_TIMING_TEST 0	27	#define DO_TIMING_TEST 0
31		28
32	#if DO_TIMING_TEST	29	#if DO_TIMING_TEST
		30	# include <sys/time.h>
33	#define TIMING_TEST_START(id) \	31	#define TIMING_TEST_START(id) \
34	struct timeval timing_test_##id##_stv;\	32	struct timeval timing_test_##id##_stv; \
35	gettimeofday (&timing_test_##id##_stv, NULL);	33	gettimeofday (&timing_test_##id##_stv, NULL);
36		34
37	#define TIMING_TEST_PRINT_RESULT(id) \	35	#define TIMING_TEST_PRINT_RESULT(id) \
38	do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\	36	do { \
		37	struct timeval tv; \
		38	gettimeofday (&tv, NULL); \
		39	tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
39	fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\	40	fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
40	tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0)	41	tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
		42	} while (0)
41		43
42	#else	44	#else
43	#define TIMING_TEST_START(id) do{}while (0)	45	#define TIMING_TEST_START(id) do {} while (0)
44	#define TIMING_TEST_PRINT_RESULT(id) do{}while (0)	46	#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
45	#endif	47	#endif
46		48
47	/*	49	/*
48	* Pixmap geometry string interpretation :	50	* Pixmap geometry string interpretation :
49	* Each geometry string contains zero or one scale/position	51	* Each geometry string contains zero or one scale/position
50	* adjustment and may optionally be followed by a colon and one or more	52	* adjustment and may optionally be followed by a colon and one or more
51	* colon-delimited pixmap operations.	53	* colon-delimited pixmap operations.
52	* The following table shows the valid geometry strings and their	54	* The following table shows the valid geometry strings and their
53	* affects on the background image :	55	* effects on the background image :
54	*	56	*
55	* WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.	57	* WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
56	* W and H are percentages of the terminal window size.	58	* W and H are percentages of the terminal window size.
57	* X and Y are also percentages; e.g., +50+50 centers	59	* X and Y are also percentages; e.g., +50+50 centers
58	* the image in the window.	60	* the image in the window.
…		…
87	* scale Scale both up and down	89	* scale Scale both up and down
88	* auto Same as 100x100+50+50	90	* auto Same as 100x100+50+50
89	*/	91	*/
90		92
91	#ifdef HAVE_BG_PIXMAP	93	#ifdef HAVE_BG_PIXMAP
92	bgPixmap_t::bgPixmap_t()	94	bgPixmap_t::bgPixmap_t ()
93	{	95	{
		96	// this is basically redundant as bgPixmap_t is only used in
		97	// zero_initialised-derived structs
94	#ifdef HAVE_AFTERIMAGE	98	#ifdef HAVE_AFTERIMAGE
95	original_asim = NULL;	99	original_asim = NULL;
96	#endif	100	#endif
97	#ifdef BG_IMAGE_FROM_FILE	101	#ifdef BG_IMAGE_FROM_FILE
		102	have_image = false;
98	h_scale = v_scale = 0;	103	h_scale = v_scale = 0;
99	h_align = v_align = 0;	104	h_align = v_align = 0;
100	#endif	105	#endif
101	flags = 0;	106	flags = 0;
102	pixmap = None;	107	pixmap = None;
		108	valid_since = invalid_since = 0;
		109	target = 0;
103	}	110	}
104		111
		112	void
		113	bgPixmap_t::destroy ()
		114	{
		115	#ifdef HAVE_AFTERIMAGE
		116	if (original_asim)
		117	safe_asimage_destroy (original_asim);
		118	#endif
		119
		120	if (pixmap && target)
		121	XFreePixmap (target->dpy, pixmap);
		122	}
105		123
106	bool	124	bool
107	bgPixmap_t::window_size_sensitive ()	125	bgPixmap_t::window_size_sensitive ()
108	{	126	{
109	# ifdef BG_IMAGE_FROM_FILE
110	# ifdef HAVE_AFTERIMAGE
111	if (original_asim != NULL)
112	# endif
113	{
114	if (h_scale != 0 \|\| v_scale != 0
115	\|\| h_align != 0 \|\| v_align != 0)
116	return true;
117	}
118	# endif
119	# ifdef ENABLE_TRANSPARENCY	127	# ifdef ENABLE_TRANSPARENCY
120	if (flags & isTransparent)	128	if (flags & isTransparent)
121	return true;	129	return true;
122	# endif	130	# endif
		131
		132	# ifdef BG_IMAGE_FROM_FILE
		133	if (have_image)
		134	{
		135	if (h_scale != 0 \|\| v_scale != 0
		136	\|\| h_align != 0 \|\| v_align != 0)
		137	return true;
		138	}
		139	# endif
		140
123	return false;	141	return false;
124	}	142	}
125		143
		144	bool
		145	bgPixmap_t::window_position_sensitive ()
		146	{
		147	# ifdef ENABLE_TRANSPARENCY
		148	if (flags & isTransparent)
		149	return true;
		150	# endif
		151
		152	# ifdef BG_IMAGE_FROM_FILE
		153	if (have_image)
		154	{
		155	if (h_align == rootAlign \|\| v_align == rootAlign)
		156	return true;
		157	}
		158	# endif
		159
		160	return false;
		161	};
		162
126	bool bgPixmap_t::need_client_side_rendering ()	163	bool bgPixmap_t::need_client_side_rendering ()
127	{	164	{
128	# ifdef HAVE_AFTERIMAGE	165	# ifdef HAVE_AFTERIMAGE
129	if (original_asim != NULL)	166	if (original_asim)
130	return true;	167	return true;
131	# endif	168	# endif
132	# ifdef ENABLE_TRANSPARENCY	169	# ifdef ENABLE_TRANSPARENCY
133	if (flags & isTransparent)	170	if (flags & isTransparent)
134	{	171	{
		172	# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
135	if (((flags & blurNeeded) && !(flags & blurServerSide))	173	if ((flags & blurNeeded) && !(flags & blurServerSide))
		174	return true;
		175	# endif
136	\|\| ((flags & tintNeeded) && !(flags & tintServerSide)))	176	if ((flags & tintNeeded) && !(flags & tintServerSide))
137	return true;	177	return true;
138	}	178	}
139	# endif	179	# endif
140	return false;	180	return false;
141	}	181	}
142		182
…		…
160	static inline bool	200	static inline bool
161	check_set_align_value (int geom_flags, int flag, int &align, int new_value)	201	check_set_align_value (int geom_flags, int flag, int &align, int new_value)
162	{	202	{
163	if (geom_flags & flag)	203	if (geom_flags & flag)
164	{	204	{
		205	if (new_value != bgPixmap_t::rootAlign)
		206	{
165	if (new_value < -100)	207	if (new_value < -100)
166	new_value = -100;	208	new_value = -100;
167	else if (new_value > 200)	209	else if (new_value > 200)
168	new_value = 200;	210	new_value = 200;
		211	}
169	if (new_value != align)	212	if (new_value != align)
170	{	213	{
171	align = new_value;	214	align = new_value;
172	return true;	215	return true;
173	}	216	}
…		…
217	int geom_flags = 0, changed = 0;	260	int geom_flags = 0, changed = 0;
218	int x = 0, y = 0;	261	int x = 0, y = 0;
219	unsigned int w = 0, h = 0;	262	unsigned int w = 0, h = 0;
220	unsigned int n;	263	unsigned int n;
221	unsigned long new_flags = (flags & (~geometryFlags));	264	unsigned long new_flags = (flags & (~geometryFlags));
222	char *p;	265	const char *p;
223	# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */	266	# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
224		267
225	if (geom == NULL)	268	if (geom == NULL)
226	return false;	269	return false;
227		270
228	char str[MAXLEN_GEOM];	271	char str[MAXLEN_GEOM];
…		…
235	if (n < MAXLEN_GEOM)	278	if (n < MAXLEN_GEOM)
236	{	279	{
237	char *ops;	280	char *ops;
238	new_flags \|= geometrySet;	281	new_flags \|= geometrySet;
239		282
240	strncpy (str, geom, n);	283	memcpy (str, geom, n);
241	str[n] = '\0';	284	str[n] = '\0';
242	if (str[0] == ':')	285	if (str[0] == ':')
243	ops = &str[0];	286	ops = &str[0];
244	else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))	287	else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
245	ops = &str[0];	288	ops = &str[0];
…		…
265	y = x;	308	y = x;
266	geom_flags \|= YValue;	309	geom_flags \|= YValue;
267	}	310	}
268		311
269	if (flags & geometrySet)	312	if (flags & geometrySet)
		313	{
270	{/* new geometry is an adjustment to the old one ! */	314	/* new geometry is an adjustment to the old one ! */
271	if ((geom_flags & WidthValue) && (geom_flags & HeightValue))	315	if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
272	{	316	{
273	if (w == 0 && h != 0)	317	if (w == 0 && h != 0)
274	{	318	{
275	w = h_scale;	319	w = h_scale;
…		…
291	}	335	}
292	}	336	}
293	else /* setting up geometry from scratch */	337	else /* setting up geometry from scratch */
294	{	338	{
295	if (!(geom_flags & XValue))	339	if (!(geom_flags & XValue))
		340	{
296	{/* use default geometry - centered */	341	/* use default geometry - centered */
297	x = y = defaultAlign;	342	x = y = defaultAlign;
298	}	343	}
299	else if (!(geom_flags & YValue))	344	else if (!(geom_flags & YValue))
300	y = x;	345	y = x;
301		346
302	if ((geom_flags & (WidthValue\|HeightValue)) == 0)	347	if ((geom_flags & (WidthValue\|HeightValue)) == 0)
		348	{
303	{/* use default geometry - scaled */	349	/* use default geometry - scaled */
304	w = h = defaultScale;	350	w = h = defaultScale;
305	}	351	}
306	else if (geom_flags & WidthValue)	352	else if (geom_flags & WidthValue)
307	{	353	{
308	if (!(geom_flags & HeightValue))	354	if (!(geom_flags & HeightValue))
…		…
311	else	357	else
312	w = h;	358	w = h;
313	}	359	}
314	} /* done parsing geometry string */	360	} /* done parsing geometry string */
315	else if (!(flags & geometrySet))	361	else if (!(flags & geometrySet))
		362	{
316	{ /* default geometry - scaled and centered */	363	/* default geometry - scaled and centered */
317	x = y = defaultAlign;	364	x = y = defaultAlign;
318	w = h = defaultScale;	365	w = h = defaultScale;
319	}	366	}
320		367
321	if (!(flags & geometrySet))	368	if (!(flags & geometrySet))
322	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	369	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
323		370
324	if (ops)	371	if (ops)
325	{	372	{
326	while (*ops)	373	while (*ops)
327	{	374	{
328	while (ops == ':' \|\| isspace(ops)) ++ops;	375	while (ops == ':' \|\| isspace(ops)) ++ops;
		376
329	# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0)	377	# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
330	if (CHECK_GEOM_OPS("tile"))	378	if (CHECK_GEOM_OPS ("tile"))
331	{	379	{
332	w = h = 0;	380	w = h = noScale;
333	geom_flags \|= WidthValue\|HeightValue;	381	geom_flags \|= WidthValue\|HeightValue;
334	}	382	}
335	else if (CHECK_GEOM_OPS("propscale"))	383	else if (CHECK_GEOM_OPS ("propscale"))
336	{	384	{
337	if (w == 0 && h == 0)	385	if (w == 0 && h == 0)
338	{	386	{
339	w = 100;	387	w = windowScale;
340	geom_flags \|= WidthValue;	388	geom_flags \|= WidthValue;
341	}	389	}
342	new_flags \|= propScale;	390	new_flags \|= propScale;
343	}	391	}
344	else if (CHECK_GEOM_OPS("hscale"))	392	else if (CHECK_GEOM_OPS ("hscale"))
345	{	393	{
346	if (w == 0)	394	if (w == 0) w = windowScale;
347	w = 100;	395
348	h = 0;	396	h = noScale;
349	geom_flags \|= WidthValue\|HeightValue;	397	geom_flags \|= WidthValue\|HeightValue;
350	}	398	}
351	else if (CHECK_GEOM_OPS("vscale"))	399	else if (CHECK_GEOM_OPS ("vscale"))
352	{	400	{
353	if (h == 0)	401	if (h == 0) h = windowScale;
354	h = 100;	402
355	w = 0;	403	w = noScale;
356	geom_flags \|= WidthValue\|HeightValue;	404	geom_flags \|= WidthValue\|HeightValue;
357	}	405	}
358	else if (CHECK_GEOM_OPS("scale"))	406	else if (CHECK_GEOM_OPS ("scale"))
359	{	407	{
360	if (h == 0)	408	if (h == 0) h = windowScale;
361	h = 100;
362	if (w == 0)	409	if (w == 0) w = windowScale;
363	w = 100;	410
364	geom_flags \|= WidthValue\|HeightValue;	411	geom_flags \|= WidthValue\|HeightValue;
365	}	412	}
366	else if (CHECK_GEOM_OPS("auto"))	413	else if (CHECK_GEOM_OPS ("auto"))
367	{	414	{
368	w = h = 100;	415	w = h = windowScale;
369	x = y = 50;	416	x = y = centerAlign;
370	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	417	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
371	}	418	}
		419	else if (CHECK_GEOM_OPS ("root"))
		420	{
		421	w = h = noScale;
		422	x = y = rootAlign;
		423	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
		424	}
372	# undef CHECK_GEOM_OPS	425	# undef CHECK_GEOM_OPS
		426
373	while (ops != ':' && ops != '\0') ++ops;	427	while (ops != ':' && ops != '\0') ++ops;
374	} /* done parsing ops */	428	} /* done parsing ops */
375	}	429	}
376		430
377	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w))	431	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
378	++changed;
379	if (check_set_scale_value (geom_flags, HeightValue, v_scale, h))	432	if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
380	++changed;
381	if (check_set_align_value (geom_flags, XValue, h_align, x))	433	if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
382	++changed;
383	if (check_set_align_value (geom_flags, YValue, v_align, y))	434	if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
384	++changed;
385	}	435	}
386		436
387	if (new_flags != flags)	437	if (new_flags != flags)
388	{	438	{
389	flags = new_flags;	439	flags = new_flags;
390	changed++;	440	changed++;
391	}	441	}
		442
392	//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",	443	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
393	// flags, h_scale, v_scale, h_align, v_align);	444	// flags, h_scale, v_scale, h_align, v_align);
394	return (changed > 0);	445	return (changed > 0);
395	}	446	}
396		447
397	# ifdef HAVE_AFTERIMAGE	448	# ifdef HAVE_AFTERIMAGE
398	bool	449	bool
399	bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)	450	bgPixmap_t::render_asim (unsigned long background_flags)
400	{	451	{
401	if (target == NULL)	452	if (target == NULL)
402	return false;	453	return false;
403		454
		455	target->init_asv ();
		456
		457	ASImage *background = NULL;
		458	ARGB32 background_tint = TINT_LEAVE_SAME;
		459
		460	# ifdef ENABLE_TRANSPARENCY
		461	if (background_flags)
		462	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
		463
		464	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
		465	{
		466	ShadingInfo as_shade;
		467	as_shade.shading = (shade == 0) ? 100 : shade;
		468
		469	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
		470	if (flags & tintSet)
		471	tint.get (c);
		472	as_shade.tintColor.red = c.r;
		473	as_shade.tintColor.green = c.g;
		474	as_shade.tintColor.blue = c.b;
		475
		476	background_tint = shading2tint32 (&as_shade);
		477	}
		478
		479	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
		480	{
		481	ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
		482	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
		483	100, ASIMAGE_QUALITY_DEFAULT);
		484	if (tmp)
		485	{
		486	destroy_asimage (&background);
		487	background = tmp;
		488	}
		489	}
		490	# endif
		491
		492	ASImage *result = 0;
		493
404	int target_width = (int)target->szHint.width;	494	int target_width = target->szHint.width;
405	int target_height = (int)target->szHint.height;	495	int target_height = target->szHint.height;
406	int new_pmap_width = target_width, new_pmap_height = target_height;	496	int new_pmap_width = target_width;
407	ASImage *result = NULL;	497	int new_pmap_height = target_height;
408		498
409	int x = 0;	499	int x = 0;
410	int y = 0;	500	int y = 0;
411	int w = h_scale * target_width / 100;	501	int w = h_scale * target_width / 100;
412	int h = v_scale * target_height / 100;	502	int h = v_scale * target_height / 100;
413		503
414	TIMING_TEST_START (asim);	504	TIMING_TEST_START (asim);
415		505
416	if (original_asim)	506	if (original_asim)
417	{	507	{
		508	if (h_align == rootAlign \|\| v_align == rootAlign)
		509	{
		510	target->get_window_origin (x, y);
		511	x = -x;
		512	y = -y;
		513	}
		514
		515	if (h_align != rootAlign)
418	x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);	516	x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
		517
		518	if (v_align != rootAlign)
419	y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);	519	y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
420	}	520	}
421		521
422	if (original_asim == NULL	522	if (!original_asim
423	\|\| x >= target_width	523	\|\| x >= target_width
424	\|\| y >= target_height	524	\|\| y >= target_height
425	\|\| (w > 0 && x + w <= 0)	525	\|\| (w > 0 && x + w <= 0)
426	\|\| (h > 0 && y + h <= 0))	526	\|\| (h > 0 && y + h <= 0))
427	{	527	{
428	if (background)	528	if (background)
429	{	529	{
430	new_pmap_width = background->width;	530	new_pmap_width = background->width;
431	new_pmap_height = background->height;	531	new_pmap_height = background->height;
432	result = background;	532	result = background;
		533
433	if (background_tint != TINT_LEAVE_SAME)	534	if (background_tint != TINT_LEAVE_SAME)
434	{	535	{
435	ASImage* tmp = tile_asimage (target->asv, background, 0, 0,	536	ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
436	target_width, target_height, background_tint,	537	target_width, target_height, background_tint,
437	ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);	538	ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
438	if (tmp)	539	if (tmp)
439	result = tmp;	540	result = tmp;
440	}	541	}
…		…
443	new_pmap_width = new_pmap_height = 0;	544	new_pmap_width = new_pmap_height = 0;
444	}	545	}
445	else	546	else
446	{	547	{
447	result = original_asim;	548	result = original_asim;
		549
448	if ((w > 0 && w != original_asim->width)	550	if ((w > 0 && w != original_asim->width)
449	\|\| (h > 0 && h != original_asim->height))	551	\|\| (h > 0 && h != original_asim->height))
450	{	552	{
451	result = scale_asimage (target->asv, original_asim,	553	result = scale_asimage (target->asv, original_asim,
452	w > 0 ? w : original_asim->width,	554	w > 0 ? w : original_asim->width,
453	h > 0 ? h : original_asim->height,	555	h > 0 ? h : original_asim->height,
454	background ? ASA_ASImage : ASA_XImage,	556	background ? ASA_ASImage : ASA_XImage,
455	100, ASIMAGE_QUALITY_DEFAULT);	557	100, ASIMAGE_QUALITY_DEFAULT);
456	}	558	}
		559
457	if (background == NULL)	560	if (background == NULL)
		561	{
458	{/* if tiling - pixmap has to be sized exactly as the image */	562	/* if tiling - pixmap has to be sized exactly as the image,
		563	but there is no need to make it bigger than the window! */
459	if (h_scale == 0)	564	if (h_scale == 0)
460	new_pmap_width = result->width;	565	new_pmap_width = min (result->width, target_width);
461	if (v_scale == 0)	566	if (v_scale == 0)
462	new_pmap_height = result->height;	567	new_pmap_height = min (result->height, target_height);
463	/* we also need to tile our image in one or both directions */	568	/* we also need to tile our image in one or both directions */
464	if (h_scale == 0 \|\| v_scale == 0)	569	if (h_scale == 0 \|\| v_scale == 0)
465	{	570	{
466	ASImage *tmp = tile_asimage (target->asv, result,	571	ASImage *tmp = tile_asimage (target->asv, result,
467	(h_scale > 0) ? 0 : (int)result->width - x,	572	(h_scale > 0) ? 0 : (int)result->width - x,
468	(v_scale > 0) ? 0 : (int)result->height - y,	573	(v_scale > 0) ? 0 : (int)result->height - y,
		574	new_pmap_width,
469	result->width, result->height,	575	new_pmap_height,
470	TINT_LEAVE_SAME, ASA_XImage,	576	TINT_LEAVE_SAME, ASA_XImage,
471	100, ASIMAGE_QUALITY_DEFAULT);	577	100, ASIMAGE_QUALITY_DEFAULT);
472	if (tmp)	578	if (tmp)
473	{	579	{
474	if (result != original_asim)	580	if (result != original_asim)
475	destroy_asimage (&result);	581	destroy_asimage (&result);
		582
476	result = tmp;	583	result = tmp;
477	}	584	}
478	}	585	}
479	}	586	}
480	else	587	else
		588	{
481	{/* if blending background and image - pixmap has to be sized same as target window */	589	/* if blending background and image - pixmap has to be sized same as target window */
482	ASImageLayer *layers = create_image_layers (2);	590	ASImageLayer *layers = create_image_layers (2);
483	ASImage *merged_im = NULL;
484		591
485	layers[0].im = background;	592	layers[0].im = background;
486	layers[0].clip_width = target_width;	593	layers[0].clip_width = target_width;
487	layers[0].clip_height = target_height;	594	layers[0].clip_height = target_height;
488	layers[0].tint = background_tint;	595	layers[0].tint = background_tint;
489	layers[1].im = result;	596	layers[1].im = result;
		597
490	if (w <= 0)	598	if (w <= 0)
		599	{
491	{/* tile horizontally */	600	/* tile horizontally */
492	while (x > 0) x -= (int)result->width;	601	while (x > 0) x -= (int)result->width;
493	layers[1].dst_x = x;	602	layers[1].dst_x = x;
494	layers[1].clip_width = result->width+target_width;	603	layers[1].clip_width = result->width+target_width;
495	}	604	}
496	else	605	else
		606	{
497	{/* clip horizontally */	607	/* clip horizontally */
498	layers[1].dst_x = x;	608	layers[1].dst_x = x;
499	layers[1].clip_width = result->width;	609	layers[1].clip_width = result->width;
500	}	610	}
		611
501	if (h <= 0)	612	if (h <= 0)
502	{	613	{
503	while (y > 0) y -= (int)result->height;	614	while (y > 0) y -= (int)result->height;
504	layers[1].dst_y = y;	615	layers[1].dst_y = y;
505	layers[1].clip_height = result->height + target_height;	616	layers[1].clip_height = result->height + target_height;
…		…
507	else	618	else
508	{	619	{
509	layers[1].dst_y = y;	620	layers[1].dst_y = y;
510	layers[1].clip_height = result->height;	621	layers[1].clip_height = result->height;
511	}	622	}
		623
512	if (target->rs[Rs_blendtype])	624	if (target->rs[Rs_blendtype])
513	{	625	{
514	layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);	626	layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
515	if (layers[1].merge_scanlines == NULL)	627	if (layers[1].merge_scanlines == NULL)
516	layers[1].merge_scanlines = alphablend_scanlines;	628	layers[1].merge_scanlines = alphablend_scanlines;
517	}	629	}
		630
518	ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,	631	ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
519	ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);	632	ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
		633
520	if (tmp)	634	if (tmp)
521	{	635	{
522	if (result != original_asim)	636	if (result != original_asim)
523	destroy_asimage (&result);	637	destroy_asimage (&result);
		638
524	result = tmp;	639	result = tmp;
525	}	640	}
		641
526	free (layers);	642	free (layers);
527	}	643	}
528	}	644	}
529	TIMING_TEST_PRINT_RESULT (asim);	645	TIMING_TEST_PRINT_RESULT (asim);
530		646
…		…
551	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);	667	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
552	pmap_width = new_pmap_width;	668	pmap_width = new_pmap_width;
553	pmap_height = new_pmap_height;	669	pmap_height = new_pmap_height;
554	pmap_depth = target->depth;	670	pmap_depth = target->depth;
555	}	671	}
556	/* fill with background color ( if result's not completely overlapping it)*/	672	/* fill with background color (if result's not completely overlapping it) */
557	gcv.foreground = target->pix_colors[Color_bg];	673	gcv.foreground = target->pix_colors[Color_bg];
558	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);	674	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
559		675
560	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;	676	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
561	int dst_width = result->width, dst_height = result->height;	677	int dst_width = result->width, dst_height = result->height;
562	if (background == NULL)	678	if (background == NULL)
563	{	679	{
564	if (h_scale > 0)
565	src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width);	680	if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
566	if (v_scale > 0)
567	src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);	681	if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
568		682
569	if (dst_x > 0 \|\| dst_y > 0	683	if (dst_x > 0 \|\| dst_y > 0
570	\|\| dst_x + dst_width < new_pmap_width	684	\|\| dst_x + dst_width < new_pmap_width
571	\|\| dst_y + dst_height < new_pmap_height)	685	\|\| dst_y + dst_height < new_pmap_height)
572	{
573	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);	686	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
574	}
575	}	687	}
576		688
577	/* put result on pixmap */	689	/* put result on pixmap */
578	if (dst_x < new_pmap_width && dst_y < new_pmap_height)	690	if (dst_x < new_pmap_width && dst_y < new_pmap_height)
579	asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);	691	asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
580		692
581	if (result != background && result != original_asim)	693	if (result != background && result != original_asim)
582	destroy_asimage (&result);	694	destroy_asimage (&result);
583		695
584	XFreeGC (target->dpy, gc);	696	XFreeGC (target->dpy, gc);
585	TIMING_TEST_PRINT_RESULT (asim);	697	TIMING_TEST_PRINT_RESULT (asim);
586	}	698	}
587		699
		700	if (background)
		701	destroy_asimage (&background);
		702
588	return true;	703	return true;
589	}	704	}
590	# endif /* HAVE_AFTERIMAGE */	705	# endif /* HAVE_AFTERIMAGE */
591		706
592	bool	707	bool
593	bgPixmap_t::set_file (const char *file)	708	bgPixmap_t::set_file (const char *file)
594	{	709	{
595	char *f;
596
597	assert (file != NULL);	710	assert (file);
598		711
599	if (*file != '\0')	712	if (*file)
600	{	713	{
		714	if (const char *p = strchr (file, ';'))
		715	{
		716	size_t len = p - file;
		717	char *f = rxvt_temp_buf<char> (len + 1);
		718	memcpy (f, file, len);
		719	f[len] = '\0';
		720	file = f;
		721	}
		722
601	# ifdef HAVE_AFTERIMAGE	723	# ifdef HAVE_AFTERIMAGE
602	if (target->asimman == NULL)	724	if (!target->asimman)
603	target->asimman = create_generic_imageman (target->rs[Rs_path]);	725	target->asimman = create_generic_imageman (target->rs[Rs_path]);
604	if ((f = strchr (file, ';')) == NULL)
605	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);	726	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
606	else	727	if (original_asim)
607	{	728	have_image = true;
608	size_t len = f - file;	729	return have_image;
609	f = (char *)malloc (len + 1);
610	strncpy (f, file, len);
611	f[len] = '\0';
612	original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
613	free (f);
614	}
615	return (original_asim != NULL);
616	# endif	730	# endif
617	}	731	}
		732
618	return false;	733	return false;
619	}	734	}
620		735
621	# endif /* BG_IMAGE_FROM_FILE */	736	# endif /* BG_IMAGE_FROM_FILE */
622		737
623	# ifdef ENABLE_TRANSPARENCY	738	# ifdef ENABLE_TRANSPARENCY
624	bool	739	bool
625	bgPixmap_t::set_transparent ()	740	bgPixmap_t::set_transparent ()
626	{	741	{
627	if (!(flags & isTransparent))	742	if (!(flags & isTransparent))
628	{	743	{
629	flags \|= isTransparent;	744	flags \|= isTransparent;
630	return true;	745	return true;
631	}	746	}
		747
632	return false;	748	return false;
633	}	749	}
634		750
635	bool	751	bool
636	bgPixmap_t::set_blur_radius (const char *geom)	752	bgPixmap_t::set_blur_radius (const char *geom)
…		…
654	if (v_blurRadius != vr)	770	if (v_blurRadius != vr)
655	{	771	{
656	++changed;	772	++changed;
657	v_blurRadius = vr;	773	v_blurRadius = vr;
658	}	774	}
659		775
660	if (v_blurRadius == 0 && h_blurRadius == 0)	776	if (v_blurRadius == 0 && h_blurRadius == 0)
661	flags &= ~blurNeeded;	777	flags &= ~blurNeeded;
662	else	778	else
663	flags \|= blurNeeded;	779	flags \|= blurNeeded;
664		780
…		…
668	static inline unsigned long	784	static inline unsigned long
669	compute_tint_shade_flags (rxvt_color *tint, int shade)	785	compute_tint_shade_flags (rxvt_color *tint, int shade)
670	{	786	{
671	unsigned long flags = 0;	787	unsigned long flags = 0;
672	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	788	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
		789	bool has_shade = (shade > 0 && shade < 100) \|\| (shade > 100 && shade < 200);
673		790
674	if (tint)	791	if (tint)
675	{	792	{
676	tint->get (c);	793	tint->get (c);
677	# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 \|\| (cmp) >= 0x00f700)	794	# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 \|\| (cmp) >= 0x00f700)
678	if (IS_COMPONENT_WHOLESOME (c.r)	795	if (!has_shade && IS_COMPONENT_WHOLESOME (c.r)
679	&& IS_COMPONENT_WHOLESOME (c.g)	796	&& IS_COMPONENT_WHOLESOME (c.g)
680	&& IS_COMPONENT_WHOLESOME (c.b))	797	&& IS_COMPONENT_WHOLESOME (c.b))
681	flags \|= bgPixmap_t::tintWholesome;	798	flags \|= bgPixmap_t::tintWholesome;
682	# undef IS_COMPONENT_WHOLESOME	799	# undef IS_COMPONENT_WHOLESOME
683	}	800	}
684		801
685	if ((shade > 0 && shade < 100) \|\| (shade > 100 && shade < 200))	802	if (has_shade)
686	flags \|= bgPixmap_t::tintNeeded;	803	flags \|= bgPixmap_t::tintNeeded;
687	else if (tint)	804	else if (tint)
688	{	805	{
689	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)	806	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)
690	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))	807	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))
691	{	808	{
692	flags \|= bgPixmap_t::tintNeeded;	809	flags \|= bgPixmap_t::tintNeeded;
693	}	810	}
694	}
695		811	}
		812
696	if (flags & bgPixmap_t::tintNeeded)	813	if (flags & bgPixmap_t::tintNeeded)
697	{	814	{
698	if (flags & bgPixmap_t::tintWholesome)	815	if (flags & bgPixmap_t::tintWholesome)
699	flags \|= bgPixmap_t::tintServerSide;	816	flags \|= bgPixmap_t::tintServerSide;
		817	else
		818	{
700	#if XFT	819	#if XFT
701	flags \|= bgPixmap_t::tintServerSide;	820	flags \|= bgPixmap_t::tintServerSide;
702	#endif	821	#endif
		822	}
703	}	823	}
704		824
705	return flags;	825	return flags;
706	}	826	}
707		827
…		…
713	unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);	833	unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
714	tint = new_tint;	834	tint = new_tint;
715	flags = (flags & ~tintFlags) \| new_flags \| tintSet;	835	flags = (flags & ~tintFlags) \| new_flags \| tintSet;
716	return true;	836	return true;
717	}	837	}
		838
718	return false;	839	return false;
719	}	840	}
720		841
721	bool	842	bool
722	bgPixmap_t::unset_tint ()	843	bgPixmap_t::unset_tint ()
723	{	844	{
724	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);	845	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
725		846
726	if (new_flags != (flags & tintFlags))	847	if (new_flags != (flags & tintFlags))
727	{	848	{
728	flags = (flags&~tintFlags)\|new_flags;	849	flags = (flags&~tintFlags)\|new_flags;
729	return true;	850	return true;
730	}	851	}
		852
731	return false;	853	return false;
732	}	854	}
733		855
734	bool	856	bool
735	bgPixmap_t::set_shade (const char *shade_str)	857	bgPixmap_t::set_shade (const char *shade_str)
736	{	858	{
737	int new_shade = (shade_str) ? atoi (shade_str) : 0;	859	int new_shade = (shade_str) ? atoi (shade_str) : 0;
738		860
		861	if (new_shade < 0 && new_shade > -100)
		862	new_shade = 200 - (100 + new_shade);
739	if (new_shade == 100)	863	else if (new_shade == 100)
740	new_shade = 0;	864	new_shade = 0;
741		865
742	if (new_shade != shade)	866	if (new_shade != shade)
743	{	867	{
744	unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);	868	unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
745	shade = new_shade;	869	shade = new_shade;
746	flags = (flags & ~tintFlags) \| new_flags;	870	flags = (flags & (~tintFlags \| tintSet)) \| new_flags;
747	return true;	871	return true;
748	}	872	}
		873
749	return false;	874	return false;
750	}	875	}
751		876
752	/* make_transparency_pixmap()	877	/* make_transparency_pixmap()
753	* Builds a pixmap sized the same as terminal window, with depth same as the root window	878	* Builds a pixmap sized the same as terminal window, with depth same as the root window
754	* that pixmap contains tiled portion of the root pixmap that is supposed to be covered by	879	* that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
755	* our window.	880	* our window.
756	*/	881	*/
757	unsigned long	882	unsigned long
758	bgPixmap_t::make_transparency_pixmap ()	883	bgPixmap_t::make_transparency_pixmap ()
759	{	884	{
760	unsigned long result = 0;	885	unsigned long result = 0;
761		886
762	if (target == NULL)	887	if (target == NULL)
763	return 0;	888	return 0;
764		889
765	/* root dimentions may change from call to call - but Display structure should	890	/* root dimensions may change from call to call - but Display structure should
766	* be always up-to-date, so let's use it :	891	* be always up-to-date, so let's use it :
767	*/	892	*/
768	Window root = target->display->root;	893	Window root = target->display->root;
769	int screen = target->display->screen;	894	int screen = target->display->screen;
770	Display *dpy = target->dpy;	895	Display *dpy = target->dpy;
…		…
783	if (sx + window_width <= 0 \|\| sy + window_height <= 0	908	if (sx + window_width <= 0 \|\| sy + window_height <= 0
784	\|\| sx >= root_width \|\| sy >= root_height)	909	\|\| sx >= root_width \|\| sy >= root_height)
785	return 0;	910	return 0;
786		911
787	if (root_pixmap != None)	912	if (root_pixmap != None)
		913	{
788	{/* we want to validate the pixmap and get it's size at the same time : */	914	/* we want to validate the pixmap and get it's size at the same time : */
789	int junk;	915	int junk;
790	unsigned int ujunk;	916	unsigned int ujunk;
791	/* root pixmap may be bad - allow a error */	917	/* root pixmap may be bad - allow a error */
792	target->allowedxerror = -1;	918	target->allowedxerror = -1;
793		919
…		…
802		928
803	if (tiled_root_pmap == None) /* something really bad happened - abort */	929	if (tiled_root_pmap == None) /* something really bad happened - abort */
804	return 0;	930	return 0;
805		931
806	if (root_pixmap == None)	932	if (root_pixmap == None)
		933	{
807	{ /* use tricks to obtain the root background image :*/	934	/* use tricks to obtain the root background image :*/
808	/* we want to create Overrideredirect window overlapping out window	935	/* we want to create Overrideredirect window overlapping out window
809	with background type of Parent Relative and then grab it */	936	with background type of Parent Relative and then grab it */
810	XSetWindowAttributes attr;	937	XSetWindowAttributes attr;
811	Window src;	938	Window src;
812	bool success = false;	939	bool success = false;
813		940
814	attr.background_pixmap = ParentRelative;	941	attr.background_pixmap = ParentRelative;
815	attr.backing_store = Always;	942	attr.backing_store = Always;
816	attr.event_mask = ExposureMask;	943	attr.event_mask = ExposureMask;
817	attr.override_redirect = True;	944	attr.override_redirect = True;
818	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,	945	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
819	CopyFromParent, CopyFromParent, CopyFromParent,	946	CopyFromParent, CopyFromParent, CopyFromParent,
820	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,	947	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,
821	&attr);	948	&attr);
822		949
823	if (src != None)	950	if (src != None)
…		…
827	XGrabServer (dpy);	954	XGrabServer (dpy);
828	XMapRaised (dpy, src);	955	XMapRaised (dpy, src);
829	XSync (dpy, False);	956	XSync (dpy, False);
830		957
831	/* XSync should get window where it's properly exposed,	958	/* XSync should get window where it's properly exposed,
832	* but to be on the safe side - let's check for the actuall event to arrive : */	959	* but to be on the safe side - let's check for the actual event to arrive : */
833	while (XCheckWindowEvent (dpy, src, ExposureMask, &event))	960	while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
834	++ev_count;	961	++ev_count;
835		962
836	if (ev_count > 0);	963	if (ev_count > 0);
		964	{
837	{ /* hooray! - we can grab the image! */	965	/* hooray! - we can grab the image! */
838	gc = XCreateGC (dpy, root, 0, NULL);	966	gc = XCreateGC (dpy, root, 0, NULL);
839	if (gc)	967	if (gc)
840	{	968	{
841	XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);	969	XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
842	success = true;	970	success = true;
843	}	971	}
844	}	972	}
		973
845	XDestroyWindow (dpy, src);	974	XDestroyWindow (dpy, src);
846	XUngrabServer (dpy);	975	XUngrabServer (dpy);
847	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);	976	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
848	}	977	}
849		978
850	if (!success)	979	if (!success)
851	{	980	{
852	XFreePixmap (dpy, tiled_root_pmap);	981	XFreePixmap (dpy, tiled_root_pmap);
853	tiled_root_pmap = None;	982	tiled_root_pmap = None;
854	}	983	}
855	else	984	else
856	result \|= transpPmapTiled;	985	result \|= transpPmapTiled;
857	}	986	}
858	else	987	else
		988	{
859	{/* strightforward pixmap copy */	989	/* straightforward pixmap copy */
860	gcv.tile = root_pixmap;	990	gcv.tile = root_pixmap;
861	gcv.fill_style = FillTiled;	991	gcv.fill_style = FillTiled;
862		992
863	while (sx < 0) sx += (int)window_width;	993	while (sx < 0) sx += (int)root_width;
864	while (sy < 0) sy += (int)window_height;	994	while (sy < 0) sy += (int)root_height;
865		995
866	gcv.ts_x_origin = -sx;	996	gcv.ts_x_origin = -sx;
867	gcv.ts_y_origin = -sy;	997	gcv.ts_y_origin = -sy;
868	gc = XCreateGC (dpy, root, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);	998	gc = XCreateGC (dpy, root, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
869		999
…		…
875	}	1005	}
876	TIMING_TEST_PRINT_RESULT (tp);	1006	TIMING_TEST_PRINT_RESULT (tp);
877		1007
878	if (tiled_root_pmap != None)	1008	if (tiled_root_pmap != None)
879	{	1009	{
880	if (!need_client_side_rendering ())	1010	if (!need_client_side_rendering ())
881	{	1011	{
882	if ((flags & tintNeeded))	1012	if ((flags & tintNeeded))
883	{	1013	{
884	if (flags & tintWholesome)	1014	if (flags & tintWholesome)
885	{	1015	{
886	/* In this case we can tint image server-side getting significant	1016	/* In this case we can tint image server-side getting significant
887	* performance improvements, as we eliminate XImage transfer	1017	* performance improvements, as we eliminate XImage transfer
…		…
912	{	1042	{
913	c.r = (c.r * shade) / 100;	1043	c.r = (c.r * shade) / 100;
914	c.g = (c.g * shade) / 100;	1044	c.g = (c.g * shade) / 100;
915	c.b = (c.b * shade) / 100;	1045	c.b = (c.b * shade) / 100;
916	}	1046	}
917	else if( shade > 100 && shade < 200)	1047	else if (shade > 100 && shade < 200)
918	{	1048	{
919	c.r = (c.r * (200 - shade)) / 100;	1049	c.r = (c.r * (200 - shade)) / 100;
920	c.g = (c.g * (200 - shade)) / 100;	1050	c.g = (c.g * (200 - shade)) / 100;
921	c.b = (c.b * (200 - shade)) / 100;	1051	c.b = (c.b * (200 - shade)) / 100;
922	}	1052	}
…		…
928	pf.direct.greenMask = 0xff;	1058	pf.direct.greenMask = 0xff;
929	pf.direct.blueMask = 0xff;	1059	pf.direct.blueMask = 0xff;
930	pf.direct.alphaMask = 0xff;	1060	pf.direct.alphaMask = 0xff;
931		1061
932	XRenderPictFormat *solid_format = XRenderFindFormat (dpy,	1062	XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
933	(PictFormatType\|	1063	(PictFormatType\|
934	PictFormatDepth\|	1064	PictFormatDepth\|
935	PictFormatRedMask\|	1065	PictFormatRedMask\|
936	PictFormatGreenMask\|	1066	PictFormatGreenMask\|
937	PictFormatBlueMask\|	1067	PictFormatBlueMask\|
938	PictFormatAlphaMask),	1068	PictFormatAlphaMask),
939	&pf,	1069	&pf,
940	0);	1070	0);
941	XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));	1071	XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
942	XRenderPictureAttributes pa ;	1072	XRenderPictureAttributes pa ;
943		1073
944	back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);	1074	back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
945		1075
…		…
947		1077
948	Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);	1078	Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
949	Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);	1079	Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
950	XFreePixmap (dpy, overlay_pmap);	1080	XFreePixmap (dpy, overlay_pmap);
951		1081
952	pa.component_alpha = True;	1082	pa.component_alpha = True;
953	Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);	1083	Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
954	Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat\|CPComponentAlpha, &pa);	1084	Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat\|CPComponentAlpha, &pa);
955	XFreePixmap (dpy, mask_pmap);	1085	XFreePixmap (dpy, mask_pmap);
956		1086
957	if (mask_pic && overlay_pic && back_pic)	1087	if (mask_pic && overlay_pic && back_pic)
…		…
959	XRenderColor mask_c;	1089	XRenderColor mask_c;
960		1090
961	memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));	1091	memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
962	mask_c.alpha = 0xffff;	1092	mask_c.alpha = 0xffff;
963	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);	1093	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
964	memset (&mask_c, 0x0, sizeof (mask_c));	1094
965	mask_c.alpha = 0;	1095	mask_c.alpha = 0;
966		1096	mask_c.red = 0xffff - c.r;
967	if (c.r == c.b && c.b == c.g) /* pure shading */	1097	mask_c.green = 0xffff - c.g;
968	{	1098	mask_c.blue = 0xffff - c.b;
969	mask_c.red = mask_c.green = mask_c.blue = 0xffff - c.r;
970	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);	1099	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
971	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);	1100	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
972	}
973	else
974	{
975	mask_c.red = 0xffff - c.r;
976	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
977	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
978	mask_c.red = 0;
979	mask_c.green = 0xffff - c.g;
980	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
981	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
982	mask_c.green = 0;
983	mask_c.blue = 0xffff - c.b;
984	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
985	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
986	}
987	result \|= transpPmapTinted;	1101	result \|= transpPmapTinted;
988	}	1102	}
		1103
989	XRenderFreePicture (dpy, mask_pic);	1104	XRenderFreePicture (dpy, mask_pic);
990	XRenderFreePicture (dpy, overlay_pic);	1105	XRenderFreePicture (dpy, overlay_pic);
991	XRenderFreePicture (dpy, back_pic);	1106	XRenderFreePicture (dpy, back_pic);
992	# if DO_TIMING_TEST	1107	# if DO_TIMING_TEST
993	XSync (dpy, False);	1108	XSync (dpy, False);
994	# endif	1109	# endif
995	# endif	1110	# endif
996	}	1111	}
997	}	1112	}
998	} /* server side rendering completed */	1113	} /* server side rendering completed */
999		1114
1000	if (pixmap)	1115	if (pixmap)
1001	XFreePixmap (dpy, pixmap);	1116	XFreePixmap (dpy, pixmap);
1002		1117
1003	pixmap = tiled_root_pmap;	1118	pixmap = tiled_root_pmap;
1004	pmap_width = window_width;	1119	pmap_width = window_width;
1005	pmap_height = window_height;	1120	pmap_height = window_height;
1006	pmap_depth = root_depth;	1121	pmap_depth = root_depth;
1007	}	1122	}
1008		1123
1009	if (gc)	1124	if (gc)
1010	XFreeGC (dpy, gc);	1125	XFreeGC (dpy, gc);
1011		1126
1012	TIMING_TEST_PRINT_RESULT (tp);	1127	TIMING_TEST_PRINT_RESULT (tp);
1013		1128
1014	return result;	1129	return result;
1015	}	1130	}
1016		1131
1017	bool	1132	bool
1018	bgPixmap_t::set_root_pixmap ()	1133	bgPixmap_t::set_root_pixmap ()
1019	{	1134	{
1020	Pixmap new_root_pixmap = None;
1021
1022	new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);	1135	Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1023	if (new_root_pixmap == None)	1136	if (new_root_pixmap == None)
1024	new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);	1137	new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1025		1138
1026	if (new_root_pixmap != root_pixmap)	1139	if (new_root_pixmap != root_pixmap)
1027	{	1140	{
1028	root_pixmap = new_root_pixmap;	1141	root_pixmap = new_root_pixmap;
1029	return true;	1142	return true;
1030	}	1143	}
		1144
1031	return false;	1145	return false;
1032	}	1146	}
1033	# endif /* ENABLE_TRANSPARENCY */	1147	# endif /* ENABLE_TRANSPARENCY */
1034		1148
1035	# ifndef HAVE_AFTERIMAGE	1149	# ifndef HAVE_AFTERIMAGE
1036	static void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm);	1150	static void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm);
1037	# endif	1151	# endif
1038
1039		1152
1040	bool	1153	bool
1041	bgPixmap_t::render ()	1154	bgPixmap_t::render ()
1042	{	1155	{
1043	unsigned long background_flags = 0;	1156	unsigned long background_flags = 0;
1044		1157
1045	if (target == NULL)	1158	if (target == NULL)
1046	return false;	1159	return false;
1047		1160
		1161	TIMING_TEST_START (tp);
		1162
1048	invalidate();	1163	invalidate ();
1049	# ifdef ENABLE_TRANSPARENCY	1164	# ifdef ENABLE_TRANSPARENCY
1050	if (flags & isTransparent)	1165	if (flags & isTransparent)
1051	{	1166	{
1052	/* we need to re-generate transparency pixmap in that case ! */	1167	/* we need to re-generate transparency pixmap in that case ! */
1053	background_flags = make_transparency_pixmap ();	1168	background_flags = make_transparency_pixmap ();
1054	if (background_flags == 0)	1169	if (background_flags == 0)
1055	return false;	1170	return false;
1056	else if ((background_flags & transpTransformations) == (flags & transpTransformations)	1171	else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1057	&& pmap_depth == target->depth)	1172	&& pmap_depth == target->depth)
1058	flags = flags & ~isInvalid;	1173	flags = flags & ~isInvalid;
1059	}	1174	}
1060	# endif	1175	# endif
1061		1176
1062	XImage *result = NULL;
1063	# ifdef HAVE_AFTERIMAGE	1177	# ifdef HAVE_AFTERIMAGE
1064	if (original_asim	1178	if (original_asim
1065	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))	1179	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))
1066	{	1180	{
1067	ASImage *background = NULL;
1068	ARGB32 as_tint = TINT_LEAVE_SAME;
1069	if (background_flags)
1070	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1071
1072	# ifdef ENABLE_TRANSPARENCY
1073	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1074	{
1075	ShadingInfo as_shade;
1076	as_shade.shading = (shade == 0) ? 100 : shade;
1077
1078	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1079	if (flags & tintSet)
1080	tint.get (c);
1081	as_shade.tintColor.red = c.r;
1082	as_shade.tintColor.green = c.g;
1083	as_shade.tintColor.blue = c.b;
1084
1085	as_tint = shading2tint32 (&as_shade);
1086	}
1087	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1088	{
1089	ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1090	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1091	100, ASIMAGE_QUALITY_DEFAULT);
1092	if (tmp)
1093	{
1094	destroy_asimage (&background);
1095	background = tmp;
1096	}
1097	}
1098	# endif
1099
1100	if (render_asim (background, as_tint))	1181	if (render_asim (background_flags))
1101	flags = flags & ~isInvalid;	1182	flags = flags & ~isInvalid;
1102	if (background)
1103	destroy_asimage (&background);
1104	}	1183	}
1105	else if (background_flags && pmap_depth != target->depth)	1184	# endif
		1185
		1186	XImage *result = NULL;
		1187
		1188	if (background_flags && (flags & isInvalid))
1106	{	1189	{
1107	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);	1190	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1108	}	1191
		1192	# if !defined(HAVE_AFTERIMAGE) && !XFT
1109	# else /* our own client-side tinting */	1193	/* our own client-side tinting */
1110	if (background_flags && (flags & isInvalid))	1194	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1111	{	1195	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1112	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1113	if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))	1196	if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1114	{	1197	{
1115	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1198	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1116	if (flags & tintSet)	1199	if (flags & tintSet)
1117	tint.get (c);	1200	tint.get (c);
1118	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1201	ShadeXImage (target, result, shade, c.r, c.g, c.b);
1119	}	1202	}
		1203	# endif
1120	}	1204	}
1121	# endif /* HAVE_AFTERIMAGE */
1122		1205
1123	if (result != NULL)	1206	if (result)
1124	{	1207	{
1125	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1208	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
		1209
1126	if (gc)	1210	if (gc)
1127	{	1211	{
1128	if (/pmap_depth != target->depth &&/ pixmap != None)	1212	if (/pmap_depth != target->depth &&/ pixmap != None)
1129	{	1213	{
1130	XFreePixmap (target->dpy, pixmap);	1214	XFreePixmap (target->dpy, pixmap);
1131	pixmap = None;	1215	pixmap = None;
1132	}	1216	}
		1217
1133	if (pixmap == None)	1218	if (pixmap == None)
1134	{	1219	{
1135	pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);	1220	pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1136	pmap_width = result->width;	1221	pmap_width = result->width;
1137	pmap_height = result->height;	1222	pmap_height = result->height;
1138	pmap_depth = target->depth;	1223	pmap_depth = target->depth;
1139	}	1224	}
		1225
1140	if (pmap_depth != result->depth)	1226	if (pmap_depth != result->depth)
		1227	{
1141	{ /* Bad Match error will ensue ! stupid X !!!! */	1228	/* Bad Match error will ensue ! stupid X !!!! */
1142	if( result->depth == 24 && pmap_depth == 32)	1229	if (result->depth == 24 && pmap_depth == 32)
1143	result->depth = 32;	1230	result->depth = 32;
1144	else if( result->depth == 32 && pmap_depth == 24)	1231	else if (result->depth == 32 && pmap_depth == 24)
1145	result->depth = 24;	1232	result->depth = 24;
1146	else	1233	else
1147	{	1234	{
1148	/* TODO: implement image recoding */	1235	/* TODO: implement image recoding */
1149	}	1236	}
1150	}	1237	}
		1238
1151	if (pmap_depth == result->depth)	1239	if (pmap_depth == result->depth)
1152	XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);	1240	XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
		1241
1153	XFreeGC (target->dpy, gc);	1242	XFreeGC (target->dpy, gc);
1154	flags = flags & ~isInvalid;	1243	flags = flags & ~isInvalid;
1155	}	1244	}
		1245
1156	XDestroyImage (result);	1246	XDestroyImage (result);
1157	}	1247	}
1158		1248
1159	if (flags & isInvalid)	1249	if (flags & isInvalid)
1160	{	1250	{
1161	if (pixmap != None)	1251	if (pixmap != None)
…		…
1165	}	1255	}
1166	}	1256	}
1167		1257
1168	apply ();	1258	apply ();
1169		1259
		1260	XSync (target->dpy, False);
		1261	valid_since = ev::now ();
		1262
		1263	TIMING_TEST_PRINT_RESULT (tp);
		1264
1170	return true;	1265	return true;
1171	}	1266	}
1172		1267
1173	bool	1268	bool
1174	bgPixmap_t::set_target (rxvt_term *new_target)	1269	bgPixmap_t::set_target (rxvt_term *new_target)
1175	{	1270	{
1176	if (new_target)	1271	if (new_target)
1177	if (target != new_target)	1272	if (target != new_target)
1178	{	1273	{
…		…
1180	# ifdef ENABLE_TRANSPARENCY	1275	# ifdef ENABLE_TRANSPARENCY
1181	root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));	1276	root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1182	# endif	1277	# endif
1183	return true;	1278	return true;
1184	}	1279	}
		1280
1185	return false;	1281	return false;
1186	}	1282	}
1187		1283
1188	void	1284	void
1189	bgPixmap_t::apply()	1285	bgPixmap_t::apply ()
1190	{	1286	{
1191	if (target)	1287	if (target)
1192	{	1288	{
1193	flags &= ~isVtOrigin;	1289	flags &= ~isVtOrigin;
		1290
1194	if (pixmap != None)	1291	if (pixmap != None)
		1292	{
1195	{ /* set target's background to pixmap */	1293	/* set target's background to pixmap */
1196	# ifdef ENABLE_TRANSPARENCY	1294	# ifdef ENABLE_TRANSPARENCY
1197	if (flags & isTransparent)	1295	if (flags & isTransparent)
1198	{	1296	{
1199	XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);	1297	XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1200	XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);	1298	XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1201	# if HAVE_SCROLLBARS	1299
1202	if (target->scrollBar.win)	1300	if (target->scrollBar.win)
1203	XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);	1301	XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1204	# endif
1205	}	1302	}
1206	else	1303	else
1207	# endif	1304	# endif
1208	{	1305	{
1209	flags \|= isVtOrigin;	1306	flags \|= isVtOrigin;
1210	/* force old pixmap dereference in case it was transparent before :*/	1307	/* force old pixmap dereference in case it was transparent before :*/
1211	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);	1308	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1212	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);	1309	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1213	/* do we also need to set scrollbar's background here ? */	1310	/* do we also need to set scrollbar's background here ? */
1214	# if HAVE_SCROLLBARS	1311
1215	if (target->scrollBar.win)	1312	if (target->scrollBar.win)
1216	XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);	1313	XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1217	# endif
1218	}	1314	}
1219	}	1315	}
1220	else	1316	else
		1317	{
1221	{ /* set target background to a pixel */	1318	/* set target background to a pixel */
1222	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);	1319	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1223	XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);	1320	XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1224	/* do we also need to set scrollbar's background here ? */	1321	/* do we also need to set scrollbar's background here ? */
1225	# if HAVE_SCROLLBARS
1226	if (target->scrollBar.win)	1322	if (target->scrollBar.win)
1227	XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);	1323	XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1228	# endif
1229	}
1230
1231	/* don't want Expose on the parent */
1232	XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False);
1233	/* do want Expose on the vt, so we get refreshed properly */
1234	XClearArea (target->dpy, target->vt, 0, 0, 0, 0, True);
1235
1236	# if HAVE_SCROLLBARS
1237	if (target->scrollBar.win)
1238	{	1324	}
1239	target->scrollBar.setIdle ();	1325
		1326	/* don't want Expose on the parent or vt. It is better to use
		1327	scr_touch or we get a great deal of flicker otherwise: */
		1328	XClearWindow (target->dpy, target->parent[0]);
		1329
		1330	if (target->scrollBar.state && target->scrollBar.win)
		1331	{
		1332	target->scrollBar.state = STATE_IDLE;
1240	target->scrollbar_show (0);	1333	target->scrollBar.show (0);
1241	}	1334	}
1242	# endif
1243	}
1244	}
1245		1335
		1336	target->want_refresh = 1;
		1337	flags \|= hasChanged;
		1338	}
		1339	}
		1340
1246	#endif /* HAVE_BG_PIXMAP */	1341	#endif /* HAVE_BG_PIXMAP */
1247		1342
1248	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)	1343	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1249	/* taken from aterm-0.4.2 */	1344	/* taken from aterm-0.4.2 */
1250		1345
1251	typedef uint32_t RUINT32T;	1346	typedef uint32_t RUINT32T;
1252		1347
1253	static void	1348	static void
1254	ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)	1349	ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
1255	{	1350	{
1256	int sh_r, sh_g, sh_b;	1351	int sh_r, sh_g, sh_b;
1257	RUINT32T mask_r, mask_g, mask_b;	1352	RUINT32T mask_r, mask_g, mask_b;
1258	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	1353	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
1259	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	1354	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.2 by sasha, Wed Sep 12 21:06:08 2007 UTC vs. Revision 1.49 by sf-exg, Tue Aug 31 15:12:49 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.2 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.49 by sf-exg, Tue Aug 31 15:12:49 2010 UTC