[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.97 by sf-exg, Fri Oct 22 18:03:10 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)
…		…
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)
…		…
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	}
…		…
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)
…		…
1367	{	1357	{
1368	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);	1358	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1369	result \|= transpPmapTiled;	1359	result \|= transpPmapTiled;
1370	XFreeGC (dpy, gc);	1360	XFreeGC (dpy, gc);
1371	}	1361	}
1372	TIMING_TEST_PRINT_RESULT (tp);
1373		1362
1374	if (tiled_root_pmap != None)	1363	if (tiled_root_pmap != None)
1375	{	1364	{
1376	if (!need_client_side_rendering ())	1365	if (!need_client_side_rendering ())
1377	{	1366	{
…		…
1394	pmap_width = window_width;	1383	pmap_width = window_width;
1395	pmap_height = window_height;	1384	pmap_height = window_height;
1396	pmap_depth = root_depth;	1385	pmap_depth = root_depth;
1397	}	1386	}
1398		1387
1399	TIMING_TEST_PRINT_RESULT (tp);
1400
1401	return result;	1388	return result;
1402	}	1389	}
1403		1390
1404	bool	1391	bool
1405	bgPixmap_t::set_root_pixmap ()	1392	bgPixmap_t::set_root_pixmap ()
…		…
1417	return false;	1404	return false;
1418	}	1405	}
1419	# endif /* ENABLE_TRANSPARENCY */	1406	# endif /* ENABLE_TRANSPARENCY */
1420		1407
1421	# ifndef HAVE_AFTERIMAGE	1408	# ifndef HAVE_AFTERIMAGE
1422	static void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm);	1409	static void ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm);
1423	# endif	1410	# endif
1424		1411
1425	bool	1412	bool
1426	bgPixmap_t::render ()	1413	bgPixmap_t::render ()
1427	{	1414	{
1428	unsigned long background_flags = 0;	1415	unsigned long background_flags = 0;
1429		1416
1430	if (target == NULL)	1417	if (target == NULL)
1431	return false;	1418	return false;
1432
1433	TIMING_TEST_START (tp);
1434		1419
1435	invalidate ();	1420	invalidate ();
1436	# ifdef ENABLE_TRANSPARENCY	1421	# ifdef ENABLE_TRANSPARENCY
1437	if (flags & isTransparent)	1422	if (flags & isTransparent)
1438	{	1423	{
…		…
1471	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1456	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472	{	1457	{
1473	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1458	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474	if (flags & tintSet)	1459	if (flags & tintSet)
1475	tint.get (c);	1460	tint.get (c);
1476	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1461	ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1477	}	1462	}
1478	# endif	1463	# endif
1479		1464
1480	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1465	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481		1466
…		…
1527	}	1512	}
1528	}	1513	}
1529		1514
1530	apply ();	1515	apply ();
1531		1516
1532	XSync (target->dpy, False);
1533	valid_since = ev::now ();	1517	valid_since = ev::now ();
1534
1535	TIMING_TEST_PRINT_RESULT (tp);
1536		1518
1537	return true;	1519	return true;
1538	}	1520	}
1539		1521
1540	bool	1522	bool
…		…
1556	void	1538	void
1557	bgPixmap_t::apply ()	1539	bgPixmap_t::apply ()
1558	{	1540	{
1559	if (target)	1541	if (target)
1560	{	1542	{
1561	flags &= ~isVtOrigin;
1562
1563	if (pixmap != None)	1543	if (pixmap != None)
1564	{	1544	{
1565	/* set target's background to pixmap */	1545	/* set target's background to pixmap */
1566	# ifdef ENABLE_TRANSPARENCY	1546	# ifdef ENABLE_TRANSPARENCY
1567	if (flags & isTransparent)	1547	if (flags & isTransparent)
…		…
1573	XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);	1553	XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1574	}	1554	}
1575	else	1555	else
1576	# endif	1556	# endif
1577	{	1557	{
1578	flags \|= isVtOrigin;
1579	/* force old pixmap dereference in case it was transparent before :*/	1558	/* force old pixmap dereference in case it was transparent before :*/
1580	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);	1559	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1581	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);	1560	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1582	/* do we also need to set scrollbar's background here ? */	1561	/* do we also need to set scrollbar's background here ? */
1583		1562
…		…
1613	#endif /* HAVE_BG_PIXMAP */	1592	#endif /* HAVE_BG_PIXMAP */
1614		1593
1615	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT	1594	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1616	/* taken from aterm-0.4.2 */	1595	/* taken from aterm-0.4.2 */
1617		1596
1618	typedef uint32_t RUINT32T;
1619
1620	static void	1597	static void
1621	ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)	1598	ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm)
1622	{	1599	{
1623	int sh_r, sh_g, sh_b;	1600	int sh_r, sh_g, sh_b;
1624	RUINT32T mask_r, mask_g, mask_b;	1601	uint32_t mask_r, mask_g, mask_b;
1625	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	1602	uint32_t lookup, lookup_r, lookup_g, lookup_b;
1626	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	1603	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1627	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	1604	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1628	int i;	1605	int i;
1629		1606	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1630	Visual *visual = term->visual;
1631		1607
1632	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;	1608	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;
1633		1609
1634	/* for convenience */	1610	/* for convenience */
1635	mask_r = visual->red_mask;	1611	mask_r = visual->red_mask;
1636	mask_g = visual->green_mask;	1612	mask_g = visual->green_mask;
1637	mask_b = visual->blue_mask;	1613	mask_b = visual->blue_mask;
1638		1614
1639	/* boring lookup table pre-initialization */	1615	/* boring lookup table pre-initialization */
1640	switch (srcImage->bits_per_pixel)	1616	switch (srcImage->depth)
1641	{	1617	{
1642	case 15:	1618	case 15:
1643	if ((mask_r != 0x7c00) \|\|	1619	if ((mask_r != 0x7c00) \|\|
1644	(mask_g != 0x03e0) \|\|	1620	(mask_g != 0x03e0) \|\|
1645	(mask_b != 0x001f))	1621	(mask_b != 0x001f))
1646	return;	1622	return;
1647	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+32+32));	1623	lookup = (uint32_t ) malloc (sizeof (uint32_t)(32+32+32));
1648	lookup_r = lookup;	1624	lookup_r = lookup;
1649	lookup_g = lookup+32;	1625	lookup_g = lookup+32;
1650	lookup_b = lookup+32+32;	1626	lookup_b = lookup+32+32;
1651	sh_r = 10;	1627	sh_r = 10;
1652	sh_g = 5;	1628	sh_g = 5;
…		…
1655	case 16:	1631	case 16:
1656	if ((mask_r != 0xf800) \|\|	1632	if ((mask_r != 0xf800) \|\|
1657	(mask_g != 0x07e0) \|\|	1633	(mask_g != 0x07e0) \|\|
1658	(mask_b != 0x001f))	1634	(mask_b != 0x001f))
1659	return;	1635	return;
1660	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+64+32));	1636	lookup = (uint32_t ) malloc (sizeof (uint32_t)(32+64+32));
1661	lookup_r = lookup;	1637	lookup_r = lookup;
1662	lookup_g = lookup+32;	1638	lookup_g = lookup+32;
1663	lookup_b = lookup+32+64;	1639	lookup_b = lookup+32+64;
1664	sh_r = 11;	1640	sh_r = 11;
1665	sh_g = 5;	1641	sh_g = 5;
…		…
1668	case 24:	1644	case 24:
1669	if ((mask_r != 0xff0000) \|\|	1645	if ((mask_r != 0xff0000) \|\|
1670	(mask_g != 0x00ff00) \|\|	1646	(mask_g != 0x00ff00) \|\|
1671	(mask_b != 0x0000ff))	1647	(mask_b != 0x0000ff))
1672	return;	1648	return;
1673	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));	1649	lookup = (uint32_t ) malloc (sizeof (uint32_t)(256+256+256));
1674	lookup_r = lookup;	1650	lookup_r = lookup;
1675	lookup_g = lookup+256;	1651	lookup_g = lookup+256;
1676	lookup_b = lookup+256+256;	1652	lookup_b = lookup+256+256;
1677	sh_r = 16;	1653	sh_r = 16;
1678	sh_g = 8;	1654	sh_g = 8;
…		…
1681	case 32:	1657	case 32:
1682	if ((mask_r != 0xff0000) \|\|	1658	if ((mask_r != 0xff0000) \|\|
1683	(mask_g != 0x00ff00) \|\|	1659	(mask_g != 0x00ff00) \|\|
1684	(mask_b != 0x0000ff))	1660	(mask_b != 0x0000ff))
1685	return;	1661	return;
1686	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));	1662	lookup = (uint32_t ) malloc (sizeof (uint32_t)(256+256+256));
1687	lookup_r = lookup;	1663	lookup_r = lookup;
1688	lookup_g = lookup+256;	1664	lookup_g = lookup+256;
1689	lookup_b = lookup+256+256;	1665	lookup_b = lookup+256+256;
1690	sh_r = 16;	1666	sh_r = 16;
1691	sh_g = 8;	1667	sh_g = 8;
…		…
1702		1678
1703	lower_lim_r = 65535-rm;	1679	lower_lim_r = 65535-rm;
1704	lower_lim_g = 65535-gm;	1680	lower_lim_g = 65535-gm;
1705	lower_lim_b = 65535-bm;	1681	lower_lim_b = 65535-bm;
1706		1682
1707	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);	1683	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);	1684	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);	1685	lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1710		1686
1711	upper_lim_r = upper_lim_g = upper_lim_b = 65535;	1687	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1712	}	1688	}
1713	else	1689	else
1714	{	1690	{
1715		1691
1716	lower_lim_r = lower_lim_g = lower_lim_b = 0;	1692	lower_lim_r = lower_lim_g = lower_lim_b = 0;
1717		1693
1718	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);	1694	upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1719	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);	1695	upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1720	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);	1696	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	}	1697	}
1736		1698
1737	/* fill our lookup tables */	1699	/* fill our lookup tables */
1738	for (i = 0; i <= mask_r>>sh_r; i++)	1700	for (i = 0; i <= mask_r>>sh_r; i++)
1739	{	1701	{
1740	RUINT32T tmp;	1702	uint32_t tmp;
1741	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));	1703	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1742	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);	1704	tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1743	lookup_r[i] = (tmp/65535)<<sh_r;	1705	lookup_r[i] = (tmp/65535)<<sh_r;
1744	}	1706	}
1745	for (i = 0; i <= mask_g>>sh_g; i++)	1707	for (i = 0; i <= mask_g>>sh_g; i++)
1746	{	1708	{
1747	RUINT32T tmp;	1709	uint32_t tmp;
1748	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));	1710	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1749	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);	1711	tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1750	lookup_g[i] = (tmp/65535)<<sh_g;	1712	lookup_g[i] = (tmp/65535)<<sh_g;
1751	}	1713	}
1752	for (i = 0; i <= mask_b>>sh_b; i++)	1714	for (i = 0; i <= mask_b>>sh_b; i++)
1753	{	1715	{
1754	RUINT32T tmp;	1716	uint32_t tmp;
1755	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));	1717	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1756	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);	1718	tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1757	lookup_b[i] = (tmp/65535)<<sh_b;	1719	lookup_b[i] = (tmp/65535)<<sh_b;
1758	}	1720	}
1759		1721
1760	/* apply table to input image (replacing colors by newly calculated ones) */	1722	/* apply table to input image (replacing colors by newly calculated ones) */
1761	switch (srcImage->bits_per_pixel)	1723	if (srcImage->bits_per_pixel == 32
		1724	&& (srcImage->depth == 24 \|\| srcImage->depth == 32)
		1725	&& srcImage->byte_order == host_byte_order)
