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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.38 by sf-exg, Sat Apr 3 16:30:39 2010 UTC vs.
Revision 1.58 by sf-exg, Fri Sep 3 22:57:31 2010 UTC

…		…
27	#define DO_TIMING_TEST 0	27	#define DO_TIMING_TEST 0
28		28
29	#if DO_TIMING_TEST	29	#if DO_TIMING_TEST
30	# include <sys/time.h>	30	# include <sys/time.h>
31	#define TIMING_TEST_START(id) \	31	#define TIMING_TEST_START(id) \
32	struct timeval timing_test_##id##_stv;\	32	struct timeval timing_test_##id##_stv; \
33	gettimeofday (&timing_test_##id##_stv, NULL);	33	gettimeofday (&timing_test_##id##_stv, NULL);
34		34
35	#define TIMING_TEST_PRINT_RESULT(id) \	35	#define TIMING_TEST_PRINT_RESULT(id) \
36	do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\	36	do { \
		37	struct timeval tv; \
		38	gettimeofday (&tv, NULL); \
		39	tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
37	fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\	40	fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
38	tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0)	41	tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
		42	} while (0)
39		43
40	#else	44	#else
41	#define TIMING_TEST_START(id) do{}while (0)	45	#define TIMING_TEST_START(id) do {} while (0)
42	#define TIMING_TEST_PRINT_RESULT(id) do{}while (0)	46	#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
43	#endif	47	#endif
44		48
45	/*	49	/*
46	* Pixmap geometry string interpretation :	50	* Pixmap geometry string interpretation :
47	* Each geometry string contains zero or one scale/position	51	* Each geometry string contains zero or one scale/position
48	* adjustment and may optionally be followed by a colon and one or more	52	* adjustment and may optionally be followed by a colon and one or more
49	* colon-delimited pixmap operations.	53	* colon-delimited pixmap operations.
50	* The following table shows the valid geometry strings and their	54	* The following table shows the valid geometry strings and their
51	* affects on the background image :	55	* effects on the background image :
52	*	56	*
53	* WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.	57	* WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
54	* W and H are percentages of the terminal window size.	58	* W and H are percentages of the terminal window size.
55	* X and Y are also percentages; e.g., +50+50 centers	59	* X and Y are also percentages; e.g., +50+50 centers
56	* the image in the window.	60	* the image in the window.
57	* WxH+X Assumes Y == X	61	* WxH+X Assumes Y == X
58	* WxH Assumes Y == X == 50 (centers the image)	62	* WxH Assumes Y == X == 50 (centers the image)
59	* W+X+Y Assumes H == W	63	* W+X+Y Assumes H == W
60	* W+X Assumes H == W and Y == X	64	* W+X Assumes H == W and Y == X
61	* W Assumes H == W and Y == X == 50	65	* W Assumes H == W and Y == X == 50
62	*	66	*
63	* Adjusting position only :	67	* Adjusting position only :
64	* =+X+Y Set position to X% by Y% (absolute).	68	* =+X+Y Set position to X% by Y% (absolute).
65	* =+X Set position to X% by X%.	69	* =+X Set position to X% by X%.
66	* +X+Y Adjust position horizontally X% and vertically Y%	70	* +X+Y Adjust position horizontally X% and vertically Y%
67	* from current position (relative).	71	* from current position (relative).
68	* +X Adjust position horizontally X% and vertically X%	72	* +X Adjust position horizontally X% and vertically X%
69	* from current position.	73	* from current position.
70	*	74	*
71	* Adjusting scale only :	75	* Adjusting scale only :
72	* Wx0 Multiply horizontal scaling factor by W%	76	* Wx0 Multiply horizontal scaling factor by W%
73	* 0xH Multiply vertical scaling factor by H%	77	* 0xH Multiply vertical scaling factor by H%
74	* 0x0 No scaling (show image at normal size).	78	* 0x0 No scaling (show image at normal size).
75	*	79	*
76	* Pixmap Operations : (should be prepended by a colon)	80	* Pixmap Operations : (should be prepended by a colon)
77	* tile Tile image. Scaling/position modifiers above will affect	81	* tile Tile image. Scaling/position modifiers above will affect
78	* the tile size and origin.	82	* the tile size and origin.
79	* propscale When scaling, scale proportionally. That is, maintain the	83	* propscale When scaling, scale proportionally. That is, maintain the
80	* proper aspect ratio for the image. Any portion of the	84	* proper aspect ratio for the image. Any portion of the
81	* background not covered by the image is filled with the	85	* background not covered by the image is filled with the
82	* current background color.	86	* current background color.
83	* hscale Scale horizontally, tile vertically ?	87	* hscale Scale horizontally, tile vertically ?
84	* vscale Tile horizontally, scale vertically ?	88	* vscale Tile horizontally, scale vertically ?
…		…
92	// this is basically redundant as bgPixmap_t is only used in	96	// this is basically redundant as bgPixmap_t is only used in
93	// zero_initialised-derived structs	97	// zero_initialised-derived structs
94	#ifdef HAVE_AFTERIMAGE	98	#ifdef HAVE_AFTERIMAGE
95	original_asim = NULL;	99	original_asim = NULL;
96	#endif	100	#endif
		101	#ifdef HAVE_PIXBUF
		102	pixbuf = NULL;
		103	#endif
97	#ifdef BG_IMAGE_FROM_FILE	104	#ifdef BG_IMAGE_FROM_FILE
		105	have_image = false;
98	h_scale = v_scale = 0;	106	h_scale = v_scale = 0;
99	h_align = v_align = 0;	107	h_align = v_align = 0;
100	#endif	108	#endif
101	flags = 0;	109	flags = 0;
102	pixmap = None;	110	pixmap = None;
…		…
110	#ifdef HAVE_AFTERIMAGE	118	#ifdef HAVE_AFTERIMAGE
111	if (original_asim)	119	if (original_asim)
112	safe_asimage_destroy (original_asim);	120	safe_asimage_destroy (original_asim);
113	#endif	121	#endif
114		122
		123	#ifdef HAVE_PIXBUF
		124	if (pixbuf)
		125	g_object_unref (pixbuf);
		126	#endif
		127
115	if (pixmap && target)	128	if (pixmap && target)
116	XFreePixmap (target->dpy, pixmap);	129	XFreePixmap (target->dpy, pixmap);
117	}	130	}
118		131
119	bool	132	bool
…		…
123	if (flags & isTransparent)	136	if (flags & isTransparent)
124	return true;	137	return true;
125	# endif	138	# endif
126		139
127	# ifdef BG_IMAGE_FROM_FILE	140	# ifdef BG_IMAGE_FROM_FILE
128	# ifdef HAVE_AFTERIMAGE	141	if (have_image)
129	if (original_asim)
130	# endif
131	{	142	{
132	if (h_scale != 0 \|\| v_scale != 0	143	if (h_scale != 0 \|\| v_scale != 0
133	\|\| h_align != 0 \|\| v_align != 0)	144	\|\| h_align != 0 \|\| v_align != 0)
134	return true;	145	return true;
135	}	146	}
…		…
145	if (flags & isTransparent)	156	if (flags & isTransparent)
146	return true;	157	return true;
147	# endif	158	# endif
148		159
149	# ifdef BG_IMAGE_FROM_FILE	160	# ifdef BG_IMAGE_FROM_FILE
150	# ifdef HAVE_AFTERIMAGE	161	if (have_image)
151	if (original_asim)
152	# endif
153	{	162	{
154	if (h_align == rootAlign \|\| v_align == rootAlign)	163	if (h_align == rootAlign \|\| v_align == rootAlign)
155	return true;	164	return true;
156	}	165	}
157	# endif	166	# endif
…		…
219		228
220	static inline int	229	static inline int
221	make_align_position (int align, int window_size, int image_size)	230	make_align_position (int align, int window_size, int image_size)
222	{	231	{
223	int diff = window_size - image_size;	232	int diff = window_size - image_size;
224	int smaller = MIN (image_size,window_size);	233	int smaller = min (image_size, window_size);
225		234
226	if (align >= 0 && align <= 50)	235	if (align >= 0 && align <= 50)
227	return diff * align / 100;	236	return diff * align / 100;
228	else if (align > 50 && align <= 100)	237	else if (align > 50 && align <= 100)
229	return window_size - image_size - diff * (100 - align) / 100;	238	return window_size - image_size - diff * (100 - align) / 100;
…		…
437	{	446	{
438	flags = new_flags;	447	flags = new_flags;
439	changed++;	448	changed++;
440	}	449	}
441		450
442	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",	451	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
443	// flags, h_scale, v_scale, h_align, v_align);	452	// flags, h_scale, v_scale, h_align, v_align);
444	return (changed > 0);	453	return (changed > 0);
445	}	454	}
446		455
447	# ifdef HAVE_AFTERIMAGE	456	# ifdef HAVE_AFTERIMAGE
448	bool	457	bool
449	bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)	458	bgPixmap_t::render_image (unsigned long background_flags)
450	{	459	{
451	if (target == NULL)	460	if (target == NULL)
452	return false;	461	return false;
453		462
454	target->init_asv ();	463	target->init_asv ();
		464
		465	ASImage *background = NULL;
		466	ARGB32 background_tint = TINT_LEAVE_SAME;
		467
		468	# ifdef ENABLE_TRANSPARENCY
		469	if (background_flags)
		470	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
		471
		472	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
		473	{
		474	ShadingInfo as_shade;
		475	as_shade.shading = (shade == 0) ? 100 : shade;
		476
		477	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
		478	if (flags & tintSet)
		479	tint.get (c);
		480	as_shade.tintColor.red = c.r;
		481	as_shade.tintColor.green = c.g;
		482	as_shade.tintColor.blue = c.b;
		483
		484	background_tint = shading2tint32 (&as_shade);
		485	}
		486
		487	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
		488	{
		489	ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
		490	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
		491	100, ASIMAGE_QUALITY_DEFAULT);
		492	if (tmp)
		493	{
		494	destroy_asimage (&background);
		495	background = tmp;
		496	}
		497	}
		498	# endif
455		499
456	ASImage *result = 0;	500	ASImage *result = 0;
457		501
458	int target_width = target->szHint.width;	502	int target_width = target->szHint.width;
459	int target_height = target->szHint.height;	503	int target_height = target->szHint.height;
…		…
469		513
470	if (original_asim)	514	if (original_asim)
471	{	515	{
472	if (h_align == rootAlign \|\| v_align == rootAlign)	516	if (h_align == rootAlign \|\| v_align == rootAlign)
473	{	517	{
474	target->get_window_origin(x, y);	518	target->get_window_origin (x, y);
475	x = -x;	519	x = -x;
476	y = -y;	520	y = -y;
477	}	521	}
478		522
479	if (h_align != rootAlign)	523	if (h_align != rootAlign)
…		…
521	100, ASIMAGE_QUALITY_DEFAULT);	565	100, ASIMAGE_QUALITY_DEFAULT);
522	}	566	}
523		567
524	if (background == NULL)	568	if (background == NULL)
525	{	569	{
526	/* if tiling - pixmap has to be sized exactly as the image,
527	but there is no need to make it bigger than the window! */
528	if (h_scale == 0)
529	new_pmap_width = min (result->width, target_width);
530	if (v_scale == 0)
531	new_pmap_height = min (result->height, target_height);
532	/* we also need to tile our image in one or both directions */
533	if (h_scale == 0 \|\| v_scale == 0)	570	if (h_scale == 0 \|\| v_scale == 0)
534	{	571	{
		572	/* if tiling - pixmap has to be sized exactly as the image,
		573	but there is no need to make it bigger than the window! */
		574	new_pmap_width = min (result->width, target_width);
		575	new_pmap_height = min (result->height, target_height);
		576
		577	/* we also need to tile our image in both directions */
535	ASImage *tmp = tile_asimage (target->asv, result,	578	ASImage *tmp = tile_asimage (target->asv, result,
536	(h_scale > 0) ? 0 : (int)result->width - x,	579	(int)result->width - x,
537	(v_scale > 0) ? 0 : (int)result->height - y,	580	(int)result->height - y,
538	new_pmap_width,	581	new_pmap_width,
539	new_pmap_height,	582	new_pmap_height,
540	TINT_LEAVE_SAME, ASA_XImage,	583	TINT_LEAVE_SAME, ASA_XImage,
541	100, ASIMAGE_QUALITY_DEFAULT);	584	100, ASIMAGE_QUALITY_DEFAULT);
542	if (tmp)	585	if (tmp)
…		…
550	}	593	}
551	else	594	else
552	{	595	{
553	/* if blending background and image - pixmap has to be sized same as target window */	596	/* if blending background and image - pixmap has to be sized same as target window */
554	ASImageLayer *layers = create_image_layers (2);	597	ASImageLayer *layers = create_image_layers (2);
555	ASImage *merged_im = NULL;
556		598
557	layers[0].im = background;	599	layers[0].im = background;
558	layers[0].clip_width = target_width;	600	layers[0].clip_width = target_width;
559	layers[0].clip_height = target_height;	601	layers[0].clip_height = target_height;
560	layers[0].tint = background_tint;	602	layers[0].tint = background_tint;
…		…
607	free (layers);	649	free (layers);
608	}	650	}
609	}	651	}
610	TIMING_TEST_PRINT_RESULT (asim);	652	TIMING_TEST_PRINT_RESULT (asim);
611		653
612	if (pixmap)	654	bool ret = false;
613	{
614	if (result == NULL
615	\|\| pmap_width != new_pmap_width
616	\|\| pmap_height != new_pmap_height
617	\|\| pmap_depth != target->depth)
618	{
619	XFreePixmap (target->dpy, pixmap);
620	pixmap = None;
621	}
622	}
623		655
624	if (result)	656	if (result)
625	{	657	{
626	XGCValues gcv;	658	XGCValues gcv;
627	GC gc;	659	GC gc;
		660
		661	if (pixmap)
		662	{
		663	if (pmap_width != new_pmap_width
		664	\|\| pmap_height != new_pmap_height
		665	\|\| pmap_depth != target->depth)
		666	{
		667	XFreePixmap (target->dpy, pixmap);
		668	pixmap = None;
		669	}
		670	}
628		671
629	/* create Pixmap */	672	/* create Pixmap */
630	if (pixmap == None)	673	if (pixmap == None)
631	{	674	{
632	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);	675	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
633	pmap_width = new_pmap_width;	676	pmap_width = new_pmap_width;
634	pmap_height = new_pmap_height;	677	pmap_height = new_pmap_height;
635	pmap_depth = target->depth;	678	pmap_depth = target->depth;
636	}	679	}
637	/* fill with background color ( if result's not completely overlapping it)*/	680	/* fill with background color (if result's not completely overlapping it) */
638	gcv.foreground = target->pix_colors[Color_bg];	681	gcv.foreground = target->pix_colors[Color_bg];
639	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);	682	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
640		683
641	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;	684	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
642	int dst_width = result->width, dst_height = result->height;	685	int dst_width = result->width, dst_height = result->height;
643	if (background == NULL)	686	if (background == NULL)
644	{	687	{
		688	if (!(h_scale == 0 \|\| v_scale == 0))
		689	{
645	if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );	690	src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
646	if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);	691	src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
		692	}
