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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.119 by sf-exg, Thu Nov 18 17:28:12 2010 UTC vs.
Revision 1.140 by sf-exg, Sun Jan 23 12:28:47 2011 UTC

…		…
30	# include <X11/extensions/Xrender.h>	30	# include <X11/extensions/Xrender.h>
31	#endif	31	#endif
32		32
33	#ifndef FilterConvolution	33	#ifndef FilterConvolution
34	#define FilterConvolution "convolution"	34	#define FilterConvolution "convolution"
35	#endif
36
37	#define DO_TIMING_TEST 0
38
39	#if DO_TIMING_TEST
40	# include <sys/time.h>
41	#define TIMING_TEST_START(id) \
42	struct timeval timing_test_##id##_stv; \
43	gettimeofday (&timing_test_##id##_stv, NULL);
44
45	#define TIMING_TEST_PRINT_RESULT(id) \
46	do { \
47	struct timeval tv; \
48	gettimeofday (&tv, NULL); \
49	tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
50	fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
51	tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
52	} while (0)
53
54	#else
55	#define TIMING_TEST_START(id) do {} while (0)
56	#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
57	#endif	35	#endif
58		36
59	/*	37	/*
60	* Pixmap geometry string interpretation :	38	* Pixmap geometry string interpretation :
61	* Each geometry string contains zero or one scale/position	39	* Each geometry string contains zero or one scale/position
…		…
101	#ifdef ENABLE_TRANSPARENCY	79	#ifdef ENABLE_TRANSPARENCY
102	shade = 100;	80	shade = 100;
103	#endif	81	#endif
104	flags = 0;	82	flags = 0;
105	pixmap = None;	83	pixmap = None;
106	valid_since = invalid_since = 0;	84	valid_since = 0;
107	target = 0;	85	target = 0;
		86	target_x = target_y = 0;
108	}	87	}
109		88
110	void	89	void
111	bgPixmap_t::destroy ()	90	bgPixmap_t::destroy ()
112	{	91	{
…		…
123	if (pixmap && target)	102	if (pixmap && target)
124	XFreePixmap (target->dpy, pixmap);	103	XFreePixmap (target->dpy, pixmap);
125	}	104	}
126		105
127	bool	106	bool
		107	bgPixmap_t::set_position (int x, int y)
		108	{
		109
		110	if (target_x != x
		111	\|\| target_y != y)
		112	{
		113	target_x = x;
		114	target_y = y;
		115	return true;
		116	}
		117	return false;
		118	}
		119
		120	bool
128	bgPixmap_t::window_size_sensitive ()	121	bgPixmap_t::window_size_sensitive ()
129	{	122	{
130	# ifdef ENABLE_TRANSPARENCY	123	# ifdef ENABLE_TRANSPARENCY
131	if (flags & isTransparent)	124	if (flags & isTransparent)
132	return true;	125	return true;
…		…
157	if (flags & rootAlign)	150	if (flags & rootAlign)
158	return true;	151	return true;
159	}	152	}
160	# endif	153	# endif
161		154
162	return false;
163	}
164
165	bool bgPixmap_t::need_client_side_rendering ()
166	{
167	# ifdef HAVE_AFTERIMAGE
168	if (original_asim)
169	return true;
170	# endif
171	return false;	155	return false;
172	}	156	}
173		157
174	# ifdef BG_IMAGE_FROM_FILE	158	# ifdef BG_IMAGE_FROM_FILE
175	static inline bool	159	static inline bool
…		…
246	int geom_flags = 0;	230	int geom_flags = 0;
247	int x = 0, y = 0;	231	int x = 0, y = 0;
248	unsigned int w = 0, h = 0;	232	unsigned int w = 0, h = 0;
249	unsigned int n;	233	unsigned int n;
250	unsigned long new_flags = (flags & (~geometryFlags));	234	unsigned long new_flags = (flags & (~geometryFlags));
251	const char *p;	235	const char *ops;
252	# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
253		236
254	if (geom == NULL)	237	if (geom == NULL)
255	return false;	238	return false;
256		239
257	char str[MAXLEN_GEOM];	240	char str[256];
258		241
259	while (isspace(*geom)) ++geom;
260	if ((p = strchr (geom, ';')) == NULL)
261	p = strchr (geom, '\0');	242	ops = strchr (geom, ':');
262		243	if (ops == NULL)
		244	n = strlen (geom);
		245	else
263	n = (p - geom);	246	n = ops - geom;
264	if (n < MAXLEN_GEOM)
265	{
266	char *ops;
267		247
		248	if (n >= sizeof (str))
		249	return false;
		250
268	memcpy (str, geom, n);	251	memcpy (str, geom, n);
269	str[n] = '\0';	252	str[n] = '\0';
270	if (str[0] == ':')	253	rxvt_strtrim (str);
271	ops = &str[0];
272	else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
273	ops = &str[0];
274	else
275	{
276	char *tmp;
277	ops = strchr (str, ':');
278	if (ops != NULL)
279	{
280	for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
281	*(++tmp) = '\0';
282	if (ops == tmp) ++ops;
283	}
284	}
285		254
286	if (ops > str \|\| ops == NULL)	255	if (str[0])
287	{	256	{
288	/* we have geometry string - let's handle it prior to applying ops */	257	/* we have geometry string - let's handle it prior to applying ops */
289	geom_flags = XParseGeometry (str, &x, &y, &w, &h);	258	geom_flags = XParseGeometry (str, &x, &y, &w, &h);
290
291	if (!update) /* setting up geometry from scratch */
292	{
293	if (!(geom_flags & XValue))
294	{
295	/* use default geometry - centered */
296	x = y = defaultAlign;
297	}
298	else if (!(geom_flags & YValue))
299	y = x;
300
301	if ((geom_flags & (WidthValue\|HeightValue)) == 0)
302	{
303	/* use default geometry - scaled */
304	w = h = defaultScale;
305	}
306	else if (geom_flags & WidthValue)
307	{
308	if (!(geom_flags & HeightValue))
309	h = w;
310	}
311	else
312	w = h;
313	}
314	} /* done parsing geometry string */	259	} /* done parsing geometry string */
		260
