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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.91 by sf-exg, Mon Oct 18 16:10:35 2010 UTC vs.
Revision 1.100 by sf-exg, Sat Oct 30 23:15:14 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)
…		…
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	{
…		…
1313	Window root = target->display->root;	1304	Window root = target->display->root;
1314	int screen = target->display->screen;	1305	int screen = target->display->screen;
1315	Display *dpy = target->dpy;	1306	Display *dpy = target->dpy;
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;
1319	int window_width = target->szHint.width;	1309	int window_width = target->szHint.width;
1320	int window_height = target->szHint.height;	1310	int window_height = target->szHint.height;
1321	int sx, sy;	1311	int sx, sy;
1322	XGCValues gcv;	1312	XGCValues gcv;
1323	GC gc;	1313	GC gc;
1324		1314
1325	TIMING_TEST_START (tp);
1326	target->get_window_origin (sx, sy);	1315	target->get_window_origin (sx, sy);
1327		1316
1328	/* check if we are outside of the visible part of the virtual screen : */	1317	/* check if we are outside of the visible part of the virtual screen : */
1329	if (sx + window_width <= 0 \|\| sy + window_height <= 0	1318	if (sx + window_width <= 0 \|\| sy + window_height <= 0
1330	\|\| sx >= root_width \|\| sy >= root_height)	1319	\|\| sx >= root_width \|\| sy >= root_height)
1331	return 0;	1320	return 0;
1332		1321
1333	if (root_pixmap != None)
1334	{
1335	/* we want to validate the pixmap and get its size at the same time : */
1336	int junk;
1337	unsigned int ujunk;
1338	/* root pixmap may be bad - allow a error */
1339	target->allowedxerror = -1;
1340
1341	if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk))
1342	root_pixmap = None;
1343
1344	target->allowedxerror = 0;
1345	}
1346
1347	if (root_pixmap == None)	1322	if (root_pixmap == None)
1348	return 0;	1323	return 0;
1349		1324
1350	Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);	1325	Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
1351		1326
…		…
1367	{	1342	{
1368	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);	1343	XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1369	result \|= transpPmapTiled;	1344	result \|= transpPmapTiled;
1370	XFreeGC (dpy, gc);	1345	XFreeGC (dpy, gc);
1371	}	1346	}
1372	TIMING_TEST_PRINT_RESULT (tp);
1373		1347
1374	if (tiled_root_pmap != None)	1348	if (tiled_root_pmap != None)
1375	{	1349	{
1376	if (!need_client_side_rendering ())	1350	if (!need_client_side_rendering ())
1377	{	1351	{
…		…
1394	pmap_width = window_width;	1368	pmap_width = window_width;
1395	pmap_height = window_height;	1369	pmap_height = window_height;
1396	pmap_depth = root_depth;	1370	pmap_depth = root_depth;
1397	}	1371	}
1398		1372
1399	TIMING_TEST_PRINT_RESULT (tp);
1400
1401	return result;	1373	return result;
1402	}	1374	}
1403		1375
1404	bool	1376	void
1405	bgPixmap_t::set_root_pixmap ()	1377	bgPixmap_t::set_root_pixmap ()
1406	{	1378	{
1407	Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);	1379	Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1408	if (new_root_pixmap == None)	1380	if (new_root_pixmap == None)
1409	new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);	1381	new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1410		1382
1411	if (new_root_pixmap != root_pixmap)
1412	{
1413	root_pixmap = new_root_pixmap;	1383	root_pixmap = new_root_pixmap;
1414	return true;	1384
		1385	// validate root pixmap
		1386	if (root_pixmap != None)
1415	}	1387	{
		1388	unsigned int width, height;
		1389	Window wdummy;
		1390	int idummy;
		1391	unsigned int udummy;
1416		1392
1417	return false;	1393	target->allowedxerror = -1;
		1394
		1395	if (!XGetGeometry (target->dpy, root_pixmap, &wdummy, &idummy, &idummy, &width, &height, &udummy, &udummy))
		1396	root_pixmap = None;
		1397
		1398	target->allowedxerror = 0;
		1399	}
