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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.87 by sf-exg, Mon Oct 18 11:00:38 2010 UTC vs.
Revision 1.105 by sf-exg, Mon Nov 1 11:36:48 2010 UTC

…		…
428	{	428	{
429	flags = new_flags;	429	flags = new_flags;
430	changed++;	430	changed++;
431	}	431	}
432		432
433	//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
434	// flags, h_scale, v_scale, h_align, v_align);
435	return (changed > 0);	433	return (changed > 0);
436	}	434	}
437		435
438	void	436	void
439	bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)	437	bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
…		…
529		527
530	int x = 0;	528	int x = 0;
531	int y = 0;	529	int y = 0;
532	int w = 0;	530	int w = 0;
533	int h = 0;	531	int h = 0;
534
535	TIMING_TEST_START (asim);
536		532
537	if (original_asim)	533	if (original_asim)
538	get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);	534	get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
539		535
540	if (!original_asim	536	if (!original_asim
…		…
657	}	653	}
658		654
659	free (layers);	655	free (layers);
660	}	656	}
661	}	657	}
662	TIMING_TEST_PRINT_RESULT (asim);
663		658
664	bool ret = false;	659	bool ret = false;
665		660
666	if (result)	661	if (result)
667	{	662	{
…		…
713		708
714	if (result != background && result != original_asim)	709	if (result != background && result != original_asim)
715	destroy_asimage (&result);	710	destroy_asimage (&result);
716		711
717	XFreeGC (target->dpy, gc);	712	XFreeGC (target->dpy, gc);
718	TIMING_TEST_PRINT_RESULT (asim);
719		713
720	ret = true;	714	ret = true;
721	}	715	}
722		716
723	if (background)	717	if (background)
…		…
735	return false;	729	return false;
736		730
737	if (!pixbuf)	731	if (!pixbuf)
738	return false;	732	return false;
739		733
740	#if !XFT	734	#if !XRENDER
741	if (background_flags)	735	if (background_flags)
742	return false;	736	return false;
743	#endif	737	#endif
744		738
745	GdkPixbuf *result;	739	GdkPixbuf *result;
…		…
862	dst_width, dst_height,	856	dst_width, dst_height,
863	XLIB_RGB_DITHER_NONE,	857	XLIB_RGB_DITHER_NONE,
864	0, 0);	858	0, 0);
865	}	859	}
866		860
867	#if XFT	861	#if XRENDER
868	if (background_flags)	862	if (background_flags)
869	{	863	{
870	Display *dpy = target->dpy;	864	Display *dpy = target->dpy;
871	XRenderPictureAttributes pa;	865	XRenderPictureAttributes pa;
872		866
873	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));	867	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
874	Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);	868	Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875		869
876	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);	870	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877	Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);	871	Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878		872
…		…
1006	if (v_blurRadius == 0 && h_blurRadius == 0)	1000	if (v_blurRadius == 0 && h_blurRadius == 0)
1007	flags &= ~blurNeeded;	1001	flags &= ~blurNeeded;
1008	else	1002	else
1009	flags \|= blurNeeded;	1003	flags \|= blurNeeded;
1010		1004
1011	#if XFT	1005	#if XRENDER
1012	XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);	1006	XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1013	if (filters)	1007	if (filters)
1014	{	1008	{
1015	for (int i = 0; i < filters->nfilter; i++)	1009	for (int i = 0; i < filters->nfilter; i++)
1016	if (!strcmp (filters->filter[i], FilterConvolution))	1010	if (!strcmp (filters->filter[i], FilterConvolution))
1017	flags \|= bgPixmap_t::blurServerSide;	1011	flags \|= bgPixmap_t::blurServerSide;
1018		1012
1019	XFree (filters);	1013	XFree (filters);
1020	}	1014	}
1021	#endif	1015	#endif
1022		1016
1023	return (changed > 0);	1017	return (changed > 0);
1024	}	1018	}
1025		1019
…		…
1056	{	1050	{
1057	if (flags & bgPixmap_t::tintWholesome)	1051	if (flags & bgPixmap_t::tintWholesome)
1058	flags \|= bgPixmap_t::tintServerSide;	1052	flags \|= bgPixmap_t::tintServerSide;
1059	else	1053	else
1060	{	1054	{
1061	#if XFT	1055	#if XRENDER
1062	flags \|= bgPixmap_t::tintServerSide;	1056	flags \|= bgPixmap_t::tintServerSide;
1063	#endif	1057	#endif
1064	}	1058	}
1065	}	1059	}
1066		1060
…		…
1113	}	1107	}
1114		1108
1115	return false;	1109	return false;
1116	}	1110	}
1117		1111
1118	#if XFT	1112	#if XRENDER
1119	static void	1113	static void
1120	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	1114	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)
1121	{	1115	{
1122	double sigma = radius / 2.0;	1116	double sigma = radius / 2.0;
1123	double scale = sqrt (2.0 * M_PI) * sigma;	1117	double scale = sqrt (2.0 * M_PI) * sigma;
1124	double sum = 0.0;	1118	double sum = 0.0;
1125		1119
1126	for (int i = 0; i < width; i++)	1120	for (int i = 0; i < width; i++)
1127	{	1121	{
1128	double x = i - width / 2;	1122	double x = i - width / 2;
1129	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	1123	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1130	sum += kernel[i];	1124	sum += kernel[i];
1131	}	1125	}
1132		1126
1133	params[0] = XDoubleToFixed (width);	1127	params[0] = XDoubleToFixed (width);
1134	params[1] = XDoubleToFixed (1);	1128	params[1] = XDoubleToFixed (1);
1135		1129
1136	for (int i = 0; i < width; i++)	1130	for (int i = 0; i < width; i++)
1137	params[i+2] = XDoubleToFixed (kernel[i] / sum);	1131	params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138	}	1132	}
1139	#endif	1133	#endif
1140		1134
1141	bool	1135	bool
1142	bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)	1136	bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143	{	1137	{
1144	bool ret = false;	1138	bool ret = false;
1145	#if XFT	1139	#if XRENDER
1146	int size = max (h_blurRadius, v_blurRadius) * 2 + 1;	1140	int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147	double kernel = (double )malloc (size * sizeof (double));	1141	double kernel = (double )malloc (size * sizeof (double));
1148	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	1142	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
1149		1143
1150	Display *dpy = target->dpy;	1144	Display *dpy = target->dpy;
1151	XRenderPictureAttributes pa;	1145	XRenderPictureAttributes pa;
1152	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual);	1146	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1153		1147
1154	Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	1148	Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1155	Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	1149	Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1156		1150
1157	if (kernel && params && src && dst)	1151	if (kernel && params && src && dst)
…		…
1227	XFreeGC (dpy, gc);	1221	XFreeGC (dpy, gc);
1228	}	1222	}
1229	}	1223	}
1230	else	1224	else
1231	{	1225	{
1232	# if XFT	1226	# if XRENDER
1233	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1227	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234		1228
1235	if (flags & tintSet)	1229	if (flags & tintSet)
1236	tint.get (c);	1230	tint.get (c);
1237		1231
…		…
1283	}	1277	}
1284		1278
1285	XRenderFreePicture (dpy, mask_pic);	1279	XRenderFreePicture (dpy, mask_pic);
1286	XRenderFreePicture (dpy, overlay_pic);	1280	XRenderFreePicture (dpy, overlay_pic);
1287	XRenderFreePicture (dpy, back_pic);	1281	XRenderFreePicture (dpy, back_pic);
1288	# if DO_TIMING_TEST
1289	XSync (dpy, False);
1290	# endif
1291	# endif	1282	# endif
1292	}	1283	}
1293		1284
1294	return ret;	1285	return ret;
1295	}	1286	}
1296		1287
1297	/* make_transparency_pixmap()	1288	/* make_transparency_pixmap()
1298	* Builds a pixmap sized the same as terminal window, with depth same as the root window	1289	* Builds a pixmap of the same size as the terminal window that contains
1299	* that pixmap contains tiled portion of the root pixmap that is supposed to be covered by	1290	* the tiled portion of the root pixmap that is supposed to be covered by
1300	* our window.	1291	* our window.
1301	*/	1292	*/
1302	unsigned long	1293	unsigned long
1303	bgPixmap_t::make_transparency_pixmap ()	1294	bgPixmap_t::make_transparency_pixmap ()
1304	{	1295	{
…		…
1308	return 0;	1299	return 0;
1309		1300
1310	/* root dimensions may change from call to call - but Display structure should	1301	/* root dimensions may change from call to call - but Display structure should
1311	* be always up-to-date, so let's use it :	1302	* be always up-to-date, so let's use it :
1312	*/	1303	*/
1313	Window root = target->display->root;
1314	int screen = target->display->screen;	1304	int screen = target->display->screen;
1315	Display *dpy = target->dpy;	1305	Display *dpy = target->dpy;
		1306	int root_depth = DefaultDepth (dpy, screen);
1316	int root_width = DisplayWidth (dpy, screen);	1307	int root_width = DisplayWidth (dpy, screen);
1317	int root_height = DisplayHeight (dpy, screen);	1308	int root_height = DisplayHeight (dpy, screen);
1318	unsigned int root_pmap_width, root_pmap_height;	1309	unsigned int root_pmap_width, root_pmap_height;
1319	int window_width = target->szHint.width;	1310	int window_width = target->szHint.width;
1320	int window_height = target->szHint.height;	1311	int window_height = target->szHint.height;
1321	int sx, sy;	1312	int sx, sy;
1322	XGCValues gcv;	1313	XGCValues gcv;
1323	GC gc;	1314	GC gc;
1324		1315
1325	TIMING_TEST_START (tp);
1326	target->get_window_origin (sx, sy);	1316	target->get_window_origin (sx, sy);
1327		1317
1328	/* check if we are outside of the visible part of the virtual screen : */	1318	/* check if we are outside of the visible part of the virtual screen : */
1329	if (sx + window_width <= 0 \|\| sy + window_height <= 0	1319	if (sx + window_width <= 0 \|\| sy + window_height <= 0
1330	\|\| sx >= root_width \|\| sy >= root_height)	1320	\|\| sx >= root_width \|\| sy >= root_height)
1331	return 0;	1321	return 0;
1332		1322
		1323	// validate root pixmap and get its size
1333	if (root_pixmap != None)	1324	if (root_pixmap != None)
1334	{	1325	{
1335	/* we want to validate the pixmap and get its size at the same time : */	1326	Window wdummy;
1336	int junk;	1327	int idummy;
1337	unsigned int ujunk;	1328	unsigned int udummy;
1338	/* root pixmap may be bad - allow a error */	1329
1339	target->allowedxerror = -1;	1330	target->allowedxerror = -1;
1340		1331
1341	if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk))	1332	if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1342	root_pixmap = None;	1333	root_pixmap = None;
1343		1334
1344	target->allowedxerror = 0;	1335	target->allowedxerror = 0;
		1336	}
		1337
		1338	Pixmap recoded_root_pmap = root_pixmap;
		1339
		1340	if (root_pixmap != None && root_depth != target->depth)
		1341	{
		1342	#if XRENDER
		1343	XRenderPictureAttributes pa;
		1344
		1345	XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
		1346	Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
		1347
		1348	recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
		1349	XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
		1350	Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
		1351
		1352	if (src && dst)
		1353	XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
		1354	else
		1355	{
		1356	XFreePixmap (dpy, recoded_root_pmap);
		1357	root_pixmap = None;
		1358	}
		1359
		1360	XRenderFreePicture (dpy, src);
		1361	XRenderFreePicture (dpy, dst);
		1362	#else
		1363	root_pixmap = None;
		1364	#endif
1345	}	1365	}
1346		1366
1347	if (root_pixmap == None)	1367	if (root_pixmap == None)
1348	return 0;	1368	return 0;
1349		1369
1350	Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);	1370	Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1351		1371
1352	if (tiled_root_pmap == None) /* something really bad happened - abort */	1372	if (tiled_root_pmap == None) /* something really bad happened - abort */
1353	return 0;	1373	return 0;
1354		1374
1355	/* straightforward pixmap copy */	1375	/* straightforward pixmap copy */
1356	gcv.tile = root_pixmap;	1376	gcv.tile = recoded_root_pmap;
1357	gcv.fill_style = FillTiled;	1377	gcv.fill_style = FillTiled;
1358		1378
1359	while (sx < 0) sx += (int)root_width;	1379	while (sx < 0) sx += (int)root_width;
1360	while (sy < 0) sy += (int)root_height;	1380	while (sy < 0) sy += (int)root_height;
1361		1381
1362	gcv.ts_x_origin = -sx;	1382	gcv.ts_x_origin = -sx;
1363	gcv.ts_y_origin = -sy;	1383	gcv.ts_y_origin = -sy;
1364	gc = XCreateGC (dpy, root, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);	1384	gc = XCreateGC (dpy, target->vt, GCFillStyle \| GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
1365		1385
1366	if (gc)	1386	if (gc)
1367	{	1387	{
1368	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);	1388	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1369	result \|= transpPmapTiled;	1389	result \|= transpPmapTiled;
1370	XFreeGC (dpy, gc);	1390	XFreeGC (dpy, gc);
1371	}	1391	}
1372	TIMING_TEST_PRINT_RESULT (tp);
1373		1392
1374	if (tiled_root_pmap != None)	1393	if (tiled_root_pmap != None)
1375	{	1394	{
1376	if (!need_client_side_rendering ())	1395	if (!need_client_side_rendering ())
1377	{	1396	{
1378	if (flags & (blurNeeded \| blurServerSide))	1397	if ((flags & blurNeeded)
		1398	&& (flags & blurServerSide))
1379	{	1399	{
1380	if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))	1400	if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1381	result \|= transpPmapBlurred;	1401	result \|= transpPmapBlurred;
1382	}	1402	}
1383	if (flags & (tintNeeded \| tintServerSide))	1403	if ((flags & tintNeeded)
		1404	&& (flags & tintServerSide))
1384	{	1405	{
1385	if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))	1406	if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1386	result \|= transpPmapTinted;	1407	result \|= transpPmapTinted;
1387	}	1408	}
1388	} /* server side rendering completed */	1409	} /* server side rendering completed */
1389		1410
1390	if (pixmap)	1411	if (pixmap)
1391	XFreePixmap (dpy, pixmap);	1412	XFreePixmap (dpy, pixmap);
1392		1413
1393	pixmap = tiled_root_pmap;	1414	pixmap = tiled_root_pmap;
1394	pmap_width = window_width;	1415	pmap_width = window_width;
1395	pmap_height = window_height;	1416	pmap_height = window_height;
1396	pmap_depth = root_depth;	1417	pmap_depth = target->depth;
1397	}	1418	}
1398		1419
1399	TIMING_TEST_PRINT_RESULT (tp);	1420	if (recoded_root_pmap != root_pixmap)
		1421	XFreePixmap (dpy, recoded_root_pmap);
