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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.116 by sf-exg, Thu Nov 11 11:58:10 2010 UTC vs.
Revision 1.128 by sf-exg, Sun Dec 19 00:49:32 2010 UTC

…		…
28		28
29	#if XRENDER	29	#if XRENDER
30	# include <X11/extensions/Xrender.h>	30	# include <X11/extensions/Xrender.h>
31	#endif	31	#endif
32		32
		33	#ifndef FilterConvolution
		34	#define FilterConvolution "convolution"
		35	#endif
		36
33	#define DO_TIMING_TEST 0	37	#define DO_TIMING_TEST 0
34		38
35	#if DO_TIMING_TEST	39	#if DO_TIMING_TEST
36	# include <sys/time.h>	40	# include <sys/time.h>
37	#define TIMING_TEST_START(id) \	41	#define TIMING_TEST_START(id) \
…		…
62	*	66	*
63	* 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%.
64	* W and H are percentages of the terminal window size.	68	* W and H are percentages of the terminal window size.
65	* X and Y are also percentages; e.g., +50+50 centers	69	* X and Y are also percentages; e.g., +50+50 centers
66	* the image in the window.	70	* the image in the window.
67	* WxH+X Assumes Y == X
68	* WxH Assumes Y == X == 50 (centers the image)
69	* W+X+Y Assumes H == W
70	* W+X Assumes H == W and Y == X
71	* W Assumes H == W and Y == X == 50
72	*
73	* Adjusting position only :
74	* =+X+Y Set position to X% by Y% (absolute).
75	* =+X Set position to X% by X%.
76	* +X+Y Adjust position horizontally X% and vertically Y%
77	* from current position (relative).
78	* +X Adjust position horizontally X% and vertically X%
79	* from current position.
80	*
81	* Adjusting scale only :
82	* Wx0 Multiply horizontal scaling factor by W%
83	* 0xH Multiply vertical scaling factor by H%
84	* 0x0 No scaling (show image at normal size).
85	*	71	*
86	* Pixmap Operations : (should be prepended by a colon)	72	* Pixmap Operations : (should be prepended by a colon)
87	* tile Tile image. Scaling/position modifiers above will affect	73	* tile Tile image. Scaling/position modifiers above will affect
88	* the tile size and origin.	74	* the tile size and origin.
89	* propscale When scaling, scale proportionally. That is, maintain the	75	* propscale When scaling, scale proportionally. That is, maintain the
…		…
117	#endif	103	#endif
118	flags = 0;	104	flags = 0;
119	pixmap = None;	105	pixmap = None;
120	valid_since = invalid_since = 0;	106	valid_since = invalid_since = 0;
121	target = 0;	107	target = 0;
		108	target_x = target_y = 0;
