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.64 by sasha, Thu Aug 9 22:08:21 2007 UTC vs.
Revision 1.71 by sasha, Fri Aug 17 22:01:33 2007 UTC

… …
82 if (h_scale != 0 || v_scale != 0) 82 if (h_scale != 0 || v_scale != 0)
83 return true; 83 return true;
84 } 84 }
85# endif 85# endif
86# ifdef ENABLE_TRANSPARENCY 86# ifdef ENABLE_TRANSPARENCY
87 if (flags & bgPmap_Transparent) 87 if (flags & isTransparent)
88 return true; 88 return true;
89# endif
90 return false;
91}
92
93bool bgPixmap_t::need_client_side_rendering ()
94{
95# ifdef HAVE_AFTERIMAGE
96 if (original_asim != NULL)
97 return true;
98# endif
99# ifdef ENABLE_TRANSPARENCY
100 if (flags & isTransparent)
101 {
102 if ((flags & blurNeeded)
103 || ((flags & tintNeeded) && !(flags & tintServerSide)))
104 return true;
105 }
89# endif 106# endif
90 return false; 107 return false;
91} 108}
92 109
93# ifdef XPM_BACKGROUND 110# ifdef XPM_BACKGROUND
… …
160 dst_size = target_size - dst_pos; 177 dst_size = target_size - dst_pos;
161 return src_pos; 178 return src_pos;
162} 179}
163 180
164bool 181bool
165bgPixmap_t::handle_geometry (const char *geom) 182bgPixmap_t::set_geometry (const char *geom)
166{ 183{
167 int geom_flags = 0, changed = 0; 184 int geom_flags = 0, changed = 0;
168 int x = 0, y = 0; 185 int x = 0, y = 0;
169 unsigned int w = 0, h = 0; 186 unsigned int w = 0, h = 0;
170 unsigned int n; 187 unsigned int n;
171 unsigned long new_flags = (flags&(~bgPmap_geometryFlags)); 188 unsigned long new_flags = (flags & (~geometryFlags));
172 char *p; 189 char *p;
173# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 190# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */
174 191
175 if (geom == NULL) 192 if (geom == NULL)
176 return false; 193 return false;
177 194
178 char str[MAXLEN_GEOM]; 195 char str[MAXLEN_GEOM];
179 196
180 if (!strcmp (geom, "?"))
181 {
182 if (target)
183 {
184 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
185 min (h_scale, 32767), min (v_scale, 32767),
186 min (h_align, 32767), min (v_align, 32767));
187 target->process_xterm_seq (XTerm_title, str, CHAR_ST);
188 }
189 return false;
190 }
191 while (isspace(*geom)) ++geom; 197 while (isspace(*geom)) ++geom;
192 if ((p = strchr (geom, ';')) == NULL) 198 if ((p = strchr (geom, ';')) == NULL)
193 p = strchr (geom, '\0'); 199 p = strchr (geom, '\0');
194 200
195 n = (p - geom); 201 n = (p - geom);
196 if (n < MAXLEN_GEOM) 202 if (n < MAXLEN_GEOM)
197 { 203 {
198 char *ops; 204 char *ops;
199 new_flags |= bgPmap_geometrySet; 205 new_flags |= geometrySet;
200 206
201 strncpy (str, geom, n); 207 strncpy (str, geom, n);
202 str[n] = '\0'; 208 str[n] = '\0';
203 if (str[0] == ':') 209 if (str[0] == ':')
204 ops = &str[0]; 210 ops = &str[0];
… …
225 { 231 {
226 y = x; 232 y = x;
227 geom_flags |= YValue; 233 geom_flags |= YValue;
228 } 234 }
229 235
230 if (flags & bgPmap_geometrySet) 236 if (flags & geometrySet)
231 {/* new geometry is an adjustment to the old one ! */ 237 {/* new geometry is an adjustment to the old one ! */
232 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 238 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
233 { 239 {
234 if (w == 0 && h != 0) 240 if (w == 0 && h != 0)
235 { 241 {
… …
253 } 259 }
254 else /* setting up geometry from scratch */ 260 else /* setting up geometry from scratch */
255 { 261 {
256 if (!(geom_flags & XValue)) 262 if (!(geom_flags & XValue))
257 {/* use default geometry - centered */ 263 {/* use default geometry - centered */
258 x = y = bgPmap_defaultAlign; 264 x = y = defaultAlign;
259 } 265 }
260 else if (!(geom_flags & YValue)) 266 else if (!(geom_flags & YValue))
261 y = x; 267 y = x;
262 268
263 if ((geom_flags & (WidthValue|HeightValue)) == 0) 269 if ((geom_flags & (WidthValue|HeightValue)) == 0)
264 {/* use default geometry - scaled */ 270 {/* use default geometry - scaled */
265 w = h = bgPmap_defaultScale; 271 w = h = defaultScale;
266 } 272 }
267 else if (geom_flags & WidthValue) 273 else if (geom_flags & WidthValue)
268 { 274 {
269 if (!(geom_flags & HeightValue)) 275 if (!(geom_flags & HeightValue))
270 h = w; 276 h = w;
271 } 277 }
272 else 278 else
273 w = h; 279 w = h;
274 } 280 }
275 } /* done parsing geometry string */ 281 } /* done parsing geometry string */
276 else if (!(flags & bgPmap_geometrySet)) 282 else if (!(flags & geometrySet))
277 { /* default geometry - scaled and centered */ 283 { /* default geometry - scaled and centered */
278 x = y = bgPmap_defaultAlign; 284 x = y = defaultAlign;
279 w = h = bgPmap_defaultScale; 285 w = h = defaultScale;
280 } 286 }
281 287
282 if (!(flags & bgPmap_geometrySet)) 288 if (!(flags & geometrySet))
283 geom_flags |= WidthValue|HeightValue|XValue|YValue; 289 geom_flags |= WidthValue|HeightValue|XValue|YValue;
284 290
285 if (ops) 291 if (ops)
286 { 292 {
287 while (*ops) 293 while (*ops)
… …
298 if (w == 0 && h == 0) 304 if (w == 0 && h == 0)
299 { 305 {
300 w = 100; 306 w = 100;
301 geom_flags |= WidthValue; 307 geom_flags |= WidthValue;
302 } 308 }
303 new_flags |= bgPmap_propScale; 309 new_flags |= propScale;
304 } 310 }
305 else if (CHECK_GEOM_OPS("hscale")) 311 else if (CHECK_GEOM_OPS("hscale"))
306 { 312 {
307 if (w == 0) 313 if (w == 0)
308 w = 100; 314 w = 100;
… …
538 544
539 if (result != background && result != original_asim) 545 if (result != background && result != original_asim)
540 destroy_asimage (&result); 546 destroy_asimage (&result);
541 547
542 XFreeGC (target->dpy, gc); 548 XFreeGC (target->dpy, gc);
543 if (background)
544 flags |= bgPmap_Transparent;
545 else
546 flags &= ~bgPmap_Transparent;
547 } 549 }
548 550
549 return true; 551 return true;
550} 552}
551# endif /* HAVE_AFTERIMAGE */ 553# endif /* HAVE_AFTERIMAGE */
552 554
553void 555bool
554rxvt_term::resize_pixmap () 556bgPixmap_t::set_file (const char *file)
555{ 557{
558 char *f;
556 559
557# ifdef ENABLE_TRANSPARENCY 560 assert (file != NULL);
558 if (option(Opt_transparent) && am_transparent) 561
559 { 562 if (*file != '\0')
560 /* we need to re-generate transparency pixmap in that case ! */
561 check_our_parents ();
562 return;
563 } 563 {
564# endif
565# ifdef HAVE_AFTERIMAGE 564# ifdef HAVE_AFTERIMAGE
566 bgPixmap.render_asim(NULL, TINT_LEAVE_SAME);
567 bgPixmap.apply_background();
568# endif
569}
570
571void
572rxvt_term::set_bgPixmap (const char *file)
573{
574 char *f;
575
576 assert (file != NULL);
577
578 if (bgPixmap.pixmap != None)
579 {
580 XFreePixmap (dpy, bgPixmap.pixmap);
581 bgPixmap.pixmap = None;
582 }
583
584 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
585 if (*file != '\0')
586 {
587# ifdef HAVE_AFTERIMAGE
588 if (asimman == NULL) 565 if (target->asimman == NULL)
589 asimman = create_generic_imageman(rs[Rs_path]); 566 target->asimman = create_generic_imageman(target->rs[Rs_path]);
590 if ((f = strchr (file, ';')) == NULL) 567 if ((f = strchr (file, ';')) == NULL)
591 bgPixmap.original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); 568 original_asim = get_asimage( target->asimman, file, 0xFFFFFFFF, 100 );
592 else 569 else
593 { 570 {
594 size_t len = f - file; 571 size_t len = f - file;
595 f = (char *)malloc (len + 1); 572 f = (char *)malloc (len + 1);
596 strncpy (f, file, len); 573 strncpy (f, file, len);
597 f[len] = '\0'; 574 f[len] = '\0';
598 bgPixmap.original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 575 original_asim = get_asimage( target->asimman, f, 0xFFFFFFFF, 100 );
599 free( f ); 576 free( f );
600 } 577 }
578 return (original_asim != NULL);
601# endif 579# endif
602 } 580 }
603 resize_pixmap (); /* TODO: temporary fix - should be done by the caller! */ 581 return false;
604} 582}
605 583
606# endif /* XPM_BACKGROUND */ 584# endif /* XPM_BACKGROUND */
607 585
608# ifdef ENABLE_TRANSPARENCY 586# ifdef ENABLE_TRANSPARENCY
587bool
588bgPixmap_t::set_transparent ()
589{
590 if (!(flags & isTransparent))
591 {
592 flags |= isTransparent;
593 return true;
594 }
595}
596
597bool
598bgPixmap_t::set_blur_radius (const char *geom)
599{
600 int changed = 0;
601 unsigned int hr, vr;
602 int junk;
603 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
604 if (!(geom_flags&WidthValue))
605 hr = 1;
606 if (!(geom_flags&HeightValue))
607 vr = hr;
608
609 if (h_blurRadius != hr)
610 {
611 ++changed;
612 h_blurRadius = hr;
613 }
614 if (v_blurRadius != vr)
615 {
616 ++changed;
617 v_blurRadius = vr;
618 }
619 if (v_blurRadius == 0 && h_blurRadius == 0)
620 flags &= ~blurNeeded;
621 else
622 flags |= blurNeeded;
623 return (changed>0);
624}
625
626static inline unsigned long
627compute_tint_shade_flags (rxvt_color *tint, int shade)
628{
629 unsigned long flags = 0;
630
631 if (shade > 0 && shade <100)
632 flags |= bgPixmap_t::tintNeeded;
633 else if (tint)
634 {
635 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
636 tint->get (c);
637
638 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
639 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
640 {
641 flags |= bgPixmap_t::tintNeeded;
642# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
643 if (IS_COMPONENT_WHOLESOME (c.r)
644 && IS_COMPONENT_WHOLESOME (c.g)
645 && IS_COMPONENT_WHOLESOME (c.b))
646 flags |= bgPixmap_t::tintServerSide;
647# undef IS_COMPONENT_WHOLESOME
648 }
649 }
650 return flags;
651}
652
653bool
654bgPixmap_t::set_tint (rxvt_color &new_tint)
655{
656 if (tint != new_tint)
657 {
658 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
659 tint = new_tint;
660 flags = (flags & ~tintFlags) | new_flags | tintSet;
661 return true;
662 }
663 return false;
664}
665
666bool
667bgPixmap_t::unset_tint ()
668{
669 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
670
671 if (new_flags != (flags & tintFlags))
672 {
673 flags = (flags&~tintFlags)|new_flags;
674 return true;
675 }
676 return false;
677}
678
679bool
680bgPixmap_t::set_shade (const char *shade_str)
681{
682 int new_shade = (shade_str) ? atoi (shade_str) : 0;
683
684 if (new_shade == 100)
685 new_shade = 0;
686
687 if (new_shade != shade)
688 {
689 unsigned long new_flags = compute_tint_shade_flags (&tint, new_shade);
690 shade = new_shade;
691 flags = (flags & ~tintFlags) | new_flags;
692 return true;
693 }
694 return false;
695}
696
697
609/* make_transparency_pixmap() 698/* make_transparency_pixmap()
610 * Builds a pixmap sized the same as terminal window, with depth same as the root window 699 * Builds a pixmap sized the same as terminal window, with depth same as the root window
611 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 700 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
612 * our window. 701 * our window.
613 */ 702 */
614bool 703unsigned long
615bgPixmap_t::make_transparency_pixmap() 704bgPixmap_t::make_transparency_pixmap ()
616{ 705{
706 unsigned long result = 0;
707
617 if (target == NULL) 708 if (target == NULL)
618 return false; 709 return 0;
619 710
620 /* root dimentions may change from call to call - but Display structure should 711 /* root dimentions may change from call to call - but Display structure should
621 * be always up-to-date, so let's use it : 712 * be always up-to-date, so let's use it :
622 */ 713 */
623 Window root = target->display->root; 714 Window root = target->display->root;
… …
627 int root_height = DisplayHeight (dpy, screen); 718 int root_height = DisplayHeight (dpy, screen);
628 unsigned int root_pmap_width, root_pmap_height; 719 unsigned int root_pmap_width, root_pmap_height;
629 int window_width = target->szHint.width; 720 int window_width = target->szHint.width;
630 int window_height = target->szHint.height; 721 int window_height = target->szHint.height;
631 int sx, sy; 722 int sx, sy;
723 XGCValues gcv;
632 724
633 target->get_window_origin (sx, sy); 725 target->get_window_origin (sx, sy);
634 726
635 /* check if we are outside of the visible part of the virtual screen : */ 727 /* check if we are outside of the visible part of the virtual screen : */
636 if (sx + window_width <= 0 || sy + window_height <= 0 728 if (sx + window_width <= 0 || sy + window_height <= 0
637 || sx >= root_width || sy >= root_height) 729 || sx >= root_width || sy >= root_height)
638 return false; 730 return 0;
639 731
640 if (root_pixmap != None) 732 if (root_pixmap != None)
641 {/* we want to validate the pixmap and get it's size at the same time : */ 733 {/* we want to validate the pixmap and get it's size at the same time : */
642 int junk; 734 int junk;
643 unsigned int ujunk; 735 unsigned int ujunk;
… …
650 742
651 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 743 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
652 GC gc = NULL; 744 GC gc = NULL;
653 745
654 if (tiled_root_pmap == None) /* something really bad happened - abort */ 746 if (tiled_root_pmap == None) /* something really bad happened - abort */
655 return false; 747 return 0;
656 748
657 if (root_pixmap == None) 749 if (root_pixmap == None)
658 { /* use tricks to obtain the root background image :*/ 750 { /* use tricks to obtain the root background image :*/
659 /* we want to create Overrideredirect window overlapping out window 751 /* we want to create Overrideredirect window overlapping out window
660 with background type of Parent Relative and then grab it */ 752 with background type of Parent Relative and then grab it */
… …
683 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 775 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
684 ++ev_count; 776 ++ev_count;
685 if (ev_count > 0); 777 if (ev_count > 0);
686 { /* hooray! - we can grab the image! */ 778 { /* hooray! - we can grab the image! */
687 gc = XCreateGC (dpy, root, 0, NULL); 779 gc = XCreateGC (dpy, root, 0, NULL);
780 if (gc)
781 {
688 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 782 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
689 success = true; 783 success = true;
784 }
690 } 785 }
691 XDestroyWindow (dpy, src); 786 XDestroyWindow (dpy, src);
692 XUngrabServer (dpy); 787 XUngrabServer (dpy);
693 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 788 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
694 } 789 }
695 if (!success) 790 if (!success)
696 { 791 {
697 XFreePixmap (dpy, tiled_root_pmap); 792 XFreePixmap (dpy, tiled_root_pmap);
698 tiled_root_pmap = None; 793 tiled_root_pmap = None;
699 } 794 }
795 else
796 result |= transpPmapTiled;
700 } 797 }
701 else 798 else
702 {/* strightforward pixmap copy */ 799 {/* strightforward pixmap copy */
703 XGCValues gcv;
704 gcv.tile = root_pixmap; 800 gcv.tile = root_pixmap;
705 gcv.fill_style = FillTiled; 801 gcv.fill_style = FillTiled;
706 while (sx < 0) sx += (int)window_width; 802 while (sx < 0) sx += (int)window_width;
707 while (sy < 0) sy += (int)window_height; 803 while (sy < 0) sy += (int)window_height;
708 gcv.ts_x_origin = -sx; 804 gcv.ts_x_origin = -sx;
709 gcv.ts_y_origin = -sy; 805 gcv.ts_y_origin = -sy;
710 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 806 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
807 if (gc)
808 {
711 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 809 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
810 result |= transpPmapTiled;
811 }
712 } 812 }
713
714 if (gc)
715 XFreeGC (dpy, gc);
716 813
717 if (tiled_root_pmap != None) 814 if (tiled_root_pmap != None)
718 { 815 {
816 if (flags & tintNeeded && !need_client_side_rendering ())
817 {
818 /* In this case we can tint image server-side getting significant
819 * performance improvements, as we eliminate XImage transfer
820 */
821 gcv.foreground = Pixel (tint);
822 gcv.function = GXand;
823 gcv.fill_style = FillSolid;
824 if (gc)
825 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
826 else
827 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
828 if (gc)
829 {
830 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
831 result |= transpPmapTinted;
832 }
833 }
719 if (pixmap) 834 if (pixmap)
720 XFreePixmap (dpy, pixmap); 835 XFreePixmap (dpy, pixmap);
721 pixmap = tiled_root_pmap; 836 pixmap = tiled_root_pmap;
722 pmap_width = window_width; 837 pmap_width = window_width;
723 pmap_height = window_height; 838 pmap_height = window_height;
724 pmap_depth = root_depth; 839 pmap_depth = root_depth;
725 } 840 }
841
842 if (gc)
843 XFreeGC (dpy, gc);
844
845 return result;
726} 846}
727 847
848bool
849bgPixmap_t::set_root_pixmap ()
850{
851 Pixmap new_root_pixmap = None;
852
853 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
854 if (new_root_pixmap == None)
855 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
856
857 if (new_root_pixmap != root_pixmap)
858 {
859 root_pixmap = new_root_pixmap;
860 return true;
861 }
862 return false;
863}
728# endif /* ENABLE_TRANSPARENCY */ 864# endif /* ENABLE_TRANSPARENCY */
865
866# ifndef HAVE_AFTERIMAGE
867static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm);
868# endif
869
870
871bool
872bgPixmap_t::render ()
873{
874 unsigned long background_flags = 0;
875
876 if (target == NULL)
877 return false;
878
879 invalidate();
880# ifdef ENABLE_TRANSPARENCY
881 if (flags & isTransparent)
882 {
883 /* we need to re-generate transparency pixmap in that case ! */
884 background_flags = make_transparency_pixmap ();
885 if (background_flags == 0)
886 return false;
887 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
888 && pmap_depth == target->depth)
889 flags = flags & ~isInvalid;
890 }
891# endif
892
893 XImage *result = NULL;
894# ifdef HAVE_AFTERIMAGE
895 if (original_asim
896 || (background_flags & transpTransformations) != (flags & transpTransformations))
897 {
898 ASImage *background = NULL;
899 ARGB32 as_tint = TINT_LEAVE_SAME;
900 if (background_flags)
901 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
902
903# ifdef ENABLE_TRANSPARENCY
904 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
905 {
906 ShadingInfo as_shade;
907 as_shade.shading = (shade == 0) ? 100 : shade;
908
909 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
910 if (flags & tintSet)
911 tint.get (c);
912 as_shade.tintColor.red = c.r;
913 as_shade.tintColor.green = c.g;
914 as_shade.tintColor.blue = c.b;
915
916 as_tint = shading2tint32 (&as_shade);
917 }
918 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
919 {
920 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
921 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
922 100, ASIMAGE_QUALITY_DEFAULT);
923 if (tmp)
924 {
925 destroy_asimage (&background);
926 background = tmp;
927 }
928 }
929# endif
930
931 if (render_asim (background, as_tint))
932 flags = flags & ~isInvalid;
933 if (background)
934 destroy_asimage (&background);
935 }
936 else if (background_flags && pmap_depth != target->depth)
937 {
938 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
939 }
940# else /* our own client-side tinting */
941 if (background_flags && (flags & isInvalid))
942 {
943 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
944 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
945 {
946 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
947 if (flags & tintSet)
948 tint.get (c);
949 ShadeXImage (target, result, shade, c.r, c.g, c.b);
950 }
951 }
952# endif /* HAVE_AFTERIMAGE */
953 if (result != NULL)
954 {
955 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
956 if (gc)
957 {
958 if (/*pmap_depth != target->depth &&*/ pixmap != None)
959 {
960 XFreePixmap (target->dpy, pixmap);
961 pixmap = None;
962 }
963 if (pixmap == None)
964 {
965 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
966 pmap_width = result->width;
967 pmap_height = result->height;
968 pmap_depth = target->depth;
969 }
970 if (pmap_depth != result->depth)
971 { /* Bad Match error will ensue ! stupid X !!!! */
972 if( result->depth == 24 && pmap_depth == 32)
973 result->depth = 32;
974 else if( result->depth == 32 && pmap_depth == 24)
975 result->depth = 24;
976 else
977 {
978 /* TODO: implement image recoding */
979 }
980 }
981 if (pmap_depth == result->depth)
982 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
983 XFreeGC (target->dpy, gc);
984 flags = flags & ~isInvalid;
985 }
986 XDestroyImage (result);
987 }
988
989 if (flags & isInvalid)
990 {
991 if (pixmap != None)
992 {
993 XFreePixmap (target->dpy, pixmap);
994 pixmap = None;
995 }
996 }
997
998 apply ();
999
1000 return true;
1001}
729 1002
730bool 1003bool
731bgPixmap_t::set_target (rxvt_term *new_target) 1004bgPixmap_t::set_target (rxvt_term *new_target)
732{ 1005{
733 if (new_target) 1006 if (new_target)
734 if (target != new_target) 1007 if (target != new_target)
735 { 1008 {
736 target = new_target; 1009 target = new_target;
737# ifdef ENABLE_TRANSPARENCY 1010# ifdef ENABLE_TRANSPARENCY
738 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1011 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
739 root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
740 if (root_pixmap == None)
741 root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
742# endif 1012# endif
743 return true; 1013 return true;
744 } 1014 }
745 return false; 1015 return false;
746} 1016}
747 1017
748void 1018void
749bgPixmap_t::apply_background() 1019bgPixmap_t::apply()
750{ 1020{
751 if (target) 1021 if (target)
752 { 1022 {
753 if (pixmap != None) 1023 if (pixmap != None)
754 { /* set target's background to pixmap */ 1024 { /* set target's background to pixmap */
755# ifdef ENABLE_TRANSPARENCY 1025# ifdef ENABLE_TRANSPARENCY
756 if (flags & bgPmap_Transparent) 1026 if (flags & isTransparent)
757 { 1027 {
758 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1028 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
759 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1029 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1030# if HAVE_SCROLLBARS
760 if (target->scrollBar.win) 1031 if (target->scrollBar.win)
761 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1032 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1033# endif
762 } 1034 }
763 else 1035 else
764# endif 1036# endif
765 { 1037 {
766 /* force old pixmap dereference in case it was transparent before :*/ 1038 /* force old pixmap dereference in case it was transparent before :*/
767 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_bg]); 1039 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
768 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1040 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
769 /* do we also need to set scrollbar's background here ? */ 1041 /* do we also need to set scrollbar's background here ? */
1042# if HAVE_SCROLLBARS
1043 if (target->scrollBar.win)
1044 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1045# endif
770 } 1046 }
771 } 1047 }
772 else 1048 else
773 { /* set target background to a pixel */ 1049 { /* set target background to a pixel */
774 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_bg]); 1050 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
775 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1051 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
776 /* do we also need to set scrollbar's background here ? */ 1052 /* do we also need to set scrollbar's background here ? */
1053# if HAVE_SCROLLBARS
1054 if (target->scrollBar.win)
1055 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1056# endif
777 } 1057 }
778 /* don't want Expose on the parent */ 1058 /* don't want Expose on the parent */
779 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False); 1059 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False);
780 /* do want Expose on the vt */ 1060 /* do want Expose on the vt */
781 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, True); 1061 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, True);
1062# if HAVE_SCROLLBARS
1063 if (target->scrollBar.win)
1064 {
1065 target->scrollBar.setIdle ();
1066 target->scrollbar_show (0);
1067 }
1068# endif
1069 /* Is that really neccessary? we did a XClearArea to generate Expose events alreday ! */
1070 target->want_refresh = 1;
1071# ifdef ENABLE_TRANSPARENCY
1072 target->want_full_refresh = 1;
1073# endif
1074 /* TODO: why do we need a flush here ??? It causes segfault on resize ! */
1075// target->flush ();
782 } 1076 }
783} 1077}
784#endif /* HAVE_BG_PIXMAP */
785
786 1078
787void 1079void
788rxvt_term::get_window_origin (int &x, int &y) 1080rxvt_term::get_window_origin (int &x, int &y)
789{ 1081{
790 Window cr; 1082 Window cr;
791 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1083 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1084/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
792} 1085}
793 1086
794Pixmap 1087Pixmap
795rxvt_term::get_pixmap_property (int prop_id) 1088rxvt_term::get_pixmap_property (int prop_id)
796{ 1089{
… …
810 } 1103 }
811 } 1104 }
812 return None; 1105 return None;
813} 1106}
814 1107
1108/*
1109 * Check our parents are still who we think they are.
1110 * Do transparency updates if required
1111 */
1112int
1113rxvt_term::update_background ()
1114{
1115 bgPixmap.invalidate();
1116 /* no chance of real time refresh if we are blurring ! */
1117 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1118 bgPixmap.render();
1119 else
1120 {
1121 update_background_ev.stop ();
1122 if (!bgPixmap.need_client_side_rendering())
1123 update_background_ev.start (NOW + .05);
1124 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1125 update_background_ev.start (NOW + .2); /* very slow !!! */
1126 else
1127 update_background_ev.start (NOW + .07);
1128 }
1129 return 0;
1130}
815 1131
816#ifdef ENABLE_TRANSPARENCY 1132void
817#ifndef HAVE_AFTERIMAGE 1133rxvt_term::update_background_cb (time_watcher &w)
1134{
1135 bgPixmap.render ();
1136}
1137#endif /* HAVE_BG_PIXMAP */
1138
1139#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
818/* taken from aterm-0.4.2 */ 1140/* taken from aterm-0.4.2 */
819 1141
820typedef uint32_t RUINT32T; 1142typedef uint32_t RUINT32T;
821 1143
822static void 1144static void
… …
829 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1151 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
830 int i; 1152 int i;
831 1153
832 Visual *visual = term->visual; 1154 Visual *visual = term->visual;
833 1155
834 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 1156 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
835 1157
1158 if (shade == 0)
1159 shade = 100;
1160
836 /* for convenience */ 1161 /* for convenience */
837 mask_r = visual->red_mask; 1162 mask_r = visual->red_mask;
838 mask_g = visual->green_mask; 1163 mask_g = visual->green_mask;
839 mask_b = visual->blue_mask; 1164 mask_b = visual->blue_mask;
840 1165
… …
1042 } 1367 }
1043 } 1368 }
1044 1369
1045 free (lookup); 1370 free (lookup);
1046} 1371}
1047#endif 1372#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */
1048 1373
1049/* 1374#if 0 /* replaced by a bgPixmap_t::render() - leve here temporarily for reference */
1050 * Check our parents are still who we think they are.
1051 * Do transparency updates if required
1052 */
1053int
1054rxvt_term::check_our_parents ()
1055{
1056 check_our_parents_ev.stop ();
1057 check_our_parents_ev.start (NOW + .1);
1058 return 0;
1059}
1060
1061void 1375void
1062rxvt_term::check_our_parents_cb (time_watcher &w) 1376rxvt_term::check_our_parents_cb (time_watcher &w)
1063{ 1377{
1378
1064 int i, aformat, rootdepth; 1379 int i, aformat, rootdepth;
1065 unsigned long nitems, bytes_after; 1380 unsigned long nitems, bytes_after;
1066 Atom atype; 1381 Atom atype;
1067 unsigned char *prop = NULL; 1382 unsigned char *prop = NULL;
1068 Window root, oldp, *list; 1383 Window root, oldp, *list;
… …
1169 1484
1170 bgPixmap.make_transparency_pixmap(); 1485 bgPixmap.make_transparency_pixmap();
1171 1486
1172 if (whole_tint && !no_tint) 1487 if (whole_tint && !no_tint)
1173 { 1488 {
1174 /* In this case we can tint image server-side getting significant
1175 * performance improvements, as we eliminate XImage transfer
1176 */
1177 gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]);
1178 gcvalue.function = GXand;
1179 gcvalue.fill_style = FillSolid;
1180 if (gc)
1181 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue);
1182 else
1183 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcvalue);
1184 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
1185 } 1489 }
1186 success = True; 1490 success = True;
1187#ifdef HAVE_AFTERIMAGE 1491#ifdef HAVE_AFTERIMAGE
1188 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100))) 1492 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100)))
1189 { 1493 {
… …
1252 PRINT_BACKGROUND_OP_TIME; 1556 PRINT_BACKGROUND_OP_TIME;
1253 1557
1254 if (gc != NULL) 1558 if (gc != NULL)
1255 XFreeGC (dpy, gc); 1559 XFreeGC (dpy, gc);
1256 1560
1257 bgPixmap.apply_background(); 1561 bgPixmap.apply();
1258 if (!success) 1562 if (!success)
1259 am_pixmap_trans = 0; 1563 am_pixmap_trans = 0;
1260 else 1564 else
1261 { 1565 {
1262 am_transparent = am_pixmap_trans = 1; 1566 am_transparent = am_pixmap_trans = 1;
… …
1277 if (am_pixmap_trans) 1581 if (am_pixmap_trans)
1278 flush (); 1582 flush ();
1279 } 1583 }
1280 } 1584 }
1281} 1585}
1282#endif 1586#endif

Diff Legend

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