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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.223 by sf-exg, Sat May 26 08:55:27 2012 UTC vs.
Revision 1.234 by sf-exg, Thu Jun 7 09:21:18 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	63	# if 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 ();	64	fimage.destroy ();
66	# endif	65	# endif
67		66
68	if (bg_pixmap)	67	if (bg_pixmap)
69	XFreePixmap (dpy, bg_pixmap);	68	XFreePixmap (dpy, bg_pixmap);
70	}	69	}
…		…
84	}	83	}
85		84
86	bool	85	bool
87	rxvt_term::bg_window_size_sensitive ()	86	rxvt_term::bg_window_size_sensitive ()
88	{	87	{
89	# ifdef ENABLE_TRANSPARENCY	88	# if ENABLE_TRANSPARENCY
90	if (bg_flags & BG_IS_TRANSPARENT)	89	if (bg_flags & BG_IS_TRANSPARENT)
91	return true;	90	return true;
92	# endif	91	# endif
93		92
94	# ifdef BG_IMAGE_FROM_FILE	93	# if BG_IMAGE_FROM_FILE
95	for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)	94	if (fimage.flags & IM_IS_SET)
96	{	95	{
97	if ((bg_image->flags & IM_IS_SIZE_SENSITIVE)	96	if ((fimage.flags & IM_IS_SIZE_SENSITIVE)
98	\|\| bg_image->width () > szHint.width	97	\|\| fimage.width () > szHint.width
99	\|\| bg_image->height () > szHint.height)	98	\|\| fimage.height () > szHint.height)
100	return true;	99	return true;
101	}	100	}
102	# endif	101	# endif
103		102
104	return false;	103	return false;
105	}	104	}
106		105
107	bool	106	bool
108	rxvt_term::bg_window_position_sensitive ()	107	rxvt_term::bg_window_position_sensitive ()
109	{	108	{
110	# ifdef ENABLE_TRANSPARENCY	109	# if ENABLE_TRANSPARENCY
111	if (bg_flags & BG_IS_TRANSPARENT)	110	if (bg_flags & BG_IS_TRANSPARENT)
112	return true;	111	return true;
113	# endif	112	# endif
114		113
115	# ifdef BG_IMAGE_FROM_FILE	114	# if BG_IMAGE_FROM_FILE
116	for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)	115	if (fimage.flags & IM_IS_SET)
117	{	116	{
118	if (bg_image->flags & IM_ROOT_ALIGN)	117	if (fimage.flags & IM_ROOT_ALIGN)
119	return true;	118	return true;
120	}	119	}
121	# endif	120	# endif
122		121
123	return false;	122	return false;
124	}	123	}
125		124
126	# ifdef BG_IMAGE_FROM_FILE	125	# if BG_IMAGE_FROM_FILE
127	static inline int	126	static inline int
128	make_align_position (int align, int window_size, int image_size)	127	make_align_position (int align, int window_size, int image_size)
129	{	128	{
130	if (align >= 0 && align <= 100)	129	if (align >= 0 && align <= 100)
131	return lerp (0, window_size - image_size, align);	130	return lerp (0, window_size - image_size, align);
…		…
303	h_align = x;	302	h_align = x;
304	v_align = y;	303	v_align = y;
305	changed = true;	304	changed = true;
306	}	305	}
307		306
308	if (!(flags & IM_TILE)	307	if (is_size_sensitive ())
309	\|\| h_scale \|\| v_scale
310	\|\| (!(flags & IM_ROOT_ALIGN) && (h_align \|\| v_align)))
311	flags \|= IM_IS_SIZE_SENSITIVE;	308	flags \|= IM_IS_SIZE_SENSITIVE;
312	else	309	else
313	flags &= ~IM_IS_SIZE_SENSITIVE;	310	flags &= ~IM_IS_SIZE_SENSITIVE;
314		311
315	return changed;	312	return changed;
…		…
349	x = make_align_position (image.h_align, target_width, w);	346	x = make_align_position (image.h_align, target_width, w);
350	y = make_align_position (image.v_align, target_height, h);	347	y = make_align_position (image.v_align, target_height, h);
351	}	348	}
352	}	349	}
353		350
354	# ifdef HAVE_PIXBUF	351	# if HAVE_PIXBUF
355	bool	352	bool
356	rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,	353	rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
357	int src_x, int src_y, int dst_x, int dst_y,	354	int src_x, int src_y, int dst_x, int dst_y,
358	unsigned int width, unsigned int height, bool argb)	355	unsigned int width, unsigned int height, bool argb)
359	{	356	{
…		…
486	return false;	483	return false;
487		484
488	bool need_blend = bg_flags & BG_IS_VALID;	485	bool need_blend = bg_flags & BG_IS_VALID;
489		486
490	if (need_blend	487	if (need_blend
491	&& !(bg_flags & BG_HAS_RENDER))	488	&& !(display->flags & DISPLAY_HAS_RENDER))
492	return false;	489	return false;
493		490
494	GdkPixbuf *result;	491	GdkPixbuf *result;
495		492
496	int image_width = gdk_pixbuf_get_width (pixbuf);	493	int image_width = gdk_pixbuf_get_width (pixbuf);
…		…
539		536
540	if (need_blend)	537	if (need_blend)
541	tmp_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, 32);	538	tmp_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, 32);
542	else	539	else
543	{	540	{
544	// optimise bg pixmap size when tiling, but only if there are no
545	// other pixbufs to render. Otherwise, the bg pixmap size must
546	// be equal to the window size.
547	if ((image.flags & IM_TILE)	541	if (image.flags & IM_TILE)
548	&& image_vec.size () == 1)
549	{	542	{
550	new_pmap_width = min (image_width, target_width);	543	new_pmap_width = min (image_width, target_width);
551	new_pmap_height = min (image_height, target_height);	544	new_pmap_height = min (image_height, target_height);
552	}	545	}
553		546
…		…
605	src_x, src_y,	598	src_x, src_y,
606	dst_x, dst_y,	599	dst_x, dst_y,
607	dst_width, dst_height, need_blend);	600	dst_width, dst_height, need_blend);
608	}	601	}
609		602
		603	if (image.need_blur ())
		604	blur_pixmap (tmp_pixmap, new_pmap_width, new_pmap_height, need_blend, image.h_blurRadius, image.v_blurRadius);
		605	if (image.need_tint ())
		606	tint_pixmap (tmp_pixmap, new_pmap_width, new_pmap_height, need_blend, image.tint, image.tint_set, image.shade);
		607
