[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.52 by sf-exg, Wed Sep 1 11:59:44 2010 UTC

…		…
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)
…		…
610	free (layers);	642	free (layers);
611	}	643	}
612	}	644	}
613	TIMING_TEST_PRINT_RESULT (asim);	645	TIMING_TEST_PRINT_RESULT (asim);
614		646
615	if (pixmap)	647	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		648
627	if (result)	649	if (result)
628	{	650	{
629	XGCValues gcv;	651	XGCValues gcv;
630	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	}
631		664
632	/* create Pixmap */	665	/* create Pixmap */
633	if (pixmap == None)	666	if (pixmap == None)
634	{	667	{
635	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);
636	pmap_width = new_pmap_width;	669	pmap_width = new_pmap_width;
637	pmap_height = new_pmap_height;	670	pmap_height = new_pmap_height;
638	pmap_depth = target->depth;	671	pmap_depth = target->depth;
639	}	672	}
640	/* fill with background color ( if result's not completely overlapping it)*/	673	/* fill with background color (if result's not completely overlapping it) */
641	gcv.foreground = target->pix_colors[Color_bg];	674	gcv.foreground = target->pix_colors[Color_bg];
642	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);	675	gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
643		676
644	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;
645	int dst_width = result->width, dst_height = result->height;	678	int dst_width = result->width, dst_height = result->height;
…		…
661	if (result != background && result != original_asim)	694	if (result != background && result != original_asim)
662	destroy_asimage (&result);	695	destroy_asimage (&result);
663		696
664	XFreeGC (target->dpy, gc);	697	XFreeGC (target->dpy, gc);
665	TIMING_TEST_PRINT_RESULT (asim);	698	TIMING_TEST_PRINT_RESULT (asim);
666	}
667		699
		700	ret = true;
		701	}
		702
		703	if (background)
		704	destroy_asimage (&background);
		705
