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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.42 by sf-exg, Sun Aug 29 13:24:30 2010 UTC vs.
Revision 1.55 by sf-exg, Thu Sep 2 15:48:10 2010 UTC

…		…
52	* 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
53	* colon-delimited pixmap operations.	53	* colon-delimited pixmap operations.
54	* The following table shows the valid geometry strings and their	54	* The following table shows the valid geometry strings and their
55	* effects on the background image :	55	* effects on the background image :
56	*	56	*
57	* 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%.
58	* W and H are percentages of the terminal window size.	58	* W and H are percentages of the terminal window size.
59	* X and Y are also percentages; e.g., +50+50 centers	59	* X and Y are also percentages; e.g., +50+50 centers
60	* the image in the window.	60	* the image in the window.
61	* WxH+X Assumes Y == X	61	* WxH+X Assumes Y == X
62	* WxH Assumes Y == X == 50 (centers the image)	62	* WxH Assumes Y == X == 50 (centers the image)
63	* W+X+Y Assumes H == W	63	* W+X+Y Assumes H == W
64	* W+X Assumes H == W and Y == X	64	* W+X Assumes H == W and Y == X
65	* W Assumes H == W and Y == X == 50	65	* W Assumes H == W and Y == X == 50
66	*	66	*
67	* Adjusting position only :	67	* Adjusting position only :
68	* =+X+Y Set position to X% by Y% (absolute).	68	* =+X+Y Set position to X% by Y% (absolute).
69	* =+X Set position to X% by X%.	69	* =+X Set position to X% by X%.
70	* +X+Y Adjust position horizontally X% and vertically Y%	70	* +X+Y Adjust position horizontally X% and vertically Y%
71	* from current position (relative).	71	* from current position (relative).
72	* +X Adjust position horizontally X% and vertically X%	72	* +X Adjust position horizontally X% and vertically X%
73	* from current position.	73	* from current position.
74	*	74	*
75	* Adjusting scale only :	75	* Adjusting scale only :
76	* Wx0 Multiply horizontal scaling factor by W%	76	* Wx0 Multiply horizontal scaling factor by W%
77	* 0xH Multiply vertical scaling factor by H%	77	* 0xH Multiply vertical scaling factor by H%
78	* 0x0 No scaling (show image at normal size).	78	* 0x0 No scaling (show image at normal size).
79	*	79	*
80	* Pixmap Operations : (should be prepended by a colon)	80	* Pixmap Operations : (should be prepended by a colon)
81	* tile Tile image. Scaling/position modifiers above will affect	81	* tile Tile image. Scaling/position modifiers above will affect
82	* the tile size and origin.	82	* the tile size and origin.
83	* propscale When scaling, scale proportionally. That is, maintain the	83	* propscale When scaling, scale proportionally. That is, maintain the
84	* proper aspect ratio for the image. Any portion of the	84	* proper aspect ratio for the image. Any portion of the
85	* background not covered by the image is filled with the	85	* background not covered by the image is filled with the
86	* current background color.	86	* current background color.
87	* hscale Scale horizontally, tile vertically ?	87	* hscale Scale horizontally, tile vertically ?
88	* vscale Tile horizontally, scale vertically ?	88	* vscale Tile horizontally, scale vertically ?
…		…
96	// this is basically redundant as bgPixmap_t is only used in	96	// this is basically redundant as bgPixmap_t is only used in
97	// zero_initialised-derived structs	97	// zero_initialised-derived structs
98	#ifdef HAVE_AFTERIMAGE	98	#ifdef HAVE_AFTERIMAGE
99	original_asim = NULL;	99	original_asim = NULL;
100	#endif	100	#endif
		101	#ifdef HAVE_PIXBUF
		102	pixbuf = NULL;
		103	#endif
101	#ifdef BG_IMAGE_FROM_FILE	104	#ifdef BG_IMAGE_FROM_FILE
		105	have_image = false;