1418	}	1400	}
1419	# endif /* ENABLE_TRANSPARENCY */	1401	# endif /* ENABLE_TRANSPARENCY */
1420		1402
1421	# ifndef HAVE_AFTERIMAGE	1403	# ifndef HAVE_AFTERIMAGE
1422	static void ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm);	1404	static void ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm);
…		…
1427	{	1409	{
1428	unsigned long background_flags = 0;	1410	unsigned long background_flags = 0;
1429		1411
1430	if (target == NULL)	1412	if (target == NULL)
1431	return false;	1413	return false;
1432
1433	TIMING_TEST_START (tp);
1434		1414
1435	invalidate ();	1415	invalidate ();
1436	# ifdef ENABLE_TRANSPARENCY	1416	# ifdef ENABLE_TRANSPARENCY
1437	if (flags & isTransparent)	1417	if (flags & isTransparent)
1438	{	1418	{
…		…
1464		1444
1465	if (result)	1445	if (result)
1466	{	1446	{
1467	# if !defined(HAVE_AFTERIMAGE) && !XFT	1447	# if !defined(HAVE_AFTERIMAGE) && !XFT
1468	/* our own client-side tinting */	1448	/* 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))	1449	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472	{	1450	{
1473	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1451	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474	if (flags & tintSet)	1452	if (flags & tintSet)
1475	tint.get (c);	1453	tint.get (c);
…		…
1527	}	1505	}
1528	}	1506	}
1529		1507
1530	apply ();	1508	apply ();
1531		1509
1532	XSync (target->dpy, False);
1533	valid_since = ev::now ();	1510	valid_since = ev::now ();
1534
1535	TIMING_TEST_PRINT_RESULT (tp);
1536		1511
1537	return true;	1512	return true;
1538	}	1513	}
1539		1514
1540	bool	1515	bool
…		…
1556	void	1531	void
1557	bgPixmap_t::apply ()	1532	bgPixmap_t::apply ()
1558	{	1533	{
1559	if (target)	1534	if (target)
1560	{	1535	{
1561	flags &= ~isVtOrigin;
1562
1563	if (pixmap != None)	1536	if (pixmap != None)
1564	{	1537	{
1565	/* set target's background to pixmap */	1538	/* set target's background to pixmap */
1566	# ifdef ENABLE_TRANSPARENCY	1539	# ifdef ENABLE_TRANSPARENCY
1567	if (flags & isTransparent)	1540	if (flags & isTransparent)
…		…
1573	XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);	1546	XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1574	}	1547	}
1575	else	1548	else
1576	# endif	1549	# endif
1577	{	1550	{
1578	flags \|= isVtOrigin;
1579	/* force old pixmap dereference in case it was transparent before :*/	1551	/* force old pixmap dereference in case it was transparent before :*/
1580	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);	1552	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1581	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);	1553	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1582	/* do we also need to set scrollbar's background here ? */	1554	/* do we also need to set scrollbar's background here ? */
1583		1555
…		…
1613	#endif /* HAVE_BG_PIXMAP */	1585	#endif /* HAVE_BG_PIXMAP */
1614		1586
1615	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT	1587	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1616	/* taken from aterm-0.4.2 */	1588	/* taken from aterm-0.4.2 */
1617		1589
1618	typedef uint32_t RUINT32T;
1619
1620	static void	1590	static void
1621	ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm)	1591	ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm)
1622	{	1592	{
1623	int sh_r, sh_g, sh_b;	1593	int sh_r, sh_g, sh_b;
1624	RUINT32T mask_r, mask_g, mask_b;	1594	uint32_t mask_r, mask_g, mask_b;
1625	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	1595	uint32_t lookup, lookup_r, lookup_g, lookup_b;
1626	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	1596	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1627	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	1597	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1628	int i;	1598	int i;
		1599	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1629		1600
1630	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;	1601	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;
1631		1602
1632	/* for convenience */	1603	/* for convenience */
1633	mask_r = visual->red_mask;	1604	mask_r = visual->red_mask;
1634	mask_g = visual->green_mask;	1605	mask_g = visual->green_mask;
1635	mask_b = visual->blue_mask;	1606	mask_b = visual->blue_mask;
1636		1607
1637	/* boring lookup table pre-initialization */	1608	/* boring lookup table pre-initialization */
1638	switch (srcImage->bits_per_pixel)	1609	switch (srcImage->depth)
1639	{	1610	{
1640	case 15:	1611	case 15:
1641	if ((mask_r != 0x7c00) \|\|	1612	if ((mask_r != 0x7c00) \|\|
1642	(mask_g != 0x03e0) \|\|	1613	(mask_g != 0x03e0) \|\|
1643	(mask_b != 0x001f))	1614	(mask_b != 0x001f))
1644	return;	1615	return;
1645	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+32+32));	1616	lookup = (uint32_t ) malloc (sizeof (uint32_t)(32+32+32));
1646	lookup_r = lookup;	1617	lookup_r = lookup;
1647	lookup_g = lookup+32;	1618	lookup_g = lookup+32;
1648	lookup_b = lookup+32+32;	1619	lookup_b = lookup+32+32;
1649	sh_r = 10;	1620	sh_r = 10;
1650	sh_g = 5;	1621	sh_g = 5;
…		…
1653	case 16:	1624	case 16:
1654	if ((mask_r != 0xf800) \|\|	1625	if ((mask_r != 0xf800) \|\|
1655	(mask_g != 0x07e0) \|\|	1626	(mask_g != 0x07e0) \|\|
1656	(mask_b != 0x001f))	1627	(mask_b != 0x001f))
1657	return;	1628	return;
1658	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+64+32));	1629	lookup = (uint32_t ) malloc (sizeof (uint32_t)(32+64+32));
1659	lookup_r = lookup;	1630	lookup_r = lookup;
1660	lookup_g = lookup+32;	1631	lookup_g = lookup+32;
1661	lookup_b = lookup+32+64;	1632	lookup_b = lookup+32+64;
1662	sh_r = 11;	1633	sh_r = 11;
1663	sh_g = 5;	1634	sh_g = 5;
…		…
1666	case 24:	1637	case 24:
1667	if ((mask_r != 0xff0000) \|\|	1638	if ((mask_r != 0xff0000) \|\|
1668	(mask_g != 0x00ff00) \|\|	1639	(mask_g != 0x00ff00) \|\|
1669	(mask_b != 0x0000ff))	1640	(mask_b != 0x0000ff))
1670	return;	1641	return;
1671	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));	1642	lookup = (uint32_t ) malloc (sizeof (uint32_t)(256+256+256));
1672	lookup_r = lookup;	1643	lookup_r = lookup;
1673	lookup_g = lookup+256;	1644	lookup_g = lookup+256;
1674	lookup_b = lookup+256+256;	1645	lookup_b = lookup+256+256;
1675	sh_r = 16;	1646	sh_r = 16;
1676	sh_g = 8;	1647	sh_g = 8;
…		…
1679	case 32:	1650	case 32:
1680	if ((mask_r != 0xff0000) \|\|	1651	if ((mask_r != 0xff0000) \|\|
1681	(mask_g != 0x00ff00) \|\|	1652	(mask_g != 0x00ff00) \|\|
1682	(mask_b != 0x0000ff))	1653	(mask_b != 0x0000ff))
1683	return;	1654	return;
1684	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));	1655	lookup = (uint32_t ) malloc (sizeof (uint32_t)(256+256+256));
1685	lookup_r = lookup;	1656	lookup_r = lookup;
1686	lookup_g = lookup+256;	1657	lookup_g = lookup+256;
1687	lookup_b = lookup+256+256;	1658	lookup_b = lookup+256+256;
1688	sh_r = 16;	1659	sh_r = 16;
1689	sh_g = 8;	1660	sh_g = 8;
…		…
1700		1671
1701	lower_lim_r = 65535-rm;	1672	lower_lim_r = 65535-rm;
1702	lower_lim_g = 65535-gm;	1673	lower_lim_g = 65535-gm;
1703	lower_lim_b = 65535-bm;	1674	lower_lim_b = 65535-bm;
1704		1675
1705	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);	1676	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);	1677	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);	1678	lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1708		1679
1709	upper_lim_r = upper_lim_g = upper_lim_b = 65535;	1680	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1710	}	1681	}
1711	else	1682	else
1712	{	1683	{
1713		1684
1714	lower_lim_r = lower_lim_g = lower_lim_b = 0;	1685	lower_lim_r = lower_lim_g = lower_lim_b = 0;
1715		1686
1716	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);	1687	upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1717	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);	1688	upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1718	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);	1689	upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1719	}
1720
1721	/* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1722	if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000))
1723	{
1724	unsigned int tmp;
1725
1726	tmp = lower_lim_r;
1727	lower_lim_r = lower_lim_b;
1728	lower_lim_b = tmp;
1729
1730	tmp = upper_lim_r;
1731	upper_lim_r = upper_lim_b;
1732	upper_lim_b = tmp;
1733	}	1690	}
1734		1691
1735	/* fill our lookup tables */	1692	/* fill our lookup tables */
1736	for (i = 0; i <= mask_r>>sh_r; i++)	1693	for (i = 0; i <= mask_r>>sh_r; i++)
1737	{	1694	{
1738	RUINT32T tmp;	1695	uint32_t tmp;
1739	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));	1696	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1740	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);	1697	tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1741	lookup_r[i] = (tmp/65535)<<sh_r;	1698	lookup_r[i] = (tmp/65535)<<sh_r;
1742	}	1699	}
1743	for (i = 0; i <= mask_g>>sh_g; i++)	1700	for (i = 0; i <= mask_g>>sh_g; i++)
1744	{	1701	{
1745	RUINT32T tmp;	1702	uint32_t tmp;
1746	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));	1703	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1747	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);	1704	tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1748	lookup_g[i] = (tmp/65535)<<sh_g;	1705	lookup_g[i] = (tmp/65535)<<sh_g;
1749	}	1706	}
1750	for (i = 0; i <= mask_b>>sh_b; i++)	1707	for (i = 0; i <= mask_b>>sh_b; i++)
1751	{	1708	{
1752	RUINT32T tmp;	1709	uint32_t tmp;
1753	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));	1710	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1754	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);	1711	tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1755	lookup_b[i] = (tmp/65535)<<sh_b;	1712	lookup_b[i] = (tmp/65535)<<sh_b;
1756	}	1713	}
1757		1714
1758	/* apply table to input image (replacing colors by newly calculated ones) */	1715	/* apply table to input image (replacing colors by newly calculated ones) */
1759	switch (srcImage->bits_per_pixel)	1716	if (srcImage->bits_per_pixel == 32
		1717	&& (srcImage->depth == 24 \|\| srcImage->depth == 32)
		1718	&& srcImage->byte_order == host_byte_order)
