[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.129 by root, Mon Jan 3 03:05:47 2011 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	}
…		…
721	}	657	}
722	# endif /* HAVE_AFTERIMAGE */	658	# endif /* HAVE_AFTERIMAGE */
723		659
724	# ifdef HAVE_PIXBUF	660	# ifdef HAVE_PIXBUF
725	bool	661	bool
		662	bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
		663	int src_x, int src_y, int dst_x, int dst_y,
		664	unsigned int width, unsigned int height)
		665	{
		666	XImage *ximage;
		667	char data, line;
		668	int bytes_per_pixel;
		669	int width_r, width_g, width_b;
		670	int sh_r, sh_g, sh_b;
		671	int rowstride;
		672	int channels;
		673	unsigned char *row;
		674	Visual *visual = target->visual;
		675	int depth = target->depth;
		676
		677	if (visual->c_class != TrueColor)
		678	return false;
		679
		680	if (depth == 24 \|\| depth == 32)
		681	bytes_per_pixel = 4;
		682	else if (depth == 15 \|\| depth == 16)
		683	bytes_per_pixel = 2;
		684	else
		685	return false;
		686
		687	width_r = rxvt_popcount (visual->red_mask);
		688	width_g = rxvt_popcount (visual->green_mask);
		689	width_b = rxvt_popcount (visual->blue_mask);
		690
		691	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8)
		692	return false;
		693
		694	sh_r = rxvt_ctz (visual->red_mask);
		695	sh_g = rxvt_ctz (visual->green_mask);
		696	sh_b = rxvt_ctz (visual->blue_mask);
		697
		698	if (width > INT_MAX / height / bytes_per_pixel)
		699	return false;
		700
		701	data = (char )malloc (width height * bytes_per_pixel);
		702	if (!data)
		703	return false;
		704
		705	ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
		706	width, height, bytes_per_pixel * 8, 0);
		707	if (!ximage)
		708	{
		709	free (data);
		710	return false;
		711	}
		712
		713	ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
		714
		715	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		716	channels = gdk_pixbuf_get_n_channels (pixbuf);
		717	row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
		718	line = data;
		719
		720	for (int y = 0; y < height; y++)
		721	{
		722	for (int x = 0; x < width; x++)
		723	{
		724	unsigned char pixel = row + x channels;
		725	uint32_t value;
		726
		727	value = ((pixel[0] >> (8 - width_r)) << sh_r)
		728	\| ((pixel[1] >> (8 - width_g)) << sh_g)
		729	\| ((pixel[2] >> (8 - width_b)) << sh_b);
		730
		731	if (bytes_per_pixel == 4)
		732	((uint32_t *)line)[x] = value;
		733	else
		734	((uint16_t *)line)[x] = value;
		735	}
		736
		737	row += rowstride;
		738	line += ximage->bytes_per_line;
		739	}
		740
		741	XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
		742	XDestroyImage (ximage);
		743	return true;
		744	}
		745
		746	bool
726	bgPixmap_t::render_image (unsigned long background_flags)	747	bgPixmap_t::render_image (unsigned long background_flags)
727	{	748	{
728	if (target == NULL)	749	if (target == NULL)
729	return false;	750	return false;
730		751
731	if (!pixbuf)	752	if (!pixbuf)
732	return false;	753	return false;
733		754
734	#if !XRENDER
735	if (background_flags)	755	if (background_flags
		756	&& !(flags & HAS_RENDER))
736	return false;	757	return false;
737	#endif
738		758
739	GdkPixbuf *result;	759	GdkPixbuf *result;
740		760
741	int image_width = gdk_pixbuf_get_width (pixbuf);	761	int image_width = gdk_pixbuf_get_width (pixbuf);
742	int image_height = gdk_pixbuf_get_height (pixbuf);	762	int image_height = gdk_pixbuf_get_height (pixbuf);
…		…
793	new_pmap_width = min (image_width, target_width);	813	new_pmap_width = min (image_width, target_width);
794	new_pmap_height = min (image_height, target_height);	814	new_pmap_height = min (image_height, target_height);
795	}	815	}
796	}	816	}
797		817
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)	818	if (pixmap == None
		819	\|\| pmap_width != new_pmap_width
		820	\|\| pmap_height != new_pmap_height
		821	\|\| pmap_depth != target->depth)
