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.122 by sf-exg, Sat Nov 20 11:30:58 2010 UTC vs.
Revision 1.128 by sf-exg, Sun Dec 19 00:49:32 2010 UTC

… …
657} 657}
658# endif /* HAVE_AFTERIMAGE */ 658# endif /* HAVE_AFTERIMAGE */
659 659
660# ifdef HAVE_PIXBUF 660# ifdef HAVE_PIXBUF
661bool 661bool
662bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
663 int src_x, int src_y, int dst_x, int dst_y,
664 unsigned int width, unsigned int height)
665{
666 XImage *ximage;
667 char *data, *line;
668 int bytes_per_pixel;
669 int width_r, width_g, width_b;
670 int sh_r, sh_g, sh_b;
671 int rowstride;
672 int channels;
673 unsigned char *row;
674 Visual *visual = target->visual;
675 int depth = target->depth;
676
677 if (visual->c_class != TrueColor)
678 return false;
679
680 if (depth == 24 || depth == 32)
681 bytes_per_pixel = 4;
682 else if (depth == 15 || depth == 16)
683 bytes_per_pixel = 2;
684 else
685 return false;
686
687 width_r = rxvt_popcount (visual->red_mask);
688 width_g = rxvt_popcount (visual->green_mask);
689 width_b = rxvt_popcount (visual->blue_mask);
690
691 if (width_r > 8 || width_g > 8 || width_b > 8)
692 return false;
693
694 sh_r = rxvt_ctz (visual->red_mask);
695 sh_g = rxvt_ctz (visual->green_mask);
696 sh_b = rxvt_ctz (visual->blue_mask);
697
698 if (width > INT_MAX / height / bytes_per_pixel)
699 return false;
700
701 data = (char *)malloc (width * height * bytes_per_pixel);
702 if (!data)
703 return false;
704
705 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
706 width, height, bytes_per_pixel * 8, 0);
707 if (!ximage)
708 {
709 free (data);
710 return false;
711 }
712
713 ximage->byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
714
715 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
716 channels = gdk_pixbuf_get_n_channels (pixbuf);
717 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
718 line = data;
719
720 for (int y = 0; y < height; y++)
721 {
722 for (int x = 0; x < width; x++)
723 {
724 unsigned char *pixel = row + x * channels;
725 uint32_t value;
726
727 value = ((pixel[0] >> (8 - width_r)) << sh_r)
728 | ((pixel[1] >> (8 - width_g)) << sh_g)
729 | ((pixel[2] >> (8 - width_b)) << sh_b);
730
731 if (bytes_per_pixel == 4)
732 ((uint32_t *)line)[x] = value;
733 else
734 ((uint16_t *)line)[x] = value;
735 }
736
737 row += rowstride;
738 line += ximage->bytes_per_line;
739 }
740
741 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
742 XDestroyImage (ximage);
743 return true;
744}
745
746bool
662bgPixmap_t::render_image (unsigned long background_flags) 747bgPixmap_t::render_image (unsigned long background_flags)
663{ 748{
664 if (target == NULL) 749 if (target == NULL)
665 return false; 750 return false;
666 751
… …
747 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 832 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
748 833
749 if (h_scale == 0 || v_scale == 0) 834 if (h_scale == 0 || v_scale == 0)
750 { 835 {
751 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 836 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
752 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 837 pixbuf_to_pixmap (result, tile, gc,
753 0, 0, 838 0, 0,
754 0, 0, 839 0, 0,
755 image_width, image_height, 840 image_width, image_height);
756 XLIB_RGB_DITHER_NONE,
757 0, 0);
758 841
759 gcv.tile = tile; 842 gcv.tile = tile;
760 gcv.fill_style = FillTiled; 843 gcv.fill_style = FillTiled;
761 gcv.ts_x_origin = x; 844 gcv.ts_x_origin = x;
762 gcv.ts_y_origin = y; 845 gcv.ts_y_origin = y;
… …
777 || dst_x + dst_width < new_pmap_width 860 || dst_x + dst_width < new_pmap_width
778 || dst_y + dst_height < new_pmap_height) 861 || dst_y + dst_height < new_pmap_height)
779 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 862 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
780 863
781 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 864 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
782 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 865 pixbuf_to_pixmap (result, pixmap, gc,
783 src_x, src_y, 866 src_x, src_y,
784 dst_x, dst_y, 867 dst_x, dst_y,
785 dst_width, dst_height, 868 dst_width, dst_height);
786 XLIB_RGB_DITHER_NONE,
787 0, 0);
788 } 869 }
789 870
790#if XRENDER 871#if XRENDER
791 if (background_flags) 872 if (background_flags)
792 { 873 {
… …
940 bool has_shade = shade != 100; 1021 bool has_shade = shade != 100;
941 1022
942 if (tint) 1023 if (tint)
943 { 1024 {
944 tint->get (c); 1025 tint->get (c);
945# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1026# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00)
946 if (!has_shade 1027 if (!has_shade
947 && IS_COMPONENT_WHOLESOME (c.r) 1028 && IS_COMPONENT_WHOLESOME (c.r)
948 && IS_COMPONENT_WHOLESOME (c.g) 1029 && IS_COMPONENT_WHOLESOME (c.g)
949 && IS_COMPONENT_WHOLESOME (c.b)) 1030 && IS_COMPONENT_WHOLESOME (c.b))
950 flags |= bgPixmap_t::tintWholesome; 1031 flags |= bgPixmap_t::tintWholesome;
951# undef IS_COMPONENT_WHOLESOME 1032# undef IS_COMPONENT_WHOLESOME
952 } 1033 }
953 1034
954 if (has_shade) 1035 if (has_shade || tint)
955 flags |= bgPixmap_t::tintNeeded; 1036 flags |= bgPixmap_t::tintNeeded;
956 else if (tint)
957 {
958 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
959 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
960 {
961 flags |= bgPixmap_t::tintNeeded;
962 }
963 }
964 1037
965 return flags; 1038 return flags;
966} 1039}
967 1040
968bool 1041bool
… …
1139 c.g = (c.g * shade) / 100; 1212 c.g = (c.g * shade) / 100;
1140 c.b = (c.b * shade) / 100; 1213 c.b = (c.b * shade) / 100;
1141 } 1214 }
1142 else 1215 else
1143 { 1216 {
1144 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1217 c.r = (c.r * (200 - shade)) / 100;
1145 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1218 c.g = (c.g * (200 - shade)) / 100;
1146 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1219 c.b = (c.b * (200 - shade)) / 100;
1147 } 1220 }
1148 1221
1149 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1222 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1223 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1151 XRenderPictureAttributes pa; 1224 XRenderPictureAttributes pa;
… …
1165 1238
1166 if (mask_pic && overlay_pic && back_pic) 1239 if (mask_pic && overlay_pic && back_pic)
1167 { 1240 {
1168 XRenderColor mask_c; 1241 XRenderColor mask_c;
1169 1242
1170 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; 1243 mask_c.red = mask_c.green = mask_c.blue = 0;
1171 mask_c.alpha = 0xffff; 1244 mask_c.alpha = 0xffff;
1172 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1245 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1173 1246
1174 mask_c.alpha = 0; 1247 mask_c.alpha = 0;
1175 mask_c.red = 0xffff - c.r; 1248 mask_c.red = 0xffff - c.r;
1176 mask_c.green = 0xffff - c.g; 1249 mask_c.green = 0xffff - c.g;
1177 mask_c.blue = 0xffff - c.b; 1250 mask_c.blue = 0xffff - c.b;
1178 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1251 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1179 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1252 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1253
1254 if (shade > 100)
1255 {
1256 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1257 mask_c.alpha = 0;
1258 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1259
1260 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1261 }
1262
1180 ret = true; 1263 ret = true;
1181 } 1264 }
1182 1265
1183 XRenderFreePicture (dpy, mask_pic); 1266 XRenderFreePicture (dpy, mask_pic);
1184 XRenderFreePicture (dpy, overlay_pic); 1267 XRenderFreePicture (dpy, overlay_pic);
… …
1330} 1413}
1331 1414
1332void 1415void
1333bgPixmap_t::set_root_pixmap () 1416bgPixmap_t::set_root_pixmap ()
1334{ 1417{
1335 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1418 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1336 if (new_root_pixmap == None) 1419 if (new_root_pixmap == None)
1337 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1420 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1338 1421
1339 root_pixmap = new_root_pixmap; 1422 root_pixmap = new_root_pixmap;
1340} 1423}
1341# endif /* ENABLE_TRANSPARENCY */ 1424# endif /* ENABLE_TRANSPARENCY */
1342 1425
1343#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1426#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1344static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); 1427static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1345# endif 1428# endif
1346 1429
1347bool 1430bool
1348bgPixmap_t::render () 1431bgPixmap_t::render ()
1349{ 1432{
… …
1388 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1389 { 1472 {
1390 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1391 if (flags & tintSet) 1474 if (flags & tintSet)
1392 tint.get (c); 1475 tint.get (c);
1393 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); 1476 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1394 } 1477 }
1395 1478
1396 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1479 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1397 1480
1398 if (gc) 1481 if (gc)
… …
1503 1586
1504#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1587#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1505/* taken from aterm-0.4.2 */ 1588/* taken from aterm-0.4.2 */
1506 1589
1507static void 1590static void
1508ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) 1591shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1509{ 1592{
1510 int sh_r, sh_g, sh_b; 1593 int sh_r, sh_g, sh_b;
1511 uint32_t mask_r, mask_g, mask_b; 1594 uint32_t mask_r, mask_g, mask_b;
1512 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1595 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1513 rgba low; 1596 rgba low;
1514 rgba high; 1597 rgba high;
1515 int i; 1598 int i;
1516 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1599 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1517 1600
1518 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1601 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1519 1602
1520 /* for convenience */ 1603 /* for convenience */
1521 mask_r = visual->red_mask; 1604 mask_r = visual->red_mask;
1522 mask_g = visual->green_mask; 1605 mask_g = visual->green_mask;
1523 mask_b = visual->blue_mask; 1606 mask_b = visual->blue_mask;
1524 1607
1525 /* boring lookup table pre-initialization */ 1608 /* boring lookup table pre-initialization */
1526 switch (srcImage->depth) 1609 switch (ximage->depth)
1527 { 1610 {
1528 case 15: 1611 case 15:
1529 if ((mask_r != 0x7c00) || 1612 if ((mask_r != 0x7c00) ||
1530 (mask_g != 0x03e0) || 1613 (mask_g != 0x03e0) ||
1531 (mask_b != 0x001f)) 1614 (mask_b != 0x001f))
… …
1584 /* prepare limits for color transformation (each channel is handled separately) */ 1667 /* prepare limits for color transformation (each channel is handled separately) */
1585 if (shade > 100) 1668 if (shade > 100)
1586 { 1669 {
1587 shade = 200 - shade; 1670 shade = 200 - shade;
1588 1671
1589 high.r = (65535 - c.r) * shade / 100; 1672 high.r = c.r * shade / 100;
1590 high.g = (65535 - c.g) * shade / 100; 1673 high.g = c.g * shade / 100;
1591 high.b = (65535 - c.b) * shade / 100; 1674 high.b = c.b * shade / 100;
1592 1675
1593 low.r = 65535 - high.r; 1676 low.r = 65535 * (100 - shade) / 100;
1594 low.g = 65535 - high.g; 1677 low.g = 65535 * (100 - shade) / 100;
1595 low.b = 65535 - high.b; 1678 low.b = 65535 * (100 - shade) / 100;
1596 } 1679 }
1597 else 1680 else
1598 { 1681 {
1599 high.r = c.r * shade / 100; 1682 high.r = c.r * shade / 100;
1600 high.g = c.g * shade / 100; 1683 high.g = c.g * shade / 100;
… …
1625 tmp += (mask_b>>sh_b) * low.b; 1708 tmp += (mask_b>>sh_b) * low.b;
1626 lookup_b[i] = (tmp/65535)<<sh_b; 1709 lookup_b[i] = (tmp/65535)<<sh_b;
1627 } 1710 }
1628 1711
1629 /* apply table to input image (replacing colors by newly calculated ones) */ 1712 /* apply table to input image (replacing colors by newly calculated ones) */
1630 if (srcImage->bits_per_pixel == 32 1713 if (ximage->bits_per_pixel == 32
1631 && (srcImage->depth == 24 || srcImage->depth == 32) 1714 && (ximage->depth == 24 || ximage->depth == 32)
1632 && srcImage->byte_order == host_byte_order) 1715 && ximage->byte_order == host_byte_order)
1633 { 1716 {
1634 uint32_t *p1, *pf, *p, *pl; 1717 uint32_t *p1, *pf, *p, *pl;
1635 p1 = (uint32_t *) srcImage->data; 1718 p1 = (uint32_t *) ximage->data;
1636 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1719 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1637 1720
1638 while (p1 < pf) 1721 while (p1 < pf)
1639 { 1722 {
1640 p = p1; 1723 p = p1;
1641 pl = p1 + srcImage->width; 1724 pl = p1 + ximage->width;
1642 for (; p < pl; p++) 1725 for (; p < pl; p++)
1643 { 1726 {
1644 *p = lookup_r[(*p & 0xff0000) >> 16] | 1727 *p = lookup_r[(*p & 0xff0000) >> 16] |
1645 lookup_g[(*p & 0x00ff00) >> 8] | 1728 lookup_g[(*p & 0x00ff00) >> 8] |
1646 lookup_b[(*p & 0x0000ff)] | 1729 lookup_b[(*p & 0x0000ff)] |
1647 (*p & 0xff000000); 1730 (*p & 0xff000000);
1648 } 1731 }
1649 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1732 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1650 } 1733 }
1651 } 1734 }
1652 else 1735 else
1653 { 1736 {
1654 for (int y = 0; y < srcImage->height; y++) 1737 for (int y = 0; y < ximage->height; y++)
1655 for (int x = 0; x < srcImage->width; x++) 1738 for (int x = 0; x < ximage->width; x++)
1656 { 1739 {
1657 unsigned long pixel = XGetPixel (srcImage, x, y); 1740 unsigned long pixel = XGetPixel (ximage, x, y);
1658 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1741 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1659 lookup_g[(pixel & mask_g) >> sh_g] | 1742 lookup_g[(pixel & mask_g) >> sh_g] |
1660 lookup_b[(pixel & mask_b) >> sh_b]; 1743 lookup_b[(pixel & mask_b) >> sh_b];
1661 XPutPixel (srcImage, x, y, pixel); 1744 XPutPixel (ximage, x, y, pixel);
1662 } 1745 }
1663 } 1746 }
1664 1747
1665 free (lookup); 1748 free (lookup);
1666} 1749}

Diff Legend

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