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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.219 by sf-exg, Thu May 24 16:17:33 2012 UTC vs.
Revision 1.228 by sf-exg, Thu May 31 20:23:51 2012 UTC

…		…
58	# endif	58	# endif
59		59
60	void	60	void
61	rxvt_term::bg_destroy ()	61	rxvt_term::bg_destroy ()
62	{	62	{
		63	# ifdef BG_IMAGE_FROM_FILE
		64	for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
		65	bg_image->destroy ();
		66	# endif
		67
63	if (bg_pixmap)	68	if (bg_pixmap)
64	XFreePixmap (dpy, bg_pixmap);	69	XFreePixmap (dpy, bg_pixmap);
65	}	70	}
66		71
67	bool	72	bool
…		…
85	if (bg_flags & BG_IS_TRANSPARENT)	90	if (bg_flags & BG_IS_TRANSPARENT)
86	return true;	91	return true;
87	# endif	92	# endif
88		93
89	# ifdef BG_IMAGE_FROM_FILE	94	# ifdef BG_IMAGE_FROM_FILE
90	if (bg_image.flags & IM_IS_SET)	95	for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
91	{	96	{
92	if ((bg_image.flags & IM_IS_SIZE_SENSITIVE)	97	if ((bg_image->flags & IM_IS_SIZE_SENSITIVE)
93	\|\| bg_image.width () > szHint.width	98	\|\| bg_image->width () > szHint.width
94	\|\| bg_image.height () > szHint.height)	99	\|\| bg_image->height () > szHint.height)
95	return true;	100	return true;
96	}	101	}
97	# endif	102	# endif
98		103
99	return false;	104	return false;
…		…
106	if (bg_flags & BG_IS_TRANSPARENT)	111	if (bg_flags & BG_IS_TRANSPARENT)
107	return true;	112	return true;
108	# endif	113	# endif
109		114
110	# ifdef BG_IMAGE_FROM_FILE	115	# ifdef BG_IMAGE_FROM_FILE
111	if (bg_image.flags & IM_IS_SET)	116	for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
112	{	117	{
113	if (bg_image.flags & IM_ROOT_ALIGN)	118	if (bg_image->flags & IM_ROOT_ALIGN)
114	return true;	119	return true;
115	}	120	}
116	# endif	121	# endif
117		122
118	return false;	123	return false;
…		…
298	h_align = x;	303	h_align = x;
299	v_align = y;	304	v_align = y;
300	changed = true;	305	changed = true;
301	}	306	}
302		307
303	if (!(flags & IM_TILE)	308	if (is_size_sensitive ())
304	\|\| h_scale \|\| v_scale
305	\|\| (!(flags & IM_ROOT_ALIGN) && (h_align \|\| v_align)))
306	flags \|= IM_IS_SIZE_SENSITIVE;	309	flags \|= IM_IS_SIZE_SENSITIVE;
307	else	310	else
308	flags &= ~IM_IS_SIZE_SENSITIVE;	311	flags &= ~IM_IS_SIZE_SENSITIVE;
309		312
310	return changed;	313	return changed;
…		…
534		537
535	if (need_blend)	538	if (need_blend)
536	tmp_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, 32);	539	tmp_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, 32);
537	else	540	else
538	{	541	{
		542	// optimise bg pixmap size when tiling, but only if there are no
		543	// other pixbufs to render. Otherwise, the bg pixmap size must
		544	// be equal to the window size.
539	if (image.flags & IM_TILE)	545	if ((image.flags & IM_TILE)
		546	&& image_vec.size () == 1)
540	{	547	{
541	new_pmap_width = min (image_width, target_width);	548	new_pmap_width = min (image_width, target_width);
542	new_pmap_height = min (image_height, target_height);	549	new_pmap_height = min (image_height, target_height);
543	}	550	}
544		551
…		…
596	src_x, src_y,	603	src_x, src_y,
597	dst_x, dst_y,	604	dst_x, dst_y,
598	dst_width, dst_height, need_blend);	605	dst_width, dst_height, need_blend);
599	}	606	}
600		607
		608	if (image.need_blur ())
		609	blur_pixmap (tmp_pixmap, new_pmap_width, new_pmap_height, need_blend, image.h_blurRadius, image.v_blurRadius);
		610	if (image.need_tint ())
		611	tint_pixmap (tmp_pixmap, new_pmap_width, new_pmap_height, need_blend, image.tint, image.tint_set, image.shade);
		612