610	#if XRENDER	608	#if XRENDER
611	if (need_blend)	609	if (need_blend)
612	{	610	{
613	XRenderPictFormat *argb_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);	611	XRenderPictFormat *argb_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
614	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	612	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
…		…
648		646
649	return ret;	647	return ret;
650	}	648	}
651	# endif /* HAVE_PIXBUF */	649	# endif /* HAVE_PIXBUF */
652		650
653	# ifndef NO_RESOURCES
654	static int
655	rxvt_define_image (XrmDatabase *database ecb_unused,
656	XrmBindingList bindings ecb_unused,
657	XrmQuarkList quarks,
658	XrmRepresentation *type ecb_unused,
659	XrmValue *value,
660	XPointer closure ecb_unused)
661	{
662	int size;
663
664	for (size = 0; quarks[size] != NULLQUARK; size++)
665	;
666
667	if (size >= 2)
668	{
669	int id = strtol (XrmQuarkToString (quarks[size-2]), 0, 0);
670	if (id >= 1)
671	GET_R->parse_image (id, XrmQuarkToString (quarks[size-1]), (char *)value->addr);
672	}
673	return False;
674	}
675
676	void
677	rxvt_term::parse_image (int id, const char type, const char arg)
678	{
679	if (image_vec.size () < id + 1)
680	image_vec.resize (id + 1);
681
682	rxvt_image *image = &image_vec[id];
683	}
684	# endif
685
686	rxvt_image::rxvt_image ()	651	rxvt_image::rxvt_image ()
687	{	652	{
688	alpha =	653	alpha = 0xffff;
689	flags =	654	flags = 0;
690	h_scale =	655	h_scale =
691	v_scale =	656	v_scale = defaultScale;
692	h_align =	657	h_align =
693	v_align = 0;	658	v_align = defaultAlign;
694		659
695	# ifdef HAVE_PIXBUF	660	# if HAVE_PIXBUF
696	pixbuf = 0;	661	pixbuf = 0;
697	# endif	662	# endif
698	}	663	}
699		664
700	bool	665	bool
…		…
714	file = f;	679	file = f;
715	}	680	}
716		681
717	bool ret = set_file (file);	682	bool ret = set_file (file);
718	alpha = 0x8000;	683	alpha = 0x8000;
719	if (ret && p)	684	if (ret)
720	set_geometry (p + 1);	685	set_geometry (p ? p + 1 : "");
721	return ret;	686	return ret;
722	}	687	}
723		688
724	bool	689	bool
725	rxvt_image::set_file (const char *file)	690	rxvt_image::set_file (const char *file)
726	{	691	{
727	bool ret = false;	692	bool ret = false;
728		693
729	# ifdef HAVE_PIXBUF	694	# if HAVE_PIXBUF
730	GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);	695	GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
731	if (image)	696	if (image)
732	{	697	{
733	if (pixbuf)	698	if (pixbuf)
734	g_object_unref (pixbuf);	699	g_object_unref (pixbuf);
…		…
736	ret = true;	701	ret = true;
737	}	702	}
738	# endif	703	# endif
739		704
740	if (ret)	705	if (ret)
741	{	706	flags \|= IM_IS_SET;
742	alpha = 0xffff;
743	flags = IM_IS_SET \| IM_IS_SIZE_SENSITIVE;
744	h_scale = v_scale = defaultScale;
745	h_align = v_align = defaultAlign;
746	}
747		707
748	return ret;	708	return ret;
749	}	709	}
750		710
751	# endif /* BG_IMAGE_FROM_FILE */	711	# endif /* BG_IMAGE_FROM_FILE */
752		712
753	# ifdef ENABLE_TRANSPARENCY
754	bool	713	bool
755	rxvt_term::bg_set_blur (const char *geom)	714	image_effects::set_blur (const char *geom)
756	{	715	{
757	bool changed = false;	716	bool changed = false;
758	unsigned int hr, vr;	717	unsigned int hr, vr;
759	int junk;	718	int junk;
760	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);	719	int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
…		…
781		740
782	return changed;	741	return changed;
783	}	742	}
784		743
785	bool	744	bool
786	rxvt_term::bg_set_tint (rxvt_color &new_tint)	745	image_effects::set_tint (const rxvt_color &new_tint)
787	{	746	{
788	if (!(bg_flags & BG_TINT_SET) \|\| tint != new_tint)	747	if (!tint_set \|\| tint != new_tint)
789	{	748	{
790	tint = new_tint;	749	tint = new_tint;
791	bg_flags \|= BG_TINT_SET;	750	tint_set = true;
792
793	rgba c;
794	tint.get (c);
795	if ((c.r <= 0x00ff \|\| c.r >= 0xff00)
796	&& (c.g <= 0x00ff \|\| c.g >= 0xff00)
797	&& (c.b <= 0x00ff \|\| c.b >= 0xff00))
798	bg_flags \|= BG_TINT_BITAND;
799	else
800	bg_flags &= ~BG_TINT_BITAND;
801		751
802	return true;	752	return true;
803	}	753	}
804		754
805	return false;	755	return false;
806	}	756	}
807		757
808	bool	758	bool
809	rxvt_term::bg_set_shade (const char *shade_str)	759	image_effects::set_shade (const char *shade_str)
810	{	760	{
811	int new_shade = atoi (shade_str);	761	int new_shade = atoi (shade_str);
812		762
813	clamp_it (new_shade, -100, 200);	763	clamp_it (new_shade, -100, 200);
814	if (new_shade < 0)	764	if (new_shade < 0)
…		…
845	params[i+2] = XDoubleToFixed (kernel[i] / sum);	795	params[i+2] = XDoubleToFixed (kernel[i] / sum);
846	}	796	}
847	#endif	797	#endif
848		798
849	bool	799	bool
850	rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height)	800	rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height, bool argb, int h_blurRadius, int v_blurRadius)
851	{	801	{
852	bool ret = false;	802	bool ret = false;
853	#if XRENDER	803	#if XRENDER
854	if (!(bg_flags & BG_HAS_RENDER_CONV))	804	if (!(display->flags & DISPLAY_HAS_RENDER_CONV))
855	return false;	805	return false;
856		806
857	int size = max (h_blurRadius, v_blurRadius) * 2 + 1;	807	int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
858	double kernel = (double )malloc (size * sizeof (double));	808	double kernel = (double )malloc (size * sizeof (double));
859	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	809	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
860		810
861	XRenderPictureAttributes pa;	811	XRenderPictureAttributes pa;
862	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	812	XRenderPictFormat *format = argb ? XRenderFindStandardFormat (dpy, PictStandardARGB32)
		813	: XRenderFindVisualFormat (dpy, visual);
863		814
864	pa.repeat = RepeatPad;	815	pa.repeat = RepeatPad;
865	Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);	816	Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
866	Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);	817	Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
867	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);	818	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
…		…
910	#endif	861	#endif
911	return ret;	862	return ret;
912	}	863	}
913		864
914	bool	865	bool
915	rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height)	866	rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height, bool argb, rxvt_color &tint, bool tint_set, int shade)
916	{	867	{
917	bool ret = false;	868	bool ret = false;
918		869
919	if (shade == 100 && (bg_flags & BG_TINT_BITAND))	870	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
		871
		872	if (tint_set)
		873	tint.get (c);
		874
		875	if (shade == 100
		876	&& (c.r <= 0x00ff \|\| c.r >= 0xff00)
		877	&& (c.g <= 0x00ff \|\| c.g >= 0xff00)
		878	&& (c.b <= 0x00ff \|\| c.b >= 0xff00))
920	{	879	{
921	XGCValues gcv;	880	XGCValues gcv;
922	GC gc;	881	GC gc;
923		882
924	/* In this case we can tint image server-side getting significant	883	/* In this case we can tint image server-side getting significant
…		…
934	ret = true;	893	ret = true;
935	XFreeGC (dpy, gc);	894	XFreeGC (dpy, gc);
936	}	895	}
937	}	896	}
938	# if XRENDER	897	# if XRENDER
939	else if (bg_flags & BG_HAS_RENDER)	898	else if (display->flags & DISPLAY_HAS_RENDER)
940	{	899	{
941	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
942
943	if (bg_flags & BG_TINT_SET)
944	tint.get (c);
945
946	if (shade <= 100)	900	if (shade <= 100)
947	{	901	{
948	c.r = c.r * shade / 100;	902	c.r = c.r * shade / 100;
949	c.g = c.g * shade / 100;	903	c.g = c.g * shade / 100;
950	c.b = c.b * shade / 100;	904	c.b = c.b * shade / 100;
…		…
954	c.r = c.r * (200 - shade) / 100;	908	c.r = c.r * (200 - shade) / 100;
955	c.g = c.g * (200 - shade) / 100;	909	c.g = c.g * (200 - shade) / 100;
956	c.b = c.b * (200 - shade) / 100;	910	c.b = c.b * (200 - shade) / 100;
957	}	911	}
958		912
959	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	913	XRenderPictFormat *format = argb ? XRenderFindStandardFormat (dpy, PictStandardARGB32)
		914	: XRenderFindVisualFormat (dpy, visual);
960		915
961	Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);	916	Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
962		917
963	Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);	918	Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
964		919
…		…
1000	# endif	955	# endif
1001		956
1002	return ret;	957	return ret;
1003	}	958	}
1004		959
		960	# if ENABLE_TRANSPARENCY
1005	/*	961	/*
1006	* Builds a pixmap of the same size as the terminal window that contains	962	* Builds a pixmap of the same size as the terminal window that contains
1007	* the tiled portion of the root pixmap that is supposed to be covered by	963	* the tiled portion of the root pixmap that is supposed to be covered by
1008	* our window.	964	* our window.
1009	*/	965	*/
1010	bool	966	bool
1011	rxvt_term::make_transparency_pixmap ()	967	rxvt_term::render_root_image ()
1012	{	968	{
1013	bool ret = false;	969	bool ret = false;
1014		970
1015	/* root dimensions may change from call to call - but Display structure should	971	/* root dimensions may change from call to call - but Display structure should
1016	* be always up-to-date, so let's use it :	972	* be always up-to-date, so let's use it :
…		…
1052	Pixmap recoded_root_pmap = root_pixmap;	1008	Pixmap recoded_root_pmap = root_pixmap;
1053		1009
1054	if (root_pixmap != None && root_depth != depth)	1010	if (root_pixmap != None && root_depth != depth)
1055	{	1011	{
1056	#if XRENDER	1012	#if XRENDER
1057	if (bg_flags & BG_HAS_RENDER)	1013	if (display->flags & DISPLAY_HAS_RENDER)
1058	{	1014	{
1059	recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);	1015	recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1060		1016
1061	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));	1017	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1062	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);	1018	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
…		…
1100		1056
1101	if (gc)	1057	if (gc)
1102	{	1058	{
1103	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);	1059	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1104	ret = true;	1060	ret = true;
1105	bool need_blur = h_blurRadius && v_blurRadius;	1061	bool need_blur = root_effects.need_blur ();
1106	bool need_tint = shade != 100 \|\| (bg_flags & BG_TINT_SET);	1062	bool need_tint = root_effects.need_tint ();
1107		1063
1108	if (!(bg_flags & BG_CLIENT_RENDER))
1109	{
1110	if (need_blur)	1064	if (need_blur)
		1065	{
		1066	if (blur_pixmap (bg_pixmap, window_width, window_height, false,
		1067	root_effects.h_blurRadius, root_effects.v_blurRadius))
		1068	need_blur = false;
		1069	}
		1070	if (need_tint)
		1071	{
		1072	if (tint_pixmap (bg_pixmap, window_width, window_height, false,
		1073	root_effects.tint, root_effects.tint_set, root_effects.shade))
		1074	need_tint = false;
		1075	}
		1076	if (need_tint)
		1077	{
		1078	XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
		1079	if (ximage)
1111	{	1080	{
1112	if (blur_pixmap (bg_pixmap, window_width, window_height))	1081	/* our own client-side tinting */
1113	need_blur = false;	1082	tint_ximage (ximage, root_effects.tint, root_effects.tint_set, root_effects.shade);
		1083
		1084	XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
		1085	XDestroyImage (ximage);
1114	}	1086	}
1115	if (need_tint)
1116	{
1117	if (tint_pixmap (bg_pixmap, window_width, window_height))
1118	need_tint = false;
1119	}	1087	}
1120	if (need_tint)
1121	{
1122	XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1123	if (ximage)
1124	{
1125	/* our own client-side tinting */
1126	tint_ximage (ximage);
1127
1128	XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1129	XDestroyImage (ximage);
1130	}
1131	}
1132	} /* server side rendering completed */
1133		1088
1134	XFreeGC (dpy, gc);	1089	XFreeGC (dpy, gc);
1135	}	1090	}
1136		1091
1137	if (recoded_root_pmap != root_pixmap)	1092	if (recoded_root_pmap != root_pixmap)
…		…
1141	}	1096	}
1142		1097
1143	void	1098	void
1144	rxvt_term::bg_set_root_pixmap ()	1099	rxvt_term::bg_set_root_pixmap ()
1145	{	1100	{
1146	Pixmap new_root_pixmap = get_pixmap_property (xa[XA_XROOTPMAP_ID]);	1101	Pixmap new_root_pixmap = display->get_pixmap_property (xa[XA_XROOTPMAP_ID]);
1147	if (new_root_pixmap == None)	1102	if (new_root_pixmap == None)
1148	new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);	1103	new_root_pixmap = display->get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1149		1104
1150	root_pixmap = new_root_pixmap;	1105	root_pixmap = new_root_pixmap;
1151	}	1106	}
1152	# endif /* ENABLE_TRANSPARENCY */	1107	# endif /* ENABLE_TRANSPARENCY */
1153		1108
1154	bool	1109	void
1155	rxvt_term::bg_render ()	1110	rxvt_term::bg_render ()
1156	{	1111	{
1157	bg_invalidate ();	1112	bg_invalidate ();
1158	# ifdef ENABLE_TRANSPARENCY	1113	# if ENABLE_TRANSPARENCY
1159	if (bg_flags & BG_IS_TRANSPARENT)	1114	if (bg_flags & BG_IS_TRANSPARENT)
1160	{	1115	{
1161	/* we need to re-generate transparency pixmap in that case ! */	1116	/* we need to re-generate transparency pixmap in that case ! */
1162	if (make_transparency_pixmap ())	1117	if (render_root_image ())
1163	bg_flags \|= BG_IS_VALID;	1118	bg_flags \|= BG_IS_VALID;
1164	}	1119	}
1165	# endif	1120	# endif
1166		1121
1167	# ifdef BG_IMAGE_FROM_FILE	1122	# if BG_IMAGE_FROM_FILE
1168	for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)	1123	if (fimage.flags & IM_IS_SET)
1169	{	1124	{
1170	if (render_image (*bg_image))	1125	if (render_image (fimage))
1171	bg_flags \|= BG_IS_VALID;	1126	bg_flags \|= BG_IS_VALID;
1172	}	1127	}
1173	# endif	1128	# endif
1174		1129
1175	if (!(bg_flags & BG_IS_VALID))	1130	if (!(bg_flags & BG_IS_VALID))
…		…
1183		1138
1184	scr_recolour (false);	1139	scr_recolour (false);
1185	bg_flags \|= BG_NEEDS_REFRESH;	1140	bg_flags \|= BG_NEEDS_REFRESH;
1186		1141
1187	bg_valid_since = ev::now ();	1142	bg_valid_since = ev::now ();
1188
1189	return true;
1190	}	1143	}
1191		1144
1192	void	1145	void
1193	rxvt_term::bg_init ()	1146	rxvt_term::bg_init ()
1194	{	1147	{
1195	#ifdef ENABLE_TRANSPARENCY	1148	#if BG_IMAGE_FROM_FILE
1196	shade = 100;	1149	if (rs[Rs_backgroundPixmap])
		1150	{
		1151	if (fimage.set_file_geometry (rs[Rs_backgroundPixmap])
		1152	&& !bg_window_position_sensitive ())
		1153	update_background ();
		1154	}
1197	#endif	1155	#endif
1198
1199	bg_flags &= ~(BG_HAS_RENDER \| BG_HAS_RENDER_CONV);
1200	#if XRENDER
1201	int major, minor;
1202	if (XRenderQueryVersion (dpy, &major, &minor))
1203	bg_flags \|= BG_HAS_RENDER;
1204	XFilters *filters = XRenderQueryFilters (dpy, vt);
1205	if (filters)
1206	{
1207	for (int i = 0; i < filters->nfilter; i++)
1208	if (!strcmp (filters->filter[i], FilterConvolution))
1209	bg_flags \|= BG_HAS_RENDER_CONV;
1210
1211	XFree (filters);
1212	}
1213	#endif
1214
1215	#ifdef BG_IMAGE_FROM_FILE
1216	if (rs[Rs_backgroundPixmap])
1217	{
1218	rxvt_image *image = new_image ();
1219	if (!image->set_file_geometry (rs[Rs_backgroundPixmap]))
1220	image_vec.pop_back ();
1221	}
1222
1223	# ifndef NO_RESOURCES
1224	find_resources ("image", "Image", XrmEnumAllLevels, rxvt_define_image);
1225	vector<rxvt_image>::iterator bg_image = image_vec.begin ();
1226	while (bg_image != image_vec.end ())
1227	{
1228	if (!(bg_image->flags & IM_IS_SET))
1229	bg_image = image_vec.erase (bg_image);
1230	else
1231	bg_image++;
1232	}
1233	# endif
1234
1235	if (image_vec.size () > 0
1236	&& !bg_window_position_sensitive ())
1237	update_background ();
1238	#endif
1239	}	1156	}
1240		1157
1241	#endif /* HAVE_BG_PIXMAP */
1242
1243	#ifdef ENABLE_TRANSPARENCY
1244	/* based on code from aterm-0.4.2 */	1158	/* based on code from aterm-0.4.2 */
1245		1159
1246	static inline void	1160	static inline void
1247	fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)	1161	fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1248	{	1162	{
…		…
1254	lookup[i] = (tmp / 0xffff) << sh;	1168	lookup[i] = (tmp / 0xffff) << sh;
1255	}	1169	}
1256	}	1170	}
1257		1171
1258	void	1172	void
1259	rxvt_term::tint_ximage (XImage *ximage)	1173	rxvt_term::tint_ximage (XImage *ximage, rxvt_color &tint, bool tint_set, int shade)
1260	{	1174	{
1261	unsigned int size_r, size_g, size_b;	1175	unsigned int size_r, size_g, size_b;
1262	int sh_r, sh_g, sh_b;	1176	int sh_r, sh_g, sh_b;
1263	uint32_t mask_r, mask_g, mask_b;	1177	uint32_t mask_r, mask_g, mask_b;
1264	uint32_t lookup, lookup_r, lookup_g, lookup_b;	1178	uint32_t lookup, lookup_r, lookup_g, lookup_b;
…		…
1289	lookup_g = lookup + size_r;	1203	lookup_g = lookup + size_r;
1290	lookup_b = lookup + size_r + size_g;	1204	lookup_b = lookup + size_r + size_g;
1291		1205
1292	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);	1206	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1293		1207
1294	if (bg_flags & BG_TINT_SET)	1208	if (tint_set)
1295	tint.get (c);	1209	tint.get (c);
1296		1210
1297	/* prepare limits for color transformation (each channel is handled separately) */	1211	/* prepare limits for color transformation (each channel is handled separately) */
1298	if (shade > 100)	1212	if (shade > 100)
1299	{	1213	{
…		…
1349	}	1263	}
1350	}	1264	}
1351		1265
1352	free (lookup);	1266	free (lookup);
1353	}	1267	}
1354	#endif /* ENABLE_TRANSPARENCY */	1268
		1269	#endif /* HAVE_BG_PIXMAP */

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.223 by sf-exg, Sat May 26 08:55:27 2012 UTC vs. Revision 1.234 by sf-exg, Thu Jun 7 09:21:18 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.223 by sf-exg, Sat May 26 08:55:27 2012 UTC vs.
Revision 1.234 by sf-exg, Thu Jun 7 09:21:18 2012 UTC