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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.87 by sf-exg, Mon Oct 18 11:00:38 2010 UTC vs.
Revision 1.98 by sf-exg, Sat Oct 30 10:57:52 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)
…		…
1007	flags &= ~blurNeeded;	1001	flags &= ~blurNeeded;
1008	else	1002	else
1009	flags \|= blurNeeded;	1003	flags \|= blurNeeded;
1010		1004
1011	#if XFT	1005	#if XFT
1012	XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);	1006	XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013	if (filters)	1007	if (filters)
1014	{	1008	{
1015	for (int i = 0; i < filters->nfilter; i++)	1009	for (int i = 0; i < filters->nfilter; i++)
1016	if (!strcmp (filters->filter[i], FilterConvolution))	1010	if (!strcmp (filters->filter[i], FilterConvolution))
1017	flags \|= bgPixmap_t::blurServerSide;	1011	flags \|= bgPixmap_t::blurServerSide;
1018		1012
1019	XFree (filters);	1013	XFree (filters);
1020	}	1014	}
1021	#endif	1015	#endif
1022		1016
1023	return (changed > 0);	1017	return (changed > 0);
1024	}	1018	}
1025		1019
…		…
1117		1111
1118	#if XFT	1112	#if XFT
1119	static void	1113	static void
1120	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)	1114	get_gaussian_kernel (int radius, int width, double kernel, XFixed params)
1121	{	1115	{
1122	double sigma = radius / 2.0;	1116	double sigma = radius / 2.0;
1123	double scale = sqrt (2.0 * M_PI) * sigma;	1117	double scale = sqrt (2.0 * M_PI) * sigma;
1124	double sum = 0.0;	1118	double sum = 0.0;
1125		1119
1126	for (int i = 0; i < width; i++)	1120	for (int i = 0; i < width; i++)
1127	{	1121	{
1128	double x = i - width / 2;	1122	double x = i - width / 2;
1129	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;	1123	kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1130	sum += kernel[i];	1124	sum += kernel[i];
1131	}	1125	}
1132		1126
1133	params[0] = XDoubleToFixed (width);	1127	params[0] = XDoubleToFixed (width);
1134	params[1] = XDoubleToFixed (1);	1128	params[1] = XDoubleToFixed (1);
1135		1129
1136	for (int i = 0; i < width; i++)	1130	for (int i = 0; i < width; i++)
1137	params[i+2] = XDoubleToFixed (kernel[i] / sum);	1131	params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138	}	1132	}
1139	#endif	1133	#endif
1140		1134
1141	bool	1135	bool
1142	bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)	1136	bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
…		…
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	{
1378	if (flags & (blurNeeded \| blurServerSide))	1367	if (flags & (blurNeeded \| blurServerSide))
1379	{	1368	{
1380	if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))	1369	if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1381	result \|= transpPmapBlurred;	1370	result \|= transpPmapBlurred;
1382	}	1371	}
1383	if (flags & (tintNeeded \| tintServerSide))	1372	if (flags & (tintNeeded \| tintServerSide))
1384	{	1373	{
1385	if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))	1374	if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1386	result \|= transpPmapTinted;	1375	result \|= transpPmapTinted;
1387	}	1376	}
1388	} /* server side rendering completed */	1377	} /* server side rendering completed */
1389		1378
1390	if (pixmap)	1379	if (pixmap)
…		…
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	void
1405	bgPixmap_t::set_root_pixmap ()	1392	bgPixmap_t::set_root_pixmap ()
1406	{	1393	{
1407	Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);	1394	Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1408	if (new_root_pixmap == None)	1395	if (new_root_pixmap == None)
1409	new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);	1396	new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1410		1397
1411	if (new_root_pixmap != root_pixmap)
1412	{
1413	root_pixmap = new_root_pixmap;	1398	root_pixmap = new_root_pixmap;
1414	return true;
1415	}
1416
1417	return false;
1418	}	1399	}
1419	# endif /* ENABLE_TRANSPARENCY */	1400	# endif /* ENABLE_TRANSPARENCY */
1420		1401
1421	# ifndef HAVE_AFTERIMAGE	1402	# ifndef HAVE_AFTERIMAGE
1422	static void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm);	1403	static void ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm);
1423	# endif	1404	# endif
1424		1405
1425	bool	1406	bool
1426	bgPixmap_t::render ()	1407	bgPixmap_t::render ()
1427	{	1408	{
1428	unsigned long background_flags = 0;	1409	unsigned long background_flags = 0;
1429		1410
1430	if (target == NULL)	1411	if (target == NULL)
1431	return false;	1412	return false;
1432
1433	TIMING_TEST_START (tp);
1434		1413
1435	invalidate ();	1414	invalidate ();
1436	# ifdef ENABLE_TRANSPARENCY	1415	# ifdef ENABLE_TRANSPARENCY
1437	if (flags & isTransparent)	1416	if (flags & isTransparent)
1438	{	1417	{
…		…
1471	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))	1450	if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472	{	1451	{
1473	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);	1452	rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474	if (flags & tintSet)	1453	if (flags & tintSet)
1475	tint.get (c);	1454	tint.get (c);
1476	ShadeXImage (target, result, shade, c.r, c.g, c.b);	1455	ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1477	}	1456	}
1478	# endif	1457	# endif
1479		1458
1480	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);	1459	GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481		1460
…		…
1527	}	1506	}
1528	}	1507	}
1529		1508
1530	apply ();	1509	apply ();
1531		1510
1532	XSync (target->dpy, False);
1533	valid_since = ev::now ();	1511	valid_since = ev::now ();
1534
1535	TIMING_TEST_PRINT_RESULT (tp);
1536		1512
1537	return true;	1513	return true;
1538	}	1514	}
1539		1515
1540	bool	1516	bool
…		…
1556	void	1532	void
1557	bgPixmap_t::apply ()	1533	bgPixmap_t::apply ()
1558	{	1534	{
1559	if (target)	1535	if (target)
1560	{	1536	{
1561	flags &= ~isVtOrigin;
1562
1563	if (pixmap != None)	1537	if (pixmap != None)
1564	{	1538	{
1565	/* set target's background to pixmap */	1539	/* set target's background to pixmap */
1566	# ifdef ENABLE_TRANSPARENCY	1540	# ifdef ENABLE_TRANSPARENCY
1567	if (flags & isTransparent)	1541	if (flags & isTransparent)
…		…
1573	XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);	1547	XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1574	}	1548	}
1575	else	1549	else
1576	# endif	1550	# endif
1577	{	1551	{
1578	flags \|= isVtOrigin;
1579	/* force old pixmap dereference in case it was transparent before :*/	1552	/* force old pixmap dereference in case it was transparent before :*/
1580	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);	1553	XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1581	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);	1554	XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1582	/* do we also need to set scrollbar's background here ? */	1555	/* do we also need to set scrollbar's background here ? */
1583		1556
…		…
1613	#endif /* HAVE_BG_PIXMAP */	1586	#endif /* HAVE_BG_PIXMAP */
1614		1587
1615	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT	1588	#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1616	/* taken from aterm-0.4.2 */	1589	/* taken from aterm-0.4.2 */
1617		1590
1618	typedef uint32_t RUINT32T;
1619
1620	static void	1591	static void
1621	ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)	1592	ShadeXImage(Visual visual, XImage srcImage, int shade, int rm, int gm, int bm)
1622	{	1593	{
1623	int sh_r, sh_g, sh_b;	1594	int sh_r, sh_g, sh_b;
1624	RUINT32T mask_r, mask_g, mask_b;	1595	uint32_t mask_r, mask_g, mask_b;
1625	RUINT32T lookup, lookup_r, lookup_g, lookup_b;	1596	uint32_t lookup, lookup_r, lookup_g, lookup_b;
1626	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;	1597	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1627	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;	1598	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1628	int i;	1599	int i;
1629		1600	int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1630	Visual *visual = term->visual;
1631		1601
1632	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;	1602	if (visual->c_class != TrueColor \|\| srcImage->format != ZPixmap) return;
1633		1603
1634	/* for convenience */	1604	/* for convenience */
1635	mask_r = visual->red_mask;	1605	mask_r = visual->red_mask;
1636	mask_g = visual->green_mask;	1606	mask_g = visual->green_mask;
1637	mask_b = visual->blue_mask;	1607	mask_b = visual->blue_mask;
1638		1608
1639	/* boring lookup table pre-initialization */	1609	/* boring lookup table pre-initialization */
1640	switch (srcImage->bits_per_pixel)	1610	switch (srcImage->depth)
1641	{	1611	{
1642	case 15:	1612	case 15:
1643	if ((mask_r != 0x7c00) \|\|	1613	if ((mask_r != 0x7c00) \|\|
1644	(mask_g != 0x03e0) \|\|	1614	(mask_g != 0x03e0) \|\|
1645	(mask_b != 0x001f))	1615	(mask_b != 0x001f))
1646	return;	1616	return;
1647	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+32+32));	1617	lookup = (uint32_t ) malloc (sizeof (uint32_t)(32+32+32));
1648	lookup_r = lookup;	1618	lookup_r = lookup;
1649	lookup_g = lookup+32;	1619	lookup_g = lookup+32;
1650	lookup_b = lookup+32+32;	1620	lookup_b = lookup+32+32;
1651	sh_r = 10;	1621	sh_r = 10;
1652	sh_g = 5;	1622	sh_g = 5;
…		…
1655	case 16:	1625	case 16:
1656	if ((mask_r != 0xf800) \|\|	1626	if ((mask_r != 0xf800) \|\|
1657	(mask_g != 0x07e0) \|\|	1627	(mask_g != 0x07e0) \|\|
1658	(mask_b != 0x001f))	1628	(mask_b != 0x001f))
1659	return;	1629	return;
1660	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+64+32));	1630	lookup = (uint32_t ) malloc (sizeof (uint32_t)(32+64+32));
1661	lookup_r = lookup;	1631	lookup_r = lookup;
1662	lookup_g = lookup+32;	1632	lookup_g = lookup+32;
1663	lookup_b = lookup+32+64;	1633	lookup_b = lookup+32+64;
1664	sh_r = 11;	1634	sh_r = 11;
1665	sh_g = 5;	1635	sh_g = 5;
…		…
1668	case 24:	1638	case 24:
1669	if ((mask_r != 0xff0000) \|\|	1639	if ((mask_r != 0xff0000) \|\|
1670	(mask_g != 0x00ff00) \|\|	1640	(mask_g != 0x00ff00) \|\|
1671	(mask_b != 0x0000ff))	1641	(mask_b != 0x0000ff))
1672	return;	1642	return;
1673	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));	1643	lookup = (uint32_t ) malloc (sizeof (uint32_t)(256+256+256));
1674	lookup_r = lookup;	1644	lookup_r = lookup;
1675	lookup_g = lookup+256;	1645	lookup_g = lookup+256;
1676	lookup_b = lookup+256+256;	1646	lookup_b = lookup+256+256;
1677	sh_r = 16;	1647	sh_r = 16;
1678	sh_g = 8;	1648	sh_g = 8;
…		…
1681	case 32:	1651	case 32:
1682	if ((mask_r != 0xff0000) \|\|	1652	if ((mask_r != 0xff0000) \|\|
1683	(mask_g != 0x00ff00) \|\|	1653	(mask_g != 0x00ff00) \|\|
1684	(mask_b != 0x0000ff))	1654	(mask_b != 0x0000ff))
1685	return;	1655	return;
1686	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));	1656	lookup = (uint32_t ) malloc (sizeof (uint32_t)(256+256+256));
1687	lookup_r = lookup;	1657	lookup_r = lookup;
1688	lookup_g = lookup+256;	1658	lookup_g = lookup+256;
1689	lookup_b = lookup+256+256;	1659	lookup_b = lookup+256+256;
1690	sh_r = 16;	1660	sh_r = 16;
1691	sh_g = 8;	1661	sh_g = 8;
…		…
1702		1672
1703	lower_lim_r = 65535-rm;	1673	lower_lim_r = 65535-rm;
1704	lower_lim_g = 65535-gm;	1674	lower_lim_g = 65535-gm;
1705	lower_lim_b = 65535-bm;	1675	lower_lim_b = 65535-bm;
1706		1676
1707	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);	1677	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);	1678	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);	1679	lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1710		1680
1711	upper_lim_r = upper_lim_g = upper_lim_b = 65535;	1681	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1712	}	1682	}
1713	else	1683	else
1714	{	1684	{
1715		1685
1716	lower_lim_r = lower_lim_g = lower_lim_b = 0;	1686	lower_lim_r = lower_lim_g = lower_lim_b = 0;
1717		1687
1718	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);	1688	upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1719	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);	1689	upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1720	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);	1690	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	}	1691	}
1736		1692
1737	/* fill our lookup tables */	1693	/* fill our lookup tables */
1738	for (i = 0; i <= mask_r>>sh_r; i++)	1694	for (i = 0; i <= mask_r>>sh_r; i++)
1739	{	1695	{
1740	RUINT32T tmp;	1696	uint32_t tmp;
1741	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));	1697	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1742	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);	1698	tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1743	lookup_r[i] = (tmp/65535)<<sh_r;	1699	lookup_r[i] = (tmp/65535)<<sh_r;
1744	}	1700	}
1745	for (i = 0; i <= mask_g>>sh_g; i++)	1701	for (i = 0; i <= mask_g>>sh_g; i++)
1746	{	1702	{
1747	RUINT32T tmp;	1703	uint32_t tmp;
1748	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));	1704	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1749	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);	1705	tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1750	lookup_g[i] = (tmp/65535)<<sh_g;	1706	lookup_g[i] = (tmp/65535)<<sh_g;
1751	}	1707	}
1752	for (i = 0; i <= mask_b>>sh_b; i++)	1708	for (i = 0; i <= mask_b>>sh_b; i++)
1753	{	1709	{
1754	RUINT32T tmp;	1710	uint32_t tmp;
1755	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));	1711	tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1756	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);	1712	tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1757	lookup_b[i] = (tmp/65535)<<sh_b;	1713	lookup_b[i] = (tmp/65535)<<sh_b;
1758	}	1714	}
1759		1715
1760	/* apply table to input image (replacing colors by newly calculated ones) */	1716	/* apply table to input image (replacing colors by newly calculated ones) */
1761	switch (srcImage->bits_per_pixel)	1717	if (srcImage->bits_per_pixel == 32
		1718	&& (srcImage->depth == 24 \|\| srcImage->depth == 32)
		1719	&& srcImage->byte_order == host_byte_order)