601	#if XRENDER	613	#if XRENDER
602	if (need_blend)	614	if (need_blend)
603	{	615	{
604	XRenderPictFormat *argb_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);	616	XRenderPictFormat *argb_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
605	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	617	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
…		…
610		622
611	Picture mask = create_xrender_mask (dpy, vt, False, False);	623	Picture mask = create_xrender_mask (dpy, vt, False, False);
612		624
613	XRenderColor mask_c;	625	XRenderColor mask_c;
614		626
615	mask_c.alpha = 0x8000;	627	mask_c.alpha = image.alpha;
616	mask_c.red =	628	mask_c.red =
617	mask_c.green =	629	mask_c.green =
618	mask_c.blue = 0;	630	mask_c.blue = 0;
619	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);	631	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
620		632
…		…
639		651
640	return ret;	652	return ret;
641	}	653	}
642	# endif /* HAVE_PIXBUF */	654	# endif /* HAVE_PIXBUF */
643		655
		656	# ifndef NO_RESOURCES
		657	static int
		658	rxvt_define_image (XrmDatabase *database ecb_unused,
		659	XrmBindingList bindings ecb_unused,
		660	XrmQuarkList quarks,
		661	XrmRepresentation *type ecb_unused,
		662	XrmValue *value,
		663	XPointer closure ecb_unused)
		664	{
		665	int size;
		666
		667	for (size = 0; quarks[size] != NULLQUARK; size++)
		668	;
		669
		670	if (size >= 2)
		671	{
		672	int id = strtol (XrmQuarkToString (quarks[size-2]), 0, 0);
		673	if (id >= 1)
		674	GET_R->parse_image (id, XrmQuarkToString (quarks[size-1]), (char *)value->addr);
		675	}
		676	return False;
		677	}
		678
		679	void
		680	rxvt_term::parse_image (int id, const char type, const char arg)
		681	{
		682	if (image_vec.size () < id + 1)
		683	image_vec.resize (id + 1);
		684
		685	rxvt_image *image = &image_vec[id];
		686	}
		687	# endif
		688
		689	rxvt_image::rxvt_image ()
		690	{
		691	alpha = 0xffff;
		692	flags = 0;
		693	h_scale =
		694	v_scale = defaultScale;
		695	h_align =
		696	v_align = defaultAlign;
		697
		698	# ifdef HAVE_PIXBUF
		699	pixbuf = 0;
		700	# endif
		701	}
		702
