[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.93 by sf-exg, Tue Oct 19 14:44:30 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
…		…
1616	/* taken from aterm-0.4.2 */	1616	/* taken from aterm-0.4.2 */
1617		1617
1618	typedef uint32_t RUINT32T;	1618	typedef uint32_t RUINT32T;
1619		1619
1620	static void	1620	static void
1621	ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)	1621	ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm)
1622	{	1622	{
1623	int sh_r, sh_g, sh_b;	1623	int sh_r, sh_g, sh_b;
1624	RUINT32T mask_r, mask_g, mask_b;	1624	RUINT32T mask_r, mask_g, mask_b;
1625	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	1625	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
1626	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	1626	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1627	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	1627	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1628	int i;	1628	int i;
1629		1629	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1630	Visual *visual = term->visual;
1631		1630
1632	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;	1631	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;
1633		1632
1634	/* for convenience */	1633	/* for convenience */
1635	mask_r = visual->red_mask;	1634	mask_r = visual->red_mask;
1636	mask_g = visual->green_mask;	1635	mask_g = visual->green_mask;
1637	mask_b = visual->blue_mask;	1636	mask_b = visual->blue_mask;
1638		1637
1639	/* boring lookup table pre-initialization */	1638	/* boring lookup table pre-initialization */
1640	switch (srcImage->bits_per_pixel)	1639	switch (srcImage->depth)
1641	{	1640	{
1642	case 15:	1641	case 15:
1643	if ((mask_r != 0x7c00) \|\|	1642	if ((mask_r != 0x7c00) \|\|
1644	(mask_g != 0x03e0) \|\|	1643	(mask_g != 0x03e0) \|\|
1645	(mask_b != 0x001f))	1644	(mask_b != 0x001f))
…		…
1718	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);	1717	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1719	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);	1718	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1720	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);	1719	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1721	}	1720	}
1722		1721
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	}
1736
1737	/* fill our lookup tables */	1722	/* fill our lookup tables */
1738	for (i = 0; i <= mask_r>>sh_r; i++)	1723	for (i = 0; i <= mask_r>>sh_r; i++)
1739	{	1724	{
1740	RUINT32T tmp;	1725	RUINT32T tmp;
1741	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));	1726	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
…		…
1756	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);	1741	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1757	lookup_b[i] = (tmp/65535)<<sh_b;	1742	lookup_b[i] = (tmp/65535)<<sh_b;
1758	}	1743	}
1759		1744
1760	/* apply table to input image (replacing colors by newly calculated ones) */	1745	/* apply table to input image (replacing colors by newly calculated ones) */
1761	switch (srcImage->bits_per_pixel)	1746	if (srcImage->bits_per_pixel == 32
		1747	&& (srcImage->depth == 24 \|\| srcImage->depth == 32)
		1748	&& srcImage->byte_order == host_byte_order)
1762	{	1749	{
1763	case 15:
1764	{
1765	unsigned short p1, pf, p, pl;
1766	p1 = (unsigned short *) srcImage->data;
1767	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
1768	while (p1 < pf)
1769	{
1770	p = p1;
1771	pl = p1 + srcImage->width;
1772	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	}
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;	1750	RUINT32T p1, pf, p, pl;
1823	p1 = (RUINT32T *) srcImage->data;	1751	p1 = (RUINT32T *) srcImage->data;
1824	pf = (RUINT32T ) (srcImage->data + srcImage->height srcImage->bytes_per_line);	1752	pf = (RUINT32T ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
1825		1753
1826	while (p1 < pf)	1754	while (p1 < pf)
1827	{	1755	{
1828	p = p1;	1756	p = p1;
1829	pl = p1 + srcImage->width;	1757	pl = p1 + srcImage->width;
1830	for (; p < pl; p++)	1758	for (; p < pl; p++)
1831	{	1759	{
1832	p = lookup_r[(p & 0xff0000)>>16] \|	1760	p = lookup_r[(p & 0xff0000) >> 16] \|
1833	lookup_g[(*p & 0x00ff00)>> 8] \|	1761	lookup_g[(*p & 0x00ff00) >> 8] \|
1834	lookup_b[(*p & 0x0000ff)] \|	1762	lookup_b[(*p & 0x0000ff)] \|
1835	(*p & ~0xffffff);	1763	(*p & 0xff000000);
1836	}	1764	}
1837	p1 = (RUINT32T ) ((char ) p1 + srcImage->bytes_per_line);	1765	p1 = (RUINT32T ) ((char ) p1 + srcImage->bytes_per_line);
		1766	}
		1767	}
		1768	else
		1769	{
		1770	for (int y = 0; y < srcImage->height; y++)
		1771	for (int x = 0; x < srcImage->width; x++)
		1772	{
		1773	unsigned long pixel = XGetPixel (srcImage, x, y);
		1774	pixel = lookup_r[(pixel & mask_r) >> sh_r] \|
		1775	lookup_g[(pixel & mask_g) >> sh_g] \|
		1776	lookup_b[(pixel & mask_b) >> sh_b];
		1777	XPutPixel (srcImage, x, y, pixel);
1838	}	1778	}
1839	break;
1840	}
1841	}	1779	}
1842		1780
1843	free (lookup);	1781	free (lookup);
1844	}	1782	}
1845	#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */	1783	#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.93 by sf-exg, Tue Oct 19 14:44:30 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.93 by sf-exg, Tue Oct 19 14:44:30 2010 UTC