1400		1422
1401	return result;	1423	return result;
1402	}	1424	}
1403		1425
1404	bool	1426	void
1405	bgPixmap_t::set_root_pixmap ()	1427	bgPixmap_t::set_root_pixmap ()
1406	{	1428	{
1407	Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);	1429	Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1408	if (new_root_pixmap == None)	1430	if (new_root_pixmap == None)
1409	new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);	1431	new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1410		1432
1411	if (new_root_pixmap != root_pixmap)
1412	{
1413	root_pixmap = new_root_pixmap;	1433	root_pixmap = new_root_pixmap;
1414	return true;
1415	}
1416
1417	return false;
1418	}	1434	}
1419	# endif /* ENABLE_TRANSPARENCY */	1435	# endif /* ENABLE_TRANSPARENCY */
1420		1436
1421	# ifndef HAVE_AFTERIMAGE	1437	# ifndef HAVE_AFTERIMAGE
1422	static void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm);	1438	static void ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm);
1423	# endif	1439	# endif
1424		1440
1425	bool	1441	bool
1426	bgPixmap_t::render ()	1442	bgPixmap_t::render ()
1427	{	1443	{
1428	unsigned long background_flags = 0;	1444	unsigned long background_flags = 0;
1429		1445
1430	if (target == NULL)	1446	if (target == NULL)
1431	return false;	1447	return false;
1432
1433	TIMING_TEST_START (tp);
1434		1448
1435	invalidate ();	1449	invalidate ();
1436	# ifdef ENABLE_TRANSPARENCY	1450	# ifdef ENABLE_TRANSPARENCY
1437	if (flags & isTransparent)	1451	if (flags & isTransparent)
1438	{	1452	{
1439	/* we need to re-generate transparency pixmap in that case ! */	1453	/* we need to re-generate transparency pixmap in that case ! */
1440	background_flags = make_transparency_pixmap ();	1454	background_flags = make_transparency_pixmap ();
1441	if (background_flags == 0)	1455	if (background_flags == 0)
1442	return false;	1456	return false;
1443	else if ((background_flags & transpTransformations) == (flags & transpTransformations)	1457	else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1444	&& pmap_depth == target->depth)
1445	flags = flags & ~isInvalid;	1458	flags = flags & ~isInvalid;
1446	}	1459	}
1447	# endif	1460	# endif
1448		1461
1449	# ifdef BG_IMAGE_FROM_FILE	1462	# ifdef BG_IMAGE_FROM_FILE
…		…
1462	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);	1475	result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1463	}	1476	}
1464		1477
1465	if (result)	1478	if (result)
1466	{	1479	{
1467	# if !defined(HAVE_AFTERIMAGE) && !XFT	1480	# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1468	/* our own client-side tinting */	1481	/* our own client-side tinting */
1469	/* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1470	This may need to be changed in need_client_side_rendering() logic is altered !!! */
1471	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1482	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472	{	1483	{
1473	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1484	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474	if (flags & tintSet)	1485	if (flags & tintSet)
1475	tint.get (c);	1486	tint.get (c);
1476	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1487	ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1477	}	1488	}
1478	# endif	1489	# endif
1479		1490
1480	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1491	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481		1492
1482	if (gc)	1493	if (gc)
1483	{	1494	{
1484	if (/pmap_depth != target->depth &&/ pixmap != None)
1485	{
1486	XFreePixmap (target->dpy, pixmap);
1487	pixmap = None;
1488	}
1489
1490	if (pixmap == None)
1491	{
1492	pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1493	pmap_width = result->width;
1494	pmap_height = result->height;
1495	pmap_depth = target->depth;
1496	}
1497
1498	if (pmap_depth != result->depth)
1499	{
1500	/* Bad Match error will ensue ! stupid X !!!! */
1501	if (result->depth == 24 && pmap_depth == 32)
1502	result->depth = 32;
1503	else if (result->depth == 32 && pmap_depth == 24)
1504	result->depth = 24;
1505	else
1506	{
1507	/* TODO: implement image recoding */
1508	}
1509	}
1510
1511	if (pmap_depth == result->depth)
1512	XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);	1495	XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1513		1496
1514	XFreeGC (target->dpy, gc);	1497	XFreeGC (target->dpy, gc);
1515	flags = flags & ~isInvalid;	1498	flags = flags & ~isInvalid;
1516	}	1499	}
1517		1500
…		…
1527	}	1510	}
1528	}	1511	}
1529		1512
1530	apply ();	1513	apply ();
1531		1514
1532	XSync (target->dpy, False);
1533	valid_since = ev::now ();	1515	valid_since = ev::now ();
1534
1535	TIMING_TEST_PRINT_RESULT (tp);
1536		1516
1537	return true;	1517	return true;
1538	}	1518	}
1539		1519
1540	bool	1520	bool
…		…
1542	{	1522	{
1543	if (new_target)	1523	if (new_target)
1544	if (target != new_target)	1524	if (target != new_target)
1545	{	1525	{
1546	target = new_target;	1526	target = new_target;
1547	# ifdef ENABLE_TRANSPARENCY
1548	root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1549	# endif
1550	return true;	1527	return true;
1551	}	1528	}
1552		1529
1553	return false;	1530	return false;
1554	}	1531	}
…		…
1556	void	1533	void
1557	bgPixmap_t::apply ()	1534	bgPixmap_t::apply ()
1558	{	1535	{
1559	if (target)	1536	if (target)
1560	{	1537	{
1561	flags &= ~isVtOrigin;
1562
1563	if (pixmap != None)	1538	if (pixmap != None)
1564	{	1539	{
1565	/* set target's background to pixmap */	1540	/* set target's background to pixmap */
1566	# ifdef ENABLE_TRANSPARENCY	1541	# ifdef ENABLE_TRANSPARENCY
1567	if (flags & isTransparent)	1542	if (flags & isTransparent)
…		…
1573	XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);	1548	XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1574	}	1549	}
1575	else	1550	else
1576	# endif	1551	# endif
1577	{	1552	{
1578	flags \|= isVtOrigin;
1579	/* force old pixmap dereference in case it was transparent before :*/	1553	/* force old pixmap dereference in case it was transparent before :*/
1580	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);	1554	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1581	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);	1555	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1582	/* do we also need to set scrollbar's background here ? */	1556	/* do we also need to set scrollbar's background here ? */
1583		1557
…		…
1610	}	1584	}
1611	}	1585	}
1612		1586
1613	#endif /* HAVE_BG_PIXMAP */	1587	#endif /* HAVE_BG_PIXMAP */
1614		1588
1615	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT	1589	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER
1616	/* taken from aterm-0.4.2 */	1590	/* taken from aterm-0.4.2 */
1617		1591
1618	typedef uint32_t RUINT32T;
1619
1620	static void	1592	static void
1621	ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)	1593	ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm)
1622	{	1594	{
1623	int sh_r, sh_g, sh_b;	1595	int sh_r, sh_g, sh_b;
1624	RUINT32T mask_r, mask_g, mask_b;	1596	uint32_t mask_r, mask_g, mask_b;
1625	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	1597	uint32_t lookup, lookup_r, lookup_g, lookup_b;
1626	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	1598	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1627	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	1599	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1628	int i;	1600	int i;
1629		1601	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1630	Visual *visual = term->visual;
1631		1602
1632	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;	1603	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;
1633		1604
1634	/* for convenience */	1605	/* for convenience */
1635	mask_r = visual->red_mask;	1606	mask_r = visual->red_mask;
1636	mask_g = visual->green_mask;	1607	mask_g = visual->green_mask;
1637	mask_b = visual->blue_mask;	1608	mask_b = visual->blue_mask;
1638		1609
1639	/* boring lookup table pre-initialization */	1610	/* boring lookup table pre-initialization */
1640	switch (srcImage->bits_per_pixel)	1611	switch (srcImage->depth)
1641	{	1612	{
1642	case 15:	1613	case 15:
1643	if ((mask_r != 0x7c00) \|\|	1614	if ((mask_r != 0x7c00) \|\|
1644	(mask_g != 0x03e0) \|\|	1615	(mask_g != 0x03e0) \|\|
1645	(mask_b != 0x001f))	1616	(mask_b != 0x001f))
1646	return;	1617	return;
1647	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+32+32));	1618	lookup = (uint32_t ) malloc (sizeof (uint32_t)(32+32+32));
1648	lookup_r = lookup;	1619	lookup_r = lookup;
1649	lookup_g = lookup+32;	1620	lookup_g = lookup+32;
1650	lookup_b = lookup+32+32;	1621	lookup_b = lookup+32+32;
1651	sh_r = 10;	1622	sh_r = 10;
1652	sh_g = 5;	1623	sh_g = 5;
…		…
1655	case 16:	1626	case 16:
1656	if ((mask_r != 0xf800) \|\|	1627	if ((mask_r != 0xf800) \|\|
1657	(mask_g != 0x07e0) \|\|	1628	(mask_g != 0x07e0) \|\|
1658	(mask_b != 0x001f))	1629	(mask_b != 0x001f))
1659	return;	1630	return;
1660	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+64+32));	1631	lookup = (uint32_t ) malloc (sizeof (uint32_t)(32+64+32));
1661	lookup_r = lookup;	1632	lookup_r = lookup;
1662	lookup_g = lookup+32;	1633	lookup_g = lookup+32;
1663	lookup_b = lookup+32+64;	1634	lookup_b = lookup+32+64;
1664	sh_r = 11;	1635	sh_r = 11;
1665	sh_g = 5;	1636	sh_g = 5;
…		…
1668	case 24:	1639	case 24:
1669	if ((mask_r != 0xff0000) \|\|	1640	if ((mask_r != 0xff0000) \|\|
1670	(mask_g != 0x00ff00) \|\|	1641	(mask_g != 0x00ff00) \|\|
1671	(mask_b != 0x0000ff))	1642	(mask_b != 0x0000ff))
1672	return;	1643	return;
1673	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));	1644	lookup = (uint32_t ) malloc (sizeof (uint32_t)(256+256+256));
1674	lookup_r = lookup;	1645	lookup_r = lookup;
1675	lookup_g = lookup+256;	1646	lookup_g = lookup+256;
1676	lookup_b = lookup+256+256;	1647	lookup_b = lookup+256+256;
1677	sh_r = 16;	1648	sh_r = 16;
1678	sh_g = 8;	1649	sh_g = 8;
…		…
1681	case 32:	1652	case 32:
1682	if ((mask_r != 0xff0000) \|\|	1653	if ((mask_r != 0xff0000) \|\|
1683	(mask_g != 0x00ff00) \|\|	1654	(mask_g != 0x00ff00) \|\|
1684	(mask_b != 0x0000ff))	1655	(mask_b != 0x0000ff))
1685	return;	1656	return;
1686	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));	1657	lookup = (uint32_t ) malloc (sizeof (uint32_t)(256+256+256));
1687	lookup_r = lookup;	1658	lookup_r = lookup;
1688	lookup_g = lookup+256;	1659	lookup_g = lookup+256;
1689	lookup_b = lookup+256+256;	1660	lookup_b = lookup+256+256;
1690	sh_r = 16;	1661	sh_r = 16;
1691	sh_g = 8;	1662	sh_g = 8;
…		…
1702		1673
1703	lower_lim_r = 65535-rm;	1674	lower_lim_r = 65535-rm;
1704	lower_lim_g = 65535-gm;	1675	lower_lim_g = 65535-gm;
1705	lower_lim_b = 65535-bm;	1676	lower_lim_b = 65535-bm;
1706		1677
1707	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);	1678	lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1708	lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);	1679	lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1709	lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);	1680	lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1710		1681
1711	upper_lim_r = upper_lim_g = upper_lim_b = 65535;	1682	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1712	}	1683	}
1713	else	1684	else
1714	{	1685	{
1715		1686
1716	lower_lim_r = lower_lim_g = lower_lim_b = 0;	1687	lower_lim_r = lower_lim_g = lower_lim_b = 0;
1717		1688
1718	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);	1689	upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1719	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);	1690	upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1720	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);	1691	upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1721	}
1722
1723	/* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1724	if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000))
1725	{
1726	unsigned int tmp;
1727
1728	tmp = lower_lim_r;
1729	lower_lim_r = lower_lim_b;
1730	lower_lim_b = tmp;
1731
1732	tmp = upper_lim_r;
1733	upper_lim_r = upper_lim_b;
1734	upper_lim_b = tmp;
1735	}	1692	}
1736		1693
1737	/* fill our lookup tables */	1694	/* fill our lookup tables */
1738	for (i = 0; i <= mask_r>>sh_r; i++)	1695	for (i = 0; i <= mask_r>>sh_r; i++)
1739	{	1696	{
1740	RUINT32T tmp;	1697	uint32_t tmp;
1741	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));	1698	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1742	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);	1699	tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1743	lookup_r[i] = (tmp/65535)<<sh_r;	1700	lookup_r[i] = (tmp/65535)<<sh_r;
1744	}	1701	}
1745	for (i = 0; i <= mask_g>>sh_g; i++)	1702	for (i = 0; i <= mask_g>>sh_g; i++)
1746	{	1703	{
1747	RUINT32T tmp;	1704	uint32_t tmp;
1748	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));	1705	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1749	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);	1706	tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1750	lookup_g[i] = (tmp/65535)<<sh_g;	1707	lookup_g[i] = (tmp/65535)<<sh_g;
1751	}	1708	}
1752	for (i = 0; i <= mask_b>>sh_b; i++)	1709	for (i = 0; i <= mask_b>>sh_b; i++)
1753	{	1710	{
1754	RUINT32T tmp;	1711	uint32_t tmp;
1755	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));	1712	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1756	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);	1713	tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1757	lookup_b[i] = (tmp/65535)<<sh_b;	1714	lookup_b[i] = (tmp/65535)<<sh_b;
1758	}	1715	}
1759		1716
1760	/* apply table to input image (replacing colors by newly calculated ones) */	1717	/* apply table to input image (replacing colors by newly calculated ones) */
1761	switch (srcImage->bits_per_pixel)	1718	if (srcImage->bits_per_pixel == 32
		1719	&& (srcImage->depth == 24 \|\| srcImage->depth == 32)
		1720	&& srcImage->byte_order == host_byte_order)