668	return true;	706	return ret;
669	}	707	}
670	# endif /* HAVE_AFTERIMAGE */	708	# endif /* HAVE_AFTERIMAGE */
671		709
672	bool	710	bool
673	bgPixmap_t::set_file (const char *file)	711	bgPixmap_t::set_file (const char *file)
674	{	712	{
675	assert (file);	713	assert (file);
676		714
677	if (*file)	715	if (*file)
678	{	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
679	# ifdef HAVE_AFTERIMAGE	726	# ifdef HAVE_AFTERIMAGE
680	if (!target->asimman)	727	if (!target->asimman)
681	target->asimman = create_generic_imageman (target->rs[Rs_path]);	728	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);	729	original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
694		730	if (original_asim)
695	return original_asim;	731	have_image = true;
		732	return have_image;
696	# endif	733	# endif
697	}	734	}
698		735
699	return false;	736	return false;
700	}	737	}
…		…
720	int changed = 0;	757	int changed = 0;
721	unsigned int hr, vr;	758	unsigned int hr, vr;
722	int junk;	759	int junk;
723	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);	760	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
724		761
725	if (!(geom_flags&WidthValue))	762	if (!(geom_flags & WidthValue))
726	hr = 1;	763	hr = 1;
727	if (!(geom_flags&HeightValue))	764	if (!(geom_flags & HeightValue))
728	vr = hr;	765	vr = hr;
729		766
730	if (h_blurRadius != hr)	767	if (h_blurRadius != hr)
731	{	768	{
732	++changed;	769	++changed;
…		…
742	if (v_blurRadius == 0 && h_blurRadius == 0)	779	if (v_blurRadius == 0 && h_blurRadius == 0)
743	flags &= ~blurNeeded;	780	flags &= ~blurNeeded;
744	else	781	else
745	flags \|= blurNeeded;	782	flags \|= blurNeeded;
746		783
747	return (changed>0);	784	return (changed > 0);
748	}	785	}
749		786
750	static inline unsigned long	787	static inline unsigned long
751	compute_tint_shade_flags (rxvt_color *tint, int shade)	788	compute_tint_shade_flags (rxvt_color *tint, int shade)
752	{	789	{
…		…
769	flags \|= bgPixmap_t::tintNeeded;	806	flags \|= bgPixmap_t::tintNeeded;
770	else if (tint)	807	else if (tint)
771	{	808	{
772	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)	809	if ((c.r > 0x000700 \|\| c.g > 0x000700 \|\| c.b > 0x000700)
773	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))	810	&& (c.r < 0x00f700 \|\| c.g < 0x00f700 \|\| c.b < 0x00f700))
774	{	811	{
775	flags \|= bgPixmap_t::tintNeeded;	812	flags \|= bgPixmap_t::tintNeeded;
776	}	813	}
777	}	814	}
778		815
779	if (flags & bgPixmap_t::tintNeeded)	816	if (flags & bgPixmap_t::tintNeeded)
780	{	817	{
781	if (flags & bgPixmap_t::tintWholesome)	818	if (flags & bgPixmap_t::tintWholesome)
…		…
810	{	847	{
811	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);	848	unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
812		849
813	if (new_flags != (flags & tintFlags))	850	if (new_flags != (flags & tintFlags))
814	{	851	{
815	flags = (flags&~tintFlags)\|new_flags;	852	flags = (flags & ~tintFlags) \| new_flags;
816	return true;	853	return true;
817	}	854	}
818		855
819	return false;	856	return false;
820	}	857	}
821		858
…		…
906		943
907	attr.background_pixmap = ParentRelative;	944	attr.background_pixmap = ParentRelative;
908	attr.backing_store = Always;	945	attr.backing_store = Always;
909	attr.event_mask = ExposureMask;	946	attr.event_mask = ExposureMask;
910	attr.override_redirect = True;	947	attr.override_redirect = True;
911	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,	948	src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
912	CopyFromParent, CopyFromParent, CopyFromParent,	949	CopyFromParent, CopyFromParent, CopyFromParent,
913	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,	950	CWBackPixmap\|CWBackingStore\|CWOverrideRedirect\|CWEventMask,
914	&attr);	951	&attr);
915		952
916	if (src != None)	953	if (src != None)
…		…
940	XDestroyWindow (dpy, src);	977	XDestroyWindow (dpy, src);
941	XUngrabServer (dpy);	978	XUngrabServer (dpy);
942	//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);
943	}	980	}
944		981
945	if (!success)	982	if (!success)
946	{	983	{
947	XFreePixmap (dpy, tiled_root_pmap);	984	XFreePixmap (dpy, tiled_root_pmap);
948	tiled_root_pmap = None;	985	tiled_root_pmap = None;
949	}	986	}
950	else	987	else
951	result \|= transpPmapTiled;	988	result \|= transpPmapTiled;
952	}	989	}
953	else	990	else
954	{	991	{
955	/* straightforward pixmap copy */	992	/* straightforward pixmap copy */
956	gcv.tile = root_pixmap;	993	gcv.tile = root_pixmap;
…		…
1073	# if DO_TIMING_TEST	1110	# if DO_TIMING_TEST
1074	XSync (dpy, False);	1111	XSync (dpy, False);
1075	# endif	1112	# endif
1076	# endif	1113	# endif
1077	}	1114	}
1078	}	1115	}
1079	} /* server side rendering completed */	1116	} /* server side rendering completed */
1080		1117
1081	if (pixmap)	1118	if (pixmap)
1082	XFreePixmap (dpy, pixmap);	1119	XFreePixmap (dpy, pixmap);
1083		1120
…		…
1133	/* we need to re-generate transparency pixmap in that case ! */	1170	/* we need to re-generate transparency pixmap in that case ! */
1134	background_flags = make_transparency_pixmap ();	1171	background_flags = make_transparency_pixmap ();
1135	if (background_flags == 0)	1172	if (background_flags == 0)
1136	return false;	1173	return false;
1137	else if ((background_flags & transpTransformations) == (flags & transpTransformations)	1174	else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1138	&& pmap_depth == target->depth)	1175	&& pmap_depth == target->depth)
1139	flags = flags & ~isInvalid;	1176	flags = flags & ~isInvalid;
1140	}	1177	}
1141	# endif	1178	# endif
1142		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
1143	XImage *result = NULL;	1189	XImage *result = NULL;
1144	# ifdef HAVE_AFTERIMAGE
1145	if (original_asim
1146	\|\| (background_flags & transpTransformations) != (flags & transpTransformations))
1147	{
1148	target->init_asv ();
1149
1150	ASImage *background = NULL;
1151	ARGB32 as_tint = TINT_LEAVE_SAME;
1152	if (background_flags)
1153	background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1154
1155	# ifdef ENABLE_TRANSPARENCY
1156	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		1190
1197	if (background_flags && (flags & isInvalid))	1191	if (background_flags && (flags & isInvalid))
1198	{	1192	{
1199	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);	1193	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1200		1194
		1195	# if !defined(HAVE_AFTERIMAGE) && !XFT
		1196	/* our own client-side tinting */
		1197	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
		1198	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1201	if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))	1199	if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1202	{	1200	{
1203	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1201	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1204	if (flags & tintSet)	1202	if (flags & tintSet)
1205	tint.get (c);	1203	tint.get (c);
1206	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1204	ShadeXImage (target, result, shade, c.r, c.g, c.b);
1207	}	1205	}
		1206	# endif
1208	}	1207	}
1209	# endif /* HAVE_AFTERIMAGE */
1210		1208
1211	if (result)	1209	if (result)
1212	{	1210	{
1213	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1211	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1214		1212
…		…
1246		1244
1247	XFreeGC (target->dpy, gc);	1245	XFreeGC (target->dpy, gc);
1248	flags = flags & ~isInvalid;	1246	flags = flags & ~isInvalid;
1249	}	1247	}
1250		1248
1251	XDestroyImage (result);	1249	XDestroyImage (result);
1252	}	1250	}
1253		1251
1254	if (flags & isInvalid)	1252	if (flags & isInvalid)
1255	{	1253	{
1256	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.42 by sf-exg, Sun Aug 29 13:24:30 2010 UTC vs. Revision 1.52 by sf-exg, Wed Sep 1 11:59:44 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.52 by sf-exg, Wed Sep 1 11:59:44 2010 UTC