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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.86 by sf-exg, Mon Oct 18 10:49:19 2010 UTC vs.
Revision 1.95 by sf-exg, Fri Oct 22 16:21:05 2010 UTC

…		…
530	int x = 0;	530	int x = 0;
531	int y = 0;	531	int y = 0;
532	int w = 0;	532	int w = 0;
533	int h = 0;	533	int h = 0;
534		534
535	TIMING_TEST_START (asim);
536
537	if (original_asim)	535	if (original_asim)
538	get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);	536	get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
539		537
540	if (!original_asim	538	if (!original_asim
541	\|\| (!(flags & rootAlign)	539	\|\| (!(flags & rootAlign)
…		…
657	}	655	}
658		656
659	free (layers);	657	free (layers);
660	}	658	}
661	}	659	}
662	TIMING_TEST_PRINT_RESULT (asim);
663		660
664	bool ret = false;	661	bool ret = false;
665		662
666	if (result)	663	if (result)
667	{	664	{
…		…
713		710
714	if (result != background && result != original_asim)	711	if (result != background && result != original_asim)
715	destroy_asimage (&result);	712	destroy_asimage (&result);
716		713
717	XFreeGC (target->dpy, gc);	714	XFreeGC (target->dpy, gc);
718	TIMING_TEST_PRINT_RESULT (asim);
719		715
720	ret = true;	716	ret = true;
721	}	717	}
722		718
723	if (background)	719	if (background)
…		…
1007	flags &= ~blurNeeded;	1003	flags &= ~blurNeeded;
1008	else	1004	else
1009	flags \|= blurNeeded;	1005	flags \|= blurNeeded;
1010		1006
1011	#if XFT	1007	#if XFT
1012	XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);	1008	XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013	if (filters)	1009	if (filters)
1014	{	1010	{
1015	for (int i = 0; i < filters->nfilter; i++)	1011	for (int i = 0; i < filters->nfilter; i++)
1016	if (!strcmp (filters->filter[i], FilterConvolution))	1012	if (!strcmp (filters->filter[i], FilterConvolution))
1017	flags \|= bgPixmap_t::blurServerSide;	1013	flags \|= bgPixmap_t::blurServerSide;
1018		1014
1019	XFree (filters);	1015	XFree (filters);
1020	}	1016	}
1021	#endif	1017	#endif
1022		1018
1023	return (changed > 0);	1019	return (changed > 0);
1024	}	1020	}
1025		1021
…		…
1117		1113
1118	#if XFT	1114	#if XFT
1119	static void	1115	static void
1120	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	1116	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)
1121	{	1117	{
1122	double sigma = radius / 2.0;	1118	double sigma = radius / 2.0;
1123	double scale = sqrt (2.0 * M_PI) * sigma;	1119	double scale = sqrt (2.0 * M_PI) * sigma;
1124	double sum = 0.0;	1120	double sum = 0.0;
1125		1121
1126	for (int i = 0; i < width; i++)	1122	for (int i = 0; i < width; i++)
1127	{	1123	{
1128	double x = i - width / 2;	1124	double x = i - width / 2;
1129	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	1125	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1130	sum += kernel[i];	1126	sum += kernel[i];
1131	}	1127	}
1132		1128
1133	params[0] = XDoubleToFixed (width);	1129	params[0] = XDoubleToFixed (width);
1134	params[1] = XDoubleToFixed (1);	1130	params[1] = XDoubleToFixed (1);
1135		1131
1136	for (int i = 0; i < width; i++)	1132	for (int i = 0; i < width; i++)
1137	params[i+2] = XDoubleToFixed (kernel[i] / sum);	1133	params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138	}	1134	}
1139	#endif	1135	#endif
1140		1136
1141	bool	1137	bool
1142	bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)	1138	bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
…		…
1147	double kernel = (double )malloc (size * sizeof (double));	1143	double kernel = (double )malloc (size * sizeof (double));
1148	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	1144	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
1149		1145
1150	Display *dpy = target->dpy;	1146	Display *dpy = target->dpy;
1151	XRenderPictureAttributes pa;	1147	XRenderPictureAttributes pa;
1152	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual);	1148	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1153		1149
1154	Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	1150	Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1155	Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	1151	Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1156		1152
1157	if (kernel && params && src && dst)	1153	if (kernel && params && src && dst)
…		…
1283	}	1279	}
1284		1280
1285	XRenderFreePicture (dpy, mask_pic);	1281	XRenderFreePicture (dpy, mask_pic);
1286	XRenderFreePicture (dpy, overlay_pic);	1282	XRenderFreePicture (dpy, overlay_pic);
1287	XRenderFreePicture (dpy, back_pic);	1283	XRenderFreePicture (dpy, back_pic);
1288	# if DO_TIMING_TEST
1289	XSync (dpy, False);
1290	# endif
1291	# endif	1284	# endif
1292	}	1285	}
1293		1286
1294	return ret;	1287	return ret;
1295	}	1288	}
…		…
1320	int window_height = target->szHint.height;	1313	int window_height = target->szHint.height;
1321	int sx, sy;	1314	int sx, sy;
1322	XGCValues gcv;	1315	XGCValues gcv;
1323	GC gc;	1316	GC gc;
1324		1317
1325	TIMING_TEST_START (tp);
1326	target->get_window_origin (sx, sy);	1318	target->get_window_origin (sx, sy);
1327		1319
1328	/* check if we are outside of the visible part of the virtual screen : */	1320	/* check if we are outside of the visible part of the virtual screen : */
1329	if (sx + window_width <= 0 \|\| sy + window_height <= 0	1321	if (sx + window_width <= 0 \|\| sy + window_height <= 0
1330	\|\| sx >= root_width \|\| sy >= root_height)	1322	\|\| sx >= root_width \|\| sy >= root_height)
…		…
1367	{	1359	{
1368	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);	1360	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1369	result \|= transpPmapTiled;	1361	result \|= transpPmapTiled;
1370	XFreeGC (dpy, gc);	1362	XFreeGC (dpy, gc);
1371	}	1363	}
1372	TIMING_TEST_PRINT_RESULT (tp);
1373		1364
1374	if (tiled_root_pmap != None)	1365	if (tiled_root_pmap != None)
1375	{	1366	{
1376	if (!need_client_side_rendering ())	1367	if (!need_client_side_rendering ())
1377	{	1368	{
1378	if (flags & (blurNeeded \| blurServerSide))	1369	if (flags & (blurNeeded \| blurServerSide))
1379	{	1370	{
1380	if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))	1371	if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1381	result \|= transpPmapBlurred;	1372	result \|= transpPmapBlurred;
1382	}	1373	}
1383	if (flags & (tintNeeded \| tintServerSide))	1374	if (flags & (tintNeeded \| tintServerSide))
1384	{	1375	{
1385	if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))	1376	if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1386	result \|= transpPmapTinted;	1377	result \|= transpPmapTinted;
1387	}	1378	}
1388	} /* server side rendering completed */	1379	} /* server side rendering completed */
1389		1380
1390	if (pixmap)	1381	if (pixmap)
…		…
1394	pmap_width = window_width;	1385	pmap_width = window_width;
1395	pmap_height = window_height;	1386	pmap_height = window_height;
1396	pmap_depth = root_depth;	1387	pmap_depth = root_depth;
1397	}	1388	}
1398		1389
1399	TIMING_TEST_PRINT_RESULT (tp);
1400
1401	return result;	1390	return result;
1402	}	1391	}
1403		1392
1404	bool	1393	bool
1405	bgPixmap_t::set_root_pixmap ()	1394	bgPixmap_t::set_root_pixmap ()
…		…
1417	return false;	1406	return false;
1418	}	1407	}
1419	# endif /* ENABLE_TRANSPARENCY */	1408	# endif /* ENABLE_TRANSPARENCY */
1420		1409
1421	# ifndef HAVE_AFTERIMAGE	1410	# ifndef HAVE_AFTERIMAGE
1422	static void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm);	1411	static void ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm);
1423	# endif	1412	# endif
1424		1413
1425	bool	1414	bool
1426	bgPixmap_t::render ()	1415	bgPixmap_t::render ()
1427	{	1416	{
1428	unsigned long background_flags = 0;	1417	unsigned long background_flags = 0;
1429		1418
1430	if (target == NULL)	1419	if (target == NULL)
1431	return false;	1420	return false;
1432
1433	TIMING_TEST_START (tp);
1434		1421
1435	invalidate ();	1422	invalidate ();
1436	# ifdef ENABLE_TRANSPARENCY	1423	# ifdef ENABLE_TRANSPARENCY
1437	if (flags & isTransparent)	1424	if (flags & isTransparent)
1438	{	1425	{
…		…
1471	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1458	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472	{	1459	{
1473	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1460	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474	if (flags & tintSet)	1461	if (flags & tintSet)
1475	tint.get (c);	1462	tint.get (c);
1476	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1463	ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1477	}	1464	}
1478	# endif	1465	# endif
1479		1466
1480	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1467	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481		1468
…		…
1527	}	1514	}
1528	}	1515	}
1529		1516
1530	apply ();	1517	apply ();
1531		1518
1532	XSync (target->dpy, False);
1533	valid_since = ev::now ();	1519	valid_since = ev::now ();
1534
1535	TIMING_TEST_PRINT_RESULT (tp);
1536		1520
1537	return true;	1521	return true;
1538	}	1522	}
1539		1523
1540	bool	1524	bool
…		…
1613	#endif /* HAVE_BG_PIXMAP */	1597	#endif /* HAVE_BG_PIXMAP */
1614		1598
1615	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT	1599	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1616	/* taken from aterm-0.4.2 */	1600	/* taken from aterm-0.4.2 */
1617		1601
1618	typedef uint32_t RUINT32T;
1619
1620	static void	1602	static void
1621	ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)	1603	ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm)
1622	{	1604	{
1623	int sh_r, sh_g, sh_b;	1605	int sh_r, sh_g, sh_b;
1624	RUINT32T mask_r, mask_g, mask_b;	1606	uint32_t mask_r, mask_g, mask_b;
1625	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	1607	uint32_t lookup, lookup_r, lookup_g, lookup_b;
1626	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	1608	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1627	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	1609	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1628	int i;	1610	int i;
1629		1611	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1630	Visual *visual = term->visual;
1631		1612
1632	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;	1613	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;
1633		1614
1634	/* for convenience */	1615	/* for convenience */
1635	mask_r = visual->red_mask;	1616	mask_r = visual->red_mask;
1636	mask_g = visual->green_mask;	1617	mask_g = visual->green_mask;
1637	mask_b = visual->blue_mask;	1618	mask_b = visual->blue_mask;
1638		1619
1639	/* boring lookup table pre-initialization */	1620	/* boring lookup table pre-initialization */
1640	switch (srcImage->bits_per_pixel) {	1621	switch (srcImage->depth)
		1622	{
1641	case 15:	1623	case 15:
1642	if ((mask_r != 0x7c00) \|\|	1624	if ((mask_r != 0x7c00) \|\|
1643	(mask_g != 0x03e0) \|\|	1625	(mask_g != 0x03e0) \|\|
1644	(mask_b != 0x001f))	1626	(mask_b != 0x001f))
1645	return;	1627	return;
1646	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+32+32));	1628	lookup = (uint32_t ) malloc (sizeof (uint32_t)(32+32+32));
1647	lookup_r = lookup;	1629	lookup_r = lookup;
1648	lookup_g = lookup+32;	1630	lookup_g = lookup+32;
1649	lookup_b = lookup+32+32;	1631	lookup_b = lookup+32+32;
1650	sh_r = 10;	1632	sh_r = 10;
1651	sh_g = 5;	1633	sh_g = 5;
1652	sh_b = 0;	1634	sh_b = 0;
1653	break;	1635	break;
1654	case 16:	1636	case 16:
1655	if ((mask_r != 0xf800) \|\|	1637	if ((mask_r != 0xf800) \|\|
1656	(mask_g != 0x07e0) \|\|	1638	(mask_g != 0x07e0) \|\|
1657	(mask_b != 0x001f))	1639	(mask_b != 0x001f))
1658	return;	1640	return;
1659	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+64+32));	1641	lookup = (uint32_t ) malloc (sizeof (uint32_t)(32+64+32));
1660	lookup_r = lookup;	1642	lookup_r = lookup;
1661	lookup_g = lookup+32;	1643	lookup_g = lookup+32;
1662	lookup_b = lookup+32+64;	1644	lookup_b = lookup+32+64;
1663	sh_r = 11;	1645	sh_r = 11;
1664	sh_g = 5;	1646	sh_g = 5;
1665	sh_b = 0;	1647	sh_b = 0;
1666	break;	1648	break;
1667	case 24:	1649	case 24:
1668	if ((mask_r != 0xff0000) \|\|	1650	if ((mask_r != 0xff0000) \|\|
1669	(mask_g != 0x00ff00) \|\|	1651	(mask_g != 0x00ff00) \|\|
1670	(mask_b != 0x0000ff))	1652	(mask_b != 0x0000ff))
1671	return;	1653	return;
1672	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));	1654	lookup = (uint32_t ) malloc (sizeof (uint32_t)(256+256+256));
1673	lookup_r = lookup;	1655	lookup_r = lookup;
1674	lookup_g = lookup+256;	1656	lookup_g = lookup+256;
1675	lookup_b = lookup+256+256;	1657	lookup_b = lookup+256+256;
1676	sh_r = 16;	1658	sh_r = 16;
1677	sh_g = 8;	1659	sh_g = 8;
1678	sh_b = 0;	1660	sh_b = 0;
1679	break;	1661	break;
1680	case 32:	1662	case 32:
1681	if ((mask_r != 0xff0000) \|\|	1663	if ((mask_r != 0xff0000) \|\|
1682	(mask_g != 0x00ff00) \|\|	1664	(mask_g != 0x00ff00) \|\|
1683	(mask_b != 0x0000ff))	1665	(mask_b != 0x0000ff))
1684	return;	1666	return;
1685	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));	1667	lookup = (uint32_t ) malloc (sizeof (uint32_t)(256+256+256));
1686	lookup_r = lookup;	1668	lookup_r = lookup;
1687	lookup_g = lookup+256;	1669	lookup_g = lookup+256;
1688	lookup_b = lookup+256+256;	1670	lookup_b = lookup+256+256;
1689	sh_r = 16;	1671	sh_r = 16;
1690	sh_g = 8;	1672	sh_g = 8;
1691	sh_b = 0;	1673	sh_b = 0;
1692	break;	1674	break;
1693	default:	1675	default:
1694	return; /* we do not support this color depth */	1676	return; /* we do not support this color depth */
1695	}	1677	}
1696		1678
1697	/* prepare limits for color transformation (each channel is handled separately) */	1679	/* prepare limits for color transformation (each channel is handled separately) */
1698	if (shade > 100) {	1680	if (shade > 100)
		1681	{
1699	shade = 200 - shade;	1682	shade = 200 - shade;
1700		1683
1701	lower_lim_r = 65535-rm;	1684	lower_lim_r = 65535-rm;
1702	lower_lim_g = 65535-gm;	1685	lower_lim_g = 65535-gm;
1703	lower_lim_b = 65535-bm;	1686	lower_lim_b = 65535-bm;
1704		1687
1705	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);	1688	lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1706	lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);	1689	lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1707	lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);	1690	lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1708		1691
1709	upper_lim_r = upper_lim_g = upper_lim_b = 65535;	1692	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
		1693	}