315	else if (!update)	261	if (!update)
316	{	262	{
317	/* default geometry - scaled and centered */	263	if (!(geom_flags & XValue))
318	x = y = defaultAlign;	264	x = y = defaultAlign;
		265	else if (!(geom_flags & YValue))
		266	y = x;
		267
		268	if (!(geom_flags & (WidthValue\|HeightValue)))
319	w = h = defaultScale;	269	w = h = defaultScale;
320	}	270	else if (!(geom_flags & HeightValue))
		271	h = w;
		272	else if (!(geom_flags & WidthValue))
		273	w = h;
321		274
322	if (!update)
323	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	275	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
		276	}
324		277
325	if (ops)	278	if (ops)
326	{	279	{
327	while (*ops)	280	char **arr = rxvt_strsplit (':', ops + 1);
		281
		282	for (int i = 0; arr[i]; i++)
328	{	283	{
329	while (ops == ':' \|\| isspace(ops)) ++ops;	284	if (!strcasecmp (arr[i], "tile"))
330
331	# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
332	if (CHECK_GEOM_OPS ("tile"))
333	{	285	{
334	w = h = noScale;	286	w = h = noScale;
335	geom_flags \|= WidthValue\|HeightValue;	287	geom_flags \|= WidthValue\|HeightValue;
336	}	288	}
337	else if (CHECK_GEOM_OPS ("propscale"))	289	else if (!strcasecmp (arr[i], "propscale"))
338	{	290	{
339	new_flags \|= propScale;	291	new_flags \|= propScale;
340	}	292	}
341	else if (CHECK_GEOM_OPS ("hscale"))	293	else if (!strcasecmp (arr[i], "hscale"))
342	{	294	{
343	if (w == 0) w = windowScale;	295	if (w == 0) w = windowScale;
344		296
345	h = noScale;	297	h = noScale;
346	geom_flags \|= WidthValue\|HeightValue;	298	geom_flags \|= WidthValue\|HeightValue;
347	}	299	}
348	else if (CHECK_GEOM_OPS ("vscale"))	300	else if (!strcasecmp (arr[i], "vscale"))
349	{	301	{
350	if (h == 0) h = windowScale;	302	if (h == 0) h = windowScale;
351		303
352	w = noScale;	304	w = noScale;
353	geom_flags \|= WidthValue\|HeightValue;	305	geom_flags \|= WidthValue\|HeightValue;
354	}	306	}
355	else if (CHECK_GEOM_OPS ("scale"))	307	else if (!strcasecmp (arr[i], "scale"))
356	{	308	{
357	if (h == 0) h = windowScale;	309	if (h == 0) h = windowScale;
358	if (w == 0) w = windowScale;	310	if (w == 0) w = windowScale;
359		311
360	geom_flags \|= WidthValue\|HeightValue;	312	geom_flags \|= WidthValue\|HeightValue;
361	}	313	}
362	else if (CHECK_GEOM_OPS ("auto"))	314	else if (!strcasecmp (arr[i], "auto"))
363	{	315	{
364	w = h = windowScale;	316	w = h = windowScale;
365	x = y = centerAlign;	317	x = y = centerAlign;
366	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	318	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
367	}	319	}
368	else if (CHECK_GEOM_OPS ("root"))	320	else if (!strcasecmp (arr[i], "root"))
369	{	321	{
370	new_flags \|= rootAlign;	322	new_flags \|= rootAlign;
371	w = h = noScale;	323	w = h = noScale;
372	geom_flags \|= WidthValue\|HeightValue;	324	geom_flags \|= WidthValue\|HeightValue;
373	}	325	}
374	# undef CHECK_GEOM_OPS
375
376	while (ops != ':' && ops != '\0') ++ops;
377	} /* done parsing ops */	326	} /* done parsing ops */
378	}
379		327
		328	rxvt_free_strsplit (arr);
		329	}
		330