810	{	822	{
		823	if (pixmap)
		824	XFreePixmap (target->dpy, pixmap);
811	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);	825	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
812	pmap_width = new_pmap_width;	826	pmap_width = new_pmap_width;
813	pmap_height = new_pmap_height;	827	pmap_height = new_pmap_height;
814	pmap_depth = target->depth;	828	pmap_depth = target->depth;
815	}	829	}
…		…
818	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);	832	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
819		833
820	if (h_scale == 0 \|\| v_scale == 0)	834	if (h_scale == 0 \|\| v_scale == 0)
821	{	835	{
822	Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);	836	Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
823	gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,	837	pixbuf_to_pixmap (result, tile, gc,
824	0, 0,	838	0, 0,
825	0, 0,	839	0, 0,
826	image_width, image_height,	840	image_width, image_height);
827	XLIB_RGB_DITHER_NONE,
828	0, 0);
829		841
830	gcv.tile = tile;	842	gcv.tile = tile;
831	gcv.fill_style = FillTiled;	843	gcv.fill_style = FillTiled;
832	gcv.ts_x_origin = x;	844	gcv.ts_x_origin = x;
833	gcv.ts_y_origin = y;	845	gcv.ts_y_origin = y;
…		…
848	\|\| dst_x + dst_width < new_pmap_width	860	\|\| dst_x + dst_width < new_pmap_width
849	\|\| dst_y + dst_height < new_pmap_height)	861	\|\| dst_y + dst_height < new_pmap_height)
850	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);	862	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
851		863
852	if (dst_x < new_pmap_width && dst_y < new_pmap_height)	864	if (dst_x < new_pmap_width && dst_y < new_pmap_height)
853	gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,	865	pixbuf_to_pixmap (result, pixmap, gc,
854	src_x, src_y,	866	src_x, src_y,
855	dst_x, dst_y,	867	dst_x, dst_y,
856	dst_width, dst_height,	868	dst_width, dst_height);
857	XLIB_RGB_DITHER_NONE,
858	0, 0);
859	}	869	}
860		870
861	#if XRENDER	871	#if XRENDER
862	if (background_flags)	872	if (background_flags)
863	{	873	{
…		…
968	}	978	}
969		979
970	bool	980	bool
971	bgPixmap_t::set_blur_radius (const char *geom)	981	bgPixmap_t::set_blur_radius (const char *geom)
972	{	982	{
973	int changed = 0;	983	bool changed = false;
974	unsigned int hr, vr;	984	unsigned int hr, vr;
975	int junk;	985	int junk;
976	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);	986	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
977		987
978	if (!(geom_flags & WidthValue))	988	if (!(geom_flags & WidthValue))
…		…
983	min_it (hr, 128);	993	min_it (hr, 128);
984	min_it (vr, 128);	994	min_it (vr, 128);
985		995
986	if (h_blurRadius != hr)	996	if (h_blurRadius != hr)
987	{	997	{
988	++changed;	998	changed = true;
989	h_blurRadius = hr;	999	h_blurRadius = hr;
990	}	1000	}
991		1001
992	if (v_blurRadius != vr)	1002	if (v_blurRadius != vr)
993	{	1003	{
994	++changed;	1004	changed = true;
995	v_blurRadius = vr;	1005	v_blurRadius = vr;
996	}	1006	}
997		1007
998	if (v_blurRadius == 0 && h_blurRadius == 0)	1008	if (v_blurRadius == 0 && h_blurRadius == 0)
999	flags &= ~blurNeeded;	1009	flags &= ~blurNeeded;
1000	else	1010	else
1001	flags \|= blurNeeded;	1011	flags \|= blurNeeded;
1002		1012
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);	1013	return changed;
1016	}	1014	}
1017		1015
1018	static inline unsigned long	1016	static inline unsigned long
1019	compute_tint_shade_flags (rxvt_color *tint, int shade)	1017	compute_tint_shade_flags (rxvt_color *tint, int shade)
1020	{	1018	{
…		…
1023	bool has_shade = shade != 100;	1021	bool has_shade = shade != 100;
1024		1022
1025	if (tint)	1023	if (tint)
1026	{	1024	{
1027	tint->get (c);	1025	tint->get (c);
1028	# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 \|\| (cmp) >= 0x00f700)	1026	# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff \|\| (cmp) >= 0xff00)
		1027	if (!has_shade
1029	if (!has_shade && IS_COMPONENT_WHOLESOME (c.r)	1028	&& IS_COMPONENT_WHOLESOME (c.r)
1030	&& IS_COMPONENT_WHOLESOME (c.g)	1029	&& IS_COMPONENT_WHOLESOME (c.g)
1031	&& IS_COMPONENT_WHOLESOME (c.b))	1030	&& IS_COMPONENT_WHOLESOME (c.b))
1032	flags \|= bgPixmap_t::tintWholesome;	1031	flags \|= bgPixmap_t::tintWholesome;
1033	# undef IS_COMPONENT_WHOLESOME	1032	# undef IS_COMPONENT_WHOLESOME
1034	}	1033	}
1035		1034
1036	if (has_shade)	1035	if (has_shade \|\| tint)
1037	flags \|= bgPixmap_t::tintNeeded;	1036	flags \|= bgPixmap_t::tintNeeded;
1038	else if (tint)
1039	{
1040	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)
1041	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))
1042	{
1043	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	}
1057	}
1058		1037
1059	return flags;	1038	return flags;
1060	}	1039	}
1061		1040
1062	bool	1041	bool
…		…
1233	c.g = (c.g * shade) / 100;	1212	c.g = (c.g * shade) / 100;
1234	c.b = (c.b * shade) / 100;	1213	c.b = (c.b * shade) / 100;
1235	}	1214	}
1236	else	1215	else
1237	{	1216	{
1238	c.r = ((0xffff - c.r) * (200 - shade)) / 100;	1217	c.r = (c.r * (200 - shade)) / 100;
1239	c.g = ((0xffff - c.g) * (200 - shade)) / 100;	1218	c.g = (c.g * (200 - shade)) / 100;
1240	c.b = ((0xffff - c.b) * (200 - shade)) / 100;	1219	c.b = (c.b * (200 - shade)) / 100;
1241	}	1220	}
1242		1221
1243	XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);	1222	XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1244	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	1223	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1245	XRenderPictureAttributes pa;	1224	XRenderPictureAttributes pa;
…		…
1259		1238
1260	if (mask_pic && overlay_pic && back_pic)	1239	if (mask_pic && overlay_pic && back_pic)
1261	{	1240	{
1262	XRenderColor mask_c;	1241	XRenderColor mask_c;
1263		1242
1264	memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));	1243	mask_c.red = mask_c.green = mask_c.blue = 0;
1265	mask_c.alpha = 0xffff;	1244	mask_c.alpha = 0xffff;
1266	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);	1245	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1267		1246
1268	mask_c.alpha = 0;	1247	mask_c.alpha = 0;
1269	mask_c.red = 0xffff - c.r;	1248	mask_c.red = 0xffff - c.r;
1270	mask_c.green = 0xffff - c.g;	1249	mask_c.green = 0xffff - c.g;
1271	mask_c.blue = 0xffff - c.b;	1250	mask_c.blue = 0xffff - c.b;
1272	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);	1251	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1273	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);	1252	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
		1253
		1254	if (shade > 100)
		1255	{
		1256	mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
		1257	mask_c.alpha = 0;
		1258	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
		1259
		1260	XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
		1261	}
		1262
