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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.180 by sf-exg, Sat Dec 24 09:44:23 2011 UTC vs.
Revision 1.196 by sf-exg, Tue Jan 10 18:50:14 2012 UTC

…		…
32		32
33	#ifndef FilterConvolution	33	#ifndef FilterConvolution
34	#define FilterConvolution "convolution"	34	#define FilterConvolution "convolution"
35	#endif	35	#endif
36		36
		37	#ifndef RepeatPad
		38	#define RepeatPad True
		39	#endif
		40
37	#ifdef HAVE_BG_PIXMAP	41	#ifdef HAVE_BG_PIXMAP
		42	# if XRENDER
		43	static Picture
		44	create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
		45	{
		46	Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
		47
		48	XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
		49	XRenderPictureAttributes pa;
		50	pa.repeat = True;
		51	pa.component_alpha = component_alpha;
		52	Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat \| CPComponentAlpha, &pa);
		53
		54	XFreePixmap (dpy, pixmap);
		55
		56	return mask;
		57	}
		58	# endif
		59
38	void	60	void
39	rxvt_term::bg_destroy ()	61	rxvt_term::bg_destroy ()
40	{	62	{
41	#ifdef HAVE_AFTERIMAGE	63	#ifdef HAVE_AFTERIMAGE
42	if (original_asim)	64	if (original_asim)
…		…
181	{	203	{
182	bool changed = false;	204	bool changed = false;
183	int geom_flags = 0;	205	int geom_flags = 0;
184	int x = 0, y = 0;	206	int x = 0, y = 0;
185	unsigned int w = 0, h = 0;	207	unsigned int w = 0, h = 0;
186	unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;	208	unsigned long new_flags = 0;
187		209
188	if (geom == NULL)	210	if (geom == NULL)
189	return false;	211	return false;
190		212
191	if (geom[0])	213	if (geom[0])
…		…
283	geom_flags \|= XParseGeometry (arr[i], &x, &y, &w, &h);	305	geom_flags \|= XParseGeometry (arr[i], &x, &y, &w, &h);
284	} /* done parsing ops */	306	} /* done parsing ops */
285		307
286	rxvt_free_strsplit (arr);	308	rxvt_free_strsplit (arr);
287	}	309	}
		310
		311	new_flags \|= bg_flags & ~BG_GEOMETRY_FLAGS;
288		312
289	if (!update)	313	if (!update)
290	{	314	{
291	if (!(geom_flags & XValue))	315	if (!(geom_flags & XValue))
292	x = y = defaultAlign;	316	x = y = defaultAlign;
…		…
800	}	824	}
801		825
802	#if XRENDER	826	#if XRENDER
803	if (tr_flags)	827	if (tr_flags)
804	{	828	{
805	XRenderPictureAttributes pa;
806
807	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual);	829	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
		830
808	Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);	831	Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
809		832
810	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
811	Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa);	833	Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
812		834
813	pa.repeat = True;	835	Picture mask = create_xrender_mask (dpy, vt, False, False);
814	Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
815	XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
816	Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
817	XFreePixmap (dpy, mask_pmap);
818		836
819	XRenderColor mask_c;	837	XRenderColor mask_c;
820		838
821	mask_c.alpha = 0x8000;	839	mask_c.alpha = 0x8000;
822	mask_c.red = 0;	840	mask_c.red =
823	mask_c.green = 0;	841	mask_c.green =
824	mask_c.blue = 0;	842	mask_c.blue = 0;
825	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);	843	XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
		844