644	bool	703	bool
645	rxvt_image::set_file (const char *file)	704	rxvt_image::set_file_geometry (const char *file)
646	{	705	{
647	if (!file \|\| !*file)	706	if (!file \|\| !*file)
648	return false;	707	return false;
649		708
650	bool ret = false;
651	const char *p = strchr (file, ';');	709	const char *p = strchr (file, ';');
652		710
653	if (p)	711	if (p)
654	{	712	{
655	size_t len = p - file;	713	size_t len = p - file;
…		…
657	memcpy (f, file, len);	715	memcpy (f, file, len);
658	f[len] = '\0';	716	f[len] = '\0';
659	file = f;	717	file = f;
660	}	718	}
661		719
		720	bool ret = set_file (file);
		721	alpha = 0x8000;
		722	if (ret)
		723	set_geometry (p ? p + 1 : "");
		724	return ret;
		725	}
		726
		727	bool
		728	rxvt_image::set_file (const char *file)
		729	{
		730	bool ret = false;
		731
662	# ifdef HAVE_PIXBUF	732	# ifdef HAVE_PIXBUF
663	GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);	733	GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
664	if (image)	734	if (image)
665	{	735	{
666	if (pixbuf)	736	if (pixbuf)
…		…
669	ret = true;	739	ret = true;
670	}	740	}
671	# endif	741	# endif
672		742
673	if (ret)	743	if (ret)
674	{	744	flags \|= IM_IS_SET;
675	flags = IM_IS_SET \| IM_IS_SIZE_SENSITIVE;
676	h_scale = v_scale = defaultScale;
677	h_align = v_align = defaultAlign;
678
679	if (p)
680	set_geometry (p + 1);
681	}
682		745
683	return ret;	746	return ret;
684	}	747	}
685		748
686	# endif /* BG_IMAGE_FROM_FILE */	749	# endif /* BG_IMAGE_FROM_FILE */
687		750
688	# ifdef ENABLE_TRANSPARENCY
689	bool	751	bool
690	rxvt_term::bg_set_blur (const char *geom)	752	image_effects::set_blur (const char *geom)
691	{	753	{
692	bool changed = false;	754	bool changed = false;
693	unsigned int hr, vr;	755	unsigned int hr, vr;
694	int junk;	756	int junk;
695	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);	757	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
…		…
716		778
717	return changed;	779	return changed;
718	}	780	}
719		781
720	bool	782	bool
721	rxvt_term::bg_set_tint (rxvt_color &new_tint)	783	image_effects::set_tint (const rxvt_color &new_tint)
722	{	784	{
723	if (!(bg_flags & BG_TINT_SET) \|\| tint != new_tint)	785	if (!tint_set \|\| tint != new_tint)
724	{	786	{
725	tint = new_tint;	787	tint = new_tint;
726	bg_flags \|= BG_TINT_SET;	788	tint_set = true;
727
728	rgba c;
729	tint.get (c);
730	if ((c.r <= 0x00ff \|\| c.r >= 0xff00)
731	&& (c.g <= 0x00ff \|\| c.g >= 0xff00)
732	&& (c.b <= 0x00ff \|\| c.b >= 0xff00))
733	bg_flags \|= BG_TINT_BITAND;
734	else
735	bg_flags &= ~BG_TINT_BITAND;
736		789
737	return true;	790	return true;
738	}	791	}
739		792
740	return false;	793	return false;
741	}	794	}
742		795
743	bool	796	bool
744	rxvt_term::bg_set_shade (const char *shade_str)	797	image_effects::set_shade (const char *shade_str)
745	{	798	{
746	int new_shade = atoi (shade_str);	799	int new_shade = atoi (shade_str);
747		800
748	clamp_it (new_shade, -100, 200);	801	clamp_it (new_shade, -100, 200);
749	if (new_shade < 0)	802	if (new_shade < 0)
…		…
780	params[i+2] = XDoubleToFixed (kernel[i] / sum);	833	params[i+2] = XDoubleToFixed (kernel[i] / sum);
781	}	834	}
782	#endif	835	#endif
783		836
784	bool	837	bool
785	rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height)	838	rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height, bool argb, int h_blurRadius, int v_blurRadius)
786	{	839	{
787	bool ret = false;	840	bool ret = false;
788	#if XRENDER	841	#if XRENDER
789	if (!(bg_flags & BG_HAS_RENDER_CONV))	842	if (!(bg_flags & BG_HAS_RENDER_CONV))
790	return false;	843	return false;
…		…
792	int size = max (h_blurRadius, v_blurRadius) * 2 + 1;	845	int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
793	double kernel = (double )malloc (size * sizeof (double));	846	double kernel = (double )malloc (size * sizeof (double));
794	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	847	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
795		848
796	XRenderPictureAttributes pa;	849	XRenderPictureAttributes pa;
797	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	850	XRenderPictFormat *format = argb ? XRenderFindStandardFormat (dpy, PictStandardARGB32)
		851	: XRenderFindVisualFormat (dpy, visual);
798		852
799	pa.repeat = RepeatPad;	853	pa.repeat = RepeatPad;
800	Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	854	Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
801	Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);	855	Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
802	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);	856	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
…		…
845	#endif	899	#endif
846	return ret;	900	return ret;
847	}	901	}
848		902
849	bool	903	bool
850	rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height)	904	rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height, bool argb, rxvt_color &tint, bool tint_set, int shade)
851	{	905	{
852	bool ret = false;	906	bool ret = false;
853		907
854	if (shade == 100 && (bg_flags & BG_TINT_BITAND))	908	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
		909
		910	if (tint_set)
		911	tint.get (c);
		912
		913	if (shade == 100
		914	&& (c.r <= 0x00ff \|\| c.r >= 0xff00)
		915	&& (c.g <= 0x00ff \|\| c.g >= 0xff00)
		916	&& (c.b <= 0x00ff \|\| c.b >= 0xff00))
855	{	917	{
856	XGCValues gcv;	918	XGCValues gcv;
857	GC gc;	919	GC gc;
858		920
859	/* In this case we can tint image server-side getting significant	921	/* In this case we can tint image server-side getting significant
…		…
871	}	933	}
872	}	934	}
873	# if XRENDER	935	# if XRENDER
874	else if (bg_flags & BG_HAS_RENDER)	936	else if (bg_flags & BG_HAS_RENDER)
875	{	937	{
876	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
877
878	if (bg_flags & BG_TINT_SET)
879	tint.get (c);
880
881	if (shade <= 100)	938	if (shade <= 100)
882	{	939	{
883	c.r = c.r * shade / 100;	940	c.r = c.r * shade / 100;
884	c.g = c.g * shade / 100;	941	c.g = c.g * shade / 100;
885	c.b = c.b * shade / 100;	942	c.b = c.b * shade / 100;
…		…
889	c.r = c.r * (200 - shade) / 100;	946	c.r = c.r * (200 - shade) / 100;
890	c.g = c.g * (200 - shade) / 100;	947	c.g = c.g * (200 - shade) / 100;
891	c.b = c.b * (200 - shade) / 100;	948	c.b = c.b * (200 - shade) / 100;
892	}	949	}
893		950
894	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	951	XRenderPictFormat *format = argb ? XRenderFindStandardFormat (dpy, PictStandardARGB32)
		952	: XRenderFindVisualFormat (dpy, visual);
895		953
896	Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);	954	Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
897		955
898	Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);	956	Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
899		957
…		…
935	# endif	993	# endif
936		994
937	return ret;	995	return ret;
938	}	996	}
939		997
		998	# ifdef ENABLE_TRANSPARENCY
940	/*	999	/*
941	* Builds a pixmap of the same size as the terminal window that contains	1000	* Builds a pixmap of the same size as the terminal window that contains
942	* the tiled portion of the root pixmap that is supposed to be covered by	1001	* the tiled portion of the root pixmap that is supposed to be covered by
943	* our window.	1002	* our window.
944	*/	1003	*/
945	bool	1004	bool
946	rxvt_term::make_transparency_pixmap ()	1005	rxvt_term::render_root_image ()
947	{	1006	{
948	bool ret = false;	1007	bool ret = false;
949		1008
950	/* root dimensions may change from call to call - but Display structure should	1009	/* root dimensions may change from call to call - but Display structure should
951	* be always up-to-date, so let's use it :	1010	* be always up-to-date, so let's use it :
…		…
1035		1094
1036	if (gc)	1095	if (gc)
1037	{	1096	{
1038	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);	1097	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1039	ret = true;	1098	ret = true;
1040	bool need_blur = h_blurRadius && v_blurRadius;	1099	bool need_blur = root_effects.need_blur ();
1041	bool need_tint = shade != 100 \|\| (bg_flags & BG_TINT_SET);	1100	bool need_tint = root_effects.need_tint ();
1042		1101
1043	if (!(bg_flags & BG_CLIENT_RENDER))
1044	{
1045	if (need_blur)	1102	if (need_blur)
		1103	{
		1104	if (blur_pixmap (bg_pixmap, window_width, window_height, false,
		1105	root_effects.h_blurRadius, root_effects.v_blurRadius))
		1106	need_blur = false;
		1107	}
		1108	if (need_tint)
		1109	{
		1110	if (tint_pixmap (bg_pixmap, window_width, window_height, false,
		1111	root_effects.tint, root_effects.tint_set, root_effects.shade))
		1112	need_tint = false;
		1113	}
		1114	if (need_tint)
		1115	{
		1116	XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
		1117	if (ximage)
1046	{	1118	{
1047	if (blur_pixmap (bg_pixmap, window_width, window_height))	1119	/* our own client-side tinting */
1048	need_blur = false;	1120	tint_ximage (ximage, root_effects.tint, root_effects.tint_set, root_effects.shade);
		1121
		1122	XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
		1123	XDestroyImage (ximage);
1049	}	1124	}
1050	if (need_tint)
1051	{
1052	if (tint_pixmap (bg_pixmap, window_width, window_height))
1053	need_tint = false;
1054	}	1125	}
1055	if (need_tint)
1056	{
1057	XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1058	if (ximage)
1059	{
1060	/* our own client-side tinting */
1061	tint_ximage (ximage);
1062
1063	XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1064	XDestroyImage (ximage);
1065	}
1066	}
1067	} /* server side rendering completed */
1068		1126
1069	XFreeGC (dpy, gc);	1127	XFreeGC (dpy, gc);
1070	}	1128	}
1071		1129
1072	if (recoded_root_pmap != root_pixmap)	1130	if (recoded_root_pmap != root_pixmap)
…		…
1092	bg_invalidate ();	1150	bg_invalidate ();
1093	# ifdef ENABLE_TRANSPARENCY	1151	# ifdef ENABLE_TRANSPARENCY
1094	if (bg_flags & BG_IS_TRANSPARENT)	1152	if (bg_flags & BG_IS_TRANSPARENT)
1095	{	1153	{
1096	/* we need to re-generate transparency pixmap in that case ! */	1154	/* we need to re-generate transparency pixmap in that case ! */
1097	if (make_transparency_pixmap ())	1155	if (render_root_image ())
1098	bg_flags \|= BG_IS_VALID;	1156	bg_flags \|= BG_IS_VALID;
1099	}	1157	}
1100	# endif	1158	# endif
1101		1159
1102	# ifdef BG_IMAGE_FROM_FILE	1160	# ifdef BG_IMAGE_FROM_FILE
1103	if (bg_image.flags & IM_IS_SET)	1161	for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
1104	{	1162	{
1105	if (render_image (bg_image))	1163	if (render_image (*bg_image))
1106	bg_flags \|= BG_IS_VALID;	1164	bg_flags \|= BG_IS_VALID;
1107	}	1165	}
1108	# endif	1166	# endif
1109		1167
1110	if (!(bg_flags & BG_IS_VALID))	1168	if (!(bg_flags & BG_IS_VALID))
…		…
1125	}	1183	}
1126		1184
1127	void	1185	void
1128	rxvt_term::bg_init ()	1186	rxvt_term::bg_init ()
1129	{	1187	{
1130	#ifdef ENABLE_TRANSPARENCY
1131	shade = 100;
1132	#endif
1133
1134	bg_flags &= ~(BG_HAS_RENDER \| BG_HAS_RENDER_CONV);	1188	bg_flags &= ~(BG_HAS_RENDER \| BG_HAS_RENDER_CONV);
1135	#if XRENDER	1189	#if XRENDER
1136	int major, minor;	1190	int major, minor;
1137	if (XRenderQueryVersion (dpy, &major, &minor))	1191	if (XRenderQueryVersion (dpy, &major, &minor))
1138	bg_flags \|= BG_HAS_RENDER;	1192	bg_flags \|= BG_HAS_RENDER;
…		…
1144	bg_flags \|= BG_HAS_RENDER_CONV;	1198	bg_flags \|= BG_HAS_RENDER_CONV;
1145		1199
1146	XFree (filters);	1200	XFree (filters);
1147	}	1201	}
1148	#endif	1202	#endif
1149	}
1150		1203
1151	#endif /* HAVE_BG_PIXMAP */	1204	#ifdef BG_IMAGE_FROM_FILE
		1205	if (rs[Rs_backgroundPixmap])
		1206	{
		1207	rxvt_image *image = new_image ();
		1208	if (!image->set_file_geometry (rs[Rs_backgroundPixmap]))
		1209	image_vec.pop_back ();
		1210	}
