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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.41 by sf-exg, Sat Aug 21 16:07:15 2010 UTC vs.
Revision 1.54 by sf-exg, Wed Sep 1 22:49:35 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 ?
…		…
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 BG_IMAGE_FROM_FILE	101	#ifdef BG_IMAGE_FROM_FILE
		102	have_image = false;
102	h_scale = v_scale = 0;	103	h_scale = v_scale = 0;
103	h_align = v_align = 0;	104	h_align = v_align = 0;
104	#endif	105	#endif
105	flags = 0;	106	flags = 0;
106	pixmap = None;	107	pixmap = None;
…		…
127	if (flags & isTransparent)	128	if (flags & isTransparent)
128	return true;	129	return true;
129	# endif	130	# endif
130		131
131	# ifdef BG_IMAGE_FROM_FILE	132	# ifdef BG_IMAGE_FROM_FILE
132	# ifdef HAVE_AFTERIMAGE	133	if (have_image)
133	if (original_asim)
134	# endif
135	{	134	{
136	if (h_scale != 0 \|\| v_scale != 0	135	if (h_scale != 0 \|\| v_scale != 0
137	\|\| h_align != 0 \|\| v_align != 0)	136	\|\| h_align != 0 \|\| v_align != 0)
138	return true;	137	return true;
139	}	138	}
…		…
149	if (flags & isTransparent)	148	if (flags & isTransparent)
150	return true;	149	return true;
151	# endif	150	# endif
152		151
153	# ifdef BG_IMAGE_FROM_FILE	152	# ifdef BG_IMAGE_FROM_FILE
154	# ifdef HAVE_AFTERIMAGE	153	if (have_image)
155	if (original_asim)
156	# endif
157	{	154	{
158	if (h_align == rootAlign \|\| v_align == rootAlign)	155	if (h_align == rootAlign \|\| v_align == rootAlign)
159	return true;	156	return true;
160	}	157	}
161	# endif	158	# endif
…		…
441	{	438	{
442	flags = new_flags;	439	flags = new_flags;
443	changed++;	440	changed++;
444	}	441	}
445		442
446	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",	443	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
447	// flags, h_scale, v_scale, h_align, v_align);	444	// flags, h_scale, v_scale, h_align, v_align);
448	return (changed > 0);	445	return (changed > 0);
449	}	446	}
450		447
451	# ifdef HAVE_AFTERIMAGE	448	# ifdef HAVE_AFTERIMAGE
452	bool	449	bool
453	bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)	450	bgPixmap_t::render_image (unsigned long background_flags)
454	{	451	{
455	if (target == NULL)	452	if (target == NULL)
456	return false;	453	return false;
457		454
458	target->init_asv ();	455	target->init_asv ();
		456
		457	ASImage *background = NULL;
		458	ARGB32 background_tint = TINT_LEAVE_SAME;
		459
		460	# ifdef ENABLE_TRANSPARENCY
		461	if (background_flags)
		462	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
		463
		464	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
		465	{
		466	ShadingInfo as_shade;
		467	as_shade.shading = (shade == 0) ? 100 : shade;
		468
		469	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
		470	if (flags & tintSet)
		471	tint.get (c);
		472	as_shade.tintColor.red = c.r;
		473	as_shade.tintColor.green = c.g;
		474	as_shade.tintColor.blue = c.b;
		475
		476	background_tint = shading2tint32 (&as_shade);
		477	}
		478
		479	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
		480	{
		481	ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
		482	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
		483	100, ASIMAGE_QUALITY_DEFAULT);
		484	if (tmp)
		485	{
		486	destroy_asimage (&background);
		487	background = tmp;
		488	}
		489	}
		490	# endif
459		491
460	ASImage *result = 0;	492	ASImage *result = 0;
461		493
462	int target_width = target->szHint.width;	494	int target_width = target->szHint.width;
463	int target_height = target->szHint.height;	495	int target_height = target->szHint.height;
…		…
473		505
474	if (original_asim)	506	if (original_asim)
475	{	507	{
476	if (h_align == rootAlign \|\| v_align == rootAlign)	508	if (h_align == rootAlign \|\| v_align == rootAlign)
477	{	509	{
478	target->get_window_origin(x, y);	510	target->get_window_origin (x, y);
479	x = -x;	511	x = -x;
480	y = -y;	512	y = -y;
481	}	513	}
482		514
483	if (h_align != rootAlign)	515	if (h_align != rootAlign)
…		…
554	}	586	}
555	else	587	else
556	{	588	{
557	/* if blending background and image - pixmap has to be sized same as target window */	589	/* if blending background and image - pixmap has to be sized same as target window */
558	ASImageLayer *layers = create_image_layers (2);	590	ASImageLayer *layers = create_image_layers (2);
559	ASImage *merged_im = NULL;
560		591
561	layers[0].im = background;	592	layers[0].im = background;
562	layers[0].clip_width = target_width;	593	layers[0].clip_width = target_width;
563	layers[0].clip_height = target_height;	594	layers[0].clip_height = target_height;
564	layers[0].tint = background_tint;	595	layers[0].tint = background_tint;
…		…
611	free (layers);	642	free (layers);
612	}	643	}
613	}	644	}
614	TIMING_TEST_PRINT_RESULT (asim);	645	TIMING_TEST_PRINT_RESULT (asim);
615		646
616	if (pixmap)	647	bool ret = false;
617	{
618	if (result == NULL
619	\|\| pmap_width != new_pmap_width
620	\|\| pmap_height != new_pmap_height
621	\|\| pmap_depth != target->depth)
622	{
623	XFreePixmap (target->dpy, pixmap);
624	pixmap = None;
625	}
626	}
627		648
628	if (result)	649	if (result)
629	{	650	{
630	XGCValues gcv;	651	XGCValues gcv;
631	GC gc;	652	GC gc;
		653
		654	if (pixmap)
		655	{
		656	if (pmap_width != new_pmap_width
		657	\|\| pmap_height != new_pmap_height
		658	\|\| pmap_depth != target->depth)
		659	{
		660	XFreePixmap (target->dpy, pixmap);
		661	pixmap = None;
		662	}
		663	}
632		664
633	/* create Pixmap */	665	/* create Pixmap */
634	if (pixmap == None)	666	if (pixmap == None)
635	{	667	{
636	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);	668	pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
637	pmap_width = new_pmap_width;	669	pmap_width = new_pmap_width;
638	pmap_height = new_pmap_height;	670	pmap_height = new_pmap_height;
639	pmap_depth = target->depth;	671	pmap_depth = target->depth;
640	}	672	}
641	/* fill with background color ( if result's not completely overlapping it)*/	673	/* fill with background color (if result's not completely overlapping it) */
642	gcv.foreground = target->pix_colors[Color_bg];	674	gcv.foreground = target->pix_colors[Color_bg];
643	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);	675	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
644		676
645	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;	677	int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
646	int dst_width = result->width, dst_height = result->height;	678	int dst_width = result->width, dst_height = result->height;
…		…
662	if (result != background && result != original_asim)	694	if (result != background && result != original_asim)
663	destroy_asimage (&result);	695	destroy_asimage (&result);
664		696
665	XFreeGC (target->dpy, gc);	697	XFreeGC (target->dpy, gc);
666	TIMING_TEST_PRINT_RESULT (asim);	698	TIMING_TEST_PRINT_RESULT (asim);
667	}
668		699
		700	ret = true;
		701	}
		702
		703	if (background)
		704	destroy_asimage (&background);
		705
