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.2 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.8 by ayin, Sat Oct 27 15:14:55 2007 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xmp.C 2 * File: background.C - former xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au> 6 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
… …
130 return true; 130 return true;
131# endif 131# endif
132# ifdef ENABLE_TRANSPARENCY 132# ifdef ENABLE_TRANSPARENCY
133 if (flags & isTransparent) 133 if (flags & isTransparent)
134 { 134 {
135# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
135 if (((flags & blurNeeded) && !(flags & blurServerSide)) 136 if ((flags & blurNeeded) && !(flags & blurServerSide))
137 return true;
138# endif
136 || ((flags & tintNeeded) && !(flags & tintServerSide))) 139 if ((flags & tintNeeded) && !(flags & tintServerSide))
137 return true; 140 return true;
138 } 141 }
139# endif 142# endif
140 return false; 143 return false;
141} 144}
142 145
… …
668static inline unsigned long 671static inline unsigned long
669compute_tint_shade_flags (rxvt_color *tint, int shade) 672compute_tint_shade_flags (rxvt_color *tint, int shade)
670{ 673{
671 unsigned long flags = 0; 674 unsigned long flags = 0;
672 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 675 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
676 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200);
673 677
674 if (tint) 678 if (tint)
675 { 679 {
676 tint->get (c); 680 tint->get (c);
677# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 681# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
678 if (IS_COMPONENT_WHOLESOME (c.r) 682 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r)
679 && IS_COMPONENT_WHOLESOME (c.g) 683 && IS_COMPONENT_WHOLESOME (c.g)
680 && IS_COMPONENT_WHOLESOME (c.b)) 684 && IS_COMPONENT_WHOLESOME (c.b))
681 flags |= bgPixmap_t::tintWholesome; 685 flags |= bgPixmap_t::tintWholesome;
682# undef IS_COMPONENT_WHOLESOME 686# undef IS_COMPONENT_WHOLESOME
683 } 687 }
684 688
685 if ((shade > 0 && shade < 100) || (shade > 100 && shade < 200)) 689 if (has_shade)
686 flags |= bgPixmap_t::tintNeeded; 690 flags |= bgPixmap_t::tintNeeded;
687 else if (tint) 691 else if (tint)
688 { 692 {
689 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 693 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
690 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 694 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
… …
695 699
696 if (flags & bgPixmap_t::tintNeeded) 700 if (flags & bgPixmap_t::tintNeeded)
697 { 701 {
698 if (flags & bgPixmap_t::tintWholesome) 702 if (flags & bgPixmap_t::tintWholesome)
699 flags |= bgPixmap_t::tintServerSide; 703 flags |= bgPixmap_t::tintServerSide;
704 else
705 {
700#if XFT 706#if XFT
701 flags |= bgPixmap_t::tintServerSide; 707 flags |= bgPixmap_t::tintServerSide;
702#endif 708#endif
709 }
703 } 710 }
704 711
705 return flags; 712 return flags;
706} 713}
707 714
… …
741 748
742 if (new_shade != shade) 749 if (new_shade != shade)
743 { 750 {
744 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 751 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
745 shade = new_shade; 752 shade = new_shade;
746 flags = (flags & ~tintFlags) | new_flags; 753 flags = (flags & (~tintFlags | tintSet)) | new_flags;
747 return true; 754 return true;
748 } 755 }
749 return false; 756 return false;
750} 757}
751 758
… …
858 else 865 else
859 {/* strightforward pixmap copy */ 866 {/* strightforward pixmap copy */
860 gcv.tile = root_pixmap; 867 gcv.tile = root_pixmap;
861 gcv.fill_style = FillTiled; 868 gcv.fill_style = FillTiled;
862 869
863 while (sx < 0) sx += (int)window_width; 870 while (sx < 0) sx += (int)root_width;
864 while (sy < 0) sy += (int)window_height; 871 while (sy < 0) sy += (int)root_height;
865 872
866 gcv.ts_x_origin = -sx; 873 gcv.ts_x_origin = -sx;
867 gcv.ts_y_origin = -sy; 874 gcv.ts_y_origin = -sy;
868 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 875 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
869 876
… …
928 pf.direct.greenMask = 0xff; 935 pf.direct.greenMask = 0xff;
929 pf.direct.blueMask = 0xff; 936 pf.direct.blueMask = 0xff;
930 pf.direct.alphaMask = 0xff; 937 pf.direct.alphaMask = 0xff;
931 938
932 XRenderPictFormat *solid_format = XRenderFindFormat (dpy, 939 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
933 (PictFormatType| 940 (PictFormatType|
934 PictFormatDepth| 941 PictFormatDepth|
935 PictFormatRedMask| 942 PictFormatRedMask|
936 PictFormatGreenMask| 943 PictFormatGreenMask|
937 PictFormatBlueMask| 944 PictFormatBlueMask|
938 PictFormatAlphaMask), 945 PictFormatAlphaMask),
939 &pf, 946 &pf,
940 0); 947 0);
941 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); 948 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
942 XRenderPictureAttributes pa ; 949 XRenderPictureAttributes pa ;
943 950
944 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa); 951 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
945 952
… …
959 XRenderColor mask_c; 966 XRenderColor mask_c;
960 967
961 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 968 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
962 mask_c.alpha = 0xffff; 969 mask_c.alpha = 0xffff;
963 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 970 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
964 memset (&mask_c, 0x0, sizeof (mask_c)); 971
965 mask_c.alpha = 0; 972 mask_c.alpha = 0;
966 973 mask_c.red = 0xffff - c.r;
967 if (c.r == c.b && c.b == c.g) /* pure shading */ 974 mask_c.green = 0xffff - c.g;
968 { 975 mask_c.blue = 0xffff - c.b;
969 mask_c.red = mask_c.green = mask_c.blue = 0xffff - c.r;
970 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 976 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
971 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); 977 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
972 }
973 else
974 {
975 mask_c.red = 0xffff - c.r;
976 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
977 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
978 mask_c.red = 0;
979 mask_c.green = 0xffff - c.g;
980 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
981 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
982 mask_c.green = 0;
983 mask_c.blue = 0xffff - c.b;
984 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
985 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
986 }
987 result |= transpPmapTinted; 978 result |= transpPmapTinted;
988 } 979 }
989 XRenderFreePicture (dpy, mask_pic); 980 XRenderFreePicture (dpy, mask_pic);
990 XRenderFreePicture (dpy, overlay_pic); 981 XRenderFreePicture (dpy, overlay_pic);
991 XRenderFreePicture (dpy, back_pic); 982 XRenderFreePicture (dpy, back_pic);
992# if DO_TIMING_TEST 983# if DO_TIMING_TEST
… …
1043 unsigned long background_flags = 0; 1034 unsigned long background_flags = 0;
1044 1035
1045 if (target == NULL) 1036 if (target == NULL)
1046 return false; 1037 return false;
1047 1038
1039 TIMING_TEST_START (tp);
1040
1048 invalidate(); 1041 invalidate();
1049# ifdef ENABLE_TRANSPARENCY 1042# ifdef ENABLE_TRANSPARENCY
1050 if (flags & isTransparent) 1043 if (flags & isTransparent)
1051 { 1044 {
1052 /* we need to re-generate transparency pixmap in that case ! */ 1045 /* we need to re-generate transparency pixmap in that case ! */
… …
1104 } 1097 }
1105 else if (background_flags && pmap_depth != target->depth) 1098 else if (background_flags && pmap_depth != target->depth)
1106 { 1099 {
1107 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1100 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1108 } 1101 }
1102
1109# else /* our own client-side tinting */ 1103# elif !XFT /* our own client-side tinting */
1104
1105 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1106 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1107
1110 if (background_flags && (flags & isInvalid)) 1108 if (background_flags && (flags & isInvalid))
1111 { 1109 {
1112 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1110 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1113 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1111 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1114 { 1112 {
… …
1164 pixmap = None; 1162 pixmap = None;
1165 } 1163 }
1166 } 1164 }
1167 1165
1168 apply (); 1166 apply ();
1167
1168 TIMING_TEST_PRINT_RESULT (tp);
1169 1169
1170 return true; 1170 return true;
1171} 1171}
1172 1172
1173bool 1173bool
… …
1225# if HAVE_SCROLLBARS 1225# if HAVE_SCROLLBARS
1226 if (target->scrollBar.win) 1226 if (target->scrollBar.win)
1227 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1227 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1228# endif 1228# endif
1229 } 1229 }
1230 1230 /* don't want Expose on the parent or vt. It is better to use
1231 /* don't want Expose on the parent */ 1231 scr_touch or we get a great deal of flicker otherwise: */
1232 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False); 1232 XClearWindow (target->dpy, target->parent[0]);
1233 /* do want Expose on the vt, so we get refreshed properly */
1234 XClearArea (target->dpy, target->vt, 0, 0, 0, 0, True);
1235 1233
1236# if HAVE_SCROLLBARS 1234# if HAVE_SCROLLBARS
1237 if (target->scrollBar.win) 1235 if (target->scrollBar.win)
1238 { 1236 {
1239 target->scrollBar.setIdle (); 1237 target->scrollBar.setIdle ();
1240 target->scrollbar_show (0); 1238 target->scrollbar_show (0);
1241 } 1239 }
1242# endif 1240# endif
1241
1242 target->want_refresh = 1;
1243 flags |= hasChanged;
1243 } 1244 }
1244} 1245}
1245 1246
1246#endif /* HAVE_BG_PIXMAP */ 1247#endif /* HAVE_BG_PIXMAP */
1247 1248
1248#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1249#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1249/* taken from aterm-0.4.2 */ 1250/* taken from aterm-0.4.2 */
1250 1251
1251typedef uint32_t RUINT32T; 1252typedef uint32_t RUINT32T;
1252 1253
1253static void 1254static void

Diff Legend

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