1710	} else {	1694	else
		1695	{
1711		1696
1712	lower_lim_r = lower_lim_g = lower_lim_b = 0;	1697	lower_lim_r = lower_lim_g = lower_lim_b = 0;
1713		1698
1714	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);	1699	upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1715	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);	1700	upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1716	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);	1701	upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1717	}	1702	}
1718
1719	/* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1720	if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000))
1721	{
1722	unsigned int tmp;
1723
1724	tmp = lower_lim_r;
1725	lower_lim_r = lower_lim_b;
1726	lower_lim_b = tmp;
1727
1728	tmp = upper_lim_r;
1729	upper_lim_r = upper_lim_b;
1730	upper_lim_b = tmp;
1731	}
1732		1703
1733	/* fill our lookup tables */	1704	/* fill our lookup tables */
1734	for (i = 0; i <= mask_r>>sh_r; i++)	1705	for (i = 0; i <= mask_r>>sh_r; i++)
1735	{	1706	{
1736	RUINT32T tmp;	1707	uint32_t tmp;
1737	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));	1708	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1738	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);	1709	tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1739	lookup_r[i] = (tmp/65535)<<sh_r;	1710	lookup_r[i] = (tmp/65535)<<sh_r;
1740	}	1711	}
1741	for (i = 0; i <= mask_g>>sh_g; i++)	1712	for (i = 0; i <= mask_g>>sh_g; i++)
1742	{	1713	{
1743	RUINT32T tmp;	1714	uint32_t tmp;
1744	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));	1715	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1745	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);	1716	tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1746	lookup_g[i] = (tmp/65535)<<sh_g;	1717	lookup_g[i] = (tmp/65535)<<sh_g;
1747	}	1718	}
1748	for (i = 0; i <= mask_b>>sh_b; i++)	1719	for (i = 0; i <= mask_b>>sh_b; i++)
1749	{	1720	{
1750	RUINT32T tmp;	1721	uint32_t tmp;
1751	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));	1722	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1752	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);	1723	tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1753	lookup_b[i] = (tmp/65535)<<sh_b;	1724	lookup_b[i] = (tmp/65535)<<sh_b;
1754	}	1725	}
1755		1726
1756	/* apply table to input image (replacing colors by newly calculated ones) */	1727	/* apply table to input image (replacing colors by newly calculated ones) */
1757	switch (srcImage->bits_per_pixel)	1728	if (srcImage->bits_per_pixel == 32
		1729	&& (srcImage->depth == 24 \|\| srcImage->depth == 32)
		1730	&& srcImage->byte_order == host_byte_order)