826	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);	845	XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
827		846
828	XRenderFreePicture (dpy, src);	847	XRenderFreePicture (dpy, src);
829	XRenderFreePicture (dpy, dst);	848	XRenderFreePicture (dpy, dst);
830	XRenderFreePicture (dpy, mask);	849	XRenderFreePicture (dpy, mask);
…		…
942	{	961	{
943	changed = true;	962	changed = true;
944	v_blurRadius = vr;	963	v_blurRadius = vr;
945	}	964	}
946		965
947	if (v_blurRadius == 0 && h_blurRadius == 0)	966	if (h_blurRadius == 0 \|\| v_blurRadius == 0)
948	bg_flags &= ~BG_NEEDS_BLUR;	967	bg_flags &= ~BG_NEEDS_BLUR;
949	else	968	else
950	bg_flags \|= BG_NEEDS_BLUR;	969	bg_flags \|= BG_NEEDS_BLUR;
951		970
952	return changed;	971	return changed;
953	}	972	}
954		973
955	void	974	void
956	rxvt_term::set_tint_shade_flags ()	975	rxvt_term::set_tint_shade_flags ()
957	{	976	{
958	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	977	rgba c;
959	bool has_shade = shade != 100;	978	bool has_shade = shade != 100;
960		979
961	bg_flags &= ~BG_TINT_FLAGS;	980	bg_flags &= ~BG_TINT_FLAGS;
962		981
963	if (bg_flags & BG_TINT_SET)	982	if (bg_flags & BG_TINT_SET)
…		…
989	}	1008	}
990		1009
991	bool	1010	bool
992	rxvt_term::bg_set_shade (const char *shade_str)	1011	rxvt_term::bg_set_shade (const char *shade_str)
993	{	1012	{
994	int new_shade = (shade_str) ? atoi (shade_str) : 100;	1013	int new_shade = atoi (shade_str);
995		1014
996	clamp_it (new_shade, -100, 200);	1015	clamp_it (new_shade, -100, 200);
997	if (new_shade < 0)	1016	if (new_shade < 0)
998	new_shade = 200 - (100 + new_shade);	1017	new_shade = 200 - (100 + new_shade);
999		1018
…		…
1029	params[i+2] = XDoubleToFixed (kernel[i] / sum);	1048	params[i+2] = XDoubleToFixed (kernel[i] / sum);
1030	}	1049	}
1031	#endif	1050	#endif
1032		1051
1033	bool	1052	bool
1034	rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)	1053	rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1035	{	1054	{
1036	bool ret = false;	1055	bool ret = false;
1037	#if XRENDER	1056	#if XRENDER
		1057	if (!(bg_flags & BG_HAS_RENDER_CONV))
		1058	return false;
		1059
1038	int size = max (h_blurRadius, v_blurRadius) * 2 + 1;	1060	int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1039	double kernel = (double )malloc (size * sizeof (double));	1061	double kernel = (double )malloc (size * sizeof (double));
1040	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	1062	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
1041		1063
1042	XRenderPictureAttributes pa;	1064	XRenderPictureAttributes pa;
1043	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	1065	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1044		1066
		1067	pa.repeat = RepeatPad;
1045	Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	1068	Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
		1069	Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1046	Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	1070	Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
		1071	XFreePixmap (dpy, tmp);
1047		1072
1048	if (kernel && params)	1073	if (kernel && params)
1049	{	1074	{
1050	if (h_blurRadius)
1051	{
1052	size = h_blurRadius * 2 + 1;	1075	size = h_blurRadius * 2 + 1;
1053	get_gaussian_kernel (h_blurRadius, size, kernel, params);	1076	get_gaussian_kernel (h_blurRadius, size, kernel, params);
1054		1077
1055	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	1078	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1056	XRenderComposite (dpy,	1079	XRenderComposite (dpy,
1057	PictOpSrc,	1080	PictOpSrc,
1058	src,	1081	src,
1059	None,	1082	None,
1060	dst,	1083	dst,
1061	0, 0,	1084	0, 0,
1062	0, 0,	1085	0, 0,
1063	0, 0,	1086	0, 0,
1064	width, height);	1087	width, height);
1065	}
1066		1088
1067	if (v_blurRadius)	1089	::swap (src, dst);
1068	{	1090
1069	size = v_blurRadius * 2 + 1;	1091	size = v_blurRadius * 2 + 1;
1070	get_gaussian_kernel (v_blurRadius, size, kernel, params);	1092	get_gaussian_kernel (v_blurRadius, size, kernel, params);
1071	::swap (params[0], params[1]);	1093	::swap (params[0], params[1]);
1072		1094
1073	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);	1095	XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1074	XRenderComposite (dpy,	1096	XRenderComposite (dpy,
1075	PictOpSrc,	1097	PictOpSrc,
1076	src,	1098	src,
1077	None,	1099	None,
1078	dst,	1100	dst,
1079	0, 0,	1101	0, 0,
1080	0, 0,	1102	0, 0,
1081	0, 0,	1103	0, 0,
1082	width, height);	1104	width, height);
1083	}
1084		1105
1085	ret = true;	1106	ret = true;
1086	}	1107	}
1087		1108
1088	free (kernel);	1109	free (kernel);
…		…
1115	XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);	1136	XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1116	ret = true;	1137	ret = true;
1117	XFreeGC (dpy, gc);	1138	XFreeGC (dpy, gc);
1118	}	1139	}
1119	}	1140	}
1120	else
1121	{
1122	# if XRENDER	1141	# if XRENDER
		1142	else if (bg_flags & BG_HAS_RENDER)
		1143	{
1123	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);	1144	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1124		1145
1125	if (bg_flags & BG_TINT_SET)	1146	if (bg_flags & BG_TINT_SET)
1126	tint.get (c);	1147	tint.get (c);
1127		1148
…		…
1136	c.r = c.r * (200 - shade) / 100;	1157	c.r = c.r * (200 - shade) / 100;
1137	c.g = c.g * (200 - shade) / 100;	1158	c.g = c.g * (200 - shade) / 100;
1138	c.b = c.b * (200 - shade) / 100;	1159	c.b = c.b * (200 - shade) / 100;
1139	}	1160	}
1140		1161
1141	XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1142	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);	1162	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1143	XRenderPictureAttributes pa;
1144		1163
1145	Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	1164	Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1146		1165
1147	pa.repeat = True;	1166	Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1148		1167
1149	Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);	1168	Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1150	Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1151	XFreePixmap (dpy, overlay_pmap);
1152
1153	pa.component_alpha = True;
1154	Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1155	Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat \| CPComponentAlpha, &pa);
1156	XFreePixmap (dpy, mask_pmap);
1157		1169
1158	XRenderColor mask_c;	1170	XRenderColor mask_c;
1159		1171
1160	mask_c.alpha = 0xffff;	1172	mask_c.alpha = 0xffff;
1161	mask_c.red =	1173	mask_c.red =
…		…
1166	mask_c.alpha = 0;	1178	mask_c.alpha = 0;
1167	mask_c.red = 0xffff - c.r;	1179	mask_c.red = 0xffff - c.r;
1168	mask_c.green = 0xffff - c.g;	1180	mask_c.green = 0xffff - c.g;
1169	mask_c.blue = 0xffff - c.b;	1181	mask_c.blue = 0xffff - c.b;
1170	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);	1182	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
		1183