102	h_scale = v_scale = 0;	106	h_scale = v_scale = 0;
103	h_align = v_align = 0;	107	h_align = v_align = 0;
104	#endif	108	#endif
105	flags = 0;	109	flags = 0;
106	pixmap = None;	110	pixmap = None;
…		…
114	#ifdef HAVE_AFTERIMAGE	118	#ifdef HAVE_AFTERIMAGE
115	if (original_asim)	119	if (original_asim)
116	safe_asimage_destroy (original_asim);	120	safe_asimage_destroy (original_asim);
117	#endif	121	#endif
118		122
		123	#ifdef HAVE_PIXBUF
		124	if (pixbuf)
		125	g_object_unref (pixbuf);
		126	#endif
		127
119	if (pixmap && target)	128	if (pixmap && target)
120	XFreePixmap (target->dpy, pixmap);	129	XFreePixmap (target->dpy, pixmap);
121	}	130	}
122		131
123	bool	132	bool
…		…
127	if (flags & isTransparent)	136	if (flags & isTransparent)
128	return true;	137	return true;
129	# endif	138	# endif
130		139
131	# ifdef BG_IMAGE_FROM_FILE	140	# ifdef BG_IMAGE_FROM_FILE
132	# ifdef HAVE_AFTERIMAGE	141	if (have_image)
133	if (original_asim)
134	# endif
135	{	142	{
136	if (h_scale != 0 \|\| v_scale != 0	143	if (h_scale != 0 \|\| v_scale != 0
137	\|\| h_align != 0 \|\| v_align != 0)	144	\|\| h_align != 0 \|\| v_align != 0)
138	return true;	145	return true;
139	}	146	}
…		…
149	if (flags & isTransparent)	156	if (flags & isTransparent)
150	return true;	157	return true;
151	# endif	158	# endif
152		159
153	# ifdef BG_IMAGE_FROM_FILE	160	# ifdef BG_IMAGE_FROM_FILE
154	# ifdef HAVE_AFTERIMAGE	161	if (have_image)
155	if (original_asim)
156	# endif
157	{	162	{
158	if (h_align == rootAlign \|\| v_align == rootAlign)	163	if (h_align == rootAlign \|\| v_align == rootAlign)
159	return true;	164	return true;
160	}	165	}
161	# endif	166	# endif
…		…
441	{	446	{
442	flags = new_flags;	447	flags = new_flags;
443	changed++;	448	changed++;
444	}	449	}
445		450
446	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",	451	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
447	// flags, h_scale, v_scale, h_align, v_align);	452	// flags, h_scale, v_scale, h_align, v_align);
448	return (changed > 0);	453	return (changed > 0);
449	}	454	}
450		455
451	# ifdef HAVE_AFTERIMAGE	456	# ifdef HAVE_AFTERIMAGE
452	bool	457	bool
453	bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)	458	bgPixmap_t::render_image (unsigned long background_flags)
454	{	459	{
455	if (target == NULL)	460	if (target == NULL)
456	return false;	461	return false;
457		462
458	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
459		499
460	ASImage *result = 0;	500	ASImage *result = 0;
461		501
462	int target_width = target->szHint.width;	502	int target_width = target->szHint.width;
463	int target_height = target->szHint.height;	503	int target_height = target->szHint.height;
…		…
473		513
474	if (original_asim)	514	if (original_asim)
475	{	515	{
476	if (h_align == rootAlign \|\| v_align == rootAlign)	516	if (h_align == rootAlign \|\| v_align == rootAlign)
477	{	517	{
478	target->get_window_origin(x, y);	518	target->get_window_origin (x, y);
479	x = -x;	519	x = -x;
480	y = -y;	520	y = -y;
481	}	521	}
482		522
483	if (h_align != rootAlign)	523	if (h_align != rootAlign)
…		…
610	free (layers);	650	free (layers);
611	}	651	}
612	}	652	}
613	TIMING_TEST_PRINT_RESULT (asim);	653	TIMING_TEST_PRINT_RESULT (asim);
614		654
615	if (pixmap)	655	bool ret = false;
616	{
617	if (result == NULL
618	\|\| pmap_width != new_pmap_width
619	\|\| pmap_height != new_pmap_height
620	\|\| pmap_depth != target->depth)
621	{
622	XFreePixmap (target->dpy, pixmap);
623	pixmap = None;
624	}
625	}
626		656
627	if (result)	657	if (result)
628	{	658	{
629	XGCValues gcv;	659	XGCValues gcv;
630	GC gc;	660	GC gc;
		661
		662	if (pixmap)
		663	{
		664	if (pmap_width != new_pmap_width
		665	\|\| pmap_height != new_pmap_height
		666	\|\| pmap_depth != target->depth)
		667	{
		668	XFreePixmap (target->dpy, pixmap);
		669	pixmap = None;
		670	}
		671	}
631		672
632	/* create Pixmap */	673	/* create Pixmap */
633	if (pixmap == None)	674	if (pixmap == None)
634	{	675	{
635	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);	676	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
636	pmap_width = new_pmap_width;	677	pmap_width = new_pmap_width;
637	pmap_height = new_pmap_height;	678	pmap_height = new_pmap_height;
638	pmap_depth = target->depth;	679	pmap_depth = target->depth;
639	}	680	}
640	/* fill with background color ( if result's not completely overlapping it)*/	681	/* fill with background color (if result's not completely overlapping it) */
641	gcv.foreground = target->pix_colors[Color_bg];	682	gcv.foreground = target->pix_colors[Color_bg];
642	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);	683	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
643		684
644	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;	685	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
645	int dst_width = result->width, dst_height = result->height;	686	int dst_width = result->width, dst_height = result->height;
…		…
661	if (result != background && result != original_asim)	702	if (result != background && result != original_asim)
662	destroy_asimage (&result);	703	destroy_asimage (&result);
663		704
664	XFreeGC (target->dpy, gc);	705	XFreeGC (target->dpy, gc);
665	TIMING_TEST_PRINT_RESULT (asim);	706	TIMING_TEST_PRINT_RESULT (asim);
666	}
667		707
		708	ret = true;
		709	}
		710
		711	if (background)
		712	destroy_asimage (&background);
		713