669	return true;	706	return ret;
670	}	707	}
671	# endif /* HAVE_AFTERIMAGE */	708	# endif /* HAVE_AFTERIMAGE */
672		709
673	bool	710	bool
674	bgPixmap_t::set_file (const char *file)	711	bgPixmap_t::set_file (const char *file)
675	{	712	{
676	assert (file);	713	assert (file);
677		714
678	if (*file)	715	if (*file)
679	{	716	{
		717	if (const char *p = strchr (file, ';'))
		718	{
		719	size_t len = p - file;
		720	char *f = rxvt_temp_buf<char> (len + 1);
		721	memcpy (f, file, len);
		722	f[len] = '\0';
		723	file = f;
		724	}
		725
680	# ifdef HAVE_AFTERIMAGE	726	# ifdef HAVE_AFTERIMAGE
681	if (!target->asimman)	727	if (!target->asimman)
682	target->asimman = create_generic_imageman (target->rs[Rs_path]);	728	target->asimman = create_generic_imageman (target->rs[Rs_path]);
683
684	if (const char *p = strchr (file, ';'))
685	{
686	size_t len = p - file;
687	char f = (char )malloc (len + 1);
688	memcpy (f, file, len);
689	f[len] = '\0';
690	original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
691	free (f);
692	}
693	else
694	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);	729	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
695		730	if (original_asim)
696	return original_asim;	731	have_image = true;
		732	return have_image;
697	# endif	733	# endif
698	}	734	}
699		735
700	return false;	736	return false;
701	}	737	}
…		…
721	int changed = 0;	757	int changed = 0;
722	unsigned int hr, vr;	758	unsigned int hr, vr;
723	int junk;	759	int junk;
724	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);	760	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
725		761
726	if (!(geom_flags&WidthValue))	762	if (!(geom_flags & WidthValue))
727	hr = 1;	763	hr = 1;
728	if (!(geom_flags&HeightValue))	764	if (!(geom_flags & HeightValue))
729	vr = hr;	765	vr = hr;
730		766
731	if (h_blurRadius != hr)	767	if (h_blurRadius != hr)
732	{	768	{
733	++changed;	769	++changed;
…		…
743	if (v_blurRadius == 0 && h_blurRadius == 0)	779	if (v_blurRadius == 0 && h_blurRadius == 0)
744	flags &= ~blurNeeded;	780	flags &= ~blurNeeded;
745	else	781	else
746	flags \|= blurNeeded;	782	flags \|= blurNeeded;
747		783
748	return (changed>0);	784	return (changed > 0);
749	}	785	}
750		786
751	static inline unsigned long	787	static inline unsigned long
752	compute_tint_shade_flags (rxvt_color *tint, int shade)	788	compute_tint_shade_flags (rxvt_color *tint, int shade)
753	{	789	{
…		…
770	flags \|= bgPixmap_t::tintNeeded;	806	flags \|= bgPixmap_t::tintNeeded;
771	else if (tint)	807	else if (tint)
772	{	808	{
773	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)	809	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)
774	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))	810	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))
775	{	811	{
776	flags \|= bgPixmap_t::tintNeeded;	812	flags \|= bgPixmap_t::tintNeeded;
777	}	813	}
778	}	814	}
779		815
780	if (flags & bgPixmap_t::tintNeeded)	816	if (flags & bgPixmap_t::tintNeeded)
781	{	817	{
782	if (flags & bgPixmap_t::tintWholesome)	818	if (flags & bgPixmap_t::tintWholesome)
…		…
811	{	847	{
812	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);	848	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
813		849
814	if (new_flags != (flags & tintFlags))	850	if (new_flags != (flags & tintFlags))
815	{	851	{
816	flags = (flags&~tintFlags)\|new_flags;	852	flags = (flags & ~tintFlags) \| new_flags;
817	return true;	853	return true;
818	}	854	}
819		855
820	return false;	856	return false;
821	}	857	}
822		858
…		…
907		943
908	attr.background_pixmap = ParentRelative;	944	attr.background_pixmap = ParentRelative;
909	attr.backing_store = Always;	945	attr.backing_store = Always;
910	attr.event_mask = ExposureMask;	946	attr.event_mask = ExposureMask;
911	attr.override_redirect = True;	947	attr.override_redirect = True;
912	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,	948	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
913	CopyFromParent, CopyFromParent, CopyFromParent,	949	CopyFromParent, CopyFromParent, CopyFromParent,
914	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,	950	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,
915	&attr);	951	&attr);
916		952
917	if (src != None)	953	if (src != None)
…		…
941	XDestroyWindow (dpy, src);	977	XDestroyWindow (dpy, src);
942	XUngrabServer (dpy);	978	XUngrabServer (dpy);
943	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);	979	//fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
944	}	980	}
945		981
946	if (!success)	982	if (!success)
947	{	983	{
948	XFreePixmap (dpy, tiled_root_pmap);	984	XFreePixmap (dpy, tiled_root_pmap);
949	tiled_root_pmap = None;	985	tiled_root_pmap = None;
950	}	986	}
951	else	987	else
952	result \|= transpPmapTiled;	988	result \|= transpPmapTiled;
953	}	989	}
954	else	990	else
955	{	991	{
956	/* straightforward pixmap copy */	992	/* straightforward pixmap copy */
957	gcv.tile = root_pixmap;	993	gcv.tile = root_pixmap;
…		…
1074	# if DO_TIMING_TEST	1110	# if DO_TIMING_TEST
1075	XSync (dpy, False);	1111	XSync (dpy, False);
1076	# endif	1112	# endif
1077	# endif	1113	# endif
1078	}	1114	}
1079	}	1115	}
1080	} /* server side rendering completed */	1116	} /* server side rendering completed */
1081		1117
1082	if (pixmap)	1118	if (pixmap)
1083	XFreePixmap (dpy, pixmap);	1119	XFreePixmap (dpy, pixmap);
1084		1120
…		…
1134	/* we need to re-generate transparency pixmap in that case ! */	1170	/* we need to re-generate transparency pixmap in that case ! */
1135	background_flags = make_transparency_pixmap ();	1171	background_flags = make_transparency_pixmap ();
1136	if (background_flags == 0)	1172	if (background_flags == 0)
1137	return false;	1173	return false;
1138	else if ((background_flags & transpTransformations) == (flags & transpTransformations)	1174	else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1139	&& pmap_depth == target->depth)	1175	&& pmap_depth == target->depth)
1140	flags = flags & ~isInvalid;	1176	flags = flags & ~isInvalid;
1141	}	1177	}
1142	# endif	1178	# endif
1143		1179
		1180	# ifdef BG_IMAGE_FROM_FILE
		1181	if (have_image
		1182	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))
		1183	{
		1184	if (render_image (background_flags))
		1185	flags = flags & ~isInvalid;
		1186	}
		1187	# endif
		1188