1171	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);	1184	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1172		1185
1173	if (shade > 100)	1186	if (shade > 100)
1174	{	1187	{
1175	mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1176	mask_c.alpha = 0;	1188	mask_c.alpha = 0;
		1189	mask_c.red =
		1190	mask_c.green =
		1191	mask_c.blue = 0xffff * (shade - 100) / 100;
1177	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);	1192	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1178		1193
1179	XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);	1194	XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1180	}	1195	}
1181		1196
1182	ret = true;	1197	ret = true;
1183		1198
1184	XRenderFreePicture (dpy, mask_pic);	1199	XRenderFreePicture (dpy, mask_pic);
1185	XRenderFreePicture (dpy, overlay_pic);	1200	XRenderFreePicture (dpy, overlay_pic);
1186	XRenderFreePicture (dpy, back_pic);	1201	XRenderFreePicture (dpy, back_pic);
		1202	}
1187	# endif	1203	# endif
1188	}
1189		1204
1190	return ret;	1205	return ret;
1191	}	1206	}
1192		1207
1193	/*	1208	/*
…		…
1244	#if XRENDER	1259	#if XRENDER
1245	if (bg_flags & BG_HAS_RENDER)	1260	if (bg_flags & BG_HAS_RENDER)
1246	{	1261	{
1247	recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);	1262	recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1248		1263
1249	XRenderPictureAttributes pa;
1250
1251	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));	1264	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1252	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);	1265	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1253		1266
1254	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);	1267	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1255	Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);	1268	Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1256		1269
1257	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);	1270	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1258		1271
1259	XRenderFreePicture (dpy, src);	1272	XRenderFreePicture (dpy, src);
1260	XRenderFreePicture (dpy, dst);	1273	XRenderFreePicture (dpy, dst);
…		…
1290		1303
1291	if (gc)	1304	if (gc)
1292	{	1305	{
1293	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);	1306	XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1294	result \|= BG_IS_VALID \| (bg_flags & BG_EFFECTS_FLAGS);	1307	result \|= BG_IS_VALID \| (bg_flags & BG_EFFECTS_FLAGS);
1295	XFreeGC (dpy, gc);
1296		1308
1297	if (!(bg_flags & BG_CLIENT_RENDER))	1309	if (!(bg_flags & BG_CLIENT_RENDER))
1298	{	1310	{
1299	if ((bg_flags & BG_NEEDS_BLUR)	1311	if (bg_flags & BG_NEEDS_BLUR)
1300	&& (bg_flags & BG_HAS_RENDER_CONV))
1301	{	1312	{
1302	if (blur_pixmap (bg_pixmap, visual, window_width, window_height))	1313	if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1303	result &= ~BG_NEEDS_BLUR;	1314	result &= ~BG_NEEDS_BLUR;
1304	}	1315	}
1305	if ((bg_flags & BG_NEEDS_TINT)	1316	if (bg_flags & BG_NEEDS_TINT)
1306	&& (bg_flags & (BG_TINT_BITAND \| BG_HAS_RENDER)))
1307	{	1317	{
1308	if (tint_pixmap (bg_pixmap, visual, window_width, window_height))	1318	if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1309	result &= ~BG_NEEDS_TINT;	1319	result &= ~BG_NEEDS_TINT;
1310	}	1320	}
		1321	# ifndef HAVE_AFTERIMAGE
		1322	if (result & BG_NEEDS_TINT)
		1323	{
		1324	XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
		1325	if (ximage)
		1326	{
		1327	/* our own client-side tinting */
		1328	tint_ximage (DefaultVisual (dpy, display->screen), ximage);
		1329
		1330	XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
		1331	XDestroyImage (ximage);
		1332	}
		1333	}
		1334	# endif