1274	ret = true;	1263	ret = true;
1275	}	1264	}
1276		1265
1277	XRenderFreePicture (dpy, mask_pic);	1266	XRenderFreePicture (dpy, mask_pic);
1278	XRenderFreePicture (dpy, overlay_pic);	1267	XRenderFreePicture (dpy, overlay_pic);
…		…
1309	int window_height = target->szHint.height;	1298	int window_height = target->szHint.height;
1310	int sx, sy;	1299	int sx, sy;
1311	XGCValues gcv;	1300	XGCValues gcv;
1312	GC gc;	1301	GC gc;
1313		1302
1314	target->get_window_origin (sx, sy);	1303	sx = target_x;
		1304	sy = target_y;
1315		1305
1316	/* check if we are outside of the visible part of the virtual screen : */	1306	/* check if we are outside of the visible part of the virtual screen : */
1317	if (sx + window_width <= 0 \|\| sy + window_height <= 0	1307	if (sx + window_width <= 0 \|\| sy + window_height <= 0
1318	\|\| sx >= root_width \|\| sy >= root_height)	1308	\|\| sx >= root_width \|\| sy >= root_height)
1319	return 0;	1309	return 0;
…		…
1336	Pixmap recoded_root_pmap = root_pixmap;	1326	Pixmap recoded_root_pmap = root_pixmap;
1337		1327
1338	if (root_pixmap != None && root_depth != target->depth)	1328	if (root_pixmap != None && root_depth != target->depth)
1339	{	1329	{
1340	#if XRENDER	1330	#if XRENDER
		1331	if (flags & HAS_RENDER)
		1332	{
1341	XRenderPictureAttributes pa;	1333	XRenderPictureAttributes pa;
1342		1334
1343	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));	1335	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1344	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);	1336	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1345		1337
1346	recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);	1338	recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1347	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);	1339	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1348	Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);	1340	Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1349		1341
1350	if (src && dst)	1342	if (src && dst)
1351	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);	1343	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
		1344	else
		1345	{
		1346	XFreePixmap (dpy, recoded_root_pmap);
		1347	root_pixmap = None;
		1348	}
		1349
		1350	XRenderFreePicture (dpy, src);
		1351	XRenderFreePicture (dpy, dst);
		1352	}