1144	XImage *result = NULL;	1189	XImage *result = NULL;
1145	# ifdef HAVE_AFTERIMAGE	1190
1146	if (original_asim	1191	if (background_flags && (flags & isInvalid))
1147	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))	1192	{
		1193	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1148	{	1194	}
1149	target->init_asv ();
1150		1195
1151	ASImage *background = NULL;	1196	if (result)
1152	ARGB32 as_tint = TINT_LEAVE_SAME;	1197	{
1153	if (background_flags)	1198	# if !defined(HAVE_AFTERIMAGE) && !XFT
1154	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);	1199	/* our own client-side tinting */
1155		1200	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1156	# ifdef ENABLE_TRANSPARENCY	1201	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1157	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1202	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1158	{
1159	ShadingInfo as_shade;
1160	as_shade.shading = (shade == 0) ? 100 : shade;
1161
1162	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1163	if (flags & tintSet)
1164	tint.get (c);
1165	as_shade.tintColor.red = c.r;
1166	as_shade.tintColor.green = c.g;
1167	as_shade.tintColor.blue = c.b;
1168
1169	as_tint = shading2tint32 (&as_shade);
1170	}
1171
1172	if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1173	{
1174	ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1175	(original_asim == NULL \|\| tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1176	100, ASIMAGE_QUALITY_DEFAULT);
1177	if (tmp)
1178	{
1179	destroy_asimage (&background);
1180	background = tmp;
1181	}
1182	}
1183	# endif
1184
1185	if (render_asim (background, as_tint))
1186	flags = flags & ~isInvalid;
1187	if (background)
1188	destroy_asimage (&background);
1189	}
1190	else if (background_flags && pmap_depth != target->depth)
1191	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1192
1193	# elif !XFT /* our own client-side tinting */
1194
1195	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1196	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1197
1198	if (background_flags && (flags & isInvalid))
1199	{
1200	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1201
1202	if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1203	{	1203	{
1204	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1204	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1205	if (flags & tintSet)	1205	if (flags & tintSet)
1206	tint.get (c);	1206	tint.get (c);
1207	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1207	ShadeXImage (target, result, shade, c.r, c.g, c.b);
1208	}	1208	}
1209	}	1209	# endif
1210	# endif /* HAVE_AFTERIMAGE */
1211		1210
1212	if (result)
1213	{
1214	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1211	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1215		1212
1216	if (gc)	1213	if (gc)
1217	{	1214	{
1218	if (/pmap_depth != target->depth &&/ pixmap != None)	1215	if (/pmap_depth != target->depth &&/ pixmap != None)
…		…
1247		1244
1248	XFreeGC (target->dpy, gc);	1245	XFreeGC (target->dpy, gc);
1249	flags = flags & ~isInvalid;	1246	flags = flags & ~isInvalid;
1250	}	1247	}
1251		1248
1252	XDestroyImage (result);	1249	XDestroyImage (result);
1253	}	1250	}
1254		1251
1255	if (flags & isInvalid)	1252	if (flags & isInvalid)
1256	{	1253	{
1257	if (pixmap != None)	1254	if (pixmap != None)

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.41 by sf-exg, Sat Aug 21 16:07:15 2010 UTC vs. Revision 1.54 by sf-exg, Wed Sep 1 22:49:35 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.41 by sf-exg, Sat Aug 21 16:07:15 2010 UTC vs.
Revision 1.54 by sf-exg, Wed Sep 1 22:49:35 2010 UTC