1762	{	1720	{
1763	case 15:	1721	uint32_t p1, pf, p, pl;
1764	{
1765	unsigned short p1, pf, p, pl;
1766	p1 = (unsigned short *) srcImage->data;	1722	p1 = (uint32_t *) srcImage->data;
1767	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);	1723	pf = (uint32_t ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
		1724
1768	while (p1 < pf)	1725	while (p1 < pf)
1769	{	1726	{
1770	p = p1;	1727	p = p1;
1771	pl = p1 + srcImage->width;	1728	pl = p1 + srcImage->width;
1772	for (; p < pl; p++)	1729	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	}	1730	{
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] \|	1731	p = lookup_r[(p & 0xff0000) >> 16] \|
1833	lookup_g[(*p & 0x00ff00)>> 8] \|	1732	lookup_g[(*p & 0x00ff00) >> 8] \|
1834	lookup_b[(*p & 0x0000ff)] \|	1733	lookup_b[(*p & 0x0000ff)] \|
1835	(*p & ~0xffffff);	1734	(*p & 0xff000000);
1836	}	1735	}
1837	p1 = (RUINT32T ) ((char ) p1 + srcImage->bytes_per_line);	1736	p1 = (uint32_t ) ((char ) p1 + srcImage->bytes_per_line);
		1737	}
		1738	}
		1739	else
		1740	{
		1741	for (int y = 0; y < srcImage->height; y++)
		1742	for (int x = 0; x < srcImage->width; x++)
		1743	{
		1744	unsigned long pixel = XGetPixel (srcImage, x, y);
		1745	pixel = lookup_r[(pixel & mask_r) >> sh_r] \|
		1746	lookup_g[(pixel & mask_g) >> sh_g] \|
		1747	lookup_b[(pixel & mask_b) >> sh_b];
		1748	XPutPixel (srcImage, x, y, pixel);
1838	}	1749	}
1839	break;
1840	}
1841	}	1750	}
1842		1751
1843	free (lookup);	1752	free (lookup);
1844	}	1753	}
1845	#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */	1754	#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.87 by sf-exg, Mon Oct 18 11:00:38 2010 UTC vs. Revision 1.98 by sf-exg, Sat Oct 30 10:57:52 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.87 by sf-exg, Mon Oct 18 11:00:38 2010 UTC vs.
Revision 1.98 by sf-exg, Sat Oct 30 10:57:52 2010 UTC