647		693
648	if (dst_x > 0 \|\| dst_y > 0	694	if (dst_x > 0 \|\| dst_y > 0
649	\|\| dst_x + dst_width < new_pmap_width	695	\|\| dst_x + dst_width < new_pmap_width
650	\|\| dst_y + dst_height < new_pmap_height)	696	\|\| dst_y + dst_height < new_pmap_height)
651	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);	697	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
…		…
658	if (result != background && result != original_asim)	704	if (result != background && result != original_asim)
659	destroy_asimage (&result);	705	destroy_asimage (&result);
660		706
661	XFreeGC (target->dpy, gc);	707	XFreeGC (target->dpy, gc);
662	TIMING_TEST_PRINT_RESULT (asim);	708	TIMING_TEST_PRINT_RESULT (asim);
663	}
664		709
		710	ret = true;
		711	}
		712
		713	if (background)
		714	destroy_asimage (&background);
		715
665	return true;	716	return ret;
666	}	717	}
667	# endif /* HAVE_AFTERIMAGE */	718	# endif /* HAVE_AFTERIMAGE */
		719
		720	# ifdef HAVE_PIXBUF
		721	bool
		722	bgPixmap_t::render_image (unsigned long background_flags)
		723	{
		724	if (target == NULL)
		725	return false;
		726
		727	if (!pixbuf)
		728	return false;
		729
		730	// TODO: add alpha blending
		731	if (background_flags)
		732	return false;
		733
		734	GdkPixbuf *result;
		735
		736	int image_width = gdk_pixbuf_get_width (pixbuf);
		737	int image_height = gdk_pixbuf_get_height (pixbuf);
		738
		739	int target_width = target->szHint.width;
		740	int target_height = target->szHint.height;
		741	int new_pmap_width = target_width;
		742	int new_pmap_height = target_height;
		743
		744	int x = 0;
		745	int y = 0;
		746	int w = h_scale * target_width / 100;
		747	int h = v_scale * target_height / 100;
		748
		749	if (h_align == rootAlign \|\| v_align == rootAlign)
		750	{
		751	target->get_window_origin (x, y);
		752	x = -x;
		753	y = -y;
		754	}
		755
		756	if (h_align != rootAlign)
		757	x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
		758
		759	if (v_align != rootAlign)
		760	y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
		761
		762	if (x >= target_width
		763	\|\| y >= target_height
		764	\|\| (w > 0 && x + w <= 0)
		765	\|\| (h > 0 && y + h <= 0))
		766	return false;
		767
		768	result = pixbuf;
		769
		770	if ((w > 0 && w != image_width)
		771	\|\| (h > 0 && h != image_height))
		772	{
		773	result = gdk_pixbuf_scale_simple (pixbuf,
		774	w > 0 ? w : image_width,
		775	h > 0 ? h : image_height,
		776	GDK_INTERP_BILINEAR);
		777	}
		778
		779	bool ret = false;
		780
		781	if (result)
		782	{
		783	XGCValues gcv;
		784	GC gc;
		785
		786	image_width = gdk_pixbuf_get_width (result);
		787	image_height = gdk_pixbuf_get_height (result);
		788
		789	if (h_scale == 0 \|\| v_scale == 0)
		790	{
		791	new_pmap_width = min (image_width, target_width);
		792	new_pmap_height = min (image_height, target_height);
		793	}
		794
		795	if (pixmap)
		796	{
		797	if (pmap_width != new_pmap_width
		798	\|\| pmap_height != new_pmap_height
		799	\|\| pmap_depth != target->depth)
		800	{
		801	XFreePixmap (target->dpy, pixmap);
		802	pixmap = None;
		803	}
		804	}
		805
		806	if (pixmap == None)
		807	{
		808	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
		809	pmap_width = new_pmap_width;
		810	pmap_height = new_pmap_height;
		811	pmap_depth = target->depth;
		812	}
		813
		814	gcv.foreground = target->pix_colors[Color_bg];
		815	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
		816
		817	if (h_scale == 0 \|\| v_scale == 0)
		818	{
		819	Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
		820	gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
		821	0, 0,
		822	0, 0,
		823	image_width, image_height,
		824	XLIB_RGB_DITHER_NONE,
		825	0, 0);
		826
		827	gcv.tile = tile;
		828	gcv.fill_style = FillTiled;
		829	gcv.ts_x_origin = x;
		830	gcv.ts_y_origin = y;
		831	XChangeGC (target->dpy, gc, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
		832
		833	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
		834	XFreePixmap (target->dpy, tile);
		835	}
		836	else
		837	{
		838	int src_x, src_y, dst_x, dst_y;
		839	int dst_width, dst_height;
		840
		841	src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
		842	src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
		843
		844	if (dst_x > 0 \|\| dst_y > 0
		845	\|\| dst_x + dst_width < new_pmap_width
		846	\|\| dst_y + dst_height < new_pmap_height)
		847	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
		848
		849	if (dst_x < new_pmap_width && dst_y < new_pmap_height)
		850	gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
		851	src_x, src_y,
		852	dst_x, dst_y,
		853	dst_width, dst_height,
		854	XLIB_RGB_DITHER_NONE,
		855	0, 0);
		856	}
		857
		858	if (result != pixbuf)
		859	g_object_unref (result);
		860
		861	XFreeGC (target->dpy, gc);
		862
		863	ret = true;
		864	}
		865
		866	return ret;
		867	}
		868	# endif /* HAVE_PIXBUF */