380	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;	331	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
381	if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;	332	if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
382	if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;	333	if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
383	if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;	334	if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
384	}
385		335
386	if (new_flags != flags)	336	if (new_flags != flags)
387	{	337	{
388	flags = new_flags;	338	flags = new_flags;
389	changed = true;	339	changed = true;
…		…
414	if (!w) w = image_width;	364	if (!w) w = image_width;
415	if (!h) h = image_height;	365	if (!h) h = image_height;
416		366
417	if (flags & rootAlign)	367	if (flags & rootAlign)
418	{	368	{
419	target->get_window_origin (x, y);
420	x = -x;	369	x = -target_x;
421	y = -y;	370	y = -target_y;
422	}	371	}
423	else	372	else
424	{	373	{
425	x = make_align_position (h_align, target_width, w);	374	x = make_align_position (h_align, target_width, w);
426	y = make_align_position (v_align, target_height, h);	375	y = make_align_position (v_align, target_height, h);
…		…
623	GC gc;	572	GC gc;
624		573
625	/* create Pixmap */	574	/* create Pixmap */
626	if (pixmap == None	575	if (pixmap == None
627	\|\| pmap_width != new_pmap_width	576	\|\| pmap_width != new_pmap_width
628	\|\| pmap_height != new_pmap_height	577	\|\| pmap_height != new_pmap_height)
629	\|\| pmap_depth != target->depth)
630	{	578	{
631	if (pixmap)	579	if (pixmap)
632	XFreePixmap (target->dpy, pixmap);	580	XFreePixmap (target->dpy, pixmap);
633	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);	581	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
634	pmap_width = new_pmap_width;	582	pmap_width = new_pmap_width;
635	pmap_height = new_pmap_height;	583	pmap_height = new_pmap_height;
636	pmap_depth = target->depth;
637	}	584	}
638	/* fill with background color (if result's not completely overlapping it) */	585	/* fill with background color (if result's not completely overlapping it) */
639	gcv.foreground = target->pix_colors[Color_bg];	586	gcv.foreground = target->pix_colors[Color_bg];
640	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);	587	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
641		588
…		…
673	return ret;	620	return ret;
674	}	621	}
675	# endif /* HAVE_AFTERIMAGE */	622	# endif /* HAVE_AFTERIMAGE */
676		623
677	# ifdef HAVE_PIXBUF	624	# ifdef HAVE_PIXBUF
		625	bool
		626	bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
		627	int src_x, int src_y, int dst_x, int dst_y,
		628	unsigned int width, unsigned int height)
		629	{
		630	XImage *ximage;
		631	char data, line;
		632	int bytes_per_pixel;
		633	int width_r, width_g, width_b;
		634	int sh_r, sh_g, sh_b;
		635	int rowstride;
		636	int channels;
		637	unsigned char *row;
		638	Visual *visual = target->visual;
		639	int depth = target->depth;
		640
		641	if (visual->c_class != TrueColor)
		642	return false;
		643
		644	if (depth == 24 \|\| depth == 32)
		645	bytes_per_pixel = 4;
		646	else if (depth == 15 \|\| depth == 16)
		647	bytes_per_pixel = 2;
		648	else
		649	return false;
		650
		651	width_r = rxvt_popcount (visual->red_mask);
		652	width_g = rxvt_popcount (visual->green_mask);
		653	width_b = rxvt_popcount (visual->blue_mask);
		654
		655	if (width_r > 8 \|\| width_g > 8 \|\| width_b > 8)
		656	return false;
		657
		658	sh_r = rxvt_ctz (visual->red_mask);
		659	sh_g = rxvt_ctz (visual->green_mask);
		660	sh_b = rxvt_ctz (visual->blue_mask);
		661
		662	if (width > INT_MAX / height / bytes_per_pixel)
		663	return false;
		664
		665	data = (char )malloc (width height * bytes_per_pixel);
		666	if (!data)
		667	return false;
		668
		669	ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
		670	width, height, bytes_per_pixel * 8, 0);
		671	if (!ximage)
		672	{
		673	free (data);
		674	return false;
		675	}
		676
		677	ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
		678
		679	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
		680	channels = gdk_pixbuf_get_n_channels (pixbuf);
		681	row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
		682	line = data;
		683
		684	for (int y = 0; y < height; y++)
		685	{
		686	for (int x = 0; x < width; x++)
		687	{
		688	unsigned char pixel = row + x channels;
		689	uint32_t value;
		690
		691	value = ((pixel[0] >> (8 - width_r)) << sh_r)
		692	\| ((pixel[1] >> (8 - width_g)) << sh_g)
		693	\| ((pixel[2] >> (8 - width_b)) << sh_b);
		694
		695	if (bytes_per_pixel == 4)
		696	((uint32_t *)line)[x] = value;
		697	else
		698	((uint16_t *)line)[x] = value;
		699	}
		700
		701	row += rowstride;
		702	line += ximage->bytes_per_line;
		703	}
		704
		705	XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
		706	XDestroyImage (ximage);
		707	return true;
		708	}
		709