122	}	109	}
123		110
124	void	111	void
125	bgPixmap_t::destroy ()	112	bgPixmap_t::destroy ()
126	{	113	{
…		…
137	if (pixmap && target)	124	if (pixmap && target)
138	XFreePixmap (target->dpy, pixmap);	125	XFreePixmap (target->dpy, pixmap);
139	}	126	}
140		127
141	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
142	bgPixmap_t::window_size_sensitive ()	143	bgPixmap_t::window_size_sensitive ()
143	{	144	{
144	# ifdef ENABLE_TRANSPARENCY	145	# ifdef ENABLE_TRANSPARENCY
145	if (flags & isTransparent)	146	if (flags & isTransparent)
146	return true;	147	return true;
…		…
172	return true;	173	return true;
173	}	174	}
174	# endif	175	# endif
175		176
176	return false;	177	return false;
177	};	178	}
178		179
179	bool bgPixmap_t::need_client_side_rendering ()	180	bool bgPixmap_t::need_client_side_rendering ()
180	{	181	{
181	# ifdef HAVE_AFTERIMAGE	182	# ifdef HAVE_AFTERIMAGE
182	if (original_asim)	183	if (original_asim)
…		…
252	dst_size = target_size - dst_pos;	253	dst_size = target_size - dst_pos;
253	return src_pos;	254	return src_pos;
254	}	255	}
255		256
256	bool	257	bool
257	bgPixmap_t::set_geometry (const char *geom)	258	bgPixmap_t::set_geometry (const char *geom, bool update)
258	{	259	{
259	bool changed = false;	260	bool changed = false;
260	int geom_flags = 0;	261	int geom_flags = 0;
261	int x = 0, y = 0;	262	int x = 0, y = 0;
262	unsigned int w = 0, h = 0;	263	unsigned int w = 0, h = 0;
263	unsigned int n;	264	unsigned int n;
264	unsigned long new_flags = (flags & (~geometryFlags));	265	unsigned long new_flags = (flags & (~geometryFlags));
265	const char *p;	266	const char *ops;
266	# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */	267	# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
267		268
268	if (geom == NULL)	269	if (geom == NULL)
269	return false;	270	return false;
270		271
271	char str[MAXLEN_GEOM];	272	char str[MAXLEN_GEOM];
272		273
273	while (isspace(*geom)) ++geom;
274	if ((p = strchr (geom, ';')) == NULL)
275	p = strchr (geom, '\0');	274	ops = strchr (geom, ':');
276		275	if (ops == NULL)
		276	n = strlen (geom);
		277	else
277	n = (p - geom);	278	n = ops - geom;
		279
278	if (n < MAXLEN_GEOM)	280	if (n >= MAXLEN_GEOM)
279	{	281	return false;
280	char *ops;
281	new_flags \|= geometrySet;
282		282
283	memcpy (str, geom, n);	283	memcpy (str, geom, n);
284	str[n] = '\0';	284	str[n] = '\0';
285	if (str[0] == ':')	285	rxvt_strtrim (str);
286	ops = &str[0];
287	else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
288	ops = &str[0];
289	else
290	{
291	char *tmp;
292	ops = strchr (str, ':');
293	if (ops != NULL)
294	{
295	for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
296	*(++tmp) = '\0';
297	if (ops == tmp) ++ops;
298	}
299	}
300		286
301	if (ops > str \|\| ops == NULL)	287	if (str[0])
302	{	288	{
303	/* 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 */
304	geom_flags = XParseGeometry (str, &x, &y, &w, &h);	290	geom_flags = XParseGeometry (str, &x, &y, &w, &h);
305
306	if ((geom_flags & XValue) && !(geom_flags & YValue))
307	{
308	y = x;
309	geom_flags \|= YValue;
310	}
311
312	if (flags & geometrySet)
313	{
314	/* new geometry is an adjustment to the old one ! */
315	if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
316	{
317	if (w == 0 && h != 0)
318	{
319	w = h_scale;
320	h = (v_scale * h) / 100;
321	}
322	else if (h == 0 && w != 0)
323	{
324	w = (h_scale * w) / 100;
325	h = v_scale;
326	}
327	}
328	if (geom_flags & XValue)
329	{
330	if (str[0] != '=')
331	{
332	y += v_align;
333	x += h_align;
334	}
335	}
336	}
337	else /* setting up geometry from scratch */
338	{
339	if (!(geom_flags & XValue))
340	{
341	/* use default geometry - centered */
342	x = y = defaultAlign;
343	}
344	else if (!(geom_flags & YValue))
345	y = x;
346
347	if ((geom_flags & (WidthValue\|HeightValue)) == 0)
348	{
349	/* use default geometry - scaled */
350	w = h = defaultScale;
351	}
352	else if (geom_flags & WidthValue)
353	{
354	if (!(geom_flags & HeightValue))
355	h = w;
356	}
357	else
358	w = h;
359	}
360	} /* done parsing geometry string */	291	} /* done parsing geometry string */
361	else if (!(flags & geometrySet))	292
362	{	293	if (!update)
363	/* default geometry - scaled and centered */	294	{
		295	if (!(geom_flags & XValue))
364	x = y = defaultAlign;	296	x = y = defaultAlign;
		297	else if (!(geom_flags & YValue))
		298	y = x;
		299
		300	if (!(geom_flags & (WidthValue\|HeightValue)))
365	w = h = defaultScale;	301	w = h = defaultScale;
366	}	302	else if (!(geom_flags & HeightValue))
		303	h = w;
		304	else if (!(geom_flags & WidthValue))
		305	w = h;
367		306
368	if (!(flags & geometrySet))
369	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	307	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
		308	}
370		309
371	if (ops)	310	if (ops)
372	{	311	{
373	while (*ops)	312	while (*ops)
374	{	313	{
375	while (ops == ':' \|\| isspace(ops)) ++ops;	314	while (ops == ':' \|\| isspace(ops)) ++ops;
376		315
377	# 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)
378	if (CHECK_GEOM_OPS ("tile"))	317	if (CHECK_GEOM_OPS ("tile"))
379	{	318	{
380	w = h = noScale;	319	w = h = noScale;
381	geom_flags \|= WidthValue\|HeightValue;	320	geom_flags \|= WidthValue\|HeightValue;
382	}	321	}
383	else if (CHECK_GEOM_OPS ("propscale"))	322	else if (CHECK_GEOM_OPS ("propscale"))
384	{	323	{
385	new_flags \|= propScale;	324	new_flags \|= propScale;
386	}	325	}
387	else if (CHECK_GEOM_OPS ("hscale"))	326	else if (CHECK_GEOM_OPS ("hscale"))
388	{	327	{
389	if (w == 0) w = windowScale;	328	if (w == 0) w = windowScale;
390		329
391	h = noScale;	330	h = noScale;
392	geom_flags \|= WidthValue\|HeightValue;	331	geom_flags \|= WidthValue\|HeightValue;
393	}	332	}
394	else if (CHECK_GEOM_OPS ("vscale"))	333	else if (CHECK_GEOM_OPS ("vscale"))
395	{	334	{
396	if (h == 0) h = windowScale;	335	if (h == 0) h = windowScale;
397		336
398	w = noScale;	337	w = noScale;
399	geom_flags \|= WidthValue\|HeightValue;	338	geom_flags \|= WidthValue\|HeightValue;
400	}	339	}
401	else if (CHECK_GEOM_OPS ("scale"))	340	else if (CHECK_GEOM_OPS ("scale"))
402	{	341	{
403	if (h == 0) h = windowScale;	342	if (h == 0) h = windowScale;
404	if (w == 0) w = windowScale;	343	if (w == 0) w = windowScale;
405		344
406	geom_flags \|= WidthValue\|HeightValue;	345	geom_flags \|= WidthValue\|HeightValue;
407	}	346	}
408	else if (CHECK_GEOM_OPS ("auto"))	347	else if (CHECK_GEOM_OPS ("auto"))
409	{	348	{
410	w = h = windowScale;	349	w = h = windowScale;
411	x = y = centerAlign;	350	x = y = centerAlign;
412	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	351	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
413	}	352	}
414	else if (CHECK_GEOM_OPS ("root"))	353	else if (CHECK_GEOM_OPS ("root"))
415	{	354	{
416	new_flags \|= rootAlign;	355	new_flags \|= rootAlign;
417	w = h = noScale;	356	w = h = noScale;
418	geom_flags \|= WidthValue\|HeightValue;	357	geom_flags \|= WidthValue\|HeightValue;
419	}	358	}
420	# undef CHECK_GEOM_OPS	359	# undef CHECK_GEOM_OPS
421		360
422	while (ops != ':' && ops != '\0') ++ops;	361	while (ops != ':' && ops != '\0') ++ops;
423	} /* done parsing ops */	362	} /* done parsing ops */
424	}	363	}
425		364
426	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;	365	if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
427	if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;	366	if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
428	if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;	367	if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
429	if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;	368	if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
430	}
431		369
432	if (new_flags != flags)	370	if (new_flags != flags)
433	{	371	{
434	flags = new_flags;	372	flags = new_flags;
435	changed = true;	373	changed = true;
…		…
460	if (!w) w = image_width;	398	if (!w) w = image_width;
461	if (!h) h = image_height;	399	if (!h) h = image_height;
462		400
463	if (flags & rootAlign)	401	if (flags & rootAlign)
464	{	402	{
465	target->get_window_origin (x, y);
466	x = -x;	403	x = -target_x;
467	y = -y;	404	y = -target_y;
468	}	405	}
469	else	406	else
470	{	407	{
471	x = make_align_position (h_align, target_width, w);	408	x = make_align_position (h_align, target_width, w);
472	y = make_align_position (v_align, target_height, h);	409	y = make_align_position (v_align, target_height, h);
…		…
720	}	657	}
721	# endif /* HAVE_AFTERIMAGE */	658	# endif /* HAVE_AFTERIMAGE */
722		659
723	# ifdef HAVE_PIXBUF	660	# ifdef HAVE_PIXBUF
724	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
725	bgPixmap_t::render_image (unsigned long background_flags)	747	bgPixmap_t::render_image (unsigned long background_flags)
726	{	748	{
727	if (target == NULL)	749	if (target == NULL)
728	return false;	750	return false;
729		751
…		…
810	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);	832	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
811		833
812	if (h_scale == 0 \|\| v_scale == 0)	834	if (h_scale == 0 \|\| v_scale == 0)
813	{	835	{
814	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);
815	gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,	837	pixbuf_to_pixmap (result, tile, gc,
816	0, 0,	838	0, 0,
817	0, 0,	839	0, 0,
818	image_width, image_height,	840	image_width, image_height);
819	XLIB_RGB_DITHER_NONE,
820	0, 0);
821		841
822	gcv.tile = tile;	842	gcv.tile = tile;
823	gcv.fill_style = FillTiled;	843	gcv.fill_style = FillTiled;
824	gcv.ts_x_origin = x;	844	gcv.ts_x_origin = x;
825	gcv.ts_y_origin = y;	845	gcv.ts_y_origin = y;
…		…
840	\|\| dst_x + dst_width < new_pmap_width	860	\|\| dst_x + dst_width < new_pmap_width
841	\|\| dst_y + dst_height < new_pmap_height)	861	\|\| dst_y + dst_height < new_pmap_height)
842	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);
843		863
844	if (dst_x < new_pmap_width && dst_y < new_pmap_height)	864	if (dst_x < new_pmap_width && dst_y < new_pmap_height)
845	gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,	865	pixbuf_to_pixmap (result, pixmap, gc,
846	src_x, src_y,	866	src_x, src_y,
847	dst_x, dst_y,	867	dst_x, dst_y,
848	dst_width, dst_height,	868	dst_width, dst_height);
849	XLIB_RGB_DITHER_NONE,
850	0, 0);
851	}	869	}
852		870
853	#if XRENDER	871	#if XRENDER
854	if (background_flags)	872	if (background_flags)
855	{	873	{
…		…
1003	bool has_shade = shade != 100;	1021	bool has_shade = shade != 100;
1004		1022
1005	if (tint)	1023	if (tint)
1006	{	1024	{
1007	tint->get (c);	1025	tint->get (c);
1008	# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 \|\| (cmp) >= 0x00f700)	1026	# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff \|\| (cmp) >= 0xff00)
		1027	if (!has_shade
1009	if (!has_shade && IS_COMPONENT_WHOLESOME (c.r)	1028	&& IS_COMPONENT_WHOLESOME (c.r)
1010	&& IS_COMPONENT_WHOLESOME (c.g)	1029	&& IS_COMPONENT_WHOLESOME (c.g)
1011	&& IS_COMPONENT_WHOLESOME (c.b))	1030	&& IS_COMPONENT_WHOLESOME (c.b))
1012	flags \|= bgPixmap_t::tintWholesome;	1031	flags \|= bgPixmap_t::tintWholesome;
1013	# undef IS_COMPONENT_WHOLESOME	1032	# undef IS_COMPONENT_WHOLESOME
1014	}	1033	}
1015		1034
1016	if (has_shade)	1035	if (has_shade \|\| tint)
1017	flags \|= bgPixmap_t::tintNeeded;	1036	flags \|= bgPixmap_t::tintNeeded;
1018	else if (tint)
1019	{
1020	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)
1021	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))
1022	{
1023	flags \|= bgPixmap_t::tintNeeded;
1024	}
1025	}
1026		1037
1027	return flags;	1038	return flags;
1028	}	1039	}
1029		1040
1030	bool	1041	bool
…		…
1201	c.g = (c.g * shade) / 100;	1212	c.g = (c.g * shade) / 100;
1202	c.b = (c.b * shade) / 100;	1213	c.b = (c.b * shade) / 100;
1203	}	1214	}
1204	else	1215	else
1205	{	1216	{
1206	c.r = ((0xffff - c.r) * (200 - shade)) / 100;	1217	c.r = (c.r * (200 - shade)) / 100;
1207	c.g = ((0xffff - c.g) * (200 - shade)) / 100;	1218	c.g = (c.g * (200 - shade)) / 100;
1208	c.b = ((0xffff - c.b) * (200 - shade)) / 100;	1219	c.b = (c.b * (200 - shade)) / 100;
1209	}	1220	}
1210		1221
1211	XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);	1222	XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1212	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	1223	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1213	XRenderPictureAttributes pa;	1224	XRenderPictureAttributes pa;
…		…
1227		1238
1228	if (mask_pic && overlay_pic && back_pic)	1239	if (mask_pic && overlay_pic && back_pic)
1229	{	1240	{
1230	XRenderColor mask_c;	1241	XRenderColor mask_c;
1231		1242
1232	mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;	1243	mask_c.red = mask_c.green = mask_c.blue = 0;
1233	mask_c.alpha = 0xffff;	1244	mask_c.alpha = 0xffff;
1234	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);	1245	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1235		1246
1236	mask_c.alpha = 0;	1247	mask_c.alpha = 0;
1237	mask_c.red = 0xffff - c.r;	1248	mask_c.red = 0xffff - c.r;
1238	mask_c.green = 0xffff - c.g;	1249	mask_c.green = 0xffff - c.g;
1239	mask_c.blue = 0xffff - c.b;	1250	mask_c.blue = 0xffff - c.b;
1240	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);	1251	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1241	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
1242	ret = true;	1263	ret = true;
1243	}	1264	}
1244		1265
1245	XRenderFreePicture (dpy, mask_pic);	1266	XRenderFreePicture (dpy, mask_pic);
1246	XRenderFreePicture (dpy, overlay_pic);	1267	XRenderFreePicture (dpy, overlay_pic);
…		…
1277	int window_height = target->szHint.height;	1298	int window_height = target->szHint.height;
1278	int sx, sy;	1299	int sx, sy;
1279	XGCValues gcv;	1300	XGCValues gcv;
1280	GC gc;	1301	GC gc;
1281		1302
1282	target->get_window_origin (sx, sy);	1303	sx = target_x;
		1304	sy = target_y;