668		869
669	bool	870	bool
670	bgPixmap_t::set_file (const char *file)	871	bgPixmap_t::set_file (const char *file)
671	{	872	{
672	assert (file);	873	assert (file);
673		874
674	if (*file)	875	if (*file)
675	{	876	{
		877	if (const char *p = strchr (file, ';'))
		878	{
		879	size_t len = p - file;
		880	char *f = rxvt_temp_buf<char> (len + 1);
		881	memcpy (f, file, len);
		882	f[len] = '\0';
		883	file = f;
		884	}
		885
676	# ifdef HAVE_AFTERIMAGE	886	# ifdef HAVE_AFTERIMAGE
677	if (!target->asimman)	887	if (!target->asimman)
678	target->asimman = create_generic_imageman (target->rs[Rs_path]);	888	target->asimman = create_generic_imageman (target->rs[Rs_path]);
679
680	if (const char *p = strchr (file, ';'))
681	{
682	size_t len = p - file;
683	char f = (char )malloc (len + 1);
684	memcpy (f, file, len);
685	f[len] = '\0';
686	original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
687	free (f);
688	}
689	else
690	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);	889	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
		890	if (original_asim)
		891	have_image = true;
		892	return have_image;
		893	# endif
691		894
692	return original_asim;	895	# ifdef HAVE_PIXBUF
		896	pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		897	if (pixbuf)
		898	have_image = true;
		899	return have_image;
693	# endif	900	# endif
694	}	901	}
695		902
696	return false;	903	return false;
697	}	904	}
…		…
717	int changed = 0;	924	int changed = 0;
718	unsigned int hr, vr;	925	unsigned int hr, vr;
719	int junk;	926	int junk;
720	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);	927	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
721		928
722	if (!(geom_flags&WidthValue))	929	if (!(geom_flags & WidthValue))
723	hr = 1;	930	hr = 1;
724	if (!(geom_flags&HeightValue))	931	if (!(geom_flags & HeightValue))
725	vr = hr;	932	vr = hr;
726		933
727	if (h_blurRadius != hr)	934	if (h_blurRadius != hr)
728	{	935	{
729	++changed;	936	++changed;
…		…
739	if (v_blurRadius == 0 && h_blurRadius == 0)	946	if (v_blurRadius == 0 && h_blurRadius == 0)
740	flags &= ~blurNeeded;	947	flags &= ~blurNeeded;
741	else	948	else
742	flags \|= blurNeeded;	949	flags \|= blurNeeded;
743		950
744	return (changed>0);	951	return (changed > 0);
745	}	952	}
746		953
747	static inline unsigned long	954	static inline unsigned long
748	compute_tint_shade_flags (rxvt_color *tint, int shade)	955	compute_tint_shade_flags (rxvt_color *tint, int shade)
749	{	956	{
…		…
766	flags \|= bgPixmap_t::tintNeeded;	973	flags \|= bgPixmap_t::tintNeeded;
767	else if (tint)	974	else if (tint)
768	{	975	{
769	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)	976	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)
770	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))	977	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))
771	{	978	{
772	flags \|= bgPixmap_t::tintNeeded;	979	flags \|= bgPixmap_t::tintNeeded;
773	}	980	}
774	}	981	}
775		982
776	if (flags & bgPixmap_t::tintNeeded)	983	if (flags & bgPixmap_t::tintNeeded)
777	{	984	{
778	if (flags & bgPixmap_t::tintWholesome)	985	if (flags & bgPixmap_t::tintWholesome)
…		…
807	{	1014	{
808	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);	1015	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
809		1016
810	if (new_flags != (flags & tintFlags))	1017	if (new_flags != (flags & tintFlags))
811	{	1018	{
812	flags = (flags&~tintFlags)\|new_flags;	1019	flags = (flags & ~tintFlags) \| new_flags;
813	return true;	1020	return true;
814	}	1021	}
815		1022
816	return false;	1023	return false;
817	}	1024	}
818		1025
…		…
848	unsigned long result = 0;	1055	unsigned long result = 0;
849		1056
850	if (target == NULL)	1057	if (target == NULL)
851	return 0;	1058	return 0;
852		1059
853	/* root dimentions may change from call to call - but Display structure should	1060	/* root dimensions may change from call to call - but Display structure should
854	* be always up-to-date, so let's use it :	1061	* be always up-to-date, so let's use it :
855	*/	1062	*/
856	Window root = target->display->root;	1063	Window root = target->display->root;
857	int screen = target->display->screen;	1064	int screen = target->display->screen;
858	Display *dpy = target->dpy;	1065	Display *dpy = target->dpy;
…		…
903		1110
904	attr.background_pixmap = ParentRelative;	1111	attr.background_pixmap = ParentRelative;
905	attr.backing_store = Always;	1112	attr.backing_store = Always;
906	attr.event_mask = ExposureMask;	1113	attr.event_mask = ExposureMask;
907	attr.override_redirect = True;	1114	attr.override_redirect = True;
908	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,	1115	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
909	CopyFromParent, CopyFromParent, CopyFromParent,	1116	CopyFromParent, CopyFromParent, CopyFromParent,
910	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,	1117	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,
911	&attr);	1118	&attr);
912		1119
913	if (src != None)	1120	if (src != None)
…		…
937	XDestroyWindow (dpy, src);	1144	XDestroyWindow (dpy, src);
938	XUngrabServer (dpy);	1145	XUngrabServer (dpy);
939	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);	1146	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
940	}	1147	}
941		1148
942	if (!success)	1149	if (!success)
943	{	1150	{
944	XFreePixmap (dpy, tiled_root_pmap);	1151	XFreePixmap (dpy, tiled_root_pmap);
945	tiled_root_pmap = None;	1152	tiled_root_pmap = None;
946	}	1153	}
947	else	1154	else
948	result \|= transpPmapTiled;	1155	result \|= transpPmapTiled;
949	}	1156	}
950	else	1157	else
951	{	1158	{
952	/* strightforward pixmap copy */	1159	/* straightforward pixmap copy */
953	gcv.tile = root_pixmap;	1160	gcv.tile = root_pixmap;
954	gcv.fill_style = FillTiled;	1161	gcv.fill_style = FillTiled;
955		1162
956	while (sx < 0) sx += (int)root_width;	1163	while (sx < 0) sx += (int)root_width;
957	while (sy < 0) sy += (int)root_height;	1164	while (sy < 0) sy += (int)root_height;
…		…
1070	# if DO_TIMING_TEST	1277	# if DO_TIMING_TEST
1071	XSync (dpy, False);	1278	XSync (dpy, False);
1072	# endif	1279	# endif
1073	# endif	1280	# endif
1074	}	1281	}
1075	}	1282	}
1076	} /* server side rendering completed */	1283	} /* server side rendering completed */
1077		1284
1078	if (pixmap)	1285	if (pixmap)
1079	XFreePixmap (dpy, pixmap);	1286	XFreePixmap (dpy, pixmap);
1080		1287
…		…
1130	/* we need to re-generate transparency pixmap in that case ! */	1337	/* we need to re-generate transparency pixmap in that case ! */
1131	background_flags = make_transparency_pixmap ();	1338	background_flags = make_transparency_pixmap ();
1132	if (background_flags == 0)	1339	if (background_flags == 0)
1133	return false;	1340	return false;
1134	else if ((background_flags & transpTransformations) == (flags & transpTransformations)	1341	else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1135	&& pmap_depth == target->depth)	1342	&& pmap_depth == target->depth)
1136	flags = flags & ~isInvalid;	1343	flags = flags & ~isInvalid;
1137	}	1344	}
1138	# endif	1345	# endif
1139		1346
		1347	# ifdef BG_IMAGE_FROM_FILE
		1348	if (have_image
		1349	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))
		1350	{
		1351	if (render_image (background_flags))
		1352	flags = flags & ~isInvalid;
		1353	}
		1354	# endif
		1355