678	bool	710	bool
679	bgPixmap_t::render_image (unsigned long background_flags)	711	bgPixmap_t::render_image (unsigned long background_flags)
680	{	712	{
681	if (target == NULL)	713	if (target == NULL)
682	return false;	714	return false;
…		…
747	}	779	}
748	}	780	}
749		781
750	if (pixmap == None	782	if (pixmap == None
751	\|\| pmap_width != new_pmap_width	783	\|\| pmap_width != new_pmap_width
752	\|\| pmap_height != new_pmap_height	784	\|\| pmap_height != new_pmap_height)
753	\|\| pmap_depth != target->depth)
754	{	785	{
755	if (pixmap)	786	if (pixmap)
756	XFreePixmap (target->dpy, pixmap);	787	XFreePixmap (target->dpy, pixmap);
757	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);	788	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
758	pmap_width = new_pmap_width;	789	pmap_width = new_pmap_width;
759	pmap_height = new_pmap_height;	790	pmap_height = new_pmap_height;
760	pmap_depth = target->depth;
761	}	791	}
762		792
763	gcv.foreground = target->pix_colors[Color_bg];	793	gcv.foreground = target->pix_colors[Color_bg];
764	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);	794	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
765		795
766	if (h_scale == 0 \|\| v_scale == 0)	796	if (h_scale == 0 \|\| v_scale == 0)
767	{	797	{
768	Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);	798	Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
769	gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,	799	pixbuf_to_pixmap (result, tile, gc,
770	0, 0,	800	0, 0,
771	0, 0,	801	0, 0,
772	image_width, image_height,	802	image_width, image_height);
773	XLIB_RGB_DITHER_NONE,
774	0, 0);
775		803
776	gcv.tile = tile;	804	gcv.tile = tile;
777	gcv.fill_style = FillTiled;	805	gcv.fill_style = FillTiled;
778	gcv.ts_x_origin = x;	806	gcv.ts_x_origin = x;
779	gcv.ts_y_origin = y;	807	gcv.ts_y_origin = y;
…		…
794	\|\| dst_x + dst_width < new_pmap_width	822	\|\| dst_x + dst_width < new_pmap_width
795	\|\| dst_y + dst_height < new_pmap_height)	823	\|\| dst_y + dst_height < new_pmap_height)
796	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);	824	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
797		825
798	if (dst_x < new_pmap_width && dst_y < new_pmap_height)	826	if (dst_x < new_pmap_width && dst_y < new_pmap_height)
799	gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,	827	pixbuf_to_pixmap (result, pixmap, gc,
800	src_x, src_y,	828	src_x, src_y,
801	dst_x, dst_y,	829	dst_x, dst_y,
802	dst_width, dst_height,	830	dst_width, dst_height);
803	XLIB_RGB_DITHER_NONE,
804	0, 0);
805	}	831	}
806		832
807	#if XRENDER	833	#if XRENDER
808	if (background_flags)	834	if (background_flags)
809	{	835	{
…		…
876	if (image)	902	if (image)
877	{	903	{
878	if (original_asim)	904	if (original_asim)
879	safe_asimage_destroy (original_asim);	905	safe_asimage_destroy (original_asim);
880	original_asim = image;	906	original_asim = image;
		907	flags \|= CLIENT_RENDER;
881	have_image = true;	908	have_image = true;
882	return true;	909	return true;
883	}	910	}
884	# endif	911	# endif
885		912
…		…
957	bool has_shade = shade != 100;	984	bool has_shade = shade != 100;
958		985
959	if (tint)	986	if (tint)
960	{	987	{
961	tint->get (c);	988	tint->get (c);
962	# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 \|\| (cmp) >= 0x00f700)	989	if (!has_shade
963	if (!has_shade && IS_COMPONENT_WHOLESOME (c.r)	990	&& (c.r <= 0x00ff \|\| c.r >= 0xff00)
964	&& IS_COMPONENT_WHOLESOME (c.g)	991	&& (c.g <= 0x00ff \|\| c.g >= 0xff00)
965	&& IS_COMPONENT_WHOLESOME (c.b))	992	&& (c.b <= 0x00ff \|\| c.b >= 0xff00))
966	flags \|= bgPixmap_t::tintWholesome;	993	flags \|= bgPixmap_t::tintWholesome;
967	# undef IS_COMPONENT_WHOLESOME
968	}	994	}
969		995
970	if (has_shade)	996	if (has_shade \|\| tint)
971	flags \|= bgPixmap_t::tintNeeded;	997	flags \|= bgPixmap_t::tintNeeded;
972	else if (tint)
973	{
974	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)
975	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))
976	{
977	flags \|= bgPixmap_t::tintNeeded;
978	}
979	}
980		998
981	return flags;	999	return flags;
982	}	1000	}
983		1001
984	bool	1002	bool
…		…
994		1012
995	return false;	1013	return false;
996	}	1014	}
997		1015
998	bool	1016	bool
999	bgPixmap_t::unset_tint ()
1000	{
1001	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
1002
1003	if (new_flags != (flags & tintFlags))
1004	{
1005	flags = (flags & ~tintFlags) \| new_flags;
1006	return true;
1007	}
1008
1009	return false;
1010	}
1011
1012	bool
1013	bgPixmap_t::set_shade (const char *shade_str)	1017	bgPixmap_t::set_shade (const char *shade_str)
1014	{	1018	{
1015	int new_shade = (shade_str) ? atoi (shade_str) : 100;	1019	int new_shade = (shade_str) ? atoi (shade_str) : 100;
1016		1020
1017	clamp_it (new_shade, -100, 200);	1021	clamp_it (new_shade, -100, 200);
…		…
1020		1024
1021	if (new_shade != shade)	1025	if (new_shade != shade)
1022	{	1026	{
1023	unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);	1027	unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1024	shade = new_shade;	1028	shade = new_shade;
1025	flags = (flags & (~tintFlags \| tintSet)) \| new_flags;	1029	flags = (flags & ~tintFlags) \| new_flags;
1026	return true;	1030	return true;
1027	}	1031	}
1028		1032
1029	return false;	1033	return false;
1030	}	1034	}
…		…
1155	c.g = (c.g * shade) / 100;	1159	c.g = (c.g * shade) / 100;
1156	c.b = (c.b * shade) / 100;	1160	c.b = (c.b * shade) / 100;
1157	}	1161	}
1158	else	1162	else
1159	{	1163	{
1160	c.r = ((0xffff - c.r) * (200 - shade)) / 100;	1164	c.r = (c.r * (200 - shade)) / 100;
1161	c.g = ((0xffff - c.g) * (200 - shade)) / 100;	1165	c.g = (c.g * (200 - shade)) / 100;
1162	c.b = ((0xffff - c.b) * (200 - shade)) / 100;	1166	c.b = (c.b * (200 - shade)) / 100;
1163	}	1167	}
1164		1168
1165	XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);	1169	XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1166	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	1170	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1167	XRenderPictureAttributes pa;	1171	XRenderPictureAttributes pa;
…		…
1181		1185
1182	if (mask_pic && overlay_pic && back_pic)	1186	if (mask_pic && overlay_pic && back_pic)
1183	{	1187	{
1184	XRenderColor mask_c;	1188	XRenderColor mask_c;
1185		1189
1186	mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;	1190	mask_c.red = mask_c.green = mask_c.blue = 0;
1187	mask_c.alpha = 0xffff;	1191	mask_c.alpha = 0xffff;
1188	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);	1192	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1189		1193
1190	mask_c.alpha = 0;	1194	mask_c.alpha = 0;
1191	mask_c.red = 0xffff - c.r;	1195	mask_c.red = 0xffff - c.r;
1192	mask_c.green = 0xffff - c.g;	1196	mask_c.green = 0xffff - c.g;
1193	mask_c.blue = 0xffff - c.b;	1197	mask_c.blue = 0xffff - c.b;
1194	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);	1198	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1195	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);	1199	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
		1200
		1201	if (shade > 100)
		1202	{
		1203	mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
		1204	mask_c.alpha = 0;
		1205	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
		1206
		1207	XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
		1208	}
		1209