668	return true;	714	return ret;
669	}	715	}
670	# endif /* HAVE_AFTERIMAGE */	716	# endif /* HAVE_AFTERIMAGE */
		717
		718	# ifdef HAVE_PIXBUF
		719	bool
		720	bgPixmap_t::render_image (unsigned long background_flags)
		721	{
		722	if (target == NULL)
		723	return false;
		724
		725	if (!pixbuf)
		726	return false;
		727
		728	// TODO: add alpha blending
		729	if (background_flags)
		730	return false;
		731
		732	GdkPixbuf *result;
		733
		734	int image_width = gdk_pixbuf_get_width (pixbuf);
		735	int image_height = gdk_pixbuf_get_height (pixbuf);
		736
		737	int target_width = target->szHint.width;
		738	int target_height = target->szHint.height;
		739	int new_pmap_width = target_width;
		740	int new_pmap_height = target_height;
		741
		742	int x = 0;
		743	int y = 0;
		744	int w = h_scale * target_width / 100;
		745	int h = v_scale * target_height / 100;
		746
		747	if (h_align == rootAlign \|\| v_align == rootAlign)
		748	{
		749	target->get_window_origin (x, y);
		750	x = -x;
		751	y = -y;
		752	}
		753
		754	if (h_align != rootAlign)
		755	x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
		756
		757	if (v_align != rootAlign)
		758	y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
		759
		760	if (x >= target_width
		761	\|\| y >= target_height
		762	\|\| (w > 0 && x + w <= 0)
		763	\|\| (h > 0 && y + h <= 0))
		764	return false;
		765
		766	result = pixbuf;
		767
		768	if ((w > 0 && w != image_width)
		769	\|\| (h > 0 && h != image_height))
		770	{
		771	result = gdk_pixbuf_scale_simple (pixbuf,
		772	w > 0 ? w : image_width,
		773	h > 0 ? h : image_height,
		774	GDK_INTERP_BILINEAR);
		775	}
		776
		777	bool ret = false;
		778
		779	if (result)
		780	{
		781	XGCValues gcv;
		782	GC gc;
		783
		784	image_width = gdk_pixbuf_get_width (result);
		785	image_height = gdk_pixbuf_get_height (result);
		786
		787	if (h_scale == 0)
		788	new_pmap_width = min (image_width, target_width);
		789	if (v_scale == 0)
		790	new_pmap_height = min (image_height, target_height);
		791
		792	if (pixmap)
		793	{
		794	if (pmap_width != new_pmap_width
		795	\|\| pmap_height != new_pmap_height
		796	\|\| pmap_depth != target->depth)
		797	{
		798	XFreePixmap (target->dpy, pixmap);
		799	pixmap = None;
		800	}
		801	}
		802
		803	if (pixmap == None)
		804	{
		805	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
		806	pmap_width = new_pmap_width;
		807	pmap_height = new_pmap_height;
		808	pmap_depth = target->depth;
		809	}
		810
		811	gcv.foreground = target->pix_colors[Color_bg];
		812	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
		813
		814	if (h_scale == 0 \|\| v_scale == 0)
		815	{
		816	Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
		817	gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
		818	0, 0,
		819	0, 0,
		820	image_width, image_height,
		821	XLIB_RGB_DITHER_NONE,
		822	0, 0);
		823
		824	gcv.tile = tile;
		825	gcv.fill_style = FillTiled;
		826	gcv.ts_x_origin = x;
		827	gcv.ts_y_origin = y;
		828	XChangeGC (target->dpy, gc, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
		829
		830	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
		831	XFreePixmap (target->dpy, tile);
		832	}
		833	else
		834	{
		835	int src_x, src_y, dst_x, dst_y;
		836	int dst_width, dst_height;
		837
		838	src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
		839	src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
		840
		841	if (dst_x > 0 \|\| dst_y > 0
		842	\|\| dst_x + dst_width < new_pmap_width
		843	\|\| dst_y + dst_height < new_pmap_height)
		844	XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
		845
		846	if (dst_x < new_pmap_width && dst_y < new_pmap_height)
		847	gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
		848	src_x, src_y,
		849	dst_x, dst_y,
		850	dst_width, dst_height,
		851	XLIB_RGB_DITHER_NONE,
		852	0, 0);
		853	}
		854
		855	if (result != pixbuf)
		856	g_object_unref (result);
		857
		858	XFreeGC (target->dpy, gc);
		859
		860	ret = true;
		861	}
		862
		863	return ret;
		864	}
		865	# endif /* HAVE_PIXBUF */