1352	else	1353	else
1353	{	1354	#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;	1355	root_pixmap = None;
1362	#endif
1363	}	1356	}
1364		1357
1365	if (root_pixmap == None)	1358	if (root_pixmap == None)
1366	return 0;	1359	return 0;
1367		1360
…		…
1369		1362
1370	if (tiled_root_pmap == None) /* something really bad happened - abort */	1363	if (tiled_root_pmap == None) /* something really bad happened - abort */
1371	return 0;	1364	return 0;
1372		1365
1373	/* straightforward pixmap copy */	1366	/* straightforward pixmap copy */
		1367	while (sx < 0) sx += (int)root_width;
		1368	while (sy < 0) sy += (int)root_height;
		1369
1374	gcv.tile = recoded_root_pmap;	1370	gcv.tile = recoded_root_pmap;
1375	gcv.fill_style = FillTiled;	1371	gcv.fill_style = FillTiled;
1376
1377	while (sx < 0) sx += (int)root_width;
1378	while (sy < 0) sy += (int)root_height;
1379
1380	gcv.ts_x_origin = -sx;	1372	gcv.ts_x_origin = -sx;
1381	gcv.ts_y_origin = -sy;	1373	gcv.ts_y_origin = -sy;
1382	gc = XCreateGC (dpy, target->vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);	1374	gc = XCreateGC (dpy, target->vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
1383		1375
1384	if (gc)	1376	if (gc)
1385	{	1377	{
1386	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);	1378	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1387	result \|= transpPmapTiled;	1379	result \|= transpPmapTiled;
1388	XFreeGC (dpy, gc);	1380	XFreeGC (dpy, gc);
1389	}
1390		1381
1391	if (tiled_root_pmap != None)
1392	{
1393	if (!need_client_side_rendering ())	1382	if (!need_client_side_rendering ())
1394	{	1383	{
1395	if ((flags & blurNeeded)	1384	if ((flags & blurNeeded)
1396	&& (flags & blurServerSide))	1385	&& (flags & HAS_RENDER_CONV))
1397	{	1386	{
1398	if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))	1387	if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1399	result \|= transpPmapBlurred;	1388	result \|= transpPmapBlurred;
1400	}	1389	}
1401	if ((flags & tintNeeded)	1390	if ((flags & tintNeeded)
1402	&& (flags & tintServerSide))	1391	&& (flags & (tintWholesome \| HAS_RENDER)))
1403	{	1392	{
1404	if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))	1393	if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1405	result \|= transpPmapTinted;	1394	result \|= transpPmapTinted;
1406	}	1395	}
1407	} /* server side rendering completed */	1396	} /* server side rendering completed */
…		…
1412	pixmap = tiled_root_pmap;	1401	pixmap = tiled_root_pmap;
1413	pmap_width = window_width;	1402	pmap_width = window_width;
1414	pmap_height = window_height;	1403	pmap_height = window_height;
1415	pmap_depth = target->depth;	1404	pmap_depth = target->depth;
1416	}	1405	}
		1406	else
		1407	XFreePixmap (dpy, tiled_root_pmap);