1196	ret = true;	1210	ret = true;
1197	}	1211	}
1198		1212
1199	XRenderFreePicture (dpy, mask_pic);	1213	XRenderFreePicture (dpy, mask_pic);
1200	XRenderFreePicture (dpy, overlay_pic);	1214	XRenderFreePicture (dpy, overlay_pic);
…		…
1231	int window_height = target->szHint.height;	1245	int window_height = target->szHint.height;
1232	int sx, sy;	1246	int sx, sy;
1233	XGCValues gcv;	1247	XGCValues gcv;
1234	GC gc;	1248	GC gc;
1235		1249
1236	target->get_window_origin (sx, sy);	1250	sx = target_x;
		1251	sy = target_y;
1237		1252
1238	/* check if we are outside of the visible part of the virtual screen : */	1253	/* check if we are outside of the visible part of the virtual screen : */
1239	if (sx + window_width <= 0 \|\| sy + window_height <= 0	1254	if (sx + window_width <= 0 \|\| sy + window_height <= 0
1240	\|\| sx >= root_width \|\| sy >= root_height)	1255	\|\| sx >= root_width \|\| sy >= root_height)
1241	return 0;	1256	return 0;
…		…
1288	}	1303	}
1289		1304
1290	if (root_pixmap == None)	1305	if (root_pixmap == None)
1291	return 0;	1306	return 0;
1292		1307
		1308	if (pixmap == None
		1309	\|\| pmap_width != window_width
		1310	\|\| pmap_height != window_height)
		1311	{
		1312	if (pixmap)
		1313	XFreePixmap (target->dpy, pixmap);
1293	Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);	1314	pixmap = XCreatePixmap (target->dpy, target->vt, window_width, window_height, target->depth);
		1315	pmap_width = window_width;
		1316	pmap_height = window_height;
		1317	}
1294		1318
1295	if (tiled_root_pmap == None) /* something really bad happened - abort */	1319	if (pixmap == None)
1296	return 0;	1320	return 0;
1297		1321
1298	/* straightforward pixmap copy */	1322	/* straightforward pixmap copy */
		1323	while (sx < 0) sx += (int)root_width;
		1324	while (sy < 0) sy += (int)root_height;
		1325