1283		1305
1284	/* 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 : */
1285	if (sx + window_width <= 0 \|\| sy + window_height <= 0	1307	if (sx + window_width <= 0 \|\| sy + window_height <= 0
1286	\|\| sx >= root_width \|\| sy >= root_height)	1308	\|\| sx >= root_width \|\| sy >= root_height)
1287	return 0;	1309	return 0;
…		…
1340		1362
1341	if (tiled_root_pmap == None) /* something really bad happened - abort */	1363	if (tiled_root_pmap == None) /* something really bad happened - abort */
1342	return 0;	1364	return 0;
1343		1365
1344	/* straightforward pixmap copy */	1366	/* straightforward pixmap copy */
		1367	while (sx < 0) sx += (int)root_width;
		1368	while (sy < 0) sy += (int)root_height;
		1369
1345	gcv.tile = recoded_root_pmap;	1370	gcv.tile = recoded_root_pmap;
1346	gcv.fill_style = FillTiled;	1371	gcv.fill_style = FillTiled;
1347
1348	while (sx < 0) sx += (int)root_width;
1349	while (sy < 0) sy += (int)root_height;
1350
1351	gcv.ts_x_origin = -sx;	1372	gcv.ts_x_origin = -sx;
1352	gcv.ts_y_origin = -sy;	1373	gcv.ts_y_origin = -sy;
1353	gc = XCreateGC (dpy, target->vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);	1374	gc = XCreateGC (dpy, target->vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
1354		1375
1355	if (gc)	1376	if (gc)
…		…
1392	}	1413	}
1393		1414
1394	void	1415	void
1395	bgPixmap_t::set_root_pixmap ()	1416	bgPixmap_t::set_root_pixmap ()
1396	{	1417	{
1397	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]);
1398	if (new_root_pixmap == None)	1419	if (new_root_pixmap == None)
1399	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]);
1400		1421
1401	root_pixmap = new_root_pixmap;	1422	root_pixmap = new_root_pixmap;
1402	}	1423	}
1403	# endif /* ENABLE_TRANSPARENCY */	1424	# endif /* ENABLE_TRANSPARENCY */
1404		1425
1405	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)	1426	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1406	static void ShadeXImage(Visual visual, XImage srcImage, int shade, const rgba &c);	1427	static void shade_ximage (Visual visual, XImage ximage, int shade, const rgba &c);
1407	# endif	1428	# endif
1408		1429
1409	bool	1430	bool
1410	bgPixmap_t::render ()	1431	bgPixmap_t::render ()
1411	{	1432	{
…		…
1421	/* we need to re-generate transparency pixmap in that case ! */	1442	/* we need to re-generate transparency pixmap in that case ! */
1422	background_flags = make_transparency_pixmap ();	1443	background_flags = make_transparency_pixmap ();
1423	if (background_flags == 0)	1444	if (background_flags == 0)
1424	return false;	1445	return false;
1425	else if ((background_flags & transpTransformations) == (flags & transpTransformations))	1446	else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1426	flags = flags & ~isInvalid;	1447	flags &= ~isInvalid;
1427	}	1448	}
1428	# endif	1449	# endif
1429		1450
1430	# ifdef BG_IMAGE_FROM_FILE	1451	# ifdef BG_IMAGE_FROM_FILE
1431	if (have_image	1452	if (have_image
1432	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))	1453	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))
1433	{	1454	{
1434	if (render_image (background_flags))	1455	if (render_image (background_flags))
1435	flags = flags & ~isInvalid;	1456	flags &= ~isInvalid;
1436	}	1457	}
1437	# endif	1458	# endif
1438		1459
1439	# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)	1460	# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1440	XImage *result = NULL;	1461	XImage *result = NULL;
…		…
1450	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1471	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1451	{	1472	{
1452	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1473	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1453	if (flags & tintSet)	1474	if (flags & tintSet)
1454	tint.get (c);	1475	tint.get (c);
1455	ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);	1476	shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1456	}	1477	}
1457		1478
1458	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1479	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1459		1480
1460	if (gc)	1481	if (gc)
1461	{	1482	{
1462	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);
1463		1484
1464	XFreeGC (target->dpy, gc);	1485	XFreeGC (target->dpy, gc);
1465	flags = flags & ~isInvalid;	1486	flags &= ~isInvalid;
1466	}	1487	}
1467		1488
1468	XDestroyImage (result);	1489	XDestroyImage (result);
1469	}	1490	}
1470	# endif	1491	# endif
…		…
1565		1586
1566	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)	1587	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1567	/* taken from aterm-0.4.2 */	1588	/* taken from aterm-0.4.2 */
1568		1589
1569	static void	1590	static void
1570	ShadeXImage(Visual visual, XImage srcImage, int shade, const rgba &c)	1591	shade_ximage (Visual visual, XImage ximage, int shade, const rgba &c)
1571	{	1592	{
1572	int sh_r, sh_g, sh_b;	1593	int sh_r, sh_g, sh_b;
1573	uint32_t mask_r, mask_g, mask_b;	1594	uint32_t mask_r, mask_g, mask_b;
1574	uint32_t lookup, lookup_r, lookup_g, lookup_b;	1595	uint32_t lookup, lookup_r, lookup_g, lookup_b;
1575	rgba low;	1596	rgba low;
1576	rgba high;	1597	rgba high;
1577	int i;	1598	int i;
1578	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;	1599	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1579		1600
1580	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;	1601	if (visual->c_class != TrueColor \|\| ximage->format != ZPixmap) return;
1581		1602
1582	/* for convenience */	1603	/* for convenience */
1583	mask_r = visual->red_mask;	1604	mask_r = visual->red_mask;
1584	mask_g = visual->green_mask;	1605	mask_g = visual->green_mask;
1585	mask_b = visual->blue_mask;	1606	mask_b = visual->blue_mask;
1586		1607
1587	/* boring lookup table pre-initialization */	1608	/* boring lookup table pre-initialization */
1588	switch (srcImage->depth)	1609	switch (ximage->depth)
1589	{	1610	{
1590	case 15:	1611	case 15:
1591	if ((mask_r != 0x7c00) \|\|	1612	if ((mask_r != 0x7c00) \|\|
1592	(mask_g != 0x03e0) \|\|	1613	(mask_g != 0x03e0) \|\|
1593	(mask_b != 0x001f))	1614	(mask_b != 0x001f))
…		…
1646	/* prepare limits for color transformation (each channel is handled separately) */	1667	/* prepare limits for color transformation (each channel is handled separately) */
1647	if (shade > 100)	1668	if (shade > 100)
1648	{	1669	{
1649	shade = 200 - shade;	1670	shade = 200 - shade;
1650		1671
1651	high.r = (65535 - c.r) * shade / 100;	1672	high.r = c.r * shade / 100;
1652	high.g = (65535 - c.g) * shade / 100;	1673	high.g = c.g * shade / 100;
1653	high.b = (65535 - c.b) * shade / 100;	1674	high.b = c.b * shade / 100;
1654		1675
1655	low.r = 65535 - high.r;	1676	low.r = 65535 * (100 - shade) / 100;
1656	low.g = 65535 - high.g;	1677	low.g = 65535 * (100 - shade) / 100;
1657	low.b = 65535 - high.b;	1678	low.b = 65535 * (100 - shade) / 100;
1658	}	1679	}
1659	else	1680	else
1660	{	1681	{
1661	high.r = c.r * shade / 100;	1682	high.r = c.r * shade / 100;
1662	high.g = c.g * shade / 100;	1683	high.g = c.g * shade / 100;
…		…
1687	tmp += (mask_b>>sh_b) * low.b;	1708	tmp += (mask_b>>sh_b) * low.b;
1688	lookup_b[i] = (tmp/65535)<<sh_b;	1709	lookup_b[i] = (tmp/65535)<<sh_b;
1689	}	1710	}
1690		1711
1691	/* apply table to input image (replacing colors by newly calculated ones) */	1712	/* apply table to input image (replacing colors by newly calculated ones) */
1692	if (srcImage->bits_per_pixel == 32	1713	if (ximage->bits_per_pixel == 32
1693	&& (srcImage->depth == 24 \|\| srcImage->depth == 32)	1714	&& (ximage->depth == 24 \|\| ximage->depth == 32)
1694	&& srcImage->byte_order == host_byte_order)	1715	&& ximage->byte_order == host_byte_order)
1695	{	1716	{
1696	uint32_t p1, pf, p, pl;	1717	uint32_t p1, pf, p, pl;
1697	p1 = (uint32_t *) srcImage->data;	1718	p1 = (uint32_t *) ximage->data;
1698	pf = (uint32_t ) (srcImage->data + srcImage->height srcImage->bytes_per_line);	1719	pf = (uint32_t ) (ximage->data + ximage->height ximage->bytes_per_line);
1699		1720
1700	while (p1 < pf)	1721	while (p1 < pf)
1701	{	1722	{
1702	p = p1;	1723	p = p1;
1703	pl = p1 + srcImage->width;	1724	pl = p1 + ximage->width;
1704	for (; p < pl; p++)	1725	for (; p < pl; p++)
1705	{	1726	{
1706	p = lookup_r[(p & 0xff0000) >> 16] \|	1727	p = lookup_r[(p & 0xff0000) >> 16] \|
1707	lookup_g[(*p & 0x00ff00) >> 8] \|	1728	lookup_g[(*p & 0x00ff00) >> 8] \|
1708	lookup_b[(*p & 0x0000ff)] \|	1729	lookup_b[(*p & 0x0000ff)] \|
1709	(*p & 0xff000000);	1730	(*p & 0xff000000);
1710	}	1731	}
1711	p1 = (uint32_t ) ((char ) p1 + srcImage->bytes_per_line);	1732	p1 = (uint32_t ) ((char ) p1 + ximage->bytes_per_line);
1712	}	1733	}
1713	}	1734	}
1714	else	1735	else
1715	{	1736	{
1716	for (int y = 0; y < srcImage->height; y++)	1737	for (int y = 0; y < ximage->height; y++)
1717	for (int x = 0; x < srcImage->width; x++)	1738	for (int x = 0; x < ximage->width; x++)
1718	{	1739	{
1719	unsigned long pixel = XGetPixel (srcImage, x, y);	1740	unsigned long pixel = XGetPixel (ximage, x, y);
1720	pixel = lookup_r[(pixel & mask_r) >> sh_r] \|	1741	pixel = lookup_r[(pixel & mask_r) >> sh_r] \|
1721	lookup_g[(pixel & mask_g) >> sh_g] \|	1742	lookup_g[(pixel & mask_g) >> sh_g] \|
1722	lookup_b[(pixel & mask_b) >> sh_b];	1743	lookup_b[(pixel & mask_b) >> sh_b];
1723	XPutPixel (srcImage, x, y, pixel);	1744	XPutPixel (ximage, x, y, pixel);
1724	}	1745	}
1725	}	1746	}
1726		1747
1727	free (lookup);	1748	free (lookup);
1728	}	1749	}

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.116 by sf-exg, Thu Nov 11 11:58:10 2010 UTC vs. Revision 1.128 by sf-exg, Sun Dec 19 00:49:32 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.116 by sf-exg, Thu Nov 11 11:58:10 2010 UTC vs.
Revision 1.128 by sf-exg, Sun Dec 19 00:49:32 2010 UTC