1311	} /* server side rendering completed */	1335	} /* server side rendering completed */
		1336
		1337	XFreeGC (dpy, gc);
1312	}	1338	}
1313		1339
1314	if (recoded_root_pmap != root_pixmap)	1340	if (recoded_root_pmap != root_pixmap)
1315	XFreePixmap (dpy, recoded_root_pmap);	1341	XFreePixmap (dpy, recoded_root_pmap);
1316		1342
…		…
1325	new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);	1351	new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1326		1352
1327	root_pixmap = new_root_pixmap;	1353	root_pixmap = new_root_pixmap;
1328	}	1354	}
1329	# endif /* ENABLE_TRANSPARENCY */	1355	# endif /* ENABLE_TRANSPARENCY */
1330
1331	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1332	static void shade_ximage (Visual visual, XImage ximage, int shade, const rgba &c);
1333	# endif
1334		1356
1335	bool	1357	bool
1336	rxvt_term::bg_render ()	1358	rxvt_term::bg_render ()
1337	{	1359	{
1338	unsigned long tr_flags = 0;	1360	unsigned long tr_flags = 0;
…		…
1353	if ((bg_flags & BG_IS_FROM_FILE)	1375	if ((bg_flags & BG_IS_FROM_FILE)
1354	\|\| (tr_flags & BG_EFFECTS_FLAGS))	1376	\|\| (tr_flags & BG_EFFECTS_FLAGS))
1355	{	1377	{
1356	if (render_image (tr_flags))	1378	if (render_image (tr_flags))
1357	bg_flags \|= BG_IS_VALID;	1379	bg_flags \|= BG_IS_VALID;
1358	}
1359	# endif
1360
1361	# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1362	XImage *result = NULL;
1363
1364	if (tr_flags & BG_NEEDS_TINT)
1365	{
1366	result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1367	}
1368
1369	if (result)
1370	{
1371	/* our own client-side tinting */
1372	//if (tr_flags & BG_NEEDS_TINT)
1373	if (1)
1374	{
1375	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1376	if (bg_flags & BG_TINT_SET)
1377	tint.get (c);
1378	shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1379	}
1380
1381	GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1382
1383	if (gc)
1384	{
1385	XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1386
1387	XFreeGC (dpy, gc);
1388	}
1389
1390	XDestroyImage (result);
1391	}	1380	}
1392	# endif	1381	# endif
1393		1382
1394	if (!(bg_flags & BG_IS_VALID))	1383	if (!(bg_flags & BG_IS_VALID))
1395	{	1384	{
…		…
1447	tmp += (mask >> sh) * low;	1436	tmp += (mask >> sh) * low;
1448	lookup[i] = (tmp / 0xffff) << sh;	1437	lookup[i] = (tmp / 0xffff) << sh;
1449	}	1438	}
1450	}	1439	}
1451		1440
1452	static void	1441	void
1453	shade_ximage (Visual visual, XImage ximage, int shade, const rgba &c)	1442	rxvt_term::tint_ximage (Visual visual, XImage ximage)
1454	{	1443	{
1455	int sh_r, sh_g, sh_b;	1444	int sh_r, sh_g, sh_b;
1456	uint32_t mask_r, mask_g, mask_b;	1445	uint32_t mask_r, mask_g, mask_b;
1457	uint32_t lookup, lookup_r, lookup_g, lookup_b;	1446	uint32_t lookup, lookup_r, lookup_g, lookup_b;
1458	unsigned short low;	1447	unsigned short low;
1459	rgba high;
1460	int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;	1448	int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1461		1449
1462	if (visual->c_class != TrueColor \|\| ximage->format != ZPixmap) return;	1450	if (visual->c_class != TrueColor \|\| ximage->format != ZPixmap) return;
1463		1451
1464	/* for convenience */	1452	/* for convenience */
…		…
1523	break;	1511	break;
1524	default:	1512	default:
1525	return; /* we do not support this color depth */	1513	return; /* we do not support this color depth */
1526	}	1514	}
1527		1515
		1516	rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
		1517
		1518	if (bg_flags & BG_TINT_SET)
		1519	tint.get (c);
		1520