1417		1408
1418	if (recoded_root_pmap != root_pixmap)	1409	if (recoded_root_pmap != root_pixmap)
1419	XFreePixmap (dpy, recoded_root_pmap);	1410	XFreePixmap (dpy, recoded_root_pmap);
1420		1411
1421	return result;	1412	return result;
1422	}	1413	}
1423		1414
1424	void	1415	void
1425	bgPixmap_t::set_root_pixmap ()	1416	bgPixmap_t::set_root_pixmap ()
1426	{	1417	{
1427	Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);	1418	Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1428	if (new_root_pixmap == None)	1419	if (new_root_pixmap == None)
1429	new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);	1420	new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1430		1421
1431	root_pixmap = new_root_pixmap;	1422	root_pixmap = new_root_pixmap;
1432	}	1423	}
1433	# endif /* ENABLE_TRANSPARENCY */	1424	# endif /* ENABLE_TRANSPARENCY */
1434		1425
1435	# ifndef HAVE_AFTERIMAGE	1426	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1436	static void ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm);	1427	static void shade_ximage (Visual visual, XImage ximage, int shade, const rgba &c);
1437	# endif	1428	# endif
1438		1429
1439	bool	1430	bool
1440	bgPixmap_t::render ()	1431	bgPixmap_t::render ()
1441	{	1432	{
…		…
1451	/* we need to re-generate transparency pixmap in that case ! */	1442	/* we need to re-generate transparency pixmap in that case ! */
1452	background_flags = make_transparency_pixmap ();	1443	background_flags = make_transparency_pixmap ();
1453	if (background_flags == 0)	1444	if (background_flags == 0)
1454	return false;	1445	return false;
1455	else if ((background_flags & transpTransformations) == (flags & transpTransformations))	1446	else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1456	flags = flags & ~isInvalid;	1447	flags &= ~isInvalid;
1457	}	1448	}
1458	# endif	1449	# endif
1459		1450
1460	# ifdef BG_IMAGE_FROM_FILE	1451	# ifdef BG_IMAGE_FROM_FILE
1461	if (have_image	1452	if (have_image
1462	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))	1453	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))
1463	{	1454	{
1464	if (render_image (background_flags))	1455	if (render_image (background_flags))
1465	flags = flags & ~isInvalid;	1456	flags &= ~isInvalid;
1466	}	1457	}
1467	# endif	1458	# endif
1468		1459
		1460	# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1469	XImage *result = NULL;	1461	XImage *result = NULL;
1470		1462
1471	if (background_flags && (flags & isInvalid))	1463	if (background_flags && (flags & isInvalid))
1472	{	1464	{
1473	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);	1465	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1474	}	1466	}
1475		1467
1476	if (result)	1468	if (result)
1477	{	1469	{
1478	# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1479	/* our own client-side tinting */	1470	/* our own client-side tinting */
1480	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1471	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1481	{	1472	{
1482	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1473	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1483	if (flags & tintSet)	1474	if (flags & tintSet)
1484	tint.get (c);	1475	tint.get (c);
1485	ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);	1476	shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1486	}	1477	}
1487	# endif
1488		1478
1489	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1479	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1490		1480
1491	if (gc)	1481	if (gc)
1492	{	1482	{
1493	XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);	1483	XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1494		1484
1495	XFreeGC (target->dpy, gc);	1485	XFreeGC (target->dpy, gc);
1496	flags = flags & ~isInvalid;	1486	flags &= ~isInvalid;
1497	}	1487	}
1498		1488
1499	XDestroyImage (result);	1489	XDestroyImage (result);
1500	}	1490	}
		1491	# endif
