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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.90 by sf-exg, Mon Oct 18 16:02:48 2010 UTC vs.
Revision 1.94 by sf-exg, Wed Oct 20 09:04:55 2010 UTC

…		…
1147	double kernel = (double )malloc (size * sizeof (double));	1147	double kernel = (double )malloc (size * sizeof (double));
1148	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));	1148	XFixed params = (XFixed )malloc ((size + 2) * sizeof (XFixed));
1149		1149
1150	Display *dpy = target->dpy;	1150	Display *dpy = target->dpy;
1151	XRenderPictureAttributes pa;	1151	XRenderPictureAttributes pa;
1152	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual);	1152	XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1153		1153
1154	Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	1154	Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1155	Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);	1155	Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1156		1156
1157	if (kernel && params && src && dst)	1157	if (kernel && params && src && dst)
…		…
1417	return false;	1417	return false;
1418	}	1418	}
1419	# endif /* ENABLE_TRANSPARENCY */	1419	# endif /* ENABLE_TRANSPARENCY */
1420		1420
1421	# ifndef HAVE_AFTERIMAGE	1421	# ifndef HAVE_AFTERIMAGE
1422	static void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm);	1422	static void ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm);
1423	# endif	1423	# endif
1424		1424
1425	bool	1425	bool
1426	bgPixmap_t::render ()	1426	bgPixmap_t::render ()
1427	{	1427	{
…		…
1471	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1471	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472	{	1472	{
1473	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1473	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474	if (flags & tintSet)	1474	if (flags & tintSet)
1475	tint.get (c);	1475	tint.get (c);
1476	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1476	ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1477	}	1477	}
1478	# endif	1478	# endif
1479		1479
1480	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1480	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481		1481
…		…
1613	#endif /* HAVE_BG_PIXMAP */	1613	#endif /* HAVE_BG_PIXMAP */
1614		1614
1615	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT	1615	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1616	/* taken from aterm-0.4.2 */	1616	/* taken from aterm-0.4.2 */
1617		1617
1618	typedef uint32_t RUINT32T;
1619
1620	static void	1618	static void
1621	ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)	1619	ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm)
1622	{	1620	{
1623	int sh_r, sh_g, sh_b;	1621	int sh_r, sh_g, sh_b;
1624	RUINT32T mask_r, mask_g, mask_b;	1622	uint32_t mask_r, mask_g, mask_b;
1625	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	1623	uint32_t lookup, lookup_r, lookup_g, lookup_b;
1626	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	1624	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1627	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	1625	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1628	int i;	1626	int i;
1629		1627	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1630	Visual *visual = term->visual;
1631		1628
1632	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;	1629	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;
1633		1630
1634	/* for convenience */	1631	/* for convenience */
1635	mask_r = visual->red_mask;	1632	mask_r = visual->red_mask;
1636	mask_g = visual->green_mask;	1633	mask_g = visual->green_mask;
1637	mask_b = visual->blue_mask;	1634	mask_b = visual->blue_mask;
1638		1635
1639	/* boring lookup table pre-initialization */	1636	/* boring lookup table pre-initialization */
1640	switch (srcImage->bits_per_pixel)	1637	switch (srcImage->depth)
1641	{	1638	{
1642	case 15:	1639	case 15:
1643	if ((mask_r != 0x7c00) \|\|	1640	if ((mask_r != 0x7c00) \|\|
1644	(mask_g != 0x03e0) \|\|	1641	(mask_g != 0x03e0) \|\|
1645	(mask_b != 0x001f))	1642	(mask_b != 0x001f))
1646	return;	1643	return;
1647	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+32+32));	1644	lookup = (uint32_t ) malloc (sizeof (uint32_t)(32+32+32));
1648	lookup_r = lookup;	1645	lookup_r = lookup;
1649	lookup_g = lookup+32;	1646	lookup_g = lookup+32;
1650	lookup_b = lookup+32+32;	1647	lookup_b = lookup+32+32;
1651	sh_r = 10;	1648	sh_r = 10;
1652	sh_g = 5;	1649	sh_g = 5;
…		…
1655	case 16:	1652	case 16:
1656	if ((mask_r != 0xf800) \|\|	1653	if ((mask_r != 0xf800) \|\|
1657	(mask_g != 0x07e0) \|\|	1654	(mask_g != 0x07e0) \|\|
1658	(mask_b != 0x001f))	1655	(mask_b != 0x001f))
1659	return;	1656	return;
1660	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+64+32));	1657	lookup = (uint32_t ) malloc (sizeof (uint32_t)(32+64+32));
1661	lookup_r = lookup;	1658	lookup_r = lookup;
1662	lookup_g = lookup+32;	1659	lookup_g = lookup+32;
1663	lookup_b = lookup+32+64;	1660	lookup_b = lookup+32+64;
1664	sh_r = 11;	1661	sh_r = 11;
1665	sh_g = 5;	1662	sh_g = 5;
…		…
1668	case 24:	1665	case 24:
1669	if ((mask_r != 0xff0000) \|\|	1666	if ((mask_r != 0xff0000) \|\|
1670	(mask_g != 0x00ff00) \|\|	1667	(mask_g != 0x00ff00) \|\|
1671	(mask_b != 0x0000ff))	1668	(mask_b != 0x0000ff))
1672	return;	1669	return;
1673	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));	1670	lookup = (uint32_t ) malloc (sizeof (uint32_t)(256+256+256));
1674	lookup_r = lookup;	1671	lookup_r = lookup;
1675	lookup_g = lookup+256;	1672	lookup_g = lookup+256;
1676	lookup_b = lookup+256+256;	1673	lookup_b = lookup+256+256;
1677	sh_r = 16;	1674	sh_r = 16;
1678	sh_g = 8;	1675	sh_g = 8;
…		…
1681	case 32:	1678	case 32:
1682	if ((mask_r != 0xff0000) \|\|	1679	if ((mask_r != 0xff0000) \|\|
1683	(mask_g != 0x00ff00) \|\|	1680	(mask_g != 0x00ff00) \|\|
1684	(mask_b != 0x0000ff))	1681	(mask_b != 0x0000ff))
1685	return;	1682	return;
1686	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));	1683	lookup = (uint32_t ) malloc (sizeof (uint32_t)(256+256+256));
1687	lookup_r = lookup;	1684	lookup_r = lookup;
1688	lookup_g = lookup+256;	1685	lookup_g = lookup+256;
1689	lookup_b = lookup+256+256;	1686	lookup_b = lookup+256+256;
1690	sh_r = 16;	1687	sh_r = 16;
1691	sh_g = 8;	1688	sh_g = 8;
…		…
1702		1699
1703	lower_lim_r = 65535-rm;	1700	lower_lim_r = 65535-rm;
1704	lower_lim_g = 65535-gm;	1701	lower_lim_g = 65535-gm;
1705	lower_lim_b = 65535-bm;	1702	lower_lim_b = 65535-bm;
1706		1703
1707	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);	1704	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);	1705	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);	1706	lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1710		1707
1711	upper_lim_r = upper_lim_g = upper_lim_b = 65535;	1708	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1712	}	1709	}
1713	else	1710	else
1714	{	1711	{
1715		1712
1716	lower_lim_r = lower_lim_g = lower_lim_b = 0;	1713	lower_lim_r = lower_lim_g = lower_lim_b = 0;
1717		1714
1718	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);	1715	upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1719	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);	1716	upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1720	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);	1717	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	}	1718	}
1736		1719
1737	/* fill our lookup tables */	1720	/* fill our lookup tables */
1738	for (i = 0; i <= mask_r>>sh_r; i++)	1721	for (i = 0; i <= mask_r>>sh_r; i++)
1739	{	1722	{
1740	RUINT32T tmp;	1723	uint32_t tmp;
1741	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));	1724	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1742	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);	1725	tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1743	lookup_r[i] = (tmp/65535)<<sh_r;	1726	lookup_r[i] = (tmp/65535)<<sh_r;
1744	}	1727	}
1745	for (i = 0; i <= mask_g>>sh_g; i++)	1728	for (i = 0; i <= mask_g>>sh_g; i++)
1746	{	1729	{
1747	RUINT32T tmp;	1730	uint32_t tmp;
1748	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));	1731	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1749	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);	1732	tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1750	lookup_g[i] = (tmp/65535)<<sh_g;	1733	lookup_g[i] = (tmp/65535)<<sh_g;
1751	}	1734	}
1752	for (i = 0; i <= mask_b>>sh_b; i++)	1735	for (i = 0; i <= mask_b>>sh_b; i++)
1753	{	1736	{
1754	RUINT32T tmp;	1737	uint32_t tmp;
1755	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));	1738	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1756	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);	1739	tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1757	lookup_b[i] = (tmp/65535)<<sh_b;	1740	lookup_b[i] = (tmp/65535)<<sh_b;
1758	}	1741	}
1759		1742
1760	/* apply table to input image (replacing colors by newly calculated ones) */	1743	/* apply table to input image (replacing colors by newly calculated ones) */
1761	switch (srcImage->bits_per_pixel)	1744	if (srcImage->bits_per_pixel == 32
		1745	&& (srcImage->depth == 24 \|\| srcImage->depth == 32)
		1746	&& srcImage->byte_order == host_byte_order)