1299	gcv.tile = recoded_root_pmap;	1326	gcv.tile = recoded_root_pmap;
1300	gcv.fill_style = FillTiled;	1327	gcv.fill_style = FillTiled;
1301
1302	while (sx < 0) sx += (int)root_width;
1303	while (sy < 0) sy += (int)root_height;
1304
1305	gcv.ts_x_origin = -sx;	1328	gcv.ts_x_origin = -sx;
1306	gcv.ts_y_origin = -sy;	1329	gcv.ts_y_origin = -sy;
1307	gc = XCreateGC (dpy, target->vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);	1330	gc = XCreateGC (dpy, target->vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
1308		1331
1309	if (gc)	1332	if (gc)
1310	{	1333	{
1311	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);	1334	XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1312	result \|= transpPmapTiled;	1335	result \|= transpPmapTiled;
1313	XFreeGC (dpy, gc);	1336	XFreeGC (dpy, gc);
1314		1337
1315	if (!need_client_side_rendering ())	1338	if (!(flags & CLIENT_RENDER))
1316	{	1339	{
1317	if ((flags & blurNeeded)	1340	if ((flags & blurNeeded)
1318	&& (flags & HAS_RENDER_CONV))	1341	&& (flags & HAS_RENDER_CONV))
1319	{	1342	{
1320	if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))	1343	if (blur_pixmap (pixmap, target->visual, window_width, window_height))
1321	result \|= transpPmapBlurred;	1344	result \|= transpPmapBlurred;
1322	}	1345	}
1323	if ((flags & tintNeeded)	1346	if ((flags & tintNeeded)
1324	&& (flags & (tintWholesome \| HAS_RENDER)))	1347	&& (flags & (tintWholesome \| HAS_RENDER)))
1325	{	1348	{
1326	if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))	1349	if (tint_pixmap (pixmap, target->visual, window_width, window_height))
1327	result \|= transpPmapTinted;	1350	result \|= transpPmapTinted;
1328	}	1351	}
1329	} /* server side rendering completed */	1352	} /* server side rendering completed */
1330
1331	if (pixmap)
1332	XFreePixmap (dpy, pixmap);
1333
1334	pixmap = tiled_root_pmap;
1335	pmap_width = window_width;
1336	pmap_height = window_height;
1337	pmap_depth = target->depth;
1338	}	1353	}
1339	else
1340	XFreePixmap (dpy, tiled_root_pmap);
1341		1354
1342	if (recoded_root_pmap != root_pixmap)	1355	if (recoded_root_pmap != root_pixmap)
1343	XFreePixmap (dpy, recoded_root_pmap);	1356	XFreePixmap (dpy, recoded_root_pmap);
1344		1357
1345	return result;	1358	return result;
1346	}	1359	}
1347		1360
1348	void	1361	void
1349	bgPixmap_t::set_root_pixmap ()	1362	bgPixmap_t::set_root_pixmap ()
1350	{	1363	{
1351	Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);	1364	Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1352	if (new_root_pixmap == None)	1365	if (new_root_pixmap == None)
1353	new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);	1366	new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1354		1367
1355	root_pixmap = new_root_pixmap;	1368	root_pixmap = new_root_pixmap;
1356	}	1369	}
1357	# endif /* ENABLE_TRANSPARENCY */	1370	# endif /* ENABLE_TRANSPARENCY */
1358		1371
1359	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)	1372	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1360	static void ShadeXImage(Visual visual, XImage srcImage, int shade, const rgba &c);	1373	static void shade_ximage (Visual visual, XImage ximage, int shade, const rgba &c);
1361	# endif	1374	# endif
1362		1375
1363	bool	1376	bool
1364	bgPixmap_t::render ()	1377	bgPixmap_t::render ()
1365	{	1378	{
…		…
1375	/* we need to re-generate transparency pixmap in that case ! */	1388	/* we need to re-generate transparency pixmap in that case ! */
1376	background_flags = make_transparency_pixmap ();	1389	background_flags = make_transparency_pixmap ();
1377	if (background_flags == 0)	1390	if (background_flags == 0)
1378	return false;	1391	return false;
1379	else if ((background_flags & transpTransformations) == (flags & transpTransformations))	1392	else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1380	flags = flags & ~isInvalid;	1393	flags \|= isValid;
1381	}	1394	}
1382	# endif	1395	# endif
1383		1396
1384	# ifdef BG_IMAGE_FROM_FILE	1397	# ifdef BG_IMAGE_FROM_FILE
1385	if (have_image	1398	if (have_image
1386	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))	1399	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))
1387	{	1400	{
1388	if (render_image (background_flags))	1401	if (render_image (background_flags))
1389	flags = flags & ~isInvalid;	1402	flags \|= isValid;
1390	}	1403	}
1391	# endif	1404	# endif
1392		1405
1393	# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)	1406	# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1394	XImage *result = NULL;	1407	XImage *result = NULL;
1395		1408
1396	if (background_flags && (flags & isInvalid))	1409	if (background_flags && !(flags & isValid))
1397	{	1410	{
1398	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);	1411	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1399	}	1412	}
1400		1413
1401	if (result)	1414	if (result)
…		…
1404	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1417	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1405	{	1418	{
1406	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1419	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1407	if (flags & tintSet)	1420	if (flags & tintSet)
1408	tint.get (c);	1421	tint.get (c);
1409	ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);	1422	shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1410	}	1423	}
1411		1424
1412	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1425	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1413		1426
1414	if (gc)	1427	if (gc)
1415	{	1428	{
1416	XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);	1429	XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1417		1430
1418	XFreeGC (target->dpy, gc);	1431	XFreeGC (target->dpy, gc);
1419	flags = flags & ~isInvalid;	1432	flags \|= isValid;
1420	}	1433	}
1421		1434
1422	XDestroyImage (result);	1435	XDestroyImage (result);
1423	}	1436	}
1424	# endif	1437	# endif
1425		1438
1426	if (flags & isInvalid)	1439	if (!(flags & isValid))
1427	{	1440	{
1428	if (pixmap != None)	1441	if (pixmap != None)
1429	{	1442	{
1430	XFreePixmap (target->dpy, pixmap);	1443	XFreePixmap (target->dpy, pixmap);
1431	pixmap = None;	1444	pixmap = None;
1432	}	1445	}
1433	}	1446	}
1434		1447
1435	apply ();	1448	target->scr_recolour (false);
		1449	flags \|= hasChanged;
