ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.93 by sf-exg, Tue Oct 19 14:44:30 2010 UTC vs.
Revision 1.94 by sf-exg, Wed Oct 20 09:04:55 2010 UTC

… …
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
1618typedef uint32_t RUINT32T;
1619
1620static void 1618static void
1621ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1619ShadeXImage(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 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1627 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1630 1628
… …
1641 case 15: 1639 case 15:
1642 if ((mask_r != 0x7c00) || 1640 if ((mask_r != 0x7c00) ||
1643 (mask_g != 0x03e0) || 1641 (mask_g != 0x03e0) ||
1644 (mask_b != 0x001f)) 1642 (mask_b != 0x001f))
1645 return; 1643 return;
1646 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1644 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1647 lookup_r = lookup; 1645 lookup_r = lookup;
1648 lookup_g = lookup+32; 1646 lookup_g = lookup+32;
1649 lookup_b = lookup+32+32; 1647 lookup_b = lookup+32+32;
1650 sh_r = 10; 1648 sh_r = 10;
1651 sh_g = 5; 1649 sh_g = 5;
… …
1654 case 16: 1652 case 16:
1655 if ((mask_r != 0xf800) || 1653 if ((mask_r != 0xf800) ||
1656 (mask_g != 0x07e0) || 1654 (mask_g != 0x07e0) ||
1657 (mask_b != 0x001f)) 1655 (mask_b != 0x001f))
1658 return; 1656 return;
1659 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1657 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1660 lookup_r = lookup; 1658 lookup_r = lookup;
1661 lookup_g = lookup+32; 1659 lookup_g = lookup+32;
1662 lookup_b = lookup+32+64; 1660 lookup_b = lookup+32+64;
1663 sh_r = 11; 1661 sh_r = 11;
1664 sh_g = 5; 1662 sh_g = 5;
… …
1667 case 24: 1665 case 24:
1668 if ((mask_r != 0xff0000) || 1666 if ((mask_r != 0xff0000) ||
1669 (mask_g != 0x00ff00) || 1667 (mask_g != 0x00ff00) ||
1670 (mask_b != 0x0000ff)) 1668 (mask_b != 0x0000ff))
1671 return; 1669 return;
1672 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1670 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1673 lookup_r = lookup; 1671 lookup_r = lookup;
1674 lookup_g = lookup+256; 1672 lookup_g = lookup+256;
1675 lookup_b = lookup+256+256; 1673 lookup_b = lookup+256+256;
1676 sh_r = 16; 1674 sh_r = 16;
1677 sh_g = 8; 1675 sh_g = 8;
… …
1680 case 32: 1678 case 32:
1681 if ((mask_r != 0xff0000) || 1679 if ((mask_r != 0xff0000) ||
1682 (mask_g != 0x00ff00) || 1680 (mask_g != 0x00ff00) ||
1683 (mask_b != 0x0000ff)) 1681 (mask_b != 0x0000ff))
1684 return; 1682 return;
1685 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1683 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1686 lookup_r = lookup; 1684 lookup_r = lookup;
1687 lookup_g = lookup+256; 1685 lookup_g = lookup+256;
1688 lookup_b = lookup+256+256; 1686 lookup_b = lookup+256+256;
1689 sh_r = 16; 1687 sh_r = 16;
1690 sh_g = 8; 1688 sh_g = 8;
… …
1701 1699
1702 lower_lim_r = 65535-rm; 1700 lower_lim_r = 65535-rm;
1703 lower_lim_g = 65535-gm; 1701 lower_lim_g = 65535-gm;
1704 lower_lim_b = 65535-bm; 1702 lower_lim_b = 65535-bm;
1705 1703
1706 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);
1707 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);
1708 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);
1709 1707
1710 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1708 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1711 } 1709 }
1712 else 1710 else
1713 { 1711 {
1714 1712
1715 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1713 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1716 1714
1717 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1715 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1718 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1716 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1719 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1717 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1720 } 1718 }
1721 1719
1722 /* fill our lookup tables */ 1720 /* fill our lookup tables */
1723 for (i = 0; i <= mask_r>>sh_r; i++) 1721 for (i = 0; i <= mask_r>>sh_r; i++)
1724 { 1722 {
1725 RUINT32T tmp; 1723 uint32_t tmp;
1726 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1724 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1727 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1725 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1728 lookup_r[i] = (tmp/65535)<<sh_r; 1726 lookup_r[i] = (tmp/65535)<<sh_r;
1729 } 1727 }
1730 for (i = 0; i <= mask_g>>sh_g; i++) 1728 for (i = 0; i <= mask_g>>sh_g; i++)
1731 { 1729 {
1732 RUINT32T tmp; 1730 uint32_t tmp;
1733 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1731 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1734 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1732 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1735 lookup_g[i] = (tmp/65535)<<sh_g; 1733 lookup_g[i] = (tmp/65535)<<sh_g;
1736 } 1734 }
1737 for (i = 0; i <= mask_b>>sh_b; i++) 1735 for (i = 0; i <= mask_b>>sh_b; i++)
1738 { 1736 {
1739 RUINT32T tmp; 1737 uint32_t tmp;
1740 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1738 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1741 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1739 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1742 lookup_b[i] = (tmp/65535)<<sh_b; 1740 lookup_b[i] = (tmp/65535)<<sh_b;
1743 } 1741 }
1744 1742
1745 /* apply table to input image (replacing colors by newly calculated ones) */ 1743 /* apply table to input image (replacing colors by newly calculated ones) */
1746 if (srcImage->bits_per_pixel == 32 1744 if (srcImage->bits_per_pixel == 32
1747 && (srcImage->depth == 24 || srcImage->depth == 32) 1745 && (srcImage->depth == 24 || srcImage->depth == 32)
1748 && srcImage->byte_order == host_byte_order) 1746 && srcImage->byte_order == host_byte_order)
1749 { 1747 {
1750 RUINT32T *p1, *pf, *p, *pl; 1748 uint32_t *p1, *pf, *p, *pl;
1751 p1 = (RUINT32T *) srcImage->data; 1749 p1 = (uint32_t *) srcImage->data;
1752 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1750 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1753 1751
1754 while (p1 < pf) 1752 while (p1 < pf)
1755 { 1753 {
1756 p = p1; 1754 p = p1;
1757 pl = p1 + srcImage->width; 1755 pl = p1 + srcImage->width;
… …
1760 *p = lookup_r[(*p & 0xff0000) >> 16] | 1758 *p = lookup_r[(*p & 0xff0000) >> 16] |
1761 lookup_g[(*p & 0x00ff00) >> 8] | 1759 lookup_g[(*p & 0x00ff00) >> 8] |
1762 lookup_b[(*p & 0x0000ff)] | 1760 lookup_b[(*p & 0x0000ff)] |
1763 (*p & 0xff000000); 1761 (*p & 0xff000000);
1764 } 1762 }
1765 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); 1763 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1766 } 1764 }
1767 } 1765 }
1768 else 1766 else
1769 { 1767 {
1770 for (int y = 0; y < srcImage->height; y++) 1768 for (int y = 0; y < srcImage->height; y++)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines