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

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.65 by sasha, Fri Aug 10 22:10:36 2007 UTC vs.
Revision 1.73 by ayin, Sun Aug 26 19:17:00 2007 UTC

… …
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *---------------------------------------------------------------------*/ 24 *---------------------------------------------------------------------*/
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28
29#define DO_TIMING_TEST 0
30
31#if DO_TIMING_TEST
32#define TIMING_TEST_START(id) \
33 struct timeval timing_test_##id##_stv;\
34 gettimeofday (&timing_test_##id##_stv, NULL);
35
36#define TIMING_TEST_PRINT_RESULT(id) \
37 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\
38 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\
39 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0)
40
41#else
42#define TIMING_TEST_START(id) do{}while (0)
43#define TIMING_TEST_PRINT_RESULT(id) do{}while (0)
44#endif
28 45
29/* 46/*
30 * Pixmap geometry string interpretation : 47 * Pixmap geometry string interpretation :
31 * Each geometry string contains zero or one scale/position 48 * Each geometry string contains zero or one scale/position
32 * adjustment and may optionally be followed by a colon and one or more 49 * adjustment and may optionally be followed by a colon and one or more
… …
88 return true; 105 return true;
89# endif 106# endif
90 return false; 107 return false;
91} 108}
92 109
110bool bgPixmap_t::need_client_side_rendering ()
111{
112# ifdef HAVE_AFTERIMAGE
113 if (original_asim != NULL)
114 return true;
115# endif
116# ifdef ENABLE_TRANSPARENCY
117 if (flags & isTransparent)
118 {
119 if ((flags & blurNeeded)
120 || ((flags & tintNeeded) && !(flags & tintServerSide)))
121 return true;
122 }
123# endif
124 return false;
125}
126
93# ifdef XPM_BACKGROUND 127# ifdef XPM_BACKGROUND
94static inline bool 128static inline bool
95check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value) 129check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
96{ 130{
97 if (geom_flags & flag) 131 if (geom_flags & flag)
… …
359 int x = 0; 393 int x = 0;
360 int y = 0; 394 int y = 0;
361 int w = h_scale * target_width / 100; 395 int w = h_scale * target_width / 100;
362 int h = v_scale * target_height / 100; 396 int h = v_scale * target_height / 100;
363 397
398 TIMING_TEST_START (asim);
399
364 if (original_asim) 400 if (original_asim)
365 { 401 {
366 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); 402 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
367 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); 403 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
368 } 404 }
… …
472 result = tmp; 508 result = tmp;
473 } 509 }
474 free (layers); 510 free (layers);
475 } 511 }
476 } 512 }
513 TIMING_TEST_PRINT_RESULT (asim);
477 514
478 if (pixmap) 515 if (pixmap)
479 { 516 {
480 if (result == NULL 517 if (result == NULL
481 || pmap_width != new_pmap_width 518 || pmap_width != new_pmap_width
… …
527 564
528 if (result != background && result != original_asim) 565 if (result != background && result != original_asim)
529 destroy_asimage (&result); 566 destroy_asimage (&result);
530 567
531 XFreeGC (target->dpy, gc); 568 XFreeGC (target->dpy, gc);
569 TIMING_TEST_PRINT_RESULT (asim);
532 } 570 }
533 571
534 return true; 572 return true;
535} 573}
536# endif /* HAVE_AFTERIMAGE */ 574# endif /* HAVE_AFTERIMAGE */
… …
573 if (!(flags & isTransparent)) 611 if (!(flags & isTransparent))
574 { 612 {
575 flags |= isTransparent; 613 flags |= isTransparent;
576 return true; 614 return true;
577 } 615 }
616 return false;
578} 617}
579 618
580bool 619bool
581bgPixmap_t::set_blur_radius (const char *geom) 620bgPixmap_t::set_blur_radius (const char *geom)
582{ 621{
… …
597 if (v_blurRadius != vr) 636 if (v_blurRadius != vr)
598 { 637 {
599 ++changed; 638 ++changed;
600 v_blurRadius = vr; 639 v_blurRadius = vr;
601 } 640 }
641 if (v_blurRadius == 0 && h_blurRadius == 0)
642 flags &= ~blurNeeded;
643 else
644 flags |= blurNeeded;
602 return (changed>0); 645 return (changed>0);
603} 646}
604 647
605static inline unsigned long 648static inline unsigned long
606compute_tint_shade_flags (rxvt_color *tint, int shade) 649compute_tint_shade_flags (rxvt_color *tint, int shade)
607{ 650{
608 unsigned long flags = 0; 651 unsigned long flags = 0;
652 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
609 653
610 if (shade > 0 && shade <100) 654 if (tint)
655 {
656 tint->get (c);
657# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
658 if (IS_COMPONENT_WHOLESOME (c.r)
659 && IS_COMPONENT_WHOLESOME (c.g)
660 && IS_COMPONENT_WHOLESOME (c.b))
661 flags |= bgPixmap_t::tintWholesome;
662# undef IS_COMPONENT_WHOLESOME
663 }
664
665 if ((shade > 0 && shade < 100) || (shade > 100 && shade < 200))
611 flags |= bgPixmap_t::tintNeeded; 666 flags |= bgPixmap_t::tintNeeded;
612 else if (tint) 667 else if (tint)
613 { 668 {
614 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
615 tint->get (c);
616
617 flags |= bgPixmap_t::tintNeeded;
618 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 669 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
619 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 670 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
620 { 671 {
621 flags |= bgPixmap_t::tintNeeded; 672 flags |= bgPixmap_t::tintNeeded;
622#define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
623 if (IS_COMPONENT_WHOLESOME (c.r)
624 && IS_COMPONENT_WHOLESOME (c.g)
625 && IS_COMPONENT_WHOLESOME (c.b))
626 flags |= bgPixmap_t::tintServerSide;
627#undef IS_COMPONENT_WHOLESOME
628 } 673 }
629 } 674 }
675
676 if (flags & bgPixmap_t::tintNeeded)
677 {
678 if (flags & bgPixmap_t::tintWholesome)
679 flags |= bgPixmap_t::tintServerSide;
680#if XFT
681 /* TODO: add logic for XRENDER tinting */
682 flags |= bgPixmap_t::tintServerSide;
683#endif
684 }
685
630 return flags; 686 return flags;
631} 687}
632 688
633bool 689bool
634bgPixmap_t::set_tint (rxvt_color &new_tint) 690bgPixmap_t::set_tint (rxvt_color &new_tint)
… …
664 if (new_shade == 100) 720 if (new_shade == 100)
665 new_shade = 0; 721 new_shade = 0;
666 722
667 if (new_shade != shade) 723 if (new_shade != shade)
668 { 724 {
669 unsigned long new_flags = compute_tint_shade_flags (&tint, new_shade); 725 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
670 shade = new_shade; 726 shade = new_shade;
671 flags = (flags & ~tintFlags) | new_flags; 727 flags = (flags & ~tintFlags) | new_flags;
672 return true; 728 return true;
673 } 729 }
674 return false; 730 return false;
… …
678/* make_transparency_pixmap() 734/* make_transparency_pixmap()
679 * Builds a pixmap sized the same as terminal window, with depth same as the root window 735 * Builds a pixmap sized the same as terminal window, with depth same as the root window
680 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 736 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
681 * our window. 737 * our window.
682 */ 738 */
683bool 739unsigned long
684bgPixmap_t::make_transparency_pixmap () 740bgPixmap_t::make_transparency_pixmap ()
685{ 741{
742 unsigned long result = 0;
743
686 if (target == NULL) 744 if (target == NULL)
687 return false; 745 return 0;
688 746
689 /* root dimentions may change from call to call - but Display structure should 747 /* root dimentions may change from call to call - but Display structure should
690 * be always up-to-date, so let's use it : 748 * be always up-to-date, so let's use it :
691 */ 749 */
692 Window root = target->display->root; 750 Window root = target->display->root;
… …
698 int window_width = target->szHint.width; 756 int window_width = target->szHint.width;
699 int window_height = target->szHint.height; 757 int window_height = target->szHint.height;
700 int sx, sy; 758 int sx, sy;
701 XGCValues gcv; 759 XGCValues gcv;
702 760
761 TIMING_TEST_START (tp);
703 target->get_window_origin (sx, sy); 762 target->get_window_origin (sx, sy);
704 763
705 /* check if we are outside of the visible part of the virtual screen : */ 764 /* check if we are outside of the visible part of the virtual screen : */
706 if (sx + window_width <= 0 || sy + window_height <= 0 765 if (sx + window_width <= 0 || sy + window_height <= 0
707 || sx >= root_width || sy >= root_height) 766 || sx >= root_width || sy >= root_height)
708 return false; 767 return 0;
709 768
710 if (root_pixmap != None) 769 if (root_pixmap != None)
711 {/* we want to validate the pixmap and get it's size at the same time : */ 770 {/* we want to validate the pixmap and get it's size at the same time : */
712 int junk; 771 int junk;
713 unsigned int ujunk; 772 unsigned int ujunk;
… …
720 779
721 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 780 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
722 GC gc = NULL; 781 GC gc = NULL;
723 782
724 if (tiled_root_pmap == None) /* something really bad happened - abort */ 783 if (tiled_root_pmap == None) /* something really bad happened - abort */
725 return false; 784 return 0;
726 785
727 if (root_pixmap == None) 786 if (root_pixmap == None)
728 { /* use tricks to obtain the root background image :*/ 787 { /* use tricks to obtain the root background image :*/
729 /* we want to create Overrideredirect window overlapping out window 788 /* we want to create Overrideredirect window overlapping out window
730 with background type of Parent Relative and then grab it */ 789 with background type of Parent Relative and then grab it */
… …
753 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 812 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
754 ++ev_count; 813 ++ev_count;
755 if (ev_count > 0); 814 if (ev_count > 0);
756 { /* hooray! - we can grab the image! */ 815 { /* hooray! - we can grab the image! */
757 gc = XCreateGC (dpy, root, 0, NULL); 816 gc = XCreateGC (dpy, root, 0, NULL);
817 if (gc)
818 {
758 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 819 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
759 success = true; 820 success = true;
821 }
760 } 822 }
761 XDestroyWindow (dpy, src); 823 XDestroyWindow (dpy, src);
762 XUngrabServer (dpy); 824 XUngrabServer (dpy);
763 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 825 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
764 } 826 }
765 if (!success) 827 if (!success)
766 { 828 {
767 XFreePixmap (dpy, tiled_root_pmap); 829 XFreePixmap (dpy, tiled_root_pmap);
768 tiled_root_pmap = None; 830 tiled_root_pmap = None;
769 } 831 }
832 else
833 result |= transpPmapTiled;
770 } 834 }
771 else 835 else
772 {/* strightforward pixmap copy */ 836 {/* strightforward pixmap copy */
773 gcv.tile = root_pixmap; 837 gcv.tile = root_pixmap;
774 gcv.fill_style = FillTiled; 838 gcv.fill_style = FillTiled;
775 while (sx < 0) sx += (int)window_width; 839 while (sx < 0) sx += (int)window_width;
776 while (sy < 0) sy += (int)window_height; 840 while (sy < 0) sy += (int)window_height;
777 gcv.ts_x_origin = -sx; 841 gcv.ts_x_origin = -sx;
778 gcv.ts_y_origin = -sy; 842 gcv.ts_y_origin = -sy;
779 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 843 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
844 if (gc)
845 {
780 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 846 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
847 result |= transpPmapTiled;
848 }
781 } 849 }
850 TIMING_TEST_PRINT_RESULT (tp);
782 851
783 if (tiled_root_pmap != None) 852 if (tiled_root_pmap != None)
853 {
854 if ((flags & tintNeeded) && !need_client_side_rendering ())
784 { 855 {
785 if (flags & tintNeeded) 856 if (flags & tintWholesome)
786 { 857 {
787 if ((flags & tintServerSide)
788 && h_blurRadius <= 1 && v_blurRadius <= 1
789# ifdef HAVE_AFTERIMAGE
790 && original_asim == NULL
791# endif
792 )
793 { /* In this case we can tint image server-side getting significant 858 /* In this case we can tint image server-side getting significant
794 * performance improvements, as we eliminate XImage transfer 859 * performance improvements, as we eliminate XImage transfer
795 */ 860 */
796 gcv.foreground = Pixel (tint); 861 gcv.foreground = Pixel (tint);
797 gcv.function = GXand; 862 gcv.function = GXand;
798 gcv.fill_style = FillSolid; 863 gcv.fill_style = FillSolid;
799 if (gc) 864 if (gc)
800 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv); 865 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
801 else 866 else
802 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 867 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
868 if (gc)
869 {
803 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 870 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
871 result |= transpPmapTinted;
804 } 872 }
805 } 873 }
874 else
875 {
876#if XFT /* TODO : implement proper detection of XRENDER, as XFT may be present without XRENDER ! */
877 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
878 if (flags & tintSet)
879 tint.get (c);
880 if (shade > 0 && shade < 100)
881 {
882 c.r = (c.r * shade) / 100;
883 c.g = (c.g * shade) / 100;
884 c.b = (c.b * shade) / 100;
885 }
886 else if( shade > 100 && shade < 200)
887 {
888 c.r = (c.r * (200 - shade)) / 100;
889 c.g = (c.g * (200 - shade)) / 100;
890 c.b = (c.b * (200 - shade)) / 100;
891 }
892
893 XRenderPictFormat pf;
894 pf.type = PictTypeDirect;
895 pf.depth = 32;
896 pf.direct.redMask = 0xff;
897 pf.direct.greenMask = 0xff;
898 pf.direct.blueMask = 0xff;
899 pf.direct.alphaMask = 0xff;
900
901 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
902 (PictFormatType|
903 PictFormatDepth|
904 PictFormatRedMask|
905 PictFormatGreenMask|
906 PictFormatBlueMask|
907 PictFormatAlphaMask),
908 &pf,
909 0);
910 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
911 XRenderPictureAttributes pa ;
912
913 Picture back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
914
915 pa.repeat = True;
916
917 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
918 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
919 XFreePixmap (dpy, overlay_pmap);
920
921 pa.component_alpha = True;
922 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
923 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
924 XFreePixmap (dpy, mask_pmap);
925
926 if (mask_pic && overlay_pic && back_pic)
927 {
928 XRenderColor mask_c;
929
930 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof(mask_c));
931 mask_c.alpha = 0xffff;
932 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
933 memset (&mask_c, 0x0, sizeof(mask_c));
934 mask_c.alpha = 0;
935 if (c.r == c.b && c.b == c.g) /* pure shading */
936 {
937 mask_c.red = mask_c.green = mask_c.blue = 0xffff-c.r;
938 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
939 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
940 }
941 else
942 {
943 mask_c.red = 0xffff-c.r;
944 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
945 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
946 mask_c.red = 0;
947 mask_c.green = 0xffff-c.g;
948 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
949 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
950 mask_c.green = 0;
951 mask_c.blue = 0xffff-c.b;
952 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
953 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
954 }
955 result |= transpPmapTinted;
956 }
957 XRenderFreePicture (dpy, mask_pic);
958 XRenderFreePicture (dpy, overlay_pic);
959 XRenderFreePicture (dpy, back_pic);
960#endif
961 }
962 }
806 if (pixmap) 963 if (pixmap)
807 XFreePixmap (dpy, pixmap); 964 XFreePixmap (dpy, pixmap);
808 pixmap = tiled_root_pmap; 965 pixmap = tiled_root_pmap;
809 pmap_width = window_width; 966 pmap_width = window_width;
810 pmap_height = window_height; 967 pmap_height = window_height;
811 pmap_depth = root_depth; 968 pmap_depth = root_depth;
812 } 969 }
813 970
814 if (gc) 971 if (gc)
815 XFreeGC (dpy, gc); 972 XFreeGC (dpy, gc);
973
974 TIMING_TEST_PRINT_RESULT (tp);
975
976 return result;
816} 977}
817 978
818bool 979bool
819bgPixmap_t::set_root_pixmap () 980bgPixmap_t::set_root_pixmap ()
820{ 981{
… …
831 } 992 }
832 return false; 993 return false;
833} 994}
834# endif /* ENABLE_TRANSPARENCY */ 995# endif /* ENABLE_TRANSPARENCY */
835 996
997# ifndef HAVE_AFTERIMAGE
998static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm);
999# endif
1000
1001
836bool 1002bool
837bgPixmap_t::render_background () 1003bgPixmap_t::render ()
838{ 1004{
839 /* TODO: temporary implementation - need to move check_parents stuff in here */ 1005 unsigned long background_flags = 0;
1006
1007 if (target == NULL)
1008 return false;
1009
1010 invalidate();
840# ifdef ENABLE_TRANSPARENCY 1011# ifdef ENABLE_TRANSPARENCY
841 if (flags & isTransparent) 1012 if (flags & isTransparent)
842 { 1013 {
843 /* we need to re-generate transparency pixmap in that case ! */ 1014 /* we need to re-generate transparency pixmap in that case ! */
844 target->check_our_parents (); 1015 background_flags = make_transparency_pixmap ();
845 return true; 1016 if (background_flags == 0)
1017 return false;
1018 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1019 && pmap_depth == target->depth)
1020 flags = flags & ~isInvalid;
846 } 1021 }
847# endif 1022# endif
1023
1024 XImage *result = NULL;
848# ifdef HAVE_AFTERIMAGE 1025# ifdef HAVE_AFTERIMAGE
849 render_asim (NULL, TINT_LEAVE_SAME); 1026 if (original_asim
850 apply_background (); 1027 || (background_flags & transpTransformations) != (flags & transpTransformations))
1028 {
1029 ASImage *background = NULL;
1030 ARGB32 as_tint = TINT_LEAVE_SAME;
1031 if (background_flags)
1032 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1033
1034# ifdef ENABLE_TRANSPARENCY
1035 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1036 {
1037 ShadingInfo as_shade;
1038 as_shade.shading = (shade == 0) ? 100 : shade;
1039
1040 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1041 if (flags & tintSet)
1042 tint.get (c);
1043 as_shade.tintColor.red = c.r;
1044 as_shade.tintColor.green = c.g;
1045 as_shade.tintColor.blue = c.b;
1046
1047 as_tint = shading2tint32 (&as_shade);
1048 }
1049 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1050 {
1051 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1052 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1053 100, ASIMAGE_QUALITY_DEFAULT);
1054 if (tmp)
1055 {
1056 destroy_asimage (&background);
1057 background = tmp;
1058 }
1059 }
1060# endif
1061
1062 if (render_asim (background, as_tint))
1063 flags = flags & ~isInvalid;
1064 if (background)
1065 destroy_asimage (&background);
1066 }
1067 else if (background_flags && pmap_depth != target->depth)
1068 {
1069 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1070 }
1071# else /* our own client-side tinting */
1072 if (background_flags && (flags & isInvalid))
1073 {
1074 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1075 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1076 {
1077 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1078 if (flags & tintSet)
1079 tint.get (c);
1080 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1081 }
1082 }
1083# endif /* HAVE_AFTERIMAGE */
1084 if (result != NULL)
1085 {
1086 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1087 if (gc)
1088 {
1089 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1090 {
1091 XFreePixmap (target->dpy, pixmap);
1092 pixmap = None;
1093 }
1094 if (pixmap == None)
1095 {
1096 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1097 pmap_width = result->width;
1098 pmap_height = result->height;
1099 pmap_depth = target->depth;
1100 }
1101 if (pmap_depth != result->depth)
1102 { /* Bad Match error will ensue ! stupid X !!!! */
1103 if( result->depth == 24 && pmap_depth == 32)
1104 result->depth = 32;
1105 else if( result->depth == 32 && pmap_depth == 24)
1106 result->depth = 24;
1107 else
1108 {
1109 /* TODO: implement image recoding */
1110 }
1111 }
1112 if (pmap_depth == result->depth)
1113 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1114 XFreeGC (target->dpy, gc);
1115 flags = flags & ~isInvalid;
1116 }
1117 XDestroyImage (result);
1118 }
1119
1120 if (flags & isInvalid)
1121 {
1122 if (pixmap != None)
1123 {
1124 XFreePixmap (target->dpy, pixmap);
1125 pixmap = None;
1126 }
1127 }
1128
1129 apply ();
1130
851 return true; 1131 return true;
852# endif
853 return false;
854} 1132}
855 1133
856bool 1134bool
857bgPixmap_t::set_target (rxvt_term *new_target) 1135bgPixmap_t::set_target (rxvt_term *new_target)
858{ 1136{
… …
867 } 1145 }
868 return false; 1146 return false;
869} 1147}
870 1148
871void 1149void
872bgPixmap_t::apply_background() 1150bgPixmap_t::apply()
873{ 1151{
874 if (target) 1152 if (target)
875 { 1153 {
876 if (pixmap != None) 1154 if (pixmap != None)
877 { /* set target's background to pixmap */ 1155 { /* set target's background to pixmap */
878# ifdef ENABLE_TRANSPARENCY 1156# ifdef ENABLE_TRANSPARENCY
879 if (flags & isTransparent) 1157 if (flags & isTransparent)
880 { 1158 {
881 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1159 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
882 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1160 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1161# if HAVE_SCROLLBARS
883 if (target->scrollBar.win) 1162 if (target->scrollBar.win)
884 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1163 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1164# endif
885 } 1165 }
886 else 1166 else
887# endif 1167# endif
888 { 1168 {
889 /* force old pixmap dereference in case it was transparent before :*/ 1169 /* force old pixmap dereference in case it was transparent before :*/
890 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_bg]); 1170 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
891 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1171 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
892 /* do we also need to set scrollbar's background here ? */ 1172 /* do we also need to set scrollbar's background here ? */
1173# if HAVE_SCROLLBARS
1174 if (target->scrollBar.win)
1175 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1176# endif
893 } 1177 }
894 } 1178 }
895 else 1179 else
896 { /* set target background to a pixel */ 1180 { /* set target background to a pixel */
897 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_bg]); 1181 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
898 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1182 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
899 /* do we also need to set scrollbar's background here ? */ 1183 /* do we also need to set scrollbar's background here ? */
1184# if HAVE_SCROLLBARS
1185 if (target->scrollBar.win)
1186 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1187# endif
900 } 1188 }
901 /* don't want Expose on the parent */ 1189 /* don't want Expose on the parent */
902 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False); 1190 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False);
903 /* do want Expose on the vt */ 1191 /* do want Expose on the vt */
904 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, True); 1192 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, True);
1193# if HAVE_SCROLLBARS
1194 if (target->scrollBar.win)
1195 {
1196 target->scrollBar.setIdle ();
1197 target->scrollbar_show (0);
1198 }
1199# endif
1200 /* Is that really neccessary? we did a XClearArea to generate Expose events alreday ! */
1201 target->want_refresh = 1;
1202# ifdef ENABLE_TRANSPARENCY
1203 target->want_full_refresh = 1;
1204# endif
1205 /* TODO: why do we need a flush here ??? It causes segfault on resize ! */
1206// target->flush ();
905 } 1207 }
906} 1208}
907#endif /* HAVE_BG_PIXMAP */
908
909 1209
910void 1210void
911rxvt_term::get_window_origin (int &x, int &y) 1211rxvt_term::get_window_origin (int &x, int &y)
912{ 1212{
913 Window cr; 1213 Window cr;
914 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1214 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1215/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
915} 1216}
916 1217
917Pixmap 1218Pixmap
918rxvt_term::get_pixmap_property (int prop_id) 1219rxvt_term::get_pixmap_property (int prop_id)
919{ 1220{
… …
933 } 1234 }
934 } 1235 }
935 return None; 1236 return None;
936} 1237}
937 1238
1239/*
1240 * Check our parents are still who we think they are.
1241 * Do transparency updates if required
1242 */
1243int
1244rxvt_term::update_background ()
1245{
1246 bgPixmap.invalidate();
1247 /* no chance of real time refresh if we are blurring ! */
1248 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1249 bgPixmap.render();
1250 else
1251 {
1252 update_background_ev.stop ();
1253 if (!bgPixmap.need_client_side_rendering())
1254 update_background_ev.start (NOW + .05);
1255 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1256 update_background_ev.start (NOW + .2); /* very slow !!! */
1257 else
1258 update_background_ev.start (NOW + .07);
1259 }
1260 return 0;
1261}
938 1262
939#ifdef ENABLE_TRANSPARENCY 1263void
940#ifndef HAVE_AFTERIMAGE 1264rxvt_term::update_background_cb (time_watcher &w)
1265{
1266 bgPixmap.render ();
1267}
1268#endif /* HAVE_BG_PIXMAP */
1269
1270#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
941/* taken from aterm-0.4.2 */ 1271/* taken from aterm-0.4.2 */
942 1272
943typedef uint32_t RUINT32T; 1273typedef uint32_t RUINT32T;
944 1274
945static void 1275static void
… …
952 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1282 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
953 int i; 1283 int i;
954 1284
955 Visual *visual = term->visual; 1285 Visual *visual = term->visual;
956 1286
957 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 1287 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1288
1289 if (shade == 0)
1290 shade = 100;
958 1291
959 /* for convenience */ 1292 /* for convenience */
960 mask_r = visual->red_mask; 1293 mask_r = visual->red_mask;
961 mask_g = visual->green_mask; 1294 mask_g = visual->green_mask;
962 mask_b = visual->blue_mask; 1295 mask_b = visual->blue_mask;
… …
1165 } 1498 }
1166 } 1499 }
1167 1500
1168 free (lookup); 1501 free (lookup);
1169} 1502}
1170#endif 1503#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */
1171 1504
1172/* 1505#if 0 /* replaced by a bgPixmap_t::render() - leve here temporarily for reference */
1173 * Check our parents are still who we think they are.
1174 * Do transparency updates if required
1175 */
1176int
1177rxvt_term::check_our_parents ()
1178{
1179 check_our_parents_ev.stop ();
1180 check_our_parents_ev.start (NOW + .1);
1181 return 0;
1182}
1183
1184void 1506void
1185rxvt_term::check_our_parents_cb (time_watcher &w) 1507rxvt_term::check_our_parents_cb (time_watcher &w)
1186{ 1508{
1509
1187 int i, aformat, rootdepth; 1510 int i, aformat, rootdepth;
1188 unsigned long nitems, bytes_after; 1511 unsigned long nitems, bytes_after;
1189 Atom atype; 1512 Atom atype;
1190 unsigned char *prop = NULL; 1513 unsigned char *prop = NULL;
1191 Window root, oldp, *list; 1514 Window root, oldp, *list;
… …
1195 Window cr; 1518 Window cr;
1196 unsigned int rootpixmap_w = 0, rootpixmap_h = 0; 1519 unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
1197 1520
1198 if (!option (Opt_transparent)) 1521 if (!option (Opt_transparent))
1199 return; /* Don't try any more */ 1522 return; /* Don't try any more */
1200#if 0
1201 struct timeval stv;
1202 gettimeofday (&stv,NULL);
1203#define PRINT_BACKGROUND_OP_TIME do{ struct timeval tv;gettimeofday (&tv,NULL); tv.tv_sec-= stv.tv_sec;\
1204 fprintf (stderr,"%d: elapsed %ld usec\n",__LINE__,\
1205 tv.tv_sec*1000000+tv.tv_usec-stv.tv_usec );}while(0)
1206#else
1207#define PRINT_BACKGROUND_OP_TIME do{}while(0)
1208#endif
1209
1210 1523
1211 XGetWindowAttributes (dpy, display->root, &wrootattr); 1524 XGetWindowAttributes (dpy, display->root, &wrootattr);
1212 rootdepth = wrootattr.depth; 1525 rootdepth = wrootattr.depth;
1213 1526
1214 XGetWindowAttributes (dpy, parent[0], &wattr); 1527 XGetWindowAttributes (dpy, parent[0], &wattr);
… …
1348 { 1661 {
1349 XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap); 1662 XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
1350 success = False; 1663 success = False;
1351 if (image != NULL) 1664 if (image != NULL)
1352 { 1665 {
1353 PRINT_BACKGROUND_OP_TIME;
1354 if (gc == NULL) 1666 if (gc == NULL)
1355 gc = XCreateGC (dpy, vt, 0UL, &gcvalue); 1667 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1356 if (ISSET_PIXCOLOR (Color_tint) || shade != 100) 1668 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
1357 ShadeXImage (this, image, shade, c.r, c.g, c.b); 1669 ShadeXImage (this, image, shade, c.r, c.g, c.b);
1358 XPutImage (dpy, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height); 1670 XPutImage (dpy, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
1359 XDestroyImage (image); 1671 XDestroyImage (image);
1360 success = True; 1672 success = True;
1361 } 1673 }
1362 } 1674 }
1363#endif /* HAVE_AFTERIMAGE */ 1675#endif /* HAVE_AFTERIMAGE */
1364 PRINT_BACKGROUND_OP_TIME;
1365 1676
1366 if (gc != NULL) 1677 if (gc != NULL)
1367 XFreeGC (dpy, gc); 1678 XFreeGC (dpy, gc);
1368 1679
1369 bgPixmap.apply_background(); 1680 bgPixmap.apply();
1370 if (!success) 1681 if (!success)
1371 am_pixmap_trans = 0; 1682 am_pixmap_trans = 0;
1372 else 1683 else
1373 { 1684 {
1374 am_transparent = am_pixmap_trans = 1; 1685 am_transparent = am_pixmap_trans = 1;
… …
1389 if (am_pixmap_trans) 1700 if (am_pixmap_trans)
1390 flush (); 1701 flush ();
1391 } 1702 }
1392 } 1703 }
1393} 1704}
1394#endif 1705#endif

Diff Legend

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