1436		1450
1437	valid_since = ev::now ();	1451	valid_since = ev::now ();
1438		1452
1439	return true;	1453	return true;
1440	}	1454	}
…		…
1459	XFree (filters);	1473	XFree (filters);
1460	}	1474	}
1461	#endif	1475	#endif
1462	}	1476	}
1463		1477
1464	void
1465	bgPixmap_t::apply ()
1466	{
1467	if (target == NULL)
1468	return;
1469
1470	if (pixmap != None)
1471	{
1472	/* set target's background to pixmap */
1473	# ifdef ENABLE_TRANSPARENCY
1474	if (flags & isTransparent)
1475	{
1476	XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1477	XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1478
1479	if (target->scrollBar.win)
1480	XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1481	}
1482	else
1483	# endif
1484	{
1485	/* force old pixmap dereference in case it was transparent before :*/
1486	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1487	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1488	/* do we also need to set scrollbar's background here ? */
1489
1490	if (target->scrollBar.win)
1491	XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1492	}
1493	}
1494	else
1495	{
1496	/* set target background to a pixel */
1497	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1498	XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1499	/* do we also need to set scrollbar's background here ? */
1500	if (target->scrollBar.win)
1501	XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1502	}
1503
1504	/* don't want Expose on the parent or vt. It is better to use
1505	scr_touch or we get a great deal of flicker otherwise: */
1506	XClearWindow (target->dpy, target->parent[0]);
1507
1508	if (target->scrollBar.state && target->scrollBar.win)
1509	{
1510	target->scrollBar.state = STATE_IDLE;
1511	target->scrollBar.show (0);
1512	}
1513
1514	target->want_refresh = 1;
1515	flags \|= hasChanged;
1516	}
1517
1518	#endif /* HAVE_BG_PIXMAP */	1478	#endif /* HAVE_BG_PIXMAP */
1519		1479
1520	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)	1480	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1521	/* taken from aterm-0.4.2 */	1481	/* taken from aterm-0.4.2 */
1522		1482
1523	static void	1483	static void
1524	ShadeXImage(Visual visual, XImage srcImage, int shade, const rgba &c)	1484	shade_ximage (Visual visual, XImage ximage, int shade, const rgba &c)
1525	{	1485	{
1526	int sh_r, sh_g, sh_b;	1486	int sh_r, sh_g, sh_b;
1527	uint32_t mask_r, mask_g, mask_b;	1487	uint32_t mask_r, mask_g, mask_b;
1528	uint32_t lookup, lookup_r, lookup_g, lookup_b;	1488	uint32_t lookup, lookup_r, lookup_g, lookup_b;
1529	rgba low;	1489	rgba low;
1530	rgba high;	1490	rgba high;
1531	int i;	1491	int i;
1532	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;	1492	int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1533		1493
1534	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;	1494	if (visual->c_class != TrueColor \|\| ximage->format != ZPixmap) return;
1535		1495
1536	/* for convenience */	1496	/* for convenience */
1537	mask_r = visual->red_mask;	1497	mask_r = visual->red_mask;
1538	mask_g = visual->green_mask;	1498	mask_g = visual->green_mask;
1539	mask_b = visual->blue_mask;	1499	mask_b = visual->blue_mask;
1540		1500
1541	/* boring lookup table pre-initialization */	1501	/* boring lookup table pre-initialization */
1542	switch (srcImage->depth)	1502	switch (ximage->depth)
1543	{	1503	{
1544	case 15:	1504	case 15:
1545	if ((mask_r != 0x7c00) \|\|	1505	if ((mask_r != 0x7c00) \|\|
1546	(mask_g != 0x03e0) \|\|	1506	(mask_g != 0x03e0) \|\|
1547	(mask_b != 0x001f))	1507	(mask_b != 0x001f))
…		…
1600	/* prepare limits for color transformation (each channel is handled separately) */	1560	/* prepare limits for color transformation (each channel is handled separately) */
1601	if (shade > 100)	1561	if (shade > 100)
1602	{	1562	{
1603	shade = 200 - shade;	1563	shade = 200 - shade;
1604		1564
1605	high.r = (65535 - c.r) * shade / 100;	1565	high.r = c.r * shade / 100;
1606	high.g = (65535 - c.g) * shade / 100;	1566	high.g = c.g * shade / 100;
1607	high.b = (65535 - c.b) * shade / 100;	1567	high.b = c.b * shade / 100;
1608		1568
1609	low.r = 65535 - high.r;	1569	low.r = 65535 * (100 - shade) / 100;
1610	low.g = 65535 - high.g;	1570	low.g = 65535 * (100 - shade) / 100;
1611	low.b = 65535 - high.b;	1571	low.b = 65535 * (100 - shade) / 100;
1612	}	1572	}
1613	else	1573	else
1614	{	1574	{
1615	high.r = c.r * shade / 100;	1575	high.r = c.r * shade / 100;
1616	high.g = c.g * shade / 100;	1576	high.g = c.g * shade / 100;
…		…
1641	tmp += (mask_b>>sh_b) * low.b;	1601	tmp += (mask_b>>sh_b) * low.b;
1642	lookup_b[i] = (tmp/65535)<<sh_b;	1602	lookup_b[i] = (tmp/65535)<<sh_b;
1643	}	1603	}
1644		1604
1645	/* apply table to input image (replacing colors by newly calculated ones) */	1605	/* apply table to input image (replacing colors by newly calculated ones) */
1646	if (srcImage->bits_per_pixel == 32	1606	if (ximage->bits_per_pixel == 32
1647	&& (srcImage->depth == 24 \|\| srcImage->depth == 32)	1607	&& (ximage->depth == 24 \|\| ximage->depth == 32)
1648	&& srcImage->byte_order == host_byte_order)	1608	&& ximage->byte_order == host_byte_order)
1649	{	1609	{
1650	uint32_t p1, pf, p, pl;	1610	uint32_t p1, pf, p, pl;
1651	p1 = (uint32_t *) srcImage->data;	1611	p1 = (uint32_t *) ximage->data;
1652	pf = (uint32_t ) (srcImage->data + srcImage->height srcImage->bytes_per_line);	1612	pf = (uint32_t ) (ximage->data + ximage->height ximage->bytes_per_line);
1653		1613
1654	while (p1 < pf)	1614	while (p1 < pf)
1655	{	1615	{
1656	p = p1;	1616	p = p1;
1657	pl = p1 + srcImage->width;	1617	pl = p1 + ximage->width;
1658	for (; p < pl; p++)	1618	for (; p < pl; p++)
1659	{	1619	{
1660	p = lookup_r[(p & 0xff0000) >> 16] \|	1620	p = lookup_r[(p & 0xff0000) >> 16] \|
1661	lookup_g[(*p & 0x00ff00) >> 8] \|	1621	lookup_g[(*p & 0x00ff00) >> 8] \|
1662	lookup_b[(*p & 0x0000ff)] \|	1622	lookup_b[(*p & 0x0000ff)] \|
1663	(*p & 0xff000000);	1623	(*p & 0xff000000);
1664	}	1624	}
1665	p1 = (uint32_t ) ((char ) p1 + srcImage->bytes_per_line);	1625	p1 = (uint32_t ) ((char ) p1 + ximage->bytes_per_line);
1666	}	1626	}
1667	}	1627	}
1668	else	1628	else
1669	{	1629	{
1670	for (int y = 0; y < srcImage->height; y++)	1630	for (int y = 0; y < ximage->height; y++)
1671	for (int x = 0; x < srcImage->width; x++)	1631	for (int x = 0; x < ximage->width; x++)
1672	{	1632	{
1673	unsigned long pixel = XGetPixel (srcImage, x, y);	1633	unsigned long pixel = XGetPixel (ximage, x, y);
1674	pixel = lookup_r[(pixel & mask_r) >> sh_r] \|	1634	pixel = lookup_r[(pixel & mask_r) >> sh_r] \|
1675	lookup_g[(pixel & mask_g) >> sh_g] \|	1635	lookup_g[(pixel & mask_g) >> sh_g] \|
1676	lookup_b[(pixel & mask_b) >> sh_b];	1636	lookup_b[(pixel & mask_b) >> sh_b];
1677	XPutPixel (srcImage, x, y, pixel);	1637	XPutPixel (ximage, x, y, pixel);
1678	}	1638	}
1679	}	1639	}
1680		1640
1681	free (lookup);	1641	free (lookup);
1682	}	1642	}

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.119 by sf-exg, Thu Nov 18 17:28:12 2010 UTC vs. Revision 1.140 by sf-exg, Sun Jan 23 12:28:47 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.119 by sf-exg, Thu Nov 18 17:28:12 2010 UTC vs.
Revision 1.140 by sf-exg, Sun Jan 23 12:28:47 2011 UTC