1501		1492
1502	if (flags & isInvalid)	1493	if (flags & isInvalid)
1503	{	1494	{
1504	if (pixmap != None)	1495	if (pixmap != None)
1505	{	1496	{
…		…
1517		1508
1518	void	1509	void
1519	bgPixmap_t::set_target (rxvt_term *new_target)	1510	bgPixmap_t::set_target (rxvt_term *new_target)
1520	{	1511	{
1521	target = new_target;	1512	target = new_target;
		1513
		1514	flags &= ~(HAS_RENDER \| HAS_RENDER_CONV);
		1515	#if XRENDER
		1516	int major, minor;
		1517	if (XRenderQueryVersion (target->dpy, &major, &minor))
		1518	flags \|= HAS_RENDER;
		1519	XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
		1520	if (filters)
		1521	{
		1522	for (int i = 0; i < filters->nfilter; i++)
		1523	if (!strcmp (filters->filter[i], FilterConvolution))
		1524	flags \|= HAS_RENDER_CONV;
		1525
		1526	XFree (filters);
		1527	}
		1528	#endif
1522	}	1529	}
1523		1530
1524	void	1531	void
1525	bgPixmap_t::apply ()	1532	bgPixmap_t::apply ()
1526	{	1533	{
…		…
1575	flags \|= hasChanged;	1582	flags \|= hasChanged;
1576	}	1583	}
1577		1584
1578	#endif /* HAVE_BG_PIXMAP */	1585	#endif /* HAVE_BG_PIXMAP */
1579		1586
1580	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER	1587	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1581	/* taken from aterm-0.4.2 */	1588	/* taken from aterm-0.4.2 */
1582		1589
1583	static void	1590	static void
1584	ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm)	1591	shade_ximage (Visual visual, XImage ximage, int shade, const rgba &c)
1585	{	1592	{
1586	int sh_r, sh_g, sh_b;	1593	int sh_r, sh_g, sh_b;
1587	uint32_t mask_r, mask_g, mask_b;	1594	uint32_t mask_r, mask_g, mask_b;
1588	uint32_t lookup, lookup_r, lookup_g, lookup_b;	1595	uint32_t lookup, lookup_r, lookup_g, lookup_b;
1589	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	1596	rgba low;
1590	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	1597	rgba high;
1591	int i;	1598	int i;
1592	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;	1599	int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1593		1600
1594	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;	1601	if (visual->c_class != TrueColor \|\| ximage->format != ZPixmap) return;
1595		1602
1596	/* for convenience */	1603	/* for convenience */
1597	mask_r = visual->red_mask;	1604	mask_r = visual->red_mask;
1598	mask_g = visual->green_mask;	1605	mask_g = visual->green_mask;
1599	mask_b = visual->blue_mask;	1606	mask_b = visual->blue_mask;
1600		1607
1601	/* boring lookup table pre-initialization */	1608	/* boring lookup table pre-initialization */
1602	switch (srcImage->depth)	1609	switch (ximage->depth)
1603	{	1610	{
1604	case 15:	1611	case 15:
1605	if ((mask_r != 0x7c00) \|\|	1612	if ((mask_r != 0x7c00) \|\|
1606	(mask_g != 0x03e0) \|\|	1613	(mask_g != 0x03e0) \|\|
1607	(mask_b != 0x001f))	1614	(mask_b != 0x001f))
…		…
1660	/* prepare limits for color transformation (each channel is handled separately) */	1667	/* prepare limits for color transformation (each channel is handled separately) */
1661	if (shade > 100)	1668	if (shade > 100)
1662	{	1669	{
1663	shade = 200 - shade;	1670	shade = 200 - shade;
1664		1671
1665	lower_lim_r = 65535-rm;	1672	high.r = c.r * shade / 100;
1666	lower_lim_g = 65535-gm;	1673	high.g = c.g * shade / 100;
1667	lower_lim_b = 65535-bm;	1674	high.b = c.b * shade / 100;
1668		1675
1669	lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);	1676	low.r = 65535 * (100 - shade) / 100;
1670	lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);	1677	low.g = 65535 * (100 - shade) / 100;
1671	lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);	1678	low.b = 65535 * (100 - shade) / 100;
1672
1673	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1674	}	1679	}
1675	else	1680	else
1676	{	1681	{
		1682	high.r = c.r * shade / 100;
		1683	high.g = c.g * shade / 100;
		1684	high.b = c.b * shade / 100;
1677		1685
1678	lower_lim_r = lower_lim_g = lower_lim_b = 0;	1686	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	}	1687	}
1684		1688
1685	/* fill our lookup tables */	1689	/* fill our lookup tables */
1686	for (i = 0; i <= mask_r>>sh_r; i++)	1690	for (i = 0; i <= mask_r>>sh_r; i++)
1687	{	1691	{
1688	uint32_t tmp;	1692	uint32_t tmp;
1689	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));	1693	tmp = i * high.r;
1690	tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);	1694	tmp += (mask_r>>sh_r) * low.r;
1691	lookup_r[i] = (tmp/65535)<<sh_r;	1695	lookup_r[i] = (tmp/65535)<<sh_r;
1692	}	1696	}
1693	for (i = 0; i <= mask_g>>sh_g; i++)	1697	for (i = 0; i <= mask_g>>sh_g; i++)
1694	{	1698	{
1695	uint32_t tmp;	1699	uint32_t tmp;
1696	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));	1700	tmp = i * high.g;
1697	tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);	1701	tmp += (mask_g>>sh_g) * low.g;
1698	lookup_g[i] = (tmp/65535)<<sh_g;	1702	lookup_g[i] = (tmp/65535)<<sh_g;
1699	}	1703	}
1700	for (i = 0; i <= mask_b>>sh_b; i++)	1704	for (i = 0; i <= mask_b>>sh_b; i++)
1701	{	1705	{
1702	uint32_t tmp;	1706	uint32_t tmp;
1703	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));	1707	tmp = i * high.b;
1704	tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);	1708	tmp += (mask_b>>sh_b) * low.b;
1705	lookup_b[i] = (tmp/65535)<<sh_b;	1709	lookup_b[i] = (tmp/65535)<<sh_b;
1706	}	1710	}
1707		1711
1708	/* apply table to input image (replacing colors by newly calculated ones) */	1712	/* apply table to input image (replacing colors by newly calculated ones) */
1709	if (srcImage->bits_per_pixel == 32	1713	if (ximage->bits_per_pixel == 32
1710	&& (srcImage->depth == 24 \|\| srcImage->depth == 32)	1714	&& (ximage->depth == 24 \|\| ximage->depth == 32)
1711	&& srcImage->byte_order == host_byte_order)	1715	&& ximage->byte_order == host_byte_order)
1712	{	1716	{
1713	uint32_t p1, pf, p, pl;	1717	uint32_t p1, pf, p, pl;
1714	p1 = (uint32_t *) srcImage->data;	1718	p1 = (uint32_t *) ximage->data;
1715	pf = (uint32_t ) (srcImage->data + srcImage->height srcImage->bytes_per_line);	1719	pf = (uint32_t ) (ximage->data + ximage->height ximage->bytes_per_line);
1716		1720
1717	while (p1 < pf)	1721	while (p1 < pf)
1718	{	1722	{
1719	p = p1;	1723	p = p1;
1720	pl = p1 + srcImage->width;	1724	pl = p1 + ximage->width;
1721	for (; p < pl; p++)	1725	for (; p < pl; p++)
1722	{	1726	{
1723	p = lookup_r[(p & 0xff0000) >> 16] \|	1727	p = lookup_r[(p & 0xff0000) >> 16] \|
1724	lookup_g[(*p & 0x00ff00) >> 8] \|	1728	lookup_g[(*p & 0x00ff00) >> 8] \|
1725	lookup_b[(*p & 0x0000ff)] \|	1729	lookup_b[(*p & 0x0000ff)] \|
1726	(*p & 0xff000000);	1730	(*p & 0xff000000);
1727	}	1731	}
1728	p1 = (uint32_t ) ((char ) p1 + srcImage->bytes_per_line);	1732	p1 = (uint32_t ) ((char ) p1 + ximage->bytes_per_line);
1729	}	1733	}
1730	}	1734	}
1731	else	1735	else
1732	{	1736	{
1733	for (int y = 0; y < srcImage->height; y++)	1737	for (int y = 0; y < ximage->height; y++)
1734	for (int x = 0; x < srcImage->width; x++)	1738	for (int x = 0; x < ximage->width; x++)
1735	{	1739	{
1736	unsigned long pixel = XGetPixel (srcImage, x, y);	1740	unsigned long pixel = XGetPixel (ximage, x, y);
1737	pixel = lookup_r[(pixel & mask_r) >> sh_r] \|	1741	pixel = lookup_r[(pixel & mask_r) >> sh_r] \|
1738	lookup_g[(pixel & mask_g) >> sh_g] \|	1742	lookup_g[(pixel & mask_g) >> sh_g] \|
1739	lookup_b[(pixel & mask_b) >> sh_b];	1743	lookup_b[(pixel & mask_b) >> sh_b];
1740	XPutPixel (srcImage, x, y, pixel);	1744	XPutPixel (ximage, x, y, pixel);
1741	}	1745	}
1742	}	1746	}
1743		1747
1744	free (lookup);	1748	free (lookup);
1745	}	1749	}

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.129 by root, Mon Jan 3 03:05:47 2011 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.129 by root, Mon Jan 3 03:05:47 2011 UTC