1762	{	1747	{
1763	case 15:	1748	uint32_t p1, pf, p, pl;
1764	{
1765	unsigned short p1, pf, p, pl;
1766	p1 = (unsigned short *) srcImage->data;	1749	p1 = (uint32_t *) srcImage->data;
1767	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);	1750	pf = (uint32_t ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
		1751
1768	while (p1 < pf)	1752	while (p1 < pf)
1769	{	1753	{
1770	p = p1;	1754	p = p1;
1771	pl = p1 + srcImage->width;	1755	pl = p1 + srcImage->width;
1772	for (; p < pl; p++)	1756	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	}	1757	{
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] \|	1758	p = lookup_r[(p & 0xff0000) >> 16] \|
1833	lookup_g[(*p & 0x00ff00)>> 8] \|	1759	lookup_g[(*p & 0x00ff00) >> 8] \|
1834	lookup_b[(*p & 0x0000ff)] \|	1760	lookup_b[(*p & 0x0000ff)] \|
1835	(*p & ~0xffffff);	1761	(*p & 0xff000000);
1836	}	1762	}
1837	p1 = (RUINT32T ) ((char ) p1 + srcImage->bytes_per_line);	1763	p1 = (uint32_t ) ((char ) p1 + srcImage->bytes_per_line);
		1764	}
		1765	}
		1766	else
		1767	{
		1768	for (int y = 0; y < srcImage->height; y++)
		1769	for (int x = 0; x < srcImage->width; x++)
		1770	{
		1771	unsigned long pixel = XGetPixel (srcImage, x, y);
		1772	pixel = lookup_r[(pixel & mask_r) >> sh_r] \|
		1773	lookup_g[(pixel & mask_g) >> sh_g] \|
		1774	lookup_b[(pixel & mask_b) >> sh_b];
		1775	XPutPixel (srcImage, x, y, pixel);
1838	}	1776	}
1839	break;
1840	}
1841	}	1777	}
1842		1778
1843	free (lookup);	1779	free (lookup);
1844	}	1780	}
1845	#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */	1781	#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.90 by sf-exg, Mon Oct 18 16:02:48 2010 UTC vs. Revision 1.94 by sf-exg, Wed Oct 20 09:04:55 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.90 by sf-exg, Mon Oct 18 16:02:48 2010 UTC vs.
Revision 1.94 by sf-exg, Wed Oct 20 09:04:55 2010 UTC