1762	{	1721	{
1763	case 15:	1722	uint32_t p1, pf, p, pl;
1764	{
1765	unsigned short p1, pf, p, pl;
1766	p1 = (unsigned short *) srcImage->data;	1723	p1 = (uint32_t *) srcImage->data;
1767	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);	1724	pf = (uint32_t ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
		1725
1768	while (p1 < pf)	1726	while (p1 < pf)
1769	{	1727	{
1770	p = p1;	1728	p = p1;
1771	pl = p1 + srcImage->width;	1729	pl = p1 + srcImage->width;
1772	for (; p < pl; p++)	1730	for (; p < pl; p++)
1773	{
1774	p = lookup_r[(p & 0x7c00)>>10] \|
1775	lookup_g[(*p & 0x03e0)>> 5] \|
1776	lookup_b[(*p & 0x001f)];
1777	}
1778	p1 = (unsigned short ) ((char ) p1 + srcImage->bytes_per_line);
1779	}	1731	{
1780	break;
1781	}
1782	case 16:
1783	{
1784	unsigned short p1, pf, p, pl;
1785	p1 = (unsigned short *) srcImage->data;
1786	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
1787	while (p1 < pf)
1788	{
1789	p = p1;
1790	pl = p1 + srcImage->width;
1791	for (; p < pl; p++)
1792	{
1793	p = lookup_r[(p & 0xf800)>>11] \|
1794	lookup_g[(*p & 0x07e0)>> 5] \|
1795	lookup_b[(*p & 0x001f)];
1796	}
1797	p1 = (unsigned short ) ((char ) p1 + srcImage->bytes_per_line);
1798	}
1799	break;
1800	}
1801	case 24:
1802	{
1803	unsigned char p1, pf, p, pl;
1804	p1 = (unsigned char *) srcImage->data;
1805	pf = (unsigned char ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
1806	while (p1 < pf)
1807	{
1808	p = p1;
1809	pl = p1 + srcImage->width * 3;
1810	for (; p < pl; p += 3)
1811	{
1812	p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1813	p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1814	p[2] = lookup_r[(p[2] & 0x0000ff)];
1815	}
1816	p1 = (unsigned char ) ((char ) p1 + srcImage->bytes_per_line);
1817	}
1818	break;
1819	}
1820	case 32:
1821	{
1822	RUINT32T p1, pf, p, pl;
1823	p1 = (RUINT32T *) srcImage->data;
1824	pf = (RUINT32T ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
1825
1826	while (p1 < pf)
1827	{
1828	p = p1;
1829	pl = p1 + srcImage->width;
1830	for (; p < pl; p++)
1831	{
1832	p = lookup_r[(p & 0xff0000)>>16] \|	1732	p = lookup_r[(p & 0xff0000) >> 16] \|
1833	lookup_g[(*p & 0x00ff00)>> 8] \|	1733	lookup_g[(*p & 0x00ff00) >> 8] \|
1834	lookup_b[(*p & 0x0000ff)] \|	1734	lookup_b[(*p & 0x0000ff)] \|
1835	(*p & ~0xffffff);	1735	(*p & 0xff000000);
1836	}	1736	}
1837	p1 = (RUINT32T ) ((char ) p1 + srcImage->bytes_per_line);	1737	p1 = (uint32_t ) ((char ) p1 + srcImage->bytes_per_line);
		1738	}
		1739	}
		1740	else
		1741	{
		1742	for (int y = 0; y < srcImage->height; y++)
		1743	for (int x = 0; x < srcImage->width; x++)
		1744	{
		1745	unsigned long pixel = XGetPixel (srcImage, x, y);
		1746	pixel = lookup_r[(pixel & mask_r) >> sh_r] \|
		1747	lookup_g[(pixel & mask_g) >> sh_g] \|
		1748	lookup_b[(pixel & mask_b) >> sh_b];
		1749	XPutPixel (srcImage, x, y, pixel);
1838	}	1750	}
1839	break;
1840	}
1841	}	1751	}
1842		1752
1843	free (lookup);	1753	free (lookup);
1844	}	1754	}
1845	#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */	1755	#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.87 by sf-exg, Mon Oct 18 11:00:38 2010 UTC vs. Revision 1.105 by sf-exg, Mon Nov 1 11:36:48 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.87 by sf-exg, Mon Oct 18 11:00:38 2010 UTC vs.
Revision 1.105 by sf-exg, Mon Nov 1 11:36:48 2010 UTC