671		866
672	bool	867	bool
673	bgPixmap_t::set_file (const char *file)	868	bgPixmap_t::set_file (const char *file)
674	{	869	{
675	assert (file);	870	assert (file);
676		871
677	if (*file)	872	if (*file)
678	{	873	{
		874	if (const char *p = strchr (file, ';'))
		875	{
		876	size_t len = p - file;
		877	char *f = rxvt_temp_buf<char> (len + 1);
		878	memcpy (f, file, len);
		879	f[len] = '\0';
		880	file = f;
		881	}
		882
679	# ifdef HAVE_AFTERIMAGE	883	# ifdef HAVE_AFTERIMAGE
680	if (!target->asimman)	884	if (!target->asimman)
681	target->asimman = create_generic_imageman (target->rs[Rs_path]);	885	target->asimman = create_generic_imageman (target->rs[Rs_path]);
682
683	if (const char *p = strchr (file, ';'))
684	{
685	size_t len = p - file;
686	char f = (char )malloc (len + 1);
687	memcpy (f, file, len);
688	f[len] = '\0';
689	original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
690	free (f);
691	}
692	else
693	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);	886	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
		887	if (original_asim)
		888	have_image = true;
		889	return have_image;
		890	# endif
694		891
695	return original_asim;	892	# ifdef HAVE_PIXBUF
		893	pixbuf = gdk_pixbuf_new_from_file (file, NULL);
		894	if (pixbuf)
		895	have_image = true;
		896	return have_image;
696	# endif	897	# endif
697	}	898	}
698		899
699	return false;	900	return false;
700	}	901	}
…		…
720	int changed = 0;	921	int changed = 0;
721	unsigned int hr, vr;	922	unsigned int hr, vr;
722	int junk;	923	int junk;
723	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);	924	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
724		925
725	if (!(geom_flags&WidthValue))	926	if (!(geom_flags & WidthValue))
726	hr = 1;	927	hr = 1;
727	if (!(geom_flags&HeightValue))	928	if (!(geom_flags & HeightValue))
728	vr = hr;	929	vr = hr;
729		930
730	if (h_blurRadius != hr)	931	if (h_blurRadius != hr)
731	{	932	{
732	++changed;	933	++changed;
…		…
742	if (v_blurRadius == 0 && h_blurRadius == 0)	943	if (v_blurRadius == 0 && h_blurRadius == 0)
743	flags &= ~blurNeeded;	944	flags &= ~blurNeeded;
744	else	945	else
745	flags \|= blurNeeded;	946	flags \|= blurNeeded;
746		947
747	return (changed>0);	948	return (changed > 0);
748	}	949	}
749		950
750	static inline unsigned long	951	static inline unsigned long
751	compute_tint_shade_flags (rxvt_color *tint, int shade)	952	compute_tint_shade_flags (rxvt_color *tint, int shade)
752	{	953	{
…		…
769	flags \|= bgPixmap_t::tintNeeded;	970	flags \|= bgPixmap_t::tintNeeded;
770	else if (tint)	971	else if (tint)
771	{	972	{
772	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)	973	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)
773	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))	974	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))
774	{	975	{
775	flags \|= bgPixmap_t::tintNeeded;	976	flags \|= bgPixmap_t::tintNeeded;
776	}	977	}
777	}	978	}
778		979
779	if (flags & bgPixmap_t::tintNeeded)	980	if (flags & bgPixmap_t::tintNeeded)
780	{	981	{
781	if (flags & bgPixmap_t::tintWholesome)	982	if (flags & bgPixmap_t::tintWholesome)
…		…
810	{	1011	{
811	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);	1012	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
812		1013
813	if (new_flags != (flags & tintFlags))	1014	if (new_flags != (flags & tintFlags))
814	{	1015	{
815	flags = (flags&~tintFlags)\|new_flags;	1016	flags = (flags & ~tintFlags) \| new_flags;
816	return true;	1017	return true;
817	}	1018	}
818		1019
819	return false;	1020	return false;
820	}	1021	}
821		1022
…		…
906		1107
907	attr.background_pixmap = ParentRelative;	1108	attr.background_pixmap = ParentRelative;
908	attr.backing_store = Always;	1109	attr.backing_store = Always;
909	attr.event_mask = ExposureMask;	1110	attr.event_mask = ExposureMask;
910	attr.override_redirect = True;	1111	attr.override_redirect = True;
911	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,	1112	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
912	CopyFromParent, CopyFromParent, CopyFromParent,	1113	CopyFromParent, CopyFromParent, CopyFromParent,
913	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,	1114	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,
914	&attr);	1115	&attr);
915		1116
916	if (src != None)	1117	if (src != None)
…		…
940	XDestroyWindow (dpy, src);	1141	XDestroyWindow (dpy, src);
941	XUngrabServer (dpy);	1142	XUngrabServer (dpy);
942	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);	1143	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
943	}	1144	}
944		1145
945	if (!success)	1146	if (!success)
946	{	1147	{
947	XFreePixmap (dpy, tiled_root_pmap);	1148	XFreePixmap (dpy, tiled_root_pmap);
948	tiled_root_pmap = None;	1149	tiled_root_pmap = None;
949	}	1150	}
950	else	1151	else
951	result \|= transpPmapTiled;	1152	result \|= transpPmapTiled;
952	}	1153	}
953	else	1154	else
954	{	1155	{
955	/* straightforward pixmap copy */	1156	/* straightforward pixmap copy */
956	gcv.tile = root_pixmap;	1157	gcv.tile = root_pixmap;
…		…
1073	# if DO_TIMING_TEST	1274	# if DO_TIMING_TEST
1074	XSync (dpy, False);	1275	XSync (dpy, False);
1075	# endif	1276	# endif
1076	# endif	1277	# endif
1077	}	1278	}
1078	}	1279	}
1079	} /* server side rendering completed */	1280	} /* server side rendering completed */
1080		1281
1081	if (pixmap)	1282	if (pixmap)
1082	XFreePixmap (dpy, pixmap);	1283	XFreePixmap (dpy, pixmap);
1083		1284
…		…
1133	/* we need to re-generate transparency pixmap in that case ! */	1334	/* we need to re-generate transparency pixmap in that case ! */
1134	background_flags = make_transparency_pixmap ();	1335	background_flags = make_transparency_pixmap ();
1135	if (background_flags == 0)	1336	if (background_flags == 0)
1136	return false;	1337	return false;
1137	else if ((background_flags & transpTransformations) == (flags & transpTransformations)	1338	else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1138	&& pmap_depth == target->depth)	1339	&& pmap_depth == target->depth)
1139	flags = flags & ~isInvalid;	1340	flags = flags & ~isInvalid;
1140	}	1341	}
1141	# endif	1342	# endif
1142		1343
		1344	# ifdef BG_IMAGE_FROM_FILE
		1345	if (have_image
		1346	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))
		1347	{
		1348	if (render_image (background_flags))
		1349	flags = flags & ~isInvalid;
		1350	}
		1351	# endif
		1352
