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.70 by sasha, Thu Aug 16 21:26:20 2007 UTC vs.
Revision 1.75 by ayin, Mon Aug 27 21:02:41 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
… …
93bool bgPixmap_t::need_client_side_rendering () 110bool bgPixmap_t::need_client_side_rendering ()
94{ 111{
95# ifdef HAVE_AFTERIMAGE 112# ifdef HAVE_AFTERIMAGE
96 if (original_asim != NULL) 113 if (original_asim != NULL)
97 return true; 114 return true;
98#endif 115# endif
99# ifdef ENABLE_TRANSPARENCY 116# ifdef ENABLE_TRANSPARENCY
100 if (flags & isTransparent) 117 if (flags & isTransparent)
101 { 118 {
102 if ((flags & blurNeeded) 119 if ((flags & blurNeeded)
103 || ((flags & tintNeeded) && !(flags & tintServerSide))) 120 || ((flags & tintNeeded) && !(flags & tintServerSide)))
… …
376 int x = 0; 393 int x = 0;
377 int y = 0; 394 int y = 0;
378 int w = h_scale * target_width / 100; 395 int w = h_scale * target_width / 100;
379 int h = v_scale * target_height / 100; 396 int h = v_scale * target_height / 100;
380 397
398 TIMING_TEST_START (asim);
399
381 if (original_asim) 400 if (original_asim)
382 { 401 {
383 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);
384 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);
385 } 404 }
… …
489 result = tmp; 508 result = tmp;
490 } 509 }
491 free (layers); 510 free (layers);
492 } 511 }
493 } 512 }
513 TIMING_TEST_PRINT_RESULT (asim);
494 514
495 if (pixmap) 515 if (pixmap)
496 { 516 {
497 if (result == NULL 517 if (result == NULL
498 || pmap_width != new_pmap_width 518 || pmap_width != new_pmap_width
… …
544 564
545 if (result != background && result != original_asim) 565 if (result != background && result != original_asim)
546 destroy_asimage (&result); 566 destroy_asimage (&result);
547 567
548 XFreeGC (target->dpy, gc); 568 XFreeGC (target->dpy, gc);
569 TIMING_TEST_PRINT_RESULT (asim);
549 } 570 }
550 571
551 return true; 572 return true;
552} 573}
553# endif /* HAVE_AFTERIMAGE */ 574# endif /* HAVE_AFTERIMAGE */
… …
561 582
562 if (*file != '\0') 583 if (*file != '\0')
563 { 584 {
564# ifdef HAVE_AFTERIMAGE 585# ifdef HAVE_AFTERIMAGE
565 if (target->asimman == NULL) 586 if (target->asimman == NULL)
566 target->asimman = create_generic_imageman(target->rs[Rs_path]); 587 target->asimman = create_generic_imageman (target->rs[Rs_path]);
567 if ((f = strchr (file, ';')) == NULL) 588 if ((f = strchr (file, ';')) == NULL)
568 original_asim = get_asimage( target->asimman, file, 0xFFFFFFFF, 100 ); 589 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
569 else 590 else
570 { 591 {
571 size_t len = f - file; 592 size_t len = f - file;
572 f = (char *)malloc (len + 1); 593 f = (char *)malloc (len + 1);
573 strncpy (f, file, len); 594 strncpy (f, file, len);
574 f[len] = '\0'; 595 f[len] = '\0';
575 original_asim = get_asimage( target->asimman, f, 0xFFFFFFFF, 100 ); 596 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
576 free( f ); 597 free (f);
577 } 598 }
578 return (original_asim != NULL); 599 return (original_asim != NULL);
579# endif 600# endif
580 } 601 }
581 return false; 602 return false;
… …
590 if (!(flags & isTransparent)) 611 if (!(flags & isTransparent))
591 { 612 {
592 flags |= isTransparent; 613 flags |= isTransparent;
593 return true; 614 return true;
594 } 615 }
616 return false;
595} 617}
596 618
597bool 619bool
598bgPixmap_t::set_blur_radius (const char *geom) 620bgPixmap_t::set_blur_radius (const char *geom)
599{ 621{
… …
625 647
626static inline unsigned long 648static inline unsigned long
627compute_tint_shade_flags (rxvt_color *tint, int shade) 649compute_tint_shade_flags (rxvt_color *tint, int shade)
628{ 650{
629 unsigned long flags = 0; 651 unsigned long flags = 0;
652 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
630 653
631 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))
632 flags |= bgPixmap_t::tintNeeded; 666 flags |= bgPixmap_t::tintNeeded;
633 else if (tint) 667 else if (tint)
634 { 668 {
635 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
636 tint->get (c);
637
638 flags |= bgPixmap_t::tintNeeded;
639 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 669 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
640 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 670 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
641 { 671 {
642 flags |= bgPixmap_t::tintNeeded; 672 flags |= bgPixmap_t::tintNeeded;
643#define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
644 if (IS_COMPONENT_WHOLESOME (c.r)
645 && IS_COMPONENT_WHOLESOME (c.g)
646 && IS_COMPONENT_WHOLESOME (c.b))
647 flags |= bgPixmap_t::tintServerSide;
648#undef IS_COMPONENT_WHOLESOME
649 } 673 }
650 } 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
651 return flags; 686 return flags;
652} 687}
653 688
654bool 689bool
655bgPixmap_t::set_tint (rxvt_color &new_tint) 690bgPixmap_t::set_tint (rxvt_color &new_tint)
… …
685 if (new_shade == 100) 720 if (new_shade == 100)
686 new_shade = 0; 721 new_shade = 0;
687 722
688 if (new_shade != shade) 723 if (new_shade != shade)
689 { 724 {
690 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);
691 shade = new_shade; 726 shade = new_shade;
692 flags = (flags & ~tintFlags) | new_flags; 727 flags = (flags & ~tintFlags) | new_flags;
693 return true; 728 return true;
694 } 729 }
695 return false; 730 return false;
… …
721 int window_width = target->szHint.width; 756 int window_width = target->szHint.width;
722 int window_height = target->szHint.height; 757 int window_height = target->szHint.height;
723 int sx, sy; 758 int sx, sy;
724 XGCValues gcv; 759 XGCValues gcv;
725 760
761 TIMING_TEST_START (tp);
726 target->get_window_origin (sx, sy); 762 target->get_window_origin (sx, sy);
727 763
728 /* 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 : */
729 if (sx + window_width <= 0 || sy + window_height <= 0 765 if (sx + window_width <= 0 || sy + window_height <= 0
730 || sx >= root_width || sy >= root_height) 766 || sx >= root_width || sy >= root_height)
… …
809 { 845 {
810 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);
811 result |= transpPmapTiled; 847 result |= transpPmapTiled;
812 } 848 }
813 } 849 }
850 TIMING_TEST_PRINT_RESULT (tp);
814 851
815 if (tiled_root_pmap != None) 852 if (tiled_root_pmap != None)
853 {
854 if ((flags & tintNeeded) && !need_client_side_rendering ())
816 { 855 {
817 if (flags & tintNeeded) 856 if (flags & tintWholesome)
818 { 857 {
819 if ((flags & tintServerSide)
820 && h_blurRadius <= 1 && v_blurRadius <= 1
821# ifdef HAVE_AFTERIMAGE
822 && original_asim == NULL
823# endif
824 )
825 { /* In this case we can tint image server-side getting significant 858 /* In this case we can tint image server-side getting significant
826 * performance improvements, as we eliminate XImage transfer 859 * performance improvements, as we eliminate XImage transfer
827 */ 860 */
828 gcv.foreground = Pixel (tint); 861 gcv.foreground = Pixel (tint);
829 gcv.function = GXand; 862 gcv.function = GXand;
830 gcv.fill_style = FillSolid; 863 gcv.fill_style = FillSolid;
831 if (gc) 864 if (gc)
832 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv); 865 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
833 else 866 else
834 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 867 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
835 if (gc) 868 if (gc)
836 { 869 {
837 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;
872 }
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 }
838 result |= transpPmapTinted; 955 result |= transpPmapTinted;
839 } 956 }
840 } 957 XRenderFreePicture (dpy, mask_pic);
958 XRenderFreePicture (dpy, overlay_pic);
959 XRenderFreePicture (dpy, back_pic);
960#endif
841 } 961 }
962 }
842 if (pixmap) 963 if (pixmap)
843 XFreePixmap (dpy, pixmap); 964 XFreePixmap (dpy, pixmap);
844 pixmap = tiled_root_pmap; 965 pixmap = tiled_root_pmap;
845 pmap_width = window_width; 966 pmap_width = window_width;
846 pmap_height = window_height; 967 pmap_height = window_height;
847 pmap_depth = root_depth; 968 pmap_depth = root_depth;
848 } 969 }
849 970
850 if (gc) 971 if (gc)
851 XFreeGC (dpy, gc); 972 XFreeGC (dpy, gc);
973
974 TIMING_TEST_PRINT_RESULT (tp);
852 975
853 return result; 976 return result;
854} 977}
855 978
856bool 979bool
857bgPixmap_t::set_root_pixmap () 980bgPixmap_t::set_root_pixmap ()
858{ 981{
… …
871} 994}
872# endif /* ENABLE_TRANSPARENCY */ 995# endif /* ENABLE_TRANSPARENCY */
873 996
874# ifndef HAVE_AFTERIMAGE 997# ifndef HAVE_AFTERIMAGE
875static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 998static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm);
876#endif 999# endif
877 1000
878 1001
879bool 1002bool
880bgPixmap_t::render () 1003bgPixmap_t::render ()
881{ 1004{
… …
906 ASImage *background = NULL; 1029 ASImage *background = NULL;
907 ARGB32 as_tint = TINT_LEAVE_SAME; 1030 ARGB32 as_tint = TINT_LEAVE_SAME;
908 if (background_flags) 1031 if (background_flags)
909 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 1032 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
910 1033
1034# ifdef ENABLE_TRANSPARENCY
911 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1035 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
912 { 1036 {
913 ShadingInfo as_shade; 1037 ShadingInfo as_shade;
914 as_shade.shading = (shade == 0) ? 100 : shade; 1038 as_shade.shading = (shade == 0) ? 100 : shade;
915 1039
… …
920 as_shade.tintColor.green = c.g; 1044 as_shade.tintColor.green = c.g;
921 as_shade.tintColor.blue = c.b; 1045 as_shade.tintColor.blue = c.b;
922 1046
923 as_tint = shading2tint32 (&as_shade); 1047 as_tint = shading2tint32 (&as_shade);
924 } 1048 }
925
926 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 1049 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
927 { 1050 {
928 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 1051 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
929 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, 1052 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
930 100, ASIMAGE_QUALITY_DEFAULT); 1053 100, ASIMAGE_QUALITY_DEFAULT);
… …
932 { 1055 {
933 destroy_asimage (&background); 1056 destroy_asimage (&background);
934 background = tmp; 1057 background = tmp;
935 } 1058 }
936 } 1059 }
1060# endif
937 1061
938 if (render_asim (background, as_tint)) 1062 if (render_asim (background, as_tint))
939 flags = flags & ~isInvalid; 1063 flags = flags & ~isInvalid;
940 if (background) 1064 if (background)
941 destroy_asimage (&background); 1065 destroy_asimage (&background);
… …
954 if (flags & tintSet) 1078 if (flags & tintSet)
955 tint.get (c); 1079 tint.get (c);
956 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1080 ShadeXImage (target, result, shade, c.r, c.g, c.b);
957 } 1081 }
958 } 1082 }
959# endif 1083# endif /* HAVE_AFTERIMAGE */
960 if (result != NULL) 1084 if (result != NULL)
961 { 1085 {
962 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1086 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
963 if (gc) 1087 if (gc)
964 { 1088 {
965 if (pmap_depth != target->depth && pixmap != None) 1089 if (/*pmap_depth != target->depth &&*/ pixmap != None)
966 { 1090 {
967 XFreePixmap (target->dpy, pixmap); 1091 XFreePixmap (target->dpy, pixmap);
968 pixmap = None; 1092 pixmap = None;
969 } 1093 }
970 if (pixmap == None) 1094 if (pixmap == None)
… …
972 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); 1096 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
973 pmap_width = result->width; 1097 pmap_width = result->width;
974 pmap_height = result->height; 1098 pmap_height = result->height;
975 pmap_depth = target->depth; 1099 pmap_depth = target->depth;
976 } 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)
977 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1113 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
978 XFreeGC (target->dpy, gc); 1114 XFreeGC (target->dpy, gc);
979 flags = flags & ~isInvalid; 1115 flags = flags & ~isInvalid;
980 } 1116 }
981 XDestroyImage (result); 1117 XDestroyImage (result);
982 } 1118 }
… …
986 if (pixmap != None) 1122 if (pixmap != None)
987 { 1123 {
988 XFreePixmap (target->dpy, pixmap); 1124 XFreePixmap (target->dpy, pixmap);
989 pixmap = None; 1125 pixmap = None;
990 } 1126 }
991// TODO : we need to get rid of that garbadge :
992 target->am_transparent = target->am_pixmap_trans = 0;
993 } 1127 }
994 else
995 target->am_transparent = target->am_pixmap_trans = 1;
996 1128
997 apply (); 1129 apply ();
998 1130
999 return true; 1131 return true;
1000} 1132}
… …
1056 } 1188 }
1057 /* don't want Expose on the parent */ 1189 /* don't want Expose on the parent */
1058 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False); 1190 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False);
1059 /* do want Expose on the vt */ 1191 /* do want Expose on the vt */
1060 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, True); 1192 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, True);
1061#if HAVE_SCROLLBARS 1193# if HAVE_SCROLLBARS
1062 if (target->scrollBar.win) 1194 if (target->scrollBar.win)
1063 { 1195 {
1064 target->scrollBar.setIdle (); 1196 target->scrollBar.setIdle ();
1065 target->scrollbar_show (0); 1197 target->scrollbar_show (0);
1066 } 1198 }
1067#endif 1199# endif
1068 /* Is that really neccessary? we did a XClearArea to generate Expose events alreday ! */ 1200 /* Is that really neccessary? we did a XClearArea to generate Expose events alreday ! */
1201 target->want_refresh = 1;
1202# ifdef ENABLE_TRANSPARENCY
1069 target->want_refresh = target->want_full_refresh = 1; 1203 target->want_full_refresh = 1;
1204# endif
1070 /* TODO: why do we need a flush here ??? It causes segfault on resize ! */ 1205 /* TODO: why do we need a flush here ??? It causes segfault on resize ! */
1071// target->flush (); 1206// target->flush ();
1072 } 1207 }
1073} 1208}
1074#endif /* HAVE_BG_PIXMAP */
1075
1076 1209
1077void 1210void
1078rxvt_term::get_window_origin (int &x, int &y) 1211rxvt_term::get_window_origin (int &x, int &y)
1079{ 1212{
1080 Window cr; 1213 Window cr;
… …
1086rxvt_term::get_pixmap_property (int prop_id) 1219rxvt_term::get_pixmap_property (int prop_id)
1087{ 1220{
1088 if (prop_id > 0 && prop_id < NUM_XA) 1221 if (prop_id > 0 && prop_id < NUM_XA)
1089 if (xa[prop_id]) 1222 if (xa[prop_id])
1090 { 1223 {
1091 int aformat, rootdepth; 1224 int aformat;
1092 unsigned long nitems, bytes_after; 1225 unsigned long nitems, bytes_after;
1093 Atom atype; 1226 Atom atype;
1094 unsigned char *prop = NULL; 1227 unsigned char *prop = NULL;
1095 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1228 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1096 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1229 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
… …
1101 } 1234 }
1102 } 1235 }
1103 return None; 1236 return None;
1104} 1237}
1105 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}
1106 1262
1107#ifdef ENABLE_TRANSPARENCY 1263void
1108#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)
1109/* taken from aterm-0.4.2 */ 1271/* taken from aterm-0.4.2 */
1110 1272
1111typedef uint32_t RUINT32T; 1273typedef uint32_t RUINT32T;
1112 1274
1113static void 1275static void
… …
1124 1286
1125 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1287 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1126 1288
1127 if (shade == 0) 1289 if (shade == 0)
1128 shade = 100; 1290 shade = 100;
1129 1291
1130 /* for convenience */ 1292 /* for convenience */
1131 mask_r = visual->red_mask; 1293 mask_r = visual->red_mask;
1132 mask_g = visual->green_mask; 1294 mask_g = visual->green_mask;
1133 mask_b = visual->blue_mask; 1295 mask_b = visual->blue_mask;
1134 1296
… …
1336 } 1498 }
1337 } 1499 }
1338 1500
1339 free (lookup); 1501 free (lookup);
1340} 1502}
1341#endif 1503#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */
1342
1343/*
1344 * Check our parents are still who we think they are.
1345 * Do transparency updates if required
1346 */
1347int
1348rxvt_term::update_background ()
1349{
1350 bgPixmap.invalidate();
1351 /* no chance of real time refresh if we are blurring ! */
1352 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1353 bgPixmap.render();
1354 else
1355 {
1356 update_background_ev.stop ();
1357 if (!bgPixmap.need_client_side_rendering())
1358 update_background_ev.start (NOW + .05);
1359 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1360 update_background_ev.start (NOW + .2); /* very slow !!! */
1361 else
1362 update_background_ev.start (NOW + .07);
1363 }
1364 return 0;
1365}
1366
1367void
1368rxvt_term::update_background_cb (time_watcher &w)
1369{
1370 bgPixmap.render ();
1371}
1372#endif /* HAVE_BG_PIXMAP */
1373
1374 1504
1375#if 0 /* replaced by a bgPixmap_t::render() - leve here temporarily for reference */ 1505#if 0 /* replaced by a bgPixmap_t::render() - leve here temporarily for reference */
1376void 1506void
1377rxvt_term::check_our_parents_cb (time_watcher &w) 1507rxvt_term::check_our_parents_cb (time_watcher &w)
1378{ 1508{
… …
1388 Window cr; 1518 Window cr;
1389 unsigned int rootpixmap_w = 0, rootpixmap_h = 0; 1519 unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
1390 1520
1391 if (!option (Opt_transparent)) 1521 if (!option (Opt_transparent))
1392 return; /* Don't try any more */ 1522 return; /* Don't try any more */
1393#if 0
1394 struct timeval stv;
1395 gettimeofday (&stv,NULL);
1396#define PRINT_BACKGROUND_OP_TIME do{ struct timeval tv;gettimeofday (&tv,NULL); tv.tv_sec-= stv.tv_sec;\
1397 fprintf (stderr,"%d: elapsed %ld usec\n",__LINE__,\
1398 tv.tv_sec*1000000+tv.tv_usec-stv.tv_usec );}while(0)
1399#else
1400#define PRINT_BACKGROUND_OP_TIME do{}while(0)
1401#endif
1402
1403 1523
1404 XGetWindowAttributes (dpy, display->root, &wrootattr); 1524 XGetWindowAttributes (dpy, display->root, &wrootattr);
1405 rootdepth = wrootattr.depth; 1525 rootdepth = wrootattr.depth;
1406 1526
1407 XGetWindowAttributes (dpy, parent[0], &wattr); 1527 XGetWindowAttributes (dpy, parent[0], &wattr);
… …
1541 { 1661 {
1542 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);
1543 success = False; 1663 success = False;
1544 if (image != NULL) 1664 if (image != NULL)
1545 { 1665 {
1546 PRINT_BACKGROUND_OP_TIME;
1547 if (gc == NULL) 1666 if (gc == NULL)
1548 gc = XCreateGC (dpy, vt, 0UL, &gcvalue); 1667 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1549 if (ISSET_PIXCOLOR (Color_tint) || shade != 100) 1668 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
1550 ShadeXImage (this, image, shade, c.r, c.g, c.b); 1669 ShadeXImage (this, image, shade, c.r, c.g, c.b);
1551 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);
1552 XDestroyImage (image); 1671 XDestroyImage (image);
1553 success = True; 1672 success = True;
1554 } 1673 }
1555 } 1674 }
1556#endif /* HAVE_AFTERIMAGE */ 1675#endif /* HAVE_AFTERIMAGE */
1557 PRINT_BACKGROUND_OP_TIME;
1558 1676
1559 if (gc != NULL) 1677 if (gc != NULL)
1560 XFreeGC (dpy, gc); 1678 XFreeGC (dpy, gc);
1561 1679
1562 bgPixmap.apply(); 1680 bgPixmap.apply();

Diff Legend

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