1140	XImage *result = NULL;	1356	XImage *result = NULL;
1141	# ifdef HAVE_AFTERIMAGE	1357
1142	if (original_asim	1358	if (background_flags && (flags & isInvalid))
1143	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))	1359	{
		1360	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1144	{	1361	}
1145	target->init_asv ();
1146		1362
1147	ASImage *background = NULL;	1363	if (result)
1148	ARGB32 as_tint = TINT_LEAVE_SAME;	1364	{
1149	if (background_flags)	1365	# if !defined(HAVE_AFTERIMAGE) && !XFT
1150	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);	1366	/* our own client-side tinting */
1151		1367	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1152	# ifdef ENABLE_TRANSPARENCY	1368	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1153	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1369	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1154	{
1155	ShadingInfo as_shade;
1156	as_shade.shading = (shade == 0) ? 100 : shade;
1157
1158	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1159	if (flags & tintSet)
1160	tint.get (c);
1161	as_shade.tintColor.red = c.r;
1162	as_shade.tintColor.green = c.g;
1163	as_shade.tintColor.blue = c.b;
1164
1165	as_tint = shading2tint32 (&as_shade);
1166	}
1167
1168	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1169	{
1170	ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1171	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1172	100, ASIMAGE_QUALITY_DEFAULT);
1173	if (tmp)
1174	{
1175	destroy_asimage (&background);
1176	background = tmp;
1177	}
1178	}
1179	# endif
1180
1181	if (render_asim (background, as_tint))
1182	flags = flags & ~isInvalid;
1183	if (background)
1184	destroy_asimage (&background);
1185	}
1186	else if (background_flags && pmap_depth != target->depth)
1187	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1188
1189	# elif !XFT /* our own client-side tinting */
1190
1191	/* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1192	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1193
1194	if (background_flags && (flags & isInvalid))
1195	{
1196	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1197
1198	if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1199	{	1370	{
1200	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1371	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1201	if (flags & tintSet)	1372	if (flags & tintSet)
1202	tint.get (c);	1373	tint.get (c);
1203	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1374	ShadeXImage (target, result, shade, c.r, c.g, c.b);
1204	}	1375	}
1205	}	1376	# endif
1206	# endif /* HAVE_AFTERIMAGE */
1207		1377
1208	if (result)
1209	{
1210	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1378	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1211		1379
1212	if (gc)	1380	if (gc)
1213	{	1381	{
1214	if (/pmap_depth != target->depth &&/ pixmap != None)	1382	if (/pmap_depth != target->depth &&/ pixmap != None)
…		…
1243		1411
1244	XFreeGC (target->dpy, gc);	1412	XFreeGC (target->dpy, gc);
1245	flags = flags & ~isInvalid;	1413	flags = flags & ~isInvalid;
1246	}	1414	}
1247		1415
1248	XDestroyImage (result);	1416	XDestroyImage (result);
1249	}	1417	}
1250		1418
1251	if (flags & isInvalid)	1419	if (flags & isInvalid)
1252	{	1420	{
1253	if (pixmap != None)	1421	if (pixmap != None)

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.38 by sf-exg, Sat Apr 3 16:30:39 2010 UTC vs. Revision 1.58 by sf-exg, Fri Sep 3 22:57:31 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.38 by sf-exg, Sat Apr 3 16:30:39 2010 UTC vs.
Revision 1.58 by sf-exg, Fri Sep 3 22:57:31 2010 UTC