1143	XImage *result = NULL;	1353	XImage *result = NULL;
1144	# ifdef HAVE_AFTERIMAGE	1354
1145	if (original_asim	1355	if (background_flags && (flags & isInvalid))
1146	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))	1356	{
		1357	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1147	{	1358	}
1148	target->init_asv ();
1149		1359
1150	ASImage *background = NULL;	1360	if (result)
1151	ARGB32 as_tint = TINT_LEAVE_SAME;	1361	{
1152	if (background_flags)	1362	# if !defined(HAVE_AFTERIMAGE) && !XFT
1153	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);	1363	/* our own client-side tinting */
1154		1364	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1155	# ifdef ENABLE_TRANSPARENCY	1365	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1156	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1366	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1157	{
1158	ShadingInfo as_shade;
1159	as_shade.shading = (shade == 0) ? 100 : shade;
1160
1161	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1162	if (flags & tintSet)
1163	tint.get (c);
1164	as_shade.tintColor.red = c.r;
1165	as_shade.tintColor.green = c.g;
1166	as_shade.tintColor.blue = c.b;
1167
1168	as_tint = shading2tint32 (&as_shade);
1169	}
1170
1171	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1172	{
1173	ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1174	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1175	100, ASIMAGE_QUALITY_DEFAULT);
1176	if (tmp)
1177	{
1178	destroy_asimage (&background);
1179	background = tmp;
1180	}
1181	}
1182	# endif
1183
1184	if (render_asim (background, as_tint))
1185	flags = flags & ~isInvalid;
1186	if (background)
1187	destroy_asimage (&background);
1188	}
1189	else if (background_flags && pmap_depth != target->depth)
1190	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1191
1192	# elif !XFT /* our own client-side tinting */
1193
1194	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1195	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1196
1197	if (background_flags && (flags & isInvalid))
1198	{
1199	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1200
1201	if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1202	{	1367	{
1203	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1368	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1204	if (flags & tintSet)	1369	if (flags & tintSet)
1205	tint.get (c);	1370	tint.get (c);
1206	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1371	ShadeXImage (target, result, shade, c.r, c.g, c.b);
1207	}	1372	}
1208	}	1373	# endif
1209	# endif /* HAVE_AFTERIMAGE */
1210		1374
1211	if (result)
1212	{
1213	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1375	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1214		1376
1215	if (gc)	1377	if (gc)
1216	{	1378	{
1217	if (/pmap_depth != target->depth &&/ pixmap != None)	1379	if (/pmap_depth != target->depth &&/ pixmap != None)
…		…
1246		1408
1247	XFreeGC (target->dpy, gc);	1409	XFreeGC (target->dpy, gc);
1248	flags = flags & ~isInvalid;	1410	flags = flags & ~isInvalid;
1249	}	1411	}
1250		1412
1251	XDestroyImage (result);	1413	XDestroyImage (result);
1252	}	1414	}
1253		1415
1254	if (flags & isInvalid)	1416	if (flags & isInvalid)
1255	{	1417	{
1256	if (pixmap != None)	1418	if (pixmap != None)

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.42 by sf-exg, Sun Aug 29 13:24:30 2010 UTC vs. Revision 1.55 by sf-exg, Thu Sep 2 15:48:10 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.42 by sf-exg, Sun Aug 29 13:24:30 2010 UTC vs.
Revision 1.55 by sf-exg, Thu Sep 2 15:48:10 2010 UTC