1760	{	1719	{
1761	case 15:	1720	uint32_t p1, pf, p, pl;
1762	{
1763	unsigned short p1, pf, p, pl;
1764	p1 = (unsigned short *) srcImage->data;	1721	p1 = (uint32_t *) srcImage->data;
1765	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);	1722	pf = (uint32_t ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
		1723
1766	while (p1 < pf)	1724	while (p1 < pf)
1767	{	1725	{
1768	p = p1;	1726	p = p1;
1769	pl = p1 + srcImage->width;	1727	pl = p1 + srcImage->width;
1770	for (; p < pl; p++)	1728	for (; p < pl; p++)
1771	{
1772	p = lookup_r[(p & 0x7c00)>>10] \|
1773	lookup_g[(*p & 0x03e0)>> 5] \|
1774	lookup_b[(*p & 0x001f)];
1775	}
1776	p1 = (unsigned short ) ((char ) p1 + srcImage->bytes_per_line);
1777	}	1729	{
1778	break;
1779	}
1780	case 16:
1781	{
1782	unsigned short p1, pf, p, pl;
1783	p1 = (unsigned short *) srcImage->data;
1784	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
1785	while (p1 < pf)
1786	{
1787	p = p1;
1788	pl = p1 + srcImage->width;
1789	for (; p < pl; p++)
1790	{
1791	p = lookup_r[(p & 0xf800)>>11] \|
1792	lookup_g[(*p & 0x07e0)>> 5] \|
1793	lookup_b[(*p & 0x001f)];
1794	}
1795	p1 = (unsigned short ) ((char ) p1 + srcImage->bytes_per_line);
1796	}
1797	break;
1798	}
1799	case 24:
1800	{
1801	unsigned char p1, pf, p, pl;
1802	p1 = (unsigned char *) srcImage->data;
1803	pf = (unsigned char ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
1804	while (p1 < pf)
1805	{
1806	p = p1;
1807	pl = p1 + srcImage->width * 3;
1808	for (; p < pl; p += 3)
1809	{
1810	p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1811	p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1812	p[2] = lookup_r[(p[2] & 0x0000ff)];
1813	}
1814	p1 = (unsigned char ) ((char ) p1 + srcImage->bytes_per_line);
1815	}
1816	break;
1817	}
1818	case 32:
1819	{
1820	RUINT32T p1, pf, p, pl;
1821	p1 = (RUINT32T *) srcImage->data;
1822	pf = (RUINT32T ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
1823
1824	while (p1 < pf)
1825	{
1826	p = p1;
1827	pl = p1 + srcImage->width;
1828	for (; p < pl; p++)
1829	{
1830	p = lookup_r[(p & 0xff0000)>>16] \|	1730	p = lookup_r[(p & 0xff0000) >> 16] \|
1831	lookup_g[(*p & 0x00ff00)>> 8] \|	1731	lookup_g[(*p & 0x00ff00) >> 8] \|
1832	lookup_b[(*p & 0x0000ff)] \|	1732	lookup_b[(*p & 0x0000ff)] \|
1833	(*p & ~0xffffff);	1733	(*p & 0xff000000);
1834	}	1734	}
1835	p1 = (RUINT32T ) ((char ) p1 + srcImage->bytes_per_line);	1735	p1 = (uint32_t ) ((char ) p1 + srcImage->bytes_per_line);
		1736	}
		1737	}
		1738	else
		1739	{
		1740	for (int y = 0; y < srcImage->height; y++)
		1741	for (int x = 0; x < srcImage->width; x++)
		1742	{
		1743	unsigned long pixel = XGetPixel (srcImage, x, y);
		1744	pixel = lookup_r[(pixel & mask_r) >> sh_r] \|
		1745	lookup_g[(pixel & mask_g) >> sh_g] \|
		1746	lookup_b[(pixel & mask_b) >> sh_b];
		1747	XPutPixel (srcImage, x, y, pixel);
1836	}	1748	}
1837	break;
1838	}
1839	}	1749	}
1840		1750
1841	free (lookup);	1751	free (lookup);
1842	}	1752	}
1843	#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */	1753	#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.91 by sf-exg, Mon Oct 18 16:10:35 2010 UTC vs. Revision 1.100 by sf-exg, Sat Oct 30 23:15:14 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.91 by sf-exg, Mon Oct 18 16:10:35 2010 UTC vs.
Revision 1.100 by sf-exg, Sat Oct 30 23:15:14 2010 UTC