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.83 by sf-exg, Thu Oct 14 17:39:42 2010 UTC vs.
Revision 1.94 by sf-exg, Wed Oct 20 09:04:55 2010 UTC

… …
222 int diff = window_size - image_size; 222 int diff = window_size - image_size;
223 int smaller = min (image_size, window_size); 223 int smaller = min (image_size, window_size);
224 224
225 if (align >= 0 && align <= 100) 225 if (align >= 0 && align <= 100)
226 return diff * align / 100; 226 return diff * align / 100;
227 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
228 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
229 else if (align >= -100 && align < 0) 229 else if (align >= -100 && align < 0)
230 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
231 return 0; 231 return 0;
232} 232}
… …
468 x = make_align_position (h_align, target_width, w); 468 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h); 469 y = make_align_position (v_align, target_height, h);
470 } 470 }
471 471
472 flags &= ~sizeSensitive; 472 flags &= ~sizeSensitive;
473 if (h_scale != 0 || v_scale != 0 473 if ((flags & propScale) || h_scale || v_scale
474 || h_align != 0 || v_align != 0 474 || (!(flags & rootAlign) && (h_align || v_align))
475 || w > target_width || h > target_height) 475 || w > target_width || h > target_height)
476 flags |= sizeSensitive; 476 flags |= sizeSensitive;
477} 477}
478 478
479# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
… …
1007 flags &= ~blurNeeded; 1007 flags &= ~blurNeeded;
1008 else 1008 else
1009 flags |= blurNeeded; 1009 flags |= blurNeeded;
1010 1010
1011#if XFT 1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root); 1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters) 1013 if (filters)
1014 { 1014 {
1015 for (int i = 0; i < filters->nfilter; i++) 1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution)) 1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide; 1017 flags |= bgPixmap_t::blurServerSide;
1018 1018
1019 XFree (filters); 1019 XFree (filters);
1020 } 1020 }
1021#endif 1021#endif
1022 1022
1023 return (changed > 0); 1023 return (changed > 0);
1024} 1024}
1025 1025
… …
1113 } 1113 }
1114 1114
1115 return false; 1115 return false;
1116} 1116}
1117 1117
1118#if XFT
1118static void 1119static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{ 1121{
1121 double sigma = radius / 2.0; 1122 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma; 1123 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0; 1124 double sum = 0.0;
1124 1125
1125 for (int i = 0; i < width; i++) 1126 for (int i = 0; i < width; i++)
1126 { 1127 {
1127 double x = i - width / 2; 1128 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1129 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i]; 1130 sum += kernel[i];
1130 } 1131 }
1131 1132
1132 params[0] = XDoubleToFixed (width); 1133 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1); 1134 params[1] = XDoubleToFixed (1);
1134 1135
1135 for (int i = 0; i < width; i++) 1136 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1137 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137} 1138}
1139#endif
1138 1140
1139bool 1141bool
1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1141{ 1143{
1142 bool ret = false; 1144 bool ret = false;
… …
1145 double *kernel = (double *)malloc (size * sizeof (double)); 1147 double *kernel = (double *)malloc (size * sizeof (double));
1146 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1147 1149
1148 Display *dpy = target->dpy; 1150 Display *dpy = target->dpy;
1149 XRenderPictureAttributes pa; 1151 XRenderPictureAttributes pa;
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); 1152 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1151 1153
1152 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1154 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1153 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1155 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154 1156
1155 if (kernel && params && src && dst) 1157 if (kernel && params && src && dst)
… …
1373 { 1375 {
1374 if (!need_client_side_rendering ()) 1376 if (!need_client_side_rendering ())
1375 { 1377 {
1376 if (flags & (blurNeeded | blurServerSide)) 1378 if (flags & (blurNeeded | blurServerSide))
1377 { 1379 {
1378 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1379 result |= transpPmapBlurred; 1381 result |= transpPmapBlurred;
1380 } 1382 }
1381 if (flags & (tintNeeded | tintServerSide)) 1383 if (flags & (tintNeeded | tintServerSide))
1382 { 1384 {
1383 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1384 result |= transpPmapTinted; 1386 result |= transpPmapTinted;
1385 } 1387 }
1386 } /* server side rendering completed */ 1388 } /* server side rendering completed */
1387 1389
1388 if (pixmap) 1390 if (pixmap)
… …
1415 return false; 1417 return false;
1416} 1418}
1417# endif /* ENABLE_TRANSPARENCY */ 1419# endif /* ENABLE_TRANSPARENCY */
1418 1420
1419# ifndef HAVE_AFTERIMAGE 1421# ifndef HAVE_AFTERIMAGE
1420static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1422static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1421# endif 1423# endif
1422 1424
1423bool 1425bool
1424bgPixmap_t::render () 1426bgPixmap_t::render ()
1425{ 1427{
… …
1469 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1470 { 1472 {
1471 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1472 if (flags & tintSet) 1474 if (flags & tintSet)
1473 tint.get (c); 1475 tint.get (c);
1474 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);
1475 } 1477 }
1476# endif 1478# endif
1477 1479
1478 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1479 1481
… …
1611#endif /* HAVE_BG_PIXMAP */ 1613#endif /* HAVE_BG_PIXMAP */
1612 1614
1613#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1615#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1614/* taken from aterm-0.4.2 */ 1616/* taken from aterm-0.4.2 */
1615 1617
1616typedef uint32_t RUINT32T;
1617
1618static void 1618static void
1619ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1619ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1620{ 1620{
1621 int sh_r, sh_g, sh_b; 1621 int sh_r, sh_g, sh_b;
1622 RUINT32T mask_r, mask_g, mask_b; 1622 uint32_t mask_r, mask_g, mask_b;
1623 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1623 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1624 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1624 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1625 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1625 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1626 int i; 1626 int i;
1627 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1627 1628
1628 Visual *visual = term->visual;
1629
1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1629 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1631 1630
1632 /* for convenience */ 1631 /* for convenience */
1633 mask_r = visual->red_mask; 1632 mask_r = visual->red_mask;
1634 mask_g = visual->green_mask; 1633 mask_g = visual->green_mask;
1635 mask_b = visual->blue_mask; 1634 mask_b = visual->blue_mask;
1636 1635
1637 /* boring lookup table pre-initialization */ 1636 /* boring lookup table pre-initialization */
1638 switch (srcImage->bits_per_pixel) { 1637 switch (srcImage->depth)
1638 {
1639 case 15: 1639 case 15:
1640 if ((mask_r != 0x7c00) || 1640 if ((mask_r != 0x7c00) ||
1641 (mask_g != 0x03e0) || 1641 (mask_g != 0x03e0) ||
1642 (mask_b != 0x001f)) 1642 (mask_b != 0x001f))
1643 return; 1643 return;
1644 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1644 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1645 lookup_r = lookup; 1645 lookup_r = lookup;
1646 lookup_g = lookup+32; 1646 lookup_g = lookup+32;
1647 lookup_b = lookup+32+32; 1647 lookup_b = lookup+32+32;
1648 sh_r = 10; 1648 sh_r = 10;
1649 sh_g = 5; 1649 sh_g = 5;
1650 sh_b = 0; 1650 sh_b = 0;
1651 break; 1651 break;
1652 case 16: 1652 case 16:
1653 if ((mask_r != 0xf800) || 1653 if ((mask_r != 0xf800) ||
1654 (mask_g != 0x07e0) || 1654 (mask_g != 0x07e0) ||
1655 (mask_b != 0x001f)) 1655 (mask_b != 0x001f))
1656 return; 1656 return;
1657 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1657 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1658 lookup_r = lookup; 1658 lookup_r = lookup;
1659 lookup_g = lookup+32; 1659 lookup_g = lookup+32;
1660 lookup_b = lookup+32+64; 1660 lookup_b = lookup+32+64;
1661 sh_r = 11; 1661 sh_r = 11;
1662 sh_g = 5; 1662 sh_g = 5;
1663 sh_b = 0; 1663 sh_b = 0;
1664 break; 1664 break;
1665 case 24: 1665 case 24:
1666 if ((mask_r != 0xff0000) || 1666 if ((mask_r != 0xff0000) ||
1667 (mask_g != 0x00ff00) || 1667 (mask_g != 0x00ff00) ||
1668 (mask_b != 0x0000ff)) 1668 (mask_b != 0x0000ff))
1669 return; 1669 return;
1670 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1670 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1671 lookup_r = lookup; 1671 lookup_r = lookup;
1672 lookup_g = lookup+256; 1672 lookup_g = lookup+256;
1673 lookup_b = lookup+256+256; 1673 lookup_b = lookup+256+256;
1674 sh_r = 16; 1674 sh_r = 16;
1675 sh_g = 8; 1675 sh_g = 8;
1676 sh_b = 0; 1676 sh_b = 0;
1677 break; 1677 break;
1678 case 32: 1678 case 32:
1679 if ((mask_r != 0xff0000) || 1679 if ((mask_r != 0xff0000) ||
1680 (mask_g != 0x00ff00) || 1680 (mask_g != 0x00ff00) ||
1681 (mask_b != 0x0000ff)) 1681 (mask_b != 0x0000ff))
1682 return; 1682 return;
1683 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1683 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1684 lookup_r = lookup; 1684 lookup_r = lookup;
1685 lookup_g = lookup+256; 1685 lookup_g = lookup+256;
1686 lookup_b = lookup+256+256; 1686 lookup_b = lookup+256+256;
1687 sh_r = 16; 1687 sh_r = 16;
1688 sh_g = 8; 1688 sh_g = 8;
1689 sh_b = 0; 1689 sh_b = 0;
1690 break; 1690 break;
1691 default: 1691 default:
1692 return; /* we do not support this color depth */ 1692 return; /* we do not support this color depth */
1693 } 1693 }
1694 1694
1695 /* prepare limits for color transformation (each channel is handled separately) */ 1695 /* prepare limits for color transformation (each channel is handled separately) */
1696 if (shade > 100) { 1696 if (shade > 100)
1697 {
1697 shade = 200 - shade; 1698 shade = 200 - shade;
1698 1699
1699 lower_lim_r = 65535-rm; 1700 lower_lim_r = 65535-rm;
1700 lower_lim_g = 65535-gm; 1701 lower_lim_g = 65535-gm;
1701 lower_lim_b = 65535-bm; 1702 lower_lim_b = 65535-bm;
1702 1703
1703 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);
1704 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);
1705 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);
1706 1707
1707 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1708 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1709 }
1708 } else { 1710 else
1711 {
1709 1712
1710 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1713 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1711 1714
1712 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1715 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1713 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1716 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1714 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1717 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1715 } 1718 }
1716
1717 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1718 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1719 {
1720 unsigned int tmp;
1721
1722 tmp = lower_lim_r;
1723 lower_lim_r = lower_lim_b;
1724 lower_lim_b = tmp;
1725
1726 tmp = upper_lim_r;
1727 upper_lim_r = upper_lim_b;
1728 upper_lim_b = tmp;
1729 }
1730 1719
1731 /* fill our lookup tables */ 1720 /* fill our lookup tables */
1732 for (i = 0; i <= mask_r>>sh_r; i++) 1721 for (i = 0; i <= mask_r>>sh_r; i++)
1733 { 1722 {
1734 RUINT32T tmp; 1723 uint32_t tmp;
1735 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1724 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1736 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1725 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1737 lookup_r[i] = (tmp/65535)<<sh_r; 1726 lookup_r[i] = (tmp/65535)<<sh_r;
1738 } 1727 }
1739 for (i = 0; i <= mask_g>>sh_g; i++) 1728 for (i = 0; i <= mask_g>>sh_g; i++)
1740 { 1729 {
1741 RUINT32T tmp; 1730 uint32_t tmp;
1742 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1731 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1743 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1732 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1744 lookup_g[i] = (tmp/65535)<<sh_g; 1733 lookup_g[i] = (tmp/65535)<<sh_g;
1745 } 1734 }
1746 for (i = 0; i <= mask_b>>sh_b; i++) 1735 for (i = 0; i <= mask_b>>sh_b; i++)
1747 { 1736 {
1748 RUINT32T tmp; 1737 uint32_t tmp;
1749 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1738 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1750 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1739 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1751 lookup_b[i] = (tmp/65535)<<sh_b; 1740 lookup_b[i] = (tmp/65535)<<sh_b;
1752 } 1741 }
1753 1742
1754 /* apply table to input image (replacing colors by newly calculated ones) */ 1743 /* apply table to input image (replacing colors by newly calculated ones) */
1755 switch (srcImage->bits_per_pixel) 1744 if (srcImage->bits_per_pixel == 32
1745 && (srcImage->depth == 24 || srcImage->depth == 32)
1746 && srcImage->byte_order == host_byte_order)
1756 { 1747 {
1757 case 15:
1758 {
1759 unsigned short *p1, *pf, *p, *pl; 1748 uint32_t *p1, *pf, *p, *pl;
1760 p1 = (unsigned short *) srcImage->data; 1749 p1 = (uint32_t *) srcImage->data;
1761 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1750 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751
1762 while (p1 < pf) 1752 while (p1 < pf)
1763 { 1753 {
1764 p = p1; 1754 p = p1;
1765 pl = p1 + srcImage->width; 1755 pl = p1 + srcImage->width;
1766 for (; p < pl; p++) 1756 for (; p < pl; p++)
1767 { 1757 {
1768 *p = lookup_r[(*p & 0x7c00)>>10] |
1769 lookup_g[(*p & 0x03e0)>> 5] |
1770 lookup_b[(*p & 0x001f)];
1771 }
1772 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1773 }
1774 break;
1775 }
1776 case 16:
1777 {
1778 unsigned short *p1, *pf, *p, *pl;
1779 p1 = (unsigned short *) srcImage->data;
1780 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1781 while (p1 < pf)
1782 {
1783 p = p1;
1784 pl = p1 + srcImage->width;
1785 for (; p < pl; p++)
1786 {
1787 *p = lookup_r[(*p & 0xf800)>>11] |
1788 lookup_g[(*p & 0x07e0)>> 5] |
1789 lookup_b[(*p & 0x001f)];
1790 }
1791 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1792 }
1793 break;
1794 }
1795 case 24:
1796 {
1797 unsigned char *p1, *pf, *p, *pl;
1798 p1 = (unsigned char *) srcImage->data;
1799 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1800 while (p1 < pf)
1801 {
1802 p = p1;
1803 pl = p1 + srcImage->width * 3;
1804 for (; p < pl; p += 3)
1805 {
1806 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1807 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1808 p[2] = lookup_r[(p[2] & 0x0000ff)];
1809 }
1810 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1811 }
1812 break;
1813 }
1814 case 32:
1815 {
1816 RUINT32T *p1, *pf, *p, *pl;
1817 p1 = (RUINT32T *) srcImage->data;
1818 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1819
1820 while (p1 < pf)
1821 {
1822 p = p1;
1823 pl = p1 + srcImage->width;
1824 for (; p < pl; p++)
1825 {
1826 *p = lookup_r[(*p & 0xff0000)>>16] | 1758 *p = lookup_r[(*p & 0xff0000) >> 16] |
1827 lookup_g[(*p & 0x00ff00)>> 8] | 1759 lookup_g[(*p & 0x00ff00) >> 8] |
1828 lookup_b[(*p & 0x0000ff)] | 1760 lookup_b[(*p & 0x0000ff)] |
1829 (*p & ~0xffffff); 1761 (*p & 0xff000000);
1762 }
1763 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1764 }
1765 }
1766 else
1767 {
1768 for (int y = 0; y < srcImage->height; y++)
1769 for (int x = 0; x < srcImage->width; x++)
1770 {
1771 unsigned long pixel = XGetPixel (srcImage, x, y);
1772 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1773 lookup_g[(pixel & mask_g) >> sh_g] |
1774 lookup_b[(pixel & mask_b) >> sh_b];
1775 XPutPixel (srcImage, x, y, pixel);
1830 } 1776 }
1831 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1832 } 1777 }
1833 break;
1834 }
1835 }
1836 1778
1837 free (lookup); 1779 free (lookup);
1838} 1780}
1839#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1781#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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