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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.62 by sf-exg, Sun Oct 3 21:44:13 2010 UTC vs.
Revision 1.66 by sf-exg, Mon Oct 4 20:46:20 2010 UTC

…		…
157	# endif	157	# endif
158		158
159	# ifdef BG_IMAGE_FROM_FILE	159	# ifdef BG_IMAGE_FROM_FILE
160	if (have_image)	160	if (have_image)
161	{	161	{
162	if (h_align == rootAlign \|\| v_align == rootAlign)	162	if (flags & rootAlign)
163	return true;	163	return true;
164	}	164	}
165	# endif	165	# endif
166		166
167	return false;	167	return false;
…		…
207	static inline bool	207	static inline bool
208	check_set_align_value (int geom_flags, int flag, int &align, int new_value)	208	check_set_align_value (int geom_flags, int flag, int &align, int new_value)
209	{	209	{
210	if (geom_flags & flag)	210	if (geom_flags & flag)
211	{	211	{
212	if (new_value != bgPixmap_t::rootAlign)
213	{
214	if (new_value < -100)	212	if (new_value < -100)
215	new_value = -100;	213	new_value = -100;
216	else if (new_value > 200)	214	else if (new_value > 200)
217	new_value = 200;	215	new_value = 200;
218	}
219	if (new_value != align)	216	if (new_value != align)
220	{	217	{
221	align = new_value;	218	align = new_value;
222	return true;	219	return true;
223	}	220	}
…		…
229	make_align_position (int align, int window_size, int image_size)	226	make_align_position (int align, int window_size, int image_size)
230	{	227	{
231	int diff = window_size - image_size;	228	int diff = window_size - image_size;
232	int smaller = min (image_size, window_size);	229	int smaller = min (image_size, window_size);
233		230
234	if (align >= 0 && align <= 50)	231	if (align >= 0 && align <= 100)
235	return diff * align / 100;	232	return diff * align / 100;
236	else if (align > 50 && align <= 100)
237	return window_size - image_size - diff * (100 - align) / 100;
238	else if (align > 100 && align <= 200 )	233	else if (align > 100 && align <= 200 )
239	return ((align - 100) * smaller / 100) + window_size - smaller;	234	return ((align - 100) * smaller / 100) + window_size - smaller;
240	else if (align > -100 && align < 0)	235	else if (align >= -100 && align < 0)
241	return ((align + 100) * smaller / 100) - image_size;	236	return ((align + 100) * smaller / 100) - image_size;
242	return 0;	237	return 0;
243	}	238	}
244		239
245	static inline int	240	static inline int
246	make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)	241	make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
247	{	242	{
248	int src_pos = 0;	243	int src_pos = 0;
249	dst_pos = 0;	244	dst_pos = pos;
250	dst_size = size;	245	dst_size = size;
251	if (pos < 0)	246	if (pos < 0)
252	{	247	{
253	src_pos = -pos;	248	src_pos = -pos;
		249	dst_pos = 0;
254	dst_size += pos;	250	dst_size += pos;
255	}	251	}
256	else if (pos > 0)
257	dst_pos = pos;
258		252
259	if (dst_pos + dst_size > target_size)	253	if (dst_pos + dst_size > target_size)
260	dst_size = target_size - dst_pos;	254	dst_size = target_size - dst_pos;
261	return src_pos;	255	return src_pos;
262	}	256	}
…		…
418	x = y = centerAlign;	412	x = y = centerAlign;
419	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	413	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;
420	}	414	}
421	else if (CHECK_GEOM_OPS ("root"))	415	else if (CHECK_GEOM_OPS ("root"))
422	{	416	{
		417	new_flags \|= rootAlign;
423	w = h = noScale;	418	w = h = noScale;
424	x = y = rootAlign;
425	geom_flags \|= WidthValue\|HeightValue\|XValue\|YValue;	419	geom_flags \|= WidthValue\|HeightValue;
426	}	420	}
427	# undef CHECK_GEOM_OPS	421	# undef CHECK_GEOM_OPS
428		422
429	while (ops != ':' && ops != '\0') ++ops;	423	while (ops != ':' && ops != '\0') ++ops;
430	} /* done parsing ops */	424	} /* done parsing ops */
…		…
464	{	458	{
465	w = h_scale * target_width / 100;	459	w = h_scale * target_width / 100;
466	h = v_scale * target_height / 100;	460	h = v_scale * target_height / 100;
467	}	461	}
468		462
469	if (h_align == rootAlign \|\| v_align == rootAlign)	463	if (flags & rootAlign)
470	{	464	{
471	target->get_window_origin (x, y);	465	target->get_window_origin (x, y);
472	x = -x;	466	x = -x;
473	y = -y;	467	y = -y;
474	}	468	}
475		469	else
476	if (h_align != rootAlign)	470	{
477	x = make_align_position (h_align, target_width, w > 0 ? w : image_width);	471	x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
478
479	if (v_align != rootAlign)
480	y = make_align_position (v_align, target_height, h > 0 ? h : image_height);	472	y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
		473	}
481		474
482	flags &= ~sizeSensitive;	475	flags &= ~sizeSensitive;
483	if (h_scale != 0 \|\| v_scale != 0	476	if (h_scale != 0 \|\| v_scale != 0
484	\|\| h_align != 0 \|\| v_align != 0	477	\|\| h_align != 0 \|\| v_align != 0
485	\|\| image_width > target_width \|\| image_height > target_height)	478	\|\| image_width > target_width \|\| image_height > target_height)
…		…
1049	flags = (flags & (~tintFlags \| tintSet)) \| new_flags;	1042	flags = (flags & (~tintFlags \| tintSet)) \| new_flags;
1050	return true;	1043	return true;
1051	}	1044	}
1052		1045
1053	return false;	1046	return false;
		1047	}
		1048
		1049	bool
		1050	bgPixmap_t::tint_pixmap (Pixmap pixmap)
		1051	{
		1052	Window root = target->display->root;
		1053	Display *dpy = target->dpy;
		1054	int window_width = target->szHint.width;
		1055	int window_height = target->szHint.height;
		1056	bool ret = false;
		1057
		1058	if (flags & tintWholesome)
		1059	{
		1060	XGCValues gcv;
		1061	GC gc;
		1062
		1063	/* In this case we can tint image server-side getting significant
		1064	* performance improvements, as we eliminate XImage transfer
		1065	*/
		1066	gcv.foreground = Pixel (tint);
		1067	gcv.function = GXand;
		1068	gcv.fill_style = FillSolid;
		1069	gc = XCreateGC (dpy, root, GCFillStyle \| GCForeground \| GCFunction, &gcv);
		1070	if (gc)
		1071	{
		1072	XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
		1073	ret = true;
		1074	XFreeGC (dpy, gc);
		1075	}
		1076	}
		1077	else
		1078	{
		1079	# if XFT
		1080	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
		1081
		1082	if (flags & tintSet)
		1083	tint.get (c);
		1084
		1085	if (shade > 0 && shade < 100)
		1086	{
		1087	c.r = (c.r * shade) / 100;
		1088	c.g = (c.g * shade) / 100;
		1089	c.b = (c.b * shade) / 100;
		1090	}
		1091	else if (shade > 100 && shade < 200)
		1092	{
		1093	c.r = (c.r * (200 - shade)) / 100;
		1094	c.g = (c.g * (200 - shade)) / 100;
		1095	c.b = (c.b * (200 - shade)) / 100;
		1096	}
		1097
		1098	XRenderPictFormat pf;
		1099	pf.type = PictTypeDirect;
		1100	pf.depth = 32;
		1101	pf.direct.redMask = 0xff;
		1102	pf.direct.greenMask = 0xff;
		1103	pf.direct.blueMask = 0xff;
		1104	pf.direct.alphaMask = 0xff;
		1105
		1106	XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
		1107	(PictFormatType\|
		1108	PictFormatDepth\|
		1109	PictFormatRedMask\|
		1110	PictFormatGreenMask\|
		1111	PictFormatBlueMask\|
		1112	PictFormatAlphaMask),
		1113	&pf,
		1114	0);
		1115	XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
		1116	XRenderPictureAttributes pa;
		1117
		1118	Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa);
		1119
		1120	pa.repeat = True;
		1121
		1122	Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
		1123	Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
		1124	XFreePixmap (dpy, overlay_pmap);
		1125
		1126	pa.component_alpha = True;
		1127	Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
		1128	Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat\|CPComponentAlpha, &pa);
		1129	XFreePixmap (dpy, mask_pmap);
		1130
		1131	if (mask_pic && overlay_pic && back_pic)
		1132	{
		1133	XRenderColor mask_c;
		1134
		1135	memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
		1136	mask_c.alpha = 0xffff;
		1137	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
		1138
		1139	mask_c.alpha = 0;
		1140	mask_c.red = 0xffff - c.r;
		1141	mask_c.green = 0xffff - c.g;
		1142	mask_c.blue = 0xffff - c.b;
		1143	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
		1144	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
		1145	ret = true;
		1146	}
		1147
		1148	XRenderFreePicture (dpy, mask_pic);
		1149	XRenderFreePicture (dpy, overlay_pic);
		1150	XRenderFreePicture (dpy, back_pic);
		1151	# if DO_TIMING_TEST
		1152	XSync (dpy, False);
		1153	# endif
		1154	# endif
		1155	}
		1156
		1157	return ret;
1054	}	1158	}
1055		1159
1056	/* make_transparency_pixmap()	1160	/* make_transparency_pixmap()
1057	* Builds a pixmap sized the same as terminal window, with depth same as the root window	1161	* Builds a pixmap sized the same as terminal window, with depth same as the root window
1058	* that pixmap contains tiled portion of the root pixmap that is supposed to be covered by	1162	* that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
…		…
1188	{	1292	{
1189	if (!need_client_side_rendering ())	1293	if (!need_client_side_rendering ())
1190	{	1294	{
1191	if ((flags & tintNeeded))	1295	if ((flags & tintNeeded))
1192	{	1296	{
1193	if (flags & tintWholesome)	1297	if (tint_pixmap (tiled_root_pmap))
1194	{
1195	/* In this case we can tint image server-side getting significant
1196	* performance improvements, as we eliminate XImage transfer
1197	*/
1198	gcv.foreground = Pixel (tint);
1199	gcv.function = GXand;
1200	gcv.fill_style = FillSolid;
1201	if (gc)
1202	XChangeGC (dpy, gc, GCFillStyle \| GCForeground \| GCFunction, &gcv);
1203	else
1204	gc = XCreateGC (dpy, root, GCFillStyle \| GCForeground \| GCFunction, &gcv);
1205	if (gc)
1206	{
1207	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1208	result \|= transpPmapTinted;	1298	result \|= transpPmapTinted;
1209	}
1210	}
1211	else
1212	{
1213	# if XFT
1214	Picture back_pic = 0;
1215	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1216
1217	if (flags & tintSet)
1218	tint.get (c);
1219
1220	if (shade > 0 && shade < 100)
1221	{
1222	c.r = (c.r * shade) / 100;
1223	c.g = (c.g * shade) / 100;
1224	c.b = (c.b * shade) / 100;
1225	}
1226	else if (shade > 100 && shade < 200)
1227	{
1228	c.r = (c.r * (200 - shade)) / 100;
1229	c.g = (c.g * (200 - shade)) / 100;
1230	c.b = (c.b * (200 - shade)) / 100;
1231	}
1232
1233	XRenderPictFormat pf;
1234	pf.type = PictTypeDirect;
1235	pf.depth = 32;
1236	pf.direct.redMask = 0xff;
1237	pf.direct.greenMask = 0xff;
1238	pf.direct.blueMask = 0xff;
1239	pf.direct.alphaMask = 0xff;
1240
1241	XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1242	(PictFormatType\|
1243	PictFormatDepth\|
1244	PictFormatRedMask\|
1245	PictFormatGreenMask\|
1246	PictFormatBlueMask\|
1247	PictFormatAlphaMask),
1248	&pf,
1249	0);
1250	XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1251	XRenderPictureAttributes pa ;
1252
1253	back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1254
1255	pa.repeat = True;
1256
1257	Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1258	Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1259	XFreePixmap (dpy, overlay_pmap);
1260
1261	pa.component_alpha = True;
1262	Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1263	Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat\|CPComponentAlpha, &pa);
1264	XFreePixmap (dpy, mask_pmap);
1265
1266	if (mask_pic && overlay_pic && back_pic)
1267	{
1268	XRenderColor mask_c;
1269
1270	memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1271	mask_c.alpha = 0xffff;
1272	XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1273
1274	mask_c.alpha = 0;
1275	mask_c.red = 0xffff - c.r;
1276	mask_c.green = 0xffff - c.g;
1277	mask_c.blue = 0xffff - c.b;
1278	XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1279	XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1280	result \|= transpPmapTinted;
1281	}
1282
1283	XRenderFreePicture (dpy, mask_pic);
1284	XRenderFreePicture (dpy, overlay_pic);
1285	XRenderFreePicture (dpy, back_pic);
1286	# if DO_TIMING_TEST
1287	XSync (dpy, False);
1288	# endif
1289	# endif
1290	}
1291	}	1299	}
1292	} /* server side rendering completed */	1300	} /* server side rendering completed */
1293		1301
1294	if (pixmap)	1302	if (pixmap)
1295	XFreePixmap (dpy, pixmap);	1303	XFreePixmap (dpy, pixmap);

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.62 by sf-exg, Sun Oct 3 21:44:13 2010 UTC vs. Revision 1.66 by sf-exg, Mon Oct 4 20:46:20 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.62 by sf-exg, Sun Oct 3 21:44:13 2010 UTC vs.
Revision 1.66 by sf-exg, Mon Oct 4 20:46:20 2010 UTC