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.132 by sf-exg, Mon Jan 10 20:46:20 2011 UTC

… …
175# endif 175# endif
176 176
177 return false; 177 return false;
178} 178}
179 179
180bool bgPixmap_t::need_client_side_rendering ()
181{
182# ifdef HAVE_AFTERIMAGE
183 if (original_asim)
184 return true;
185# endif
186 return false;
187}
188
189# ifdef BG_IMAGE_FROM_FILE 180# ifdef BG_IMAGE_FROM_FILE
190static inline bool 181static inline bool
191check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value) 182check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
192{ 183{
193 if (geom_flags & flag) 184 if (geom_flags & flag)
… …
307 geom_flags |= WidthValue|HeightValue|XValue|YValue; 298 geom_flags |= WidthValue|HeightValue|XValue|YValue;
308 } 299 }
309 300
310 if (ops) 301 if (ops)
311 { 302 {
312 while (*ops) 303 char **arr = rxvt_strsplit (':', ops + 1);
313 {
314 while (*ops == ':' || isspace(*ops)) ++ops;
315 304
305 for (int i = 0; arr[i]; i++)
306 {
316# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 307# define CHECK_GEOM_OPS(op_str) (strcasecmp (arr[i], (op_str)) == 0)
317 if (CHECK_GEOM_OPS ("tile")) 308 if (CHECK_GEOM_OPS ("tile"))
318 { 309 {
319 w = h = noScale; 310 w = h = noScale;
320 geom_flags |= WidthValue|HeightValue; 311 geom_flags |= WidthValue|HeightValue;
321 } 312 }
… …
355 new_flags |= rootAlign; 346 new_flags |= rootAlign;
356 w = h = noScale; 347 w = h = noScale;
357 geom_flags |= WidthValue|HeightValue; 348 geom_flags |= WidthValue|HeightValue;
358 } 349 }
359# undef CHECK_GEOM_OPS 350# undef CHECK_GEOM_OPS
360
361 while (*ops != ':' && *ops != '\0') ++ops;
362 } /* done parsing ops */ 351 } /* done parsing ops */
352
353 rxvt_free_strsplit (arr);
363 } 354 }
364 355
365 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 356 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
366 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 357 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
367 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 358 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
… …
657} 648}
658# endif /* HAVE_AFTERIMAGE */ 649# endif /* HAVE_AFTERIMAGE */
659 650
660# ifdef HAVE_PIXBUF 651# ifdef HAVE_PIXBUF
661bool 652bool
653bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
654 int src_x, int src_y, int dst_x, int dst_y,
655 unsigned int width, unsigned int height)
656{
657 XImage *ximage;
658 char *data, *line;
659 int bytes_per_pixel;
660 int width_r, width_g, width_b;
661 int sh_r, sh_g, sh_b;
662 int rowstride;
663 int channels;
664 unsigned char *row;
665 Visual *visual = target->visual;
666 int depth = target->depth;
667
668 if (visual->c_class != TrueColor)
669 return false;
670
671 if (depth == 24 || depth == 32)
672 bytes_per_pixel = 4;
673 else if (depth == 15 || depth == 16)
674 bytes_per_pixel = 2;
675 else
676 return false;
677
678 width_r = rxvt_popcount (visual->red_mask);
679 width_g = rxvt_popcount (visual->green_mask);
680 width_b = rxvt_popcount (visual->blue_mask);
681
682 if (width_r > 8 || width_g > 8 || width_b > 8)
683 return false;
684
685 sh_r = rxvt_ctz (visual->red_mask);
686 sh_g = rxvt_ctz (visual->green_mask);
687 sh_b = rxvt_ctz (visual->blue_mask);
688
689 if (width > INT_MAX / height / bytes_per_pixel)
690 return false;
691
692 data = (char *)malloc (width * height * bytes_per_pixel);
693 if (!data)
694 return false;
695
696 ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
697 width, height, bytes_per_pixel * 8, 0);
698 if (!ximage)
699 {
700 free (data);
701 return false;
702 }
703
704 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
705
706 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
707 channels = gdk_pixbuf_get_n_channels (pixbuf);
708 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
709 line = data;
710
711 for (int y = 0; y < height; y++)
712 {
713 for (int x = 0; x < width; x++)
714 {
715 unsigned char *pixel = row + x * channels;
716 uint32_t value;
717
718 value = ((pixel[0] >> (8 - width_r)) << sh_r)
719 | ((pixel[1] >> (8 - width_g)) << sh_g)
720 | ((pixel[2] >> (8 - width_b)) << sh_b);
721
722 if (bytes_per_pixel == 4)
723 ((uint32_t *)line)[x] = value;
724 else
725 ((uint16_t *)line)[x] = value;
726 }
727
728 row += rowstride;
729 line += ximage->bytes_per_line;
730 }
731
732 XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
733 XDestroyImage (ximage);
734 return true;
735}
736
737bool
662bgPixmap_t::render_image (unsigned long background_flags) 738bgPixmap_t::render_image (unsigned long background_flags)
663{ 739{
664 if (target == NULL) 740 if (target == NULL)
665 return false; 741 return false;
666 742
… …
747 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 823 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
748 824
749 if (h_scale == 0 || v_scale == 0) 825 if (h_scale == 0 || v_scale == 0)
750 { 826 {
751 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 827 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
752 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 828 pixbuf_to_pixmap (result, tile, gc,
753 0, 0, 829 0, 0,
754 0, 0, 830 0, 0,
755 image_width, image_height, 831 image_width, image_height);
756 XLIB_RGB_DITHER_NONE,
757 0, 0);
758 832
759 gcv.tile = tile; 833 gcv.tile = tile;
760 gcv.fill_style = FillTiled; 834 gcv.fill_style = FillTiled;
761 gcv.ts_x_origin = x; 835 gcv.ts_x_origin = x;
762 gcv.ts_y_origin = y; 836 gcv.ts_y_origin = y;
… …
777 || dst_x + dst_width < new_pmap_width 851 || dst_x + dst_width < new_pmap_width
778 || dst_y + dst_height < new_pmap_height) 852 || dst_y + dst_height < new_pmap_height)
779 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 853 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
780 854
781 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 855 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
782 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 856 pixbuf_to_pixmap (result, pixmap, gc,
783 src_x, src_y, 857 src_x, src_y,
784 dst_x, dst_y, 858 dst_x, dst_y,
785 dst_width, dst_height, 859 dst_width, dst_height);
786 XLIB_RGB_DITHER_NONE,
787 0, 0);
788 } 860 }
789 861
790#if XRENDER 862#if XRENDER
791 if (background_flags) 863 if (background_flags)
792 { 864 {
… …
859 if (image) 931 if (image)
860 { 932 {
861 if (original_asim) 933 if (original_asim)
862 safe_asimage_destroy (original_asim); 934 safe_asimage_destroy (original_asim);
863 original_asim = image; 935 original_asim = image;
936 flags |= CLIENT_RENDER;
864 have_image = true; 937 have_image = true;
865 return true; 938 return true;
866 } 939 }
867# endif 940# endif
868 941
… …
963 if (!(flags & tintSet) || tint != new_tint) 1036 if (!(flags & tintSet) || tint != new_tint)
964 { 1037 {
965 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1038 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
966 tint = new_tint; 1039 tint = new_tint;
967 flags = (flags & ~tintFlags) | new_flags | tintSet; 1040 flags = (flags & ~tintFlags) | new_flags | tintSet;
968 return true;
969 }
970
971 return false;
972}
973
974bool
975bgPixmap_t::unset_tint ()
976{
977 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
978
979 if (new_flags != (flags & tintFlags))
980 {
981 flags = (flags & ~tintFlags) | new_flags;
982 return true; 1041 return true;
983 } 1042 }
984 1043
985 return false; 1044 return false;
986} 1045}
… …
1131 c.g = (c.g * shade) / 100; 1190 c.g = (c.g * shade) / 100;
1132 c.b = (c.b * shade) / 100; 1191 c.b = (c.b * shade) / 100;
1133 } 1192 }
1134 else 1193 else
1135 { 1194 {
1136 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1195 c.r = (c.r * (200 - shade)) / 100;
1137 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1196 c.g = (c.g * (200 - shade)) / 100;
1138 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1197 c.b = (c.b * (200 - shade)) / 100;
1139 } 1198 }
1140 1199
1141 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1200 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1142 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1201 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1143 XRenderPictureAttributes pa; 1202 XRenderPictureAttributes pa;
… …
1157 1216
1158 if (mask_pic && overlay_pic && back_pic) 1217 if (mask_pic && overlay_pic && back_pic)
1159 { 1218 {
1160 XRenderColor mask_c; 1219 XRenderColor mask_c;
1161 1220
1162 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0; 1221 mask_c.red = mask_c.green = mask_c.blue = 0;
1163 mask_c.alpha = 0xffff; 1222 mask_c.alpha = 0xffff;
1164 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1223 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1165 1224
1166 mask_c.alpha = 0; 1225 mask_c.alpha = 0;
1167 mask_c.red = 0xffff - c.r; 1226 mask_c.red = 0xffff - c.r;
1168 mask_c.green = 0xffff - c.g; 1227 mask_c.green = 0xffff - c.g;
1169 mask_c.blue = 0xffff - c.b; 1228 mask_c.blue = 0xffff - c.b;
1170 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1229 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); 1230 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1231
1232 if (shade > 100)
1233 {
1234 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1235 mask_c.alpha = 0;
1236 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1237
1238 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1239 }
1240
1172 ret = true; 1241 ret = true;
1173 } 1242 }
1174 1243
1175 XRenderFreePicture (dpy, mask_pic); 1244 XRenderFreePicture (dpy, mask_pic);
1176 XRenderFreePicture (dpy, overlay_pic); 1245 XRenderFreePicture (dpy, overlay_pic);
… …
1286 { 1355 {
1287 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1356 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1288 result |= transpPmapTiled; 1357 result |= transpPmapTiled;
1289 XFreeGC (dpy, gc); 1358 XFreeGC (dpy, gc);
1290 1359
1291 if (!need_client_side_rendering ()) 1360 if (!(flags & CLIENT_RENDER))
1292 { 1361 {
1293 if ((flags & blurNeeded) 1362 if ((flags & blurNeeded)
1294 && (flags & HAS_RENDER_CONV)) 1363 && (flags & HAS_RENDER_CONV))
1295 { 1364 {
1296 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1365 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
… …
1322} 1391}
1323 1392
1324void 1393void
1325bgPixmap_t::set_root_pixmap () 1394bgPixmap_t::set_root_pixmap ()
1326{ 1395{
1327 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1396 Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
1328 if (new_root_pixmap == None) 1397 if (new_root_pixmap == None)
1329 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1398 new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
1330 1399
1331 root_pixmap = new_root_pixmap; 1400 root_pixmap = new_root_pixmap;
1332} 1401}
1333# endif /* ENABLE_TRANSPARENCY */ 1402# endif /* ENABLE_TRANSPARENCY */
1334 1403
1335#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1404#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1336static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c); 1405static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1337# endif 1406# endif
1338 1407
1339bool 1408bool
1340bgPixmap_t::render () 1409bgPixmap_t::render ()
1341{ 1410{
… …
1380 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1449 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1381 { 1450 {
1382 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1451 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1383 if (flags & tintSet) 1452 if (flags & tintSet)
1384 tint.get (c); 1453 tint.get (c);
1385 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c); 1454 shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1386 } 1455 }
1387 1456
1388 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1457 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1389 1458
1390 if (gc) 1459 if (gc)
… …
1495 1564
1496#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1565#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1497/* taken from aterm-0.4.2 */ 1566/* taken from aterm-0.4.2 */
1498 1567
1499static void 1568static void
1500ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c) 1569shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1501{ 1570{
1502 int sh_r, sh_g, sh_b; 1571 int sh_r, sh_g, sh_b;
1503 uint32_t mask_r, mask_g, mask_b; 1572 uint32_t mask_r, mask_g, mask_b;
1504 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1573 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1505 rgba low; 1574 rgba low;
1506 rgba high; 1575 rgba high;
1507 int i; 1576 int i;
1508 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1577 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1509 1578
1510 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1579 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1511 1580
1512 /* for convenience */ 1581 /* for convenience */
1513 mask_r = visual->red_mask; 1582 mask_r = visual->red_mask;
1514 mask_g = visual->green_mask; 1583 mask_g = visual->green_mask;
1515 mask_b = visual->blue_mask; 1584 mask_b = visual->blue_mask;
1516 1585
1517 /* boring lookup table pre-initialization */ 1586 /* boring lookup table pre-initialization */
1518 switch (srcImage->depth) 1587 switch (ximage->depth)
1519 { 1588 {
1520 case 15: 1589 case 15:
1521 if ((mask_r != 0x7c00) || 1590 if ((mask_r != 0x7c00) ||
1522 (mask_g != 0x03e0) || 1591 (mask_g != 0x03e0) ||
1523 (mask_b != 0x001f)) 1592 (mask_b != 0x001f))
… …
1576 /* prepare limits for color transformation (each channel is handled separately) */ 1645 /* prepare limits for color transformation (each channel is handled separately) */
1577 if (shade > 100) 1646 if (shade > 100)
1578 { 1647 {
1579 shade = 200 - shade; 1648 shade = 200 - shade;
1580 1649
1581 high.r = (65535 - c.r) * shade / 100; 1650 high.r = c.r * shade / 100;
1582 high.g = (65535 - c.g) * shade / 100; 1651 high.g = c.g * shade / 100;
1583 high.b = (65535 - c.b) * shade / 100; 1652 high.b = c.b * shade / 100;
1584 1653
1585 low.r = 65535 - high.r; 1654 low.r = 65535 * (100 - shade) / 100;
1586 low.g = 65535 - high.g; 1655 low.g = 65535 * (100 - shade) / 100;
1587 low.b = 65535 - high.b; 1656 low.b = 65535 * (100 - shade) / 100;
1588 } 1657 }
1589 else 1658 else
1590 { 1659 {
1591 high.r = c.r * shade / 100; 1660 high.r = c.r * shade / 100;
1592 high.g = c.g * shade / 100; 1661 high.g = c.g * shade / 100;
… …
1617 tmp += (mask_b>>sh_b) * low.b; 1686 tmp += (mask_b>>sh_b) * low.b;
1618 lookup_b[i] = (tmp/65535)<<sh_b; 1687 lookup_b[i] = (tmp/65535)<<sh_b;
1619 } 1688 }
1620 1689
1621 /* apply table to input image (replacing colors by newly calculated ones) */ 1690 /* apply table to input image (replacing colors by newly calculated ones) */
1622 if (srcImage->bits_per_pixel == 32 1691 if (ximage->bits_per_pixel == 32
1623 && (srcImage->depth == 24 || srcImage->depth == 32) 1692 && (ximage->depth == 24 || ximage->depth == 32)
1624 && srcImage->byte_order == host_byte_order) 1693 && ximage->byte_order == host_byte_order)
1625 { 1694 {
1626 uint32_t *p1, *pf, *p, *pl; 1695 uint32_t *p1, *pf, *p, *pl;
1627 p1 = (uint32_t *) srcImage->data; 1696 p1 = (uint32_t *) ximage->data;
1628 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1697 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1629 1698
1630 while (p1 < pf) 1699 while (p1 < pf)
1631 { 1700 {
1632 p = p1; 1701 p = p1;
1633 pl = p1 + srcImage->width; 1702 pl = p1 + ximage->width;
1634 for (; p < pl; p++) 1703 for (; p < pl; p++)
1635 { 1704 {
1636 *p = lookup_r[(*p & 0xff0000) >> 16] | 1705 *p = lookup_r[(*p & 0xff0000) >> 16] |
1637 lookup_g[(*p & 0x00ff00) >> 8] | 1706 lookup_g[(*p & 0x00ff00) >> 8] |
1638 lookup_b[(*p & 0x0000ff)] | 1707 lookup_b[(*p & 0x0000ff)] |
1639 (*p & 0xff000000); 1708 (*p & 0xff000000);
1640 } 1709 }
1641 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1710 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1642 } 1711 }
1643 } 1712 }
1644 else 1713 else
1645 { 1714 {
1646 for (int y = 0; y < srcImage->height; y++) 1715 for (int y = 0; y < ximage->height; y++)
1647 for (int x = 0; x < srcImage->width; x++) 1716 for (int x = 0; x < ximage->width; x++)
1648 { 1717 {
1649 unsigned long pixel = XGetPixel (srcImage, x, y); 1718 unsigned long pixel = XGetPixel (ximage, x, y);
1650 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1719 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1651 lookup_g[(pixel & mask_g) >> sh_g] | 1720 lookup_g[(pixel & mask_g) >> sh_g] |
1652 lookup_b[(pixel & mask_b) >> sh_b]; 1721 lookup_b[(pixel & mask_b) >> sh_b];
1653 XPutPixel (srcImage, x, y, pixel); 1722 XPutPixel (ximage, x, y, pixel);
1654 } 1723 }
1655 } 1724 }
1656 1725
1657 free (lookup); 1726 free (lookup);
1658} 1727}

Diff Legend

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