1528	/* prepare limits for color transformation (each channel is handled separately) */	1521	/* prepare limits for color transformation (each channel is handled separately) */
1529	if (shade > 100)	1522	if (shade > 100)
1530	{	1523	{
1531	shade = 200 - shade;	1524	c.r = c.r * (200 - shade) / 100;
		1525	c.g = c.g * (200 - shade) / 100;
		1526	c.b = c.b * (200 - shade) / 100;
1532		1527
1533	high.r = c.r * shade / 100;
1534	high.g = c.g * shade / 100;
1535	high.b = c.b * shade / 100;
1536
1537	low = 0xffff * (100 - shade) / 100;	1528	low = 0xffff * (shade - 100) / 100;
1538	}	1529	}
1539	else	1530	else
1540	{	1531	{
1541	high.r = c.r * shade / 100;	1532	c.r = c.r * shade / 100;
1542	high.g = c.g * shade / 100;	1533	c.g = c.g * shade / 100;
1543	high.b = c.b * shade / 100;	1534	c.b = c.b * shade / 100;
1544		1535
1545	low = 0;	1536	low = 0;
1546	}	1537	}
1547		1538
1548	/* fill our lookup tables */	1539	/* fill our lookup tables */
1549	fill_lut (lookup_r, mask_r, sh_r, low, high.r);	1540	fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1550	fill_lut (lookup_g, mask_g, sh_g, low, high.g);	1541	fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1551	fill_lut (lookup_b, mask_b, sh_b, low, high.b);	1542	fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1552		1543
1553	/* apply table to input image (replacing colors by newly calculated ones) */	1544	/* apply table to input image (replacing colors by newly calculated ones) */
1554	if (ximage->bits_per_pixel == 32	1545	if (ximage->bits_per_pixel == 32
1555	&& (ximage->depth == 24 \|\| ximage->depth == 32)	1546	&& (ximage->depth == 24 \|\| ximage->depth == 32)
1556	&& ximage->byte_order == host_byte_order)	1547	&& ximage->byte_order == host_byte_order)

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.180 by sf-exg, Sat Dec 24 09:44:23 2011 UTC vs. Revision 1.196 by sf-exg, Tue Jan 10 18:50:14 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.180 by sf-exg, Sat Dec 24 09:44:23 2011 UTC vs.
Revision 1.196 by sf-exg, Tue Jan 10 18:50:14 2012 UTC