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.124 by sf-exg, Tue Nov 23 16:37:36 2010 UTC vs.
Revision 1.129 by root, Mon Jan 3 03:05:47 2011 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 {
… …
1131 c.g = (c.g * shade) / 100; 1212 c.g = (c.g * shade) / 100;
1132 c.b = (c.b * shade) / 100; 1213 c.b = (c.b * shade) / 100;
1133 } 1214 }
1134 else 1215 else
1135 { 1216 {
1136 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1217 c.r = (c.r * (200 - shade)) / 100;
1137 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1218 c.g = (c.g * (200 - shade)) / 100;
1138 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1219 c.b = (c.b * (200 - shade)) / 100;
1139 } 1220 }
1140 1221
1141 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1222 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1142 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1223 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1143 XRenderPictureAttributes pa; 1224 XRenderPictureAttributes pa;
… …
1157 1238
1158 if (mask_pic && overlay_pic && back_pic) 1239 if (mask_pic && overlay_pic && back_pic)
1159 { 1240 {
1160 XRenderColor mask_c; 1241 XRenderColor mask_c;
1161 1242
1162 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; 1243 mask_c.red = mask_c.green = mask_c.blue = 0;
1163 mask_c.alpha = 0xffff; 1244 mask_c.alpha = 0xffff;
1164 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1245 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1165 1246
1166 mask_c.alpha = 0; 1247 mask_c.alpha = 0;
1167 mask_c.red = 0xffff - c.r; 1248 mask_c.red = 0xffff - c.r;
1168 mask_c.green = 0xffff - c.g; 1249 mask_c.green = 0xffff - c.g;
1169 mask_c.blue = 0xffff - c.b; 1250 mask_c.blue = 0xffff - c.b;
1170 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1251 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1171 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
1172 ret = true; 1263 ret = true;
1173 } 1264 }
1174 1265
1175 XRenderFreePicture (dpy, mask_pic); 1266 XRenderFreePicture (dpy, mask_pic);
1176 XRenderFreePicture (dpy, overlay_pic); 1267 XRenderFreePicture (dpy, overlay_pic);
… …
1322} 1413}
1323 1414
1324void 1415void
1325bgPixmap_t::set_root_pixmap () 1416bgPixmap_t::set_root_pixmap ()
1326{ 1417{
1327 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]);
1328 if (new_root_pixmap == None) 1419 if (new_root_pixmap == None)
1329 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]);
1330 1421
1331 root_pixmap = new_root_pixmap; 1422 root_pixmap = new_root_pixmap;
1332} 1423}
1333# endif /* ENABLE_TRANSPARENCY */ 1424# endif /* ENABLE_TRANSPARENCY */
1334 1425
1335#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1426#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1336static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); 1427static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1337# endif 1428# endif
1338 1429
1339bool 1430bool
1340bgPixmap_t::render () 1431bgPixmap_t::render ()
1341{ 1432{
… …
1380 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1381 { 1472 {
1382 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1383 if (flags & tintSet) 1474 if (flags & tintSet)
1384 tint.get (c); 1475 tint.get (c);
1385 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); 1476 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1386 } 1477 }
1387 1478
1388 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1479 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1389 1480
1390 if (gc) 1481 if (gc)
… …
1495 1586
1496#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1587#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1497/* taken from aterm-0.4.2 */ 1588/* taken from aterm-0.4.2 */
1498 1589
1499static void 1590static void
1500ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) 1591shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1501{ 1592{
1502 int sh_r, sh_g, sh_b; 1593 int sh_r, sh_g, sh_b;
1503 uint32_t mask_r, mask_g, mask_b; 1594 uint32_t mask_r, mask_g, mask_b;
1504 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1595 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1505 rgba low; 1596 rgba low;
1506 rgba high; 1597 rgba high;
1507 int i; 1598 int i;
1508 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1599 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1509 1600
1510 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1601 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1511 1602
1512 /* for convenience */ 1603 /* for convenience */
1513 mask_r = visual->red_mask; 1604 mask_r = visual->red_mask;
1514 mask_g = visual->green_mask; 1605 mask_g = visual->green_mask;
1515 mask_b = visual->blue_mask; 1606 mask_b = visual->blue_mask;
1516 1607
1517 /* boring lookup table pre-initialization */ 1608 /* boring lookup table pre-initialization */
1518 switch (srcImage->depth) 1609 switch (ximage->depth)
1519 { 1610 {
1520 case 15: 1611 case 15:
1521 if ((mask_r != 0x7c00) || 1612 if ((mask_r != 0x7c00) ||
1522 (mask_g != 0x03e0) || 1613 (mask_g != 0x03e0) ||
1523 (mask_b != 0x001f)) 1614 (mask_b != 0x001f))
… …
1576 /* prepare limits for color transformation (each channel is handled separately) */ 1667 /* prepare limits for color transformation (each channel is handled separately) */
1577 if (shade > 100) 1668 if (shade > 100)
1578 { 1669 {
1579 shade = 200 - shade; 1670 shade = 200 - shade;
1580 1671
1581 high.r = (65535 - c.r) * shade / 100; 1672 high.r = c.r * shade / 100;
1582 high.g = (65535 - c.g) * shade / 100; 1673 high.g = c.g * shade / 100;
1583 high.b = (65535 - c.b) * shade / 100; 1674 high.b = c.b * shade / 100;
1584 1675
1585 low.r = 65535 - high.r; 1676 low.r = 65535 * (100 - shade) / 100;
1586 low.g = 65535 - high.g; 1677 low.g = 65535 * (100 - shade) / 100;
1587 low.b = 65535 - high.b; 1678 low.b = 65535 * (100 - shade) / 100;
1588 } 1679 }
1589 else 1680 else
1590 { 1681 {
1591 high.r = c.r * shade / 100; 1682 high.r = c.r * shade / 100;
1592 high.g = c.g * shade / 100; 1683 high.g = c.g * shade / 100;
… …
1617 tmp += (mask_b>>sh_b) * low.b; 1708 tmp += (mask_b>>sh_b) * low.b;
1618 lookup_b[i] = (tmp/65535)<<sh_b; 1709 lookup_b[i] = (tmp/65535)<<sh_b;
1619 } 1710 }
1620 1711
1621 /* apply table to input image (replacing colors by newly calculated ones) */ 1712 /* apply table to input image (replacing colors by newly calculated ones) */
1622 if (srcImage->bits_per_pixel == 32 1713 if (ximage->bits_per_pixel == 32
1623 && (srcImage->depth == 24 || srcImage->depth == 32) 1714 && (ximage->depth == 24 || ximage->depth == 32)
1624 && srcImage->byte_order == host_byte_order) 1715 && ximage->byte_order == host_byte_order)
1625 { 1716 {
1626 uint32_t *p1, *pf, *p, *pl; 1717 uint32_t *p1, *pf, *p, *pl;
1627 p1 = (uint32_t *) srcImage->data; 1718 p1 = (uint32_t *) ximage->data;
1628 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1719 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1629 1720
1630 while (p1 < pf) 1721 while (p1 < pf)
1631 { 1722 {
1632 p = p1; 1723 p = p1;
1633 pl = p1 + srcImage->width; 1724 pl = p1 + ximage->width;
1634 for (; p < pl; p++) 1725 for (; p < pl; p++)
1635 { 1726 {
1636 *p = lookup_r[(*p & 0xff0000) >> 16] | 1727 *p = lookup_r[(*p & 0xff0000) >> 16] |
1637 lookup_g[(*p & 0x00ff00) >> 8] | 1728 lookup_g[(*p & 0x00ff00) >> 8] |
1638 lookup_b[(*p & 0x0000ff)] | 1729 lookup_b[(*p & 0x0000ff)] |
1639 (*p & 0xff000000); 1730 (*p & 0xff000000);
1640 } 1731 }
1641 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1732 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1642 } 1733 }
1643 } 1734 }
1644 else 1735 else
1645 { 1736 {
1646 for (int y = 0; y < srcImage->height; y++) 1737 for (int y = 0; y < ximage->height; y++)
1647 for (int x = 0; x < srcImage->width; x++) 1738 for (int x = 0; x < ximage->width; x++)
1648 { 1739 {
1649 unsigned long pixel = XGetPixel (srcImage, x, y); 1740 unsigned long pixel = XGetPixel (ximage, x, y);
1650 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1741 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1651 lookup_g[(pixel & mask_g) >> sh_g] | 1742 lookup_g[(pixel & mask_g) >> sh_g] |
1652 lookup_b[(pixel & mask_b) >> sh_b]; 1743 lookup_b[(pixel & mask_b) >> sh_b];
1653 XPutPixel (srcImage, x, y, pixel); 1744 XPutPixel (ximage, x, y, pixel);
1654 } 1745 }
1655 } 1746 }
1656 1747
1657 free (lookup); 1748 free (lookup);
1658} 1749}

Diff Legend

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