1152		1211
1153	#ifdef ENABLE_TRANSPARENCY	1212	# ifndef NO_RESOURCES
		1213	find_resources ("image", "Image", XrmEnumAllLevels, rxvt_define_image);
		1214	vector<rxvt_image>::iterator bg_image = image_vec.begin ();
		1215	while (bg_image != image_vec.end ())
		1216	{
		1217	if (!(bg_image->flags & IM_IS_SET))
		1218	bg_image = image_vec.erase (bg_image);
		1219	else
		1220	{
		1221	if (bg_image->is_size_sensitive ())
		1222	bg_image->flags \|= IM_IS_SIZE_SENSITIVE;
		1223
		1224	bg_image++;
		1225	}
		1226	}
		1227	# endif
		1228
		1229	if (image_vec.size () > 0
		1230	&& !bg_window_position_sensitive ())
		1231	update_background ();
		1232	#endif
		1233	}
		1234
1154	/* based on code from aterm-0.4.2 */	1235	/* based on code from aterm-0.4.2 */
1155		1236
1156	static inline void	1237	static inline void
1157	fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)	1238	fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1158	{	1239	{
…		…
1164	lookup[i] = (tmp / 0xffff) << sh;	1245	lookup[i] = (tmp / 0xffff) << sh;
1165	}	1246	}
1166	}	1247	}
1167		1248
1168	void	1249	void
1169	rxvt_term::tint_ximage (XImage *ximage)	1250	rxvt_term::tint_ximage (XImage *ximage, rxvt_color &tint, bool tint_set, int shade)
1170	{	1251	{
1171	unsigned int size_r, size_g, size_b;	1252	unsigned int size_r, size_g, size_b;
1172	int sh_r, sh_g, sh_b;	1253	int sh_r, sh_g, sh_b;
1173	uint32_t mask_r, mask_g, mask_b;	1254	uint32_t mask_r, mask_g, mask_b;
1174	uint32_t lookup, lookup_r, lookup_g, lookup_b;	1255	uint32_t lookup, lookup_r, lookup_g, lookup_b;
…		…
1199	lookup_g = lookup + size_r;	1280	lookup_g = lookup + size_r;
1200	lookup_b = lookup + size_r + size_g;	1281	lookup_b = lookup + size_r + size_g;
1201		1282
1202	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);	1283	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1203		1284
1204	if (bg_flags & BG_TINT_SET)	1285	if (tint_set)
1205	tint.get (c);	1286	tint.get (c);
1206		1287
1207	/* prepare limits for color transformation (each channel is handled separately) */	1288	/* prepare limits for color transformation (each channel is handled separately) */
1208	if (shade > 100)	1289	if (shade > 100)
1209	{	1290	{
…		…
1259	}	1340	}
1260	}	1341	}
1261		1342
1262	free (lookup);	1343	free (lookup);
1263	}	1344	}
1264	#endif /* ENABLE_TRANSPARENCY */	1345
		1346	#endif /* HAVE_BG_PIXMAP */

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.219 by sf-exg, Thu May 24 16:17:33 2012 UTC vs. Revision 1.228 by sf-exg, Thu May 31 20:23:51 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.219 by sf-exg, Thu May 24 16:17:33 2012 UTC vs.
Revision 1.228 by sf-exg, Thu May 31 20:23:51 2012 UTC