1758	{	1731	{
1759	case 15:
1760	{
1761	unsigned short p1, pf, p, pl;	1732	uint32_t p1, pf, p, pl;
1762	p1 = (unsigned short *) srcImage->data;	1733	p1 = (uint32_t *) srcImage->data;
1763	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);	1734	pf = (uint32_t ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
		1735
1764	while (p1 < pf)	1736	while (p1 < pf)
1765	{	1737	{
1766	p = p1;	1738	p = p1;
1767	pl = p1 + srcImage->width;	1739	pl = p1 + srcImage->width;
1768	for (; p < pl; p++)	1740	for (; p < pl; p++)
1769	{	1741	{
1770	p = lookup_r[(p & 0x7c00)>>10] \|
1771	lookup_g[(*p & 0x03e0)>> 5] \|
1772	lookup_b[(*p & 0x001f)];
1773	}
1774	p1 = (unsigned short ) ((char ) p1 + srcImage->bytes_per_line);
1775	}
1776	break;
1777	}
1778	case 16:
1779	{
1780	unsigned short p1, pf, p, pl;
1781	p1 = (unsigned short *) srcImage->data;
1782	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
1783	while (p1 < pf)
1784	{
1785	p = p1;
1786	pl = p1 + srcImage->width;
1787	for (; p < pl; p++)
1788	{
1789	p = lookup_r[(p & 0xf800)>>11] \|
1790	lookup_g[(*p & 0x07e0)>> 5] \|
1791	lookup_b[(*p & 0x001f)];
1792	}
1793	p1 = (unsigned short ) ((char ) p1 + srcImage->bytes_per_line);
1794	}
1795	break;
1796	}
1797	case 24:
1798	{
1799	unsigned char p1, pf, p, pl;
1800	p1 = (unsigned char *) srcImage->data;
1801	pf = (unsigned char ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
1802	while (p1 < pf)
1803	{
1804	p = p1;
1805	pl = p1 + srcImage->width * 3;
1806	for (; p < pl; p += 3)
1807	{
1808	p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1809	p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1810	p[2] = lookup_r[(p[2] & 0x0000ff)];
1811	}
1812	p1 = (unsigned char ) ((char ) p1 + srcImage->bytes_per_line);
1813	}
1814	break;
1815	}
1816	case 32:
1817	{
1818	RUINT32T p1, pf, p, pl;
1819	p1 = (RUINT32T *) srcImage->data;
1820	pf = (RUINT32T ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
1821
1822	while (p1 < pf)
1823	{
1824	p = p1;
1825	pl = p1 + srcImage->width;
1826	for (; p < pl; p++)
1827	{
1828	p = lookup_r[(p & 0xff0000)>>16] \|	1742	p = lookup_r[(p & 0xff0000) >> 16] \|
1829	lookup_g[(*p & 0x00ff00)>> 8] \|	1743	lookup_g[(*p & 0x00ff00) >> 8] \|
1830	lookup_b[(*p & 0x0000ff)] \|	1744	lookup_b[(*p & 0x0000ff)] \|
1831	(*p & ~0xffffff);	1745	(*p & 0xff000000);
		1746	}
		1747	p1 = (uint32_t ) ((char ) p1 + srcImage->bytes_per_line);
		1748	}
		1749	}
		1750	else
		1751	{
		1752	for (int y = 0; y < srcImage->height; y++)
		1753	for (int x = 0; x < srcImage->width; x++)
		1754	{
		1755	unsigned long pixel = XGetPixel (srcImage, x, y);
		1756	pixel = lookup_r[(pixel & mask_r) >> sh_r] \|
		1757	lookup_g[(pixel & mask_g) >> sh_g] \|
		1758	lookup_b[(pixel & mask_b) >> sh_b];
		1759	XPutPixel (srcImage, x, y, pixel);
1832	}	1760	}
1833	p1 = (RUINT32T ) ((char ) p1 + srcImage->bytes_per_line);
1834	}	1761	}
1835	break;
1836	}
1837	}
1838		1762
1839	free (lookup);	1763	free (lookup);
1840	}	1764	}
1841	#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */	1765	#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.86 by sf-exg, Mon Oct 18 10:49:19 2010 UTC vs. Revision 1.95 by sf-exg, Fri Oct 22 16:21:05 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.86 by sf-exg, Mon Oct 18 10:49:19 2010 UTC vs.
Revision 1.95 by sf-exg, Fri Oct 22 16:21:05 2010 UTC