1762	{	1726	{
1763	case 15:	1727	uint32_t p1, pf, p, pl;
1764	{
1765	unsigned short p1, pf, p, pl;
1766	p1 = (unsigned short *) srcImage->data;	1728	p1 = (uint32_t *) srcImage->data;
1767	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);	1729	pf = (uint32_t ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
		1730
1768	while (p1 < pf)	1731	while (p1 < pf)
1769	{	1732	{
1770	p = p1;	1733	p = p1;
1771	pl = p1 + srcImage->width;	1734	pl = p1 + srcImage->width;
1772	for (; p < pl; p++)	1735	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	}	1736	{
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] \|	1737	p = lookup_r[(p & 0xff0000) >> 16] \|
1833	lookup_g[(*p & 0x00ff00)>> 8] \|	1738	lookup_g[(*p & 0x00ff00) >> 8] \|
1834	lookup_b[(*p & 0x0000ff)] \|	1739	lookup_b[(*p & 0x0000ff)] \|
1835	(*p & ~0xffffff);	1740	(*p & 0xff000000);
1836	}	1741	}
1837	p1 = (RUINT32T ) ((char ) p1 + srcImage->bytes_per_line);	1742	p1 = (uint32_t ) ((char ) p1 + srcImage->bytes_per_line);
		1743	}
		1744	}
		1745	else
		1746	{
		1747	for (int y = 0; y < srcImage->height; y++)
		1748	for (int x = 0; x < srcImage->width; x++)
		1749	{
		1750	unsigned long pixel = XGetPixel (srcImage, x, y);
		1751	pixel = lookup_r[(pixel & mask_r) >> sh_r] \|
		1752	lookup_g[(pixel & mask_g) >> sh_g] \|
		1753	lookup_b[(pixel & mask_b) >> sh_b];
		1754	XPutPixel (srcImage, x, y, pixel);
1838	}	1755	}
1839	break;
1840	}
1841	}	1756	}
1842		1757
1843	free (lookup);	1758	free (lookup);
1844	}	1759	}
1845	#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */	1760	#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.97 by sf-exg, Fri Oct 22 18:03:10 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.97 by sf-exg, Fri Oct 22 18:03:10 2010 UTC