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.63 by sasha, Wed Aug 8 22:39:49 2007 UTC vs.
Revision 1.76 by sasha, Wed Sep 12 19:51: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
77# ifdef XPM_BACKGROUND 94# ifdef XPM_BACKGROUND
78# ifdef HAVE_AFTERIMAGE 95# ifdef HAVE_AFTERIMAGE
79 if (original_asim != NULL) 96 if (original_asim != NULL)
80# endif 97# endif
81 { 98 {
82 if (h_scale != 0 || v_scale != 0) 99 if (h_scale != 0 || v_scale != 0
100 || h_align != 0 || v_align != 0)
83 return true; 101 return true;
84 } 102 }
85# endif 103# endif
86# ifdef ENABLE_TRANSPARENCY 104# ifdef ENABLE_TRANSPARENCY
87 if (flags & bgPmap_Transparent) 105 if (flags & isTransparent)
88 return true; 106 return true;
107# endif
108 return false;
109}
110
111bool bgPixmap_t::need_client_side_rendering ()
112{
113# ifdef HAVE_AFTERIMAGE
114 if (original_asim != NULL)
115 return true;
116# endif
117# ifdef ENABLE_TRANSPARENCY
118 if (flags & isTransparent)
119 {
120 if (((flags & blurNeeded) && !(flags & blurServerSide))
121 || ((flags & tintNeeded) && !(flags & tintServerSide)))
122 return true;
123 }
89# endif 124# endif
90 return false; 125 return false;
91} 126}
92 127
93# ifdef XPM_BACKGROUND 128# ifdef XPM_BACKGROUND
160 dst_size = target_size - dst_pos; 195 dst_size = target_size - dst_pos;
161 return src_pos; 196 return src_pos;
162} 197}
163 198
164bool 199bool
165bgPixmap_t::handle_geometry (const char *geom) 200bgPixmap_t::set_geometry (const char *geom)
166{ 201{
167 int geom_flags = 0, changed = 0; 202 int geom_flags = 0, changed = 0;
168 int x = 0, y = 0; 203 int x = 0, y = 0;
169 unsigned int w = 0, h = 0; 204 unsigned int w = 0, h = 0;
170 unsigned int n; 205 unsigned int n;
171 unsigned long new_flags = (flags&(~bgPmap_geometryFlags)); 206 unsigned long new_flags = (flags & (~geometryFlags));
172 char *p; 207 char *p;
173# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 208# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */
174 209
175 if (geom == NULL) 210 if (geom == NULL)
176 return false; 211 return false;
177 212
178 char str[MAXLEN_GEOM]; 213 char str[MAXLEN_GEOM];
179 214
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; 215 while (isspace(*geom)) ++geom;
192 if ((p = strchr (geom, ';')) == NULL) 216 if ((p = strchr (geom, ';')) == NULL)
193 p = strchr (geom, '\0'); 217 p = strchr (geom, '\0');
194 218
195 n = (p - geom); 219 n = (p - geom);
196 if (n < MAXLEN_GEOM) 220 if (n < MAXLEN_GEOM)
197 { 221 {
198 char *ops; 222 char *ops;
199 new_flags |= bgPmap_geometrySet; 223 new_flags |= geometrySet;
200 224
201 strncpy (str, geom, n); 225 strncpy (str, geom, n);
202 str[n] = '\0'; 226 str[n] = '\0';
203 if (str[0] == ':') 227 if (str[0] == ':')
204 ops = &str[0]; 228 ops = &str[0];
225 { 249 {
226 y = x; 250 y = x;
227 geom_flags |= YValue; 251 geom_flags |= YValue;
228 } 252 }
229 253
230 if (flags & bgPmap_geometrySet) 254 if (flags & geometrySet)
231 {/* new geometry is an adjustment to the old one ! */ 255 {/* new geometry is an adjustment to the old one ! */
232 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 256 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
233 { 257 {
234 if (w == 0 && h != 0) 258 if (w == 0 && h != 0)
235 { 259 {
253 } 277 }
254 else /* setting up geometry from scratch */ 278 else /* setting up geometry from scratch */
255 { 279 {
256 if (!(geom_flags & XValue)) 280 if (!(geom_flags & XValue))
257 {/* use default geometry - centered */ 281 {/* use default geometry - centered */
258 x = y = bgPmap_defaultAlign; 282 x = y = defaultAlign;
259 } 283 }
260 else if (!(geom_flags & YValue)) 284 else if (!(geom_flags & YValue))
261 y = x; 285 y = x;
262 286
263 if ((geom_flags & (WidthValue|HeightValue)) == 0) 287 if ((geom_flags & (WidthValue|HeightValue)) == 0)
264 {/* use default geometry - scaled */ 288 {/* use default geometry - scaled */
265 w = h = bgPmap_defaultScale; 289 w = h = defaultScale;
266 } 290 }
267 else if (geom_flags & WidthValue) 291 else if (geom_flags & WidthValue)
268 { 292 {
269 if (!(geom_flags & HeightValue)) 293 if (!(geom_flags & HeightValue))
270 h = w; 294 h = w;
271 } 295 }
272 else 296 else
273 w = h; 297 w = h;
274 } 298 }
275 } /* done parsing geometry string */ 299 } /* done parsing geometry string */
276 else if (!(flags & bgPmap_geometrySet)) 300 else if (!(flags & geometrySet))
277 { /* default geometry - scaled and centered */ 301 { /* default geometry - scaled and centered */
278 x = y = bgPmap_defaultAlign; 302 x = y = defaultAlign;
279 w = h = bgPmap_defaultScale; 303 w = h = defaultScale;
280 } 304 }
281 305
282 if (!(flags & bgPmap_geometrySet)) 306 if (!(flags & geometrySet))
283 geom_flags |= WidthValue|HeightValue|XValue|YValue; 307 geom_flags |= WidthValue|HeightValue|XValue|YValue;
284 308
285 if (ops) 309 if (ops)
286 { 310 {
287 while (*ops) 311 while (*ops)
298 if (w == 0 && h == 0) 322 if (w == 0 && h == 0)
299 { 323 {
300 w = 100; 324 w = 100;
301 geom_flags |= WidthValue; 325 geom_flags |= WidthValue;
302 } 326 }
303 new_flags |= bgPmap_propScale; 327 new_flags |= propScale;
304 } 328 }
305 else if (CHECK_GEOM_OPS("hscale")) 329 else if (CHECK_GEOM_OPS("hscale"))
306 { 330 {
307 if (w == 0) 331 if (w == 0)
308 w = 100; 332 w = 100;
370 int x = 0; 394 int x = 0;
371 int y = 0; 395 int y = 0;
372 int w = h_scale * target_width / 100; 396 int w = h_scale * target_width / 100;
373 int h = v_scale * target_height / 100; 397 int h = v_scale * target_height / 100;
374 398
399 TIMING_TEST_START (asim);
400
375 if (original_asim) 401 if (original_asim)
376 { 402 {
377 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); 403 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
378 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); 404 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
379 } 405 }
483 result = tmp; 509 result = tmp;
484 } 510 }
485 free (layers); 511 free (layers);
486 } 512 }
487 } 513 }
514 TIMING_TEST_PRINT_RESULT (asim);
488 515
489 if (pixmap) 516 if (pixmap)
490 { 517 {
491 if (result == NULL 518 if (result == NULL
492 || pmap_width != new_pmap_width 519 || pmap_width != new_pmap_width
538 565
539 if (result != background && result != original_asim) 566 if (result != background && result != original_asim)
540 destroy_asimage (&result); 567 destroy_asimage (&result);
541 568
542 XFreeGC (target->dpy, gc); 569 XFreeGC (target->dpy, gc);
543 if (background) 570 TIMING_TEST_PRINT_RESULT (asim);
544 flags |= bgPmap_Transparent;
545 else
546 flags &= ~bgPmap_Transparent;
547 } 571 }
548 572
549 return true; 573 return true;
550} 574}
551# endif /* HAVE_AFTERIMAGE */ 575# endif /* HAVE_AFTERIMAGE */
552 576
553void 577bool
554rxvt_term::resize_pixmap () 578bgPixmap_t::set_file (const char *file)
555{ 579{
580 char *f;
556 581
557# ifdef ENABLE_TRANSPARENCY 582 assert (file != NULL);
558 if (option(Opt_transparent) && am_transparent) 583
559 { 584 if (*file != '\0')
560 /* we need to re-generate transparency pixmap in that case ! */
561 check_our_parents ();
562 return;
563 } 585 {
564# endif
565# ifdef HAVE_AFTERIMAGE 586# 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) 587 if (target->asimman == NULL)
589 asimman = create_generic_imageman(rs[Rs_path]); 588 target->asimman = create_generic_imageman (target->rs[Rs_path]);
590 if ((f = strchr (file, ';')) == NULL) 589 if ((f = strchr (file, ';')) == NULL)
591 bgPixmap.original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); 590 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
592 else 591 else
593 { 592 {
594 size_t len = f - file; 593 size_t len = f - file;
595 f = (char *)malloc (len + 1); 594 f = (char *)malloc (len + 1);
596 strncpy (f, file, len); 595 strncpy (f, file, len);
597 f[len] = '\0'; 596 f[len] = '\0';
598 bgPixmap.original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 597 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
599 free( f ); 598 free (f);
600 } 599 }
600 return (original_asim != NULL);
601# endif 601# endif
602 } 602 }
603 resize_pixmap (); /* TODO: temporary fix - should be done by the caller! */ 603 return false;
604} 604}
605 605
606# endif /* XPM_BACKGROUND */ 606# endif /* XPM_BACKGROUND */
607 607
608# ifdef ENABLE_TRANSPARENCY 608# ifdef ENABLE_TRANSPARENCY
609bool
610bgPixmap_t::set_transparent ()
611{
612 if (!(flags & isTransparent))
613 {
614 flags |= isTransparent;
615 return true;
616 }
617 return false;
618}
619
620bool
621bgPixmap_t::set_blur_radius (const char *geom)
622{
623 int changed = 0;
624 unsigned int hr, vr;
625 int junk;
626 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
627
628 if (!(geom_flags&WidthValue))
629 hr = 1;
630 if (!(geom_flags&HeightValue))
631 vr = hr;
632
633 if (h_blurRadius != hr)
634 {
635 ++changed;
636 h_blurRadius = hr;
637 }
638
639 if (v_blurRadius != vr)
640 {
641 ++changed;
642 v_blurRadius = vr;
643 }
644
645 if (v_blurRadius == 0 && h_blurRadius == 0)
646 flags &= ~blurNeeded;
647 else
648 flags |= blurNeeded;
649
650 return (changed>0);
651}
652
653static inline unsigned long
654compute_tint_shade_flags (rxvt_color *tint, int shade)
655{
656 unsigned long flags = 0;
657 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
658
659 if (tint)
660 {
661 tint->get (c);
662# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
663 if (IS_COMPONENT_WHOLESOME (c.r)
664 && IS_COMPONENT_WHOLESOME (c.g)
665 && IS_COMPONENT_WHOLESOME (c.b))
666 flags |= bgPixmap_t::tintWholesome;
667# undef IS_COMPONENT_WHOLESOME
668 }
669
670 if ((shade > 0 && shade < 100) || (shade > 100 && shade < 200))
671 flags |= bgPixmap_t::tintNeeded;
672 else if (tint)
673 {
674 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
675 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
676 {
677 flags |= bgPixmap_t::tintNeeded;
678 }
679 }
680
681 if (flags & bgPixmap_t::tintNeeded)
682 {
683 if (flags & bgPixmap_t::tintWholesome)
684 flags |= bgPixmap_t::tintServerSide;
685#if XFT
686 flags |= bgPixmap_t::tintServerSide;
687#endif
688 }
689
690 return flags;
691}
692
693bool
694bgPixmap_t::set_tint (rxvt_color &new_tint)
695{
696 if (tint != new_tint)
697 {
698 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
699 tint = new_tint;
700 flags = (flags & ~tintFlags) | new_flags | tintSet;
701 return true;
702 }
703 return false;
704}
705
706bool
707bgPixmap_t::unset_tint ()
708{
709 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
710
711 if (new_flags != (flags & tintFlags))
712 {
713 flags = (flags&~tintFlags)|new_flags;
714 return true;
715 }
716 return false;
717}
718
719bool
720bgPixmap_t::set_shade (const char *shade_str)
721{
722 int new_shade = (shade_str) ? atoi (shade_str) : 0;
723
724 if (new_shade == 100)
725 new_shade = 0;
726
727 if (new_shade != shade)
728 {
729 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
730 shade = new_shade;
731 flags = (flags & ~tintFlags) | new_flags;
732 return true;
733 }
734 return false;
735}
736
609/* make_transparency_pixmap() 737/* make_transparency_pixmap()
610 * Builds a pixmap sized the same as terminal window, with depth same as the root window 738 * 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 739 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
612 * our window. 740 * our window.
613 */ 741 */
614#if 0 742unsigned long
743bgPixmap_t::make_transparency_pixmap ()
744{
745 unsigned long result = 0;
746
747 if (target == NULL)
748 return 0;
749
750 /* root dimentions may change from call to call - but Display structure should
751 * be always up-to-date, so let's use it :
752 */
753 Window root = target->display->root;
754 int screen = target->display->screen;
755 Display *dpy = target->dpy;
756 int root_width = DisplayWidth (dpy, screen);
757 int root_height = DisplayHeight (dpy, screen);
758 unsigned int root_pmap_width, root_pmap_height;
759 int window_width = target->szHint.width;
760 int window_height = target->szHint.height;
761 int sx, sy;
762 XGCValues gcv;
763
764 TIMING_TEST_START (tp);
765 target->get_window_origin (sx, sy);
766
767 /* check if we are outside of the visible part of the virtual screen : */
768 if (sx + window_width <= 0 || sy + window_height <= 0
769 || sx >= root_width || sy >= root_height)
770 return 0;
771
772 if (root_pixmap != None)
773 {/* we want to validate the pixmap and get it's size at the same time : */
774 int junk;
775 unsigned int ujunk;
776 /* root pixmap may be bad - allow a error */
777 target->allowedxerror = -1;
778
779 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk))
780 root_pixmap = None;
781
782 target->allowedxerror = 0;
783 }
784
785 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
786 GC gc = NULL;
787
788 if (tiled_root_pmap == None) /* something really bad happened - abort */
789 return 0;
790
791 if (root_pixmap == None)
792 { /* use tricks to obtain the root background image :*/
793 /* we want to create Overrideredirect window overlapping out window
794 with background type of Parent Relative and then grab it */
795 XSetWindowAttributes attr;
796 Window src;
797 bool success = false;
798
799 attr.background_pixmap = ParentRelative;
800 attr.backing_store = Always;
801 attr.event_mask = ExposureMask;
802 attr.override_redirect = True;
803 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
804 CopyFromParent, CopyFromParent, CopyFromParent,
805 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
806 &attr);
807
808 if (src != None)
809 {
810 XEvent event;
811 int ev_count = 0;
812 XGrabServer (dpy);
813 XMapRaised (dpy, src);
814 XSync (dpy, False);
815
816 /* XSync should get window where it's properly exposed,
817 * but to be on the safe side - let's check for the actuall event to arrive : */
818 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
819 ++ev_count;
820
821 if (ev_count > 0);
822 { /* hooray! - we can grab the image! */
823 gc = XCreateGC (dpy, root, 0, NULL);
824 if (gc)
825 {
826 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
827 success = true;
828 }
829 }
830 XDestroyWindow (dpy, src);
831 XUngrabServer (dpy);
832 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
833 }
834
835 if (!success)
836 {
837 XFreePixmap (dpy, tiled_root_pmap);
838 tiled_root_pmap = None;
839 }
840 else
841 result |= transpPmapTiled;
842 }
843 else
844 {/* strightforward pixmap copy */
845 gcv.tile = root_pixmap;
846 gcv.fill_style = FillTiled;
847
848 while (sx < 0) sx += (int)window_width;
849 while (sy < 0) sy += (int)window_height;
850
851 gcv.ts_x_origin = -sx;
852 gcv.ts_y_origin = -sy;
853 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
854
855 if (gc)
856 {
857 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
858 result |= transpPmapTiled;
859 }
860 }
861 TIMING_TEST_PRINT_RESULT (tp);
862
863 if (tiled_root_pmap != None)
864 {
865 if (!need_client_side_rendering ())
866 {
867 if ((flags & tintNeeded))
868 {
869 if (flags & tintWholesome)
870 {
871 /* In this case we can tint image server-side getting significant
872 * performance improvements, as we eliminate XImage transfer
873 */
874 gcv.foreground = Pixel (tint);
875 gcv.function = GXand;
876 gcv.fill_style = FillSolid;
877 if (gc)
878 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
879 else
880 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
881 if (gc)
882 {
883 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
884 result |= transpPmapTinted;
885 }
886 }
887 else
888 {
889# if XFT
890 Picture back_pic = 0;
891 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
892
893 if (flags & tintSet)
894 tint.get (c);
895
896 if (shade > 0 && shade < 100)
897 {
898 c.r = (c.r * shade) / 100;
899 c.g = (c.g * shade) / 100;
900 c.b = (c.b * shade) / 100;
901 }
902 else if( shade > 100 && shade < 200)
903 {
904 c.r = (c.r * (200 - shade)) / 100;
905 c.g = (c.g * (200 - shade)) / 100;
906 c.b = (c.b * (200 - shade)) / 100;
907 }
908
909 XRenderPictFormat pf;
910 pf.type = PictTypeDirect;
911 pf.depth = 32;
912 pf.direct.redMask = 0xff;
913 pf.direct.greenMask = 0xff;
914 pf.direct.blueMask = 0xff;
915 pf.direct.alphaMask = 0xff;
916
917 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
918 (PictFormatType|
919 PictFormatDepth|
920 PictFormatRedMask|
921 PictFormatGreenMask|
922 PictFormatBlueMask|
923 PictFormatAlphaMask),
924 &pf,
925 0);
926 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
927 XRenderPictureAttributes pa ;
928
929 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
930
931 pa.repeat = True;
932
933 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
934 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
935 XFreePixmap (dpy, overlay_pmap);
936
937 pa.component_alpha = True;
938 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
939 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
940 XFreePixmap (dpy, mask_pmap);
941
942 if (mask_pic && overlay_pic && back_pic)
943 {
944 XRenderColor mask_c;
945
946 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
947 mask_c.alpha = 0xffff;
948 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
949 memset (&mask_c, 0x0, sizeof (mask_c));
950 mask_c.alpha = 0;
951
952 if (c.r == c.b && c.b == c.g) /* pure shading */
953 {
954 mask_c.red = mask_c.green = mask_c.blue = 0xffff - c.r;
955 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
956 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
957 }
958 else
959 {
960 mask_c.red = 0xffff - c.r;
961 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
962 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
963 mask_c.red = 0;
964 mask_c.green = 0xffff - c.g;
965 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
966 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
967 mask_c.green = 0;
968 mask_c.blue = 0xffff - c.b;
969 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
970 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
971 }
972 result |= transpPmapTinted;
973 }
974 XRenderFreePicture (dpy, mask_pic);
975 XRenderFreePicture (dpy, overlay_pic);
976 XRenderFreePicture (dpy, back_pic);
977# if DO_TIMING_TEST
978 XSync (dpy, False);
979# endif
980# endif
981 }
982 }
983 } /* server side rendering completed */
984
985 if (pixmap)
986 XFreePixmap (dpy, pixmap);
987
988 pixmap = tiled_root_pmap;
989 pmap_width = window_width;
990 pmap_height = window_height;
991 pmap_depth = root_depth;
992 }
993
994 if (gc)
995 XFreeGC (dpy, gc);
996
997 TIMING_TEST_PRINT_RESULT (tp);
998
999 return result;
1000}
1001
615bool 1002bool
616bgPixmap_t::make_transparency_pixmap() 1003bgPixmap_t::set_root_pixmap ()
617{ 1004{
1005 Pixmap new_root_pixmap = None;
1006
1007 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1008 if (new_root_pixmap == None)
1009 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1010
1011 if (new_root_pixmap != root_pixmap)
1012 {
1013 root_pixmap = new_root_pixmap;
1014 return true;
1015 }
1016 return false;
1017}
1018# endif /* ENABLE_TRANSPARENCY */
1019
1020# ifndef HAVE_AFTERIMAGE
1021static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm);
1022# endif
1023
1024
1025bool
1026bgPixmap_t::render ()
1027{
1028 unsigned long background_flags = 0;
1029
618 if (target == NULL) 1030 if (target == NULL)
619 return false; 1031 return false;
620 1032
621 int sx, sy; 1033 invalidate();
622 Window cr; 1034# ifdef ENABLE_TRANSPARENCY
623 XTranslateCoordinates (target->dpy, target->parent[0], target->display->root, 1035 if (flags & isTransparent)
624 0, 0, &sx, &sy, &cr); 1036 {
1037 /* we need to re-generate transparency pixmap in that case ! */
1038 background_flags = make_transparency_pixmap ();
1039 if (background_flags == 0)
1040 return false;
1041 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1042 && pmap_depth == target->depth)
1043 flags = flags & ~isInvalid;
1044 }
1045# endif
625 1046
626 /* check if we are outside of the visible part of the virtual screen : */ 1047 XImage *result = NULL;
627 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0 1048# ifdef HAVE_AFTERIMAGE
628 || sx >= wrootattr.width || sy >= wrootattr.height ) 1049 if (original_asim
1050 || (background_flags & transpTransformations) != (flags & transpTransformations))
1051 {
1052 ASImage *background = NULL;
1053 ARGB32 as_tint = TINT_LEAVE_SAME;
1054 if (background_flags)
1055 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1056
1057# ifdef ENABLE_TRANSPARENCY
1058 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1059 {
1060 ShadingInfo as_shade;
1061 as_shade.shading = (shade == 0) ? 100 : shade;
1062
1063 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1064 if (flags & tintSet)
1065 tint.get (c);
1066 as_shade.tintColor.red = c.r;
1067 as_shade.tintColor.green = c.g;
1068 as_shade.tintColor.blue = c.b;
1069
1070 as_tint = shading2tint32 (&as_shade);
1071 }
1072 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1073 {
1074 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1075 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1076 100, ASIMAGE_QUALITY_DEFAULT);
1077 if (tmp)
1078 {
1079 destroy_asimage (&background);
1080 background = tmp;
1081 }
1082 }
1083# endif
1084
1085 if (render_asim (background, as_tint))
1086 flags = flags & ~isInvalid;
1087 if (background)
1088 destroy_asimage (&background);
1089 }
1090 else if (background_flags && pmap_depth != target->depth)
1091 {
1092 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1093 }
1094# else /* our own client-side tinting */
1095 if (background_flags && (flags & isInvalid))
1096 {
1097 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1098 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1099 {
1100 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1101 if (flags & tintSet)
1102 tint.get (c);
1103 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1104 }
1105 }
1106# endif /* HAVE_AFTERIMAGE */
1107
1108 if (result != NULL)
1109 {
1110 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1111 if (gc)
1112 {
1113 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1114 {
1115 XFreePixmap (target->dpy, pixmap);
1116 pixmap = None;
1117 }
1118 if (pixmap == None)
1119 {
1120 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1121 pmap_width = result->width;
1122 pmap_height = result->height;
1123 pmap_depth = target->depth;
1124 }
1125 if (pmap_depth != result->depth)
1126 { /* Bad Match error will ensue ! stupid X !!!! */
1127 if( result->depth == 24 && pmap_depth == 32)
1128 result->depth = 32;
1129 else if( result->depth == 32 && pmap_depth == 24)
1130 result->depth = 24;
1131 else
1132 {
1133 /* TODO: implement image recoding */
1134 }
1135 }
1136 if (pmap_depth == result->depth)
1137 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1138 XFreeGC (target->dpy, gc);
1139 flags = flags & ~isInvalid;
1140 }
1141 XDestroyImage (result);
1142 }
1143
1144 if (flags & isInvalid)
1145 {
1146 if (pixmap != None)
1147 {
1148 XFreePixmap (target->dpy, pixmap);
1149 pixmap = None;
1150 }
1151 }
1152
1153 apply ();
1154
1155 return true;
1156}
1157
1158bool
1159bgPixmap_t::set_target (rxvt_term *new_target)
1160{
1161 if (new_target)
1162 if (target != new_target)
1163 {
1164 target = new_target;
1165# ifdef ENABLE_TRANSPARENCY
1166 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1167# endif
1168 return true;
1169 }
629 return false ; 1170 return false;
630
631 XWindowAttributes wattr, wrootattr;
632
633 XGetWindowAttributes (dpy, display->root, &wrootattr);
634
635 /*
636 * Make the frame window set by the window manager have
637 * the root background. Some window managers put multiple nested frame
638 * windows for each client, so we have to take care about that.
639 */
640 i = (xa[XA_XROOTPMAP_ID]
641 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
643 &nitems, &bytes_after, &prop) == Success);
644
645 if (!i || prop == NULL)
646 i = (xa[XA_ESETROOT_PMAP_ID]
647 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
648 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
649 &nitems, &bytes_after, &prop) == Success);
650
651 if (!i || prop == NULL)
652 rootpixmap = None;
653
654} 1171}
655#endif /* 0 */
656# endif /* ENABLE_TRANSPARENCY */
657 1172
658void 1173void
659bgPixmap_t::apply_background() 1174bgPixmap_t::apply()
660{ 1175{
661 if (target) 1176 if (target)
662 { 1177 {
1178 flags &= ~isVtOrigin;
663 if (pixmap != None) 1179 if (pixmap != None)
664 { /* set target's background to pixmap */ 1180 { /* set target's background to pixmap */
665# ifdef ENABLE_TRANSPARENCY 1181# ifdef ENABLE_TRANSPARENCY
666 if (flags & bgPmap_Transparent) 1182 if (flags & isTransparent)
667 { 1183 {
668 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1184 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
669 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1185 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1186# if HAVE_SCROLLBARS
670 if (target->scrollBar.win) 1187 if (target->scrollBar.win)
671 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1188 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1189# endif
672 } 1190 }
673 else 1191 else
674# endif 1192# endif
675 { 1193 {
1194 flags |= isVtOrigin;
676 /* force old pixmap dereference in case it was transparent before :*/ 1195 /* force old pixmap dereference in case it was transparent before :*/
677 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_bg]); 1196 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
678 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1197 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
679 /* do we also need to set scrollbar's background here ? */ 1198 /* do we also need to set scrollbar's background here ? */
1199# if HAVE_SCROLLBARS
1200 if (target->scrollBar.win)
1201 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1202# endif
680 } 1203 }
681 } 1204 }
682 else 1205 else
683 { /* set target background to a pixel */ 1206 { /* set target background to a pixel */
684 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_bg]); 1207 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
685 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1208 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
686 /* do we also need to set scrollbar's background here ? */ 1209 /* do we also need to set scrollbar's background here ? */
1210# if HAVE_SCROLLBARS
1211 if (target->scrollBar.win)
1212 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1213# endif
687 } 1214 }
1215
688 /* don't want Expose on the parent */ 1216 /* don't want Expose on the parent */
689 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False); 1217 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False);
690 /* do want Expose on the vt */ 1218 /* do want Expose on the vt, so we get refreshed properly */
691 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, True); 1219 XClearArea (target->dpy, target->vt, 0, 0, 0, 0, True);
1220
1221# if HAVE_SCROLLBARS
1222 if (target->scrollBar.win)
1223 {
1224 target->scrollBar.setIdle ();
1225 target->scrollbar_show (0);
1226 }
1227# endif
1228 }
1229}
1230
1231void
1232rxvt_term::get_window_origin (int &x, int &y)
1233{
1234 Window cr;
1235 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1236/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1237}
1238
1239Pixmap
1240rxvt_term::get_pixmap_property (int prop_id)
1241{
1242 if (prop_id > 0 && prop_id < NUM_XA)
1243 if (xa[prop_id])
1244 {
1245 int aformat;
1246 unsigned long nitems, bytes_after;
1247 Atom atype;
1248 unsigned char *prop = NULL;
1249 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1250 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1251 &nitems, &bytes_after, &prop);
1252 if (result == Success && prop && atype == XA_PIXMAP)
1253 {
1254 return *(Pixmap *)prop;
1255 }
692 } 1256 }
1257 return None;
693} 1258}
1259
1260/*
1261 * Check our parents are still who we think they are.
1262 * Do transparency updates if required
1263 */
1264int
1265rxvt_term::update_background ()
1266{
1267 bgPixmap.invalidate();
1268
1269 /* no chance of real time refresh if we are blurring ! */
1270 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1271 bgPixmap.render();
1272 else
1273 {
1274 update_background_ev.stop ();
1275 if (!bgPixmap.need_client_side_rendering())
1276 update_background_ev.start (NOW + .05);
1277 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1278 update_background_ev.start (NOW + .2); /* very slow !!! */
1279 else
1280 update_background_ev.start (NOW + .07);
1281 }
1282 return 0;
1283}
1284
1285void
1286rxvt_term::update_background_cb (time_watcher &w)
1287{
1288 bgPixmap.render ();
1289}
694#endif /* HAVE_BG_PIXMAP */ 1290#endif /* HAVE_BG_PIXMAP */
695 1291
696 1292#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
697
698#ifdef ENABLE_TRANSPARENCY
699#ifndef HAVE_AFTERIMAGE
700/* taken from aterm-0.4.2 */ 1293/* taken from aterm-0.4.2 */
701 1294
702typedef uint32_t RUINT32T; 1295typedef uint32_t RUINT32T;
703 1296
704static void 1297static void
711 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1304 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
712 int i; 1305 int i;
713 1306
714 Visual *visual = term->visual; 1307 Visual *visual = term->visual;
715 1308
716 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 1309 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1310
1311 if (shade == 0)
1312 shade = 100;
717 1313
718 /* for convenience */ 1314 /* for convenience */
719 mask_r = visual->red_mask; 1315 mask_r = visual->red_mask;
720 mask_g = visual->green_mask; 1316 mask_g = visual->green_mask;
721 mask_b = visual->blue_mask; 1317 mask_b = visual->blue_mask;
924 } 1520 }
925 } 1521 }
926 1522
927 free (lookup); 1523 free (lookup);
928} 1524}
929#endif 1525#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */
930 1526
931/* 1527#if 0 /* replaced by a bgPixmap_t::render() - leve here temporarily for reference */
932 * Check our parents are still who we think they are.
933 * Do transparency updates if required
934 */
935int
936rxvt_term::check_our_parents ()
937{
938 check_our_parents_ev.stop ();
939 check_our_parents_ev.start (NOW + .1);
940 return 0;
941}
942
943void 1528void
944rxvt_term::check_our_parents_cb (time_watcher &w) 1529rxvt_term::check_our_parents_cb (time_watcher &w)
945{ 1530{
1531
946 int i, aformat, rootdepth; 1532 int i, aformat, rootdepth;
947 unsigned long nitems, bytes_after; 1533 unsigned long nitems, bytes_after;
948 Atom atype; 1534 Atom atype;
949 unsigned char *prop = NULL; 1535 unsigned char *prop = NULL;
950 Window root, oldp, *list; 1536 Window root, oldp, *list;
954 Window cr; 1540 Window cr;
955 unsigned int rootpixmap_w = 0, rootpixmap_h = 0; 1541 unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
956 1542
957 if (!option (Opt_transparent)) 1543 if (!option (Opt_transparent))
958 return; /* Don't try any more */ 1544 return; /* Don't try any more */
959
960#if 0
961 struct timeval stv;
962 gettimeofday (&stv,NULL);
963#define PRINT_BACKGROUND_OP_TIME do{ struct timeval tv;gettimeofday (&tv,NULL); tv.tv_sec-= stv.tv_sec;\
964 fprintf (stderr,"%d: elapsed %ld usec\n",__LINE__,\
965 tv.tv_sec*1000000+tv.tv_usec-stv.tv_usec );}while(0)
966#else
967#define PRINT_BACKGROUND_OP_TIME do{}while(0)
968#endif
969
970 1545
971 XGetWindowAttributes (dpy, display->root, &wrootattr); 1546 XGetWindowAttributes (dpy, display->root, &wrootattr);
972 rootdepth = wrootattr.depth; 1547 rootdepth = wrootattr.depth;
973 1548
974 XGetWindowAttributes (dpy, parent[0], &wattr); 1549 XGetWindowAttributes (dpy, parent[0], &wattr);
1047 whole_tint = (IS_COMPONENT_WHOLESOME(c.r) 1622 whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
1048 && IS_COMPONENT_WHOLESOME(c.g) 1623 && IS_COMPONENT_WHOLESOME(c.g)
1049 && IS_COMPONENT_WHOLESOME(c.b)); 1624 && IS_COMPONENT_WHOLESOME(c.b));
1050 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700); 1625 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700);
1051#undef IS_COMPONENT_WHOLESOME 1626#undef IS_COMPONENT_WHOLESOME
1052 /* theer are no performance advantages to reusing same pixmap */
1053 if (bgPixmap.pixmap != None)
1054 XFreePixmap (dpy, bgPixmap.pixmap);
1055 bgPixmap.pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, rootdepth);
1056 bgPixmap.pmap_width = szHint.width;
1057 bgPixmap.pmap_height = szHint.height;
1058 bgPixmap.pmap_depth = rootdepth;
1059 1627
1060#if 0 /* TODO : identify cases where this will be detrimental to performance : */ 1628 bgPixmap.make_transparency_pixmap();
1061 /* we want to tile root pixmap into our own pixmap in this cases :
1062 * 1) rootpixmap does not cover our window entirely
1063 * 2) whole_tint - we can use server-side tinting or tinting disabled
1064 */
1065 if ( whole_tint || no_tint || pmap_w < sx + szHint.width || pmap_h < sy + szHint.height)
1066 {
1067 }
1068#endif
1069 gcvalue.tile = rootpixmap;
1070 gcvalue.fill_style = FillTiled;
1071 gcvalue.ts_x_origin = -sx;
1072 gcvalue.ts_y_origin = -sy;
1073 gc = XCreateGC (dpy, rootpixmap, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcvalue);
1074 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
1075 1629
1076 if (whole_tint && !no_tint) 1630 if (whole_tint && !no_tint)
1077 { 1631 {
1078 /* In this case we can tint image server-side getting significant
1079 * performance improvements, as we eliminate XImage transfer
1080 */
1081 gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]);
1082 gcvalue.function = GXand;
1083 gcvalue.fill_style = FillSolid;
1084 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue);
1085 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
1086 } 1632 }
1087 success = True; 1633 success = True;
1088#ifdef HAVE_AFTERIMAGE 1634#ifdef HAVE_AFTERIMAGE
1089 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100))) 1635 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100)))
1090 { 1636 {
1137 { 1683 {
1138 XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap); 1684 XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
1139 success = False; 1685 success = False;
1140 if (image != NULL) 1686 if (image != NULL)
1141 { 1687 {
1142 PRINT_BACKGROUND_OP_TIME;
1143 if (gc == NULL) 1688 if (gc == NULL)
1144 gc = XCreateGC (dpy, vt, 0UL, &gcvalue); 1689 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1145 if (ISSET_PIXCOLOR (Color_tint) || shade != 100) 1690 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
1146 ShadeXImage (this, image, shade, c.r, c.g, c.b); 1691 ShadeXImage (this, image, shade, c.r, c.g, c.b);
1147 XPutImage (dpy, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height); 1692 XPutImage (dpy, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
1148 XDestroyImage (image); 1693 XDestroyImage (image);
1149 success = True; 1694 success = True;
1150 } 1695 }
1151 } 1696 }
1152#endif /* HAVE_AFTERIMAGE */ 1697#endif /* HAVE_AFTERIMAGE */
1153 PRINT_BACKGROUND_OP_TIME;
1154 1698
1155 if (gc != NULL) 1699 if (gc != NULL)
1156 XFreeGC (dpy, gc); 1700 XFreeGC (dpy, gc);
1157 1701
1158 bgPixmap.apply_background(); 1702 bgPixmap.apply();
1159 if (!success) 1703 if (!success)
1160 am_pixmap_trans = 0; 1704 am_pixmap_trans = 0;
1161 else 1705 else
1162 { 1706 {
1163 am_transparent = am_pixmap_trans = 1; 1707 am_transparent = am_pixmap_trans = 1;
1178 if (am_pixmap_trans) 1722 if (am_pixmap_trans)
1179 flush (); 1723 flush ();
1180 } 1724 }
1181 } 1725 }
1182} 1726}
1183#endif 1727#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines