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.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
82 if (h_scale != 0 || v_scale != 0) 99 if (h_scale != 0 || v_scale != 0)
83 return true; 100 return true;
84 } 101 }
85# endif 102# endif
86# ifdef ENABLE_TRANSPARENCY 103# ifdef ENABLE_TRANSPARENCY
87 if (flags & bgPmap_Transparent) 104 if (flags & isTransparent)
88 return true; 105 return true;
106# endif
107 return false;
108}
109
110bool bgPixmap_t::need_client_side_rendering ()
111{
112# ifdef HAVE_AFTERIMAGE
113 if (original_asim != NULL)
114 return true;
115# endif
116# ifdef ENABLE_TRANSPARENCY
117 if (flags & isTransparent)
118 {
119 if ((flags & blurNeeded)
120 || ((flags & tintNeeded) && !(flags & tintServerSide)))
121 return true;
122 }
89# endif 123# endif
90 return false; 124 return false;
91} 125}
92 126
93# ifdef XPM_BACKGROUND 127# ifdef XPM_BACKGROUND
160 dst_size = target_size - dst_pos; 194 dst_size = target_size - dst_pos;
161 return src_pos; 195 return src_pos;
162} 196}
163 197
164bool 198bool
165bgPixmap_t::handle_geometry (const char *geom) 199bgPixmap_t::set_geometry (const char *geom)
166{ 200{
167 int geom_flags = 0, changed = 0; 201 int geom_flags = 0, changed = 0;
168 int x = 0, y = 0; 202 int x = 0, y = 0;
169 unsigned int w = 0, h = 0; 203 unsigned int w = 0, h = 0;
170 unsigned int n; 204 unsigned int n;
171 unsigned long new_flags = (flags&(~bgPmap_geometryFlags)); 205 unsigned long new_flags = (flags & (~geometryFlags));
172 char *p; 206 char *p;
173# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 207# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */
174 208
175 if (geom == NULL) 209 if (geom == NULL)
176 return false; 210 return false;
177 211
178 char str[MAXLEN_GEOM]; 212 char str[MAXLEN_GEOM];
179 213
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; 214 while (isspace(*geom)) ++geom;
192 if ((p = strchr (geom, ';')) == NULL) 215 if ((p = strchr (geom, ';')) == NULL)
193 p = strchr (geom, '\0'); 216 p = strchr (geom, '\0');
194 217
195 n = (p - geom); 218 n = (p - geom);
196 if (n < MAXLEN_GEOM) 219 if (n < MAXLEN_GEOM)
197 { 220 {
198 char *ops; 221 char *ops;
199 new_flags |= bgPmap_geometrySet; 222 new_flags |= geometrySet;
200 223
201 strncpy (str, geom, n); 224 strncpy (str, geom, n);
202 str[n] = '\0'; 225 str[n] = '\0';
203 if (str[0] == ':') 226 if (str[0] == ':')
204 ops = &str[0]; 227 ops = &str[0];
225 { 248 {
226 y = x; 249 y = x;
227 geom_flags |= YValue; 250 geom_flags |= YValue;
228 } 251 }
229 252
230 if (flags & bgPmap_geometrySet) 253 if (flags & geometrySet)
231 {/* new geometry is an adjustment to the old one ! */ 254 {/* new geometry is an adjustment to the old one ! */
232 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 255 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
233 { 256 {
234 if (w == 0 && h != 0) 257 if (w == 0 && h != 0)
235 { 258 {
253 } 276 }
254 else /* setting up geometry from scratch */ 277 else /* setting up geometry from scratch */
255 { 278 {
256 if (!(geom_flags & XValue)) 279 if (!(geom_flags & XValue))
257 {/* use default geometry - centered */ 280 {/* use default geometry - centered */
258 x = y = bgPmap_defaultAlign; 281 x = y = defaultAlign;
259 } 282 }
260 else if (!(geom_flags & YValue)) 283 else if (!(geom_flags & YValue))
261 y = x; 284 y = x;
262 285
263 if ((geom_flags & (WidthValue|HeightValue)) == 0) 286 if ((geom_flags & (WidthValue|HeightValue)) == 0)
264 {/* use default geometry - scaled */ 287 {/* use default geometry - scaled */
265 w = h = bgPmap_defaultScale; 288 w = h = defaultScale;
266 } 289 }
267 else if (geom_flags & WidthValue) 290 else if (geom_flags & WidthValue)
268 { 291 {
269 if (!(geom_flags & HeightValue)) 292 if (!(geom_flags & HeightValue))
270 h = w; 293 h = w;
271 } 294 }
272 else 295 else
273 w = h; 296 w = h;
274 } 297 }
275 } /* done parsing geometry string */ 298 } /* done parsing geometry string */
276 else if (!(flags & bgPmap_geometrySet)) 299 else if (!(flags & geometrySet))
277 { /* default geometry - scaled and centered */ 300 { /* default geometry - scaled and centered */
278 x = y = bgPmap_defaultAlign; 301 x = y = defaultAlign;
279 w = h = bgPmap_defaultScale; 302 w = h = defaultScale;
280 } 303 }
281 304
282 if (!(flags & bgPmap_geometrySet)) 305 if (!(flags & geometrySet))
283 geom_flags |= WidthValue|HeightValue|XValue|YValue; 306 geom_flags |= WidthValue|HeightValue|XValue|YValue;
284 307
285 if (ops) 308 if (ops)
286 { 309 {
287 while (*ops) 310 while (*ops)
298 if (w == 0 && h == 0) 321 if (w == 0 && h == 0)
299 { 322 {
300 w = 100; 323 w = 100;
301 geom_flags |= WidthValue; 324 geom_flags |= WidthValue;
302 } 325 }
303 new_flags |= bgPmap_propScale; 326 new_flags |= propScale;
304 } 327 }
305 else if (CHECK_GEOM_OPS("hscale")) 328 else if (CHECK_GEOM_OPS("hscale"))
306 { 329 {
307 if (w == 0) 330 if (w == 0)
308 w = 100; 331 w = 100;
369 392
370 int x = 0; 393 int x = 0;
371 int y = 0; 394 int y = 0;
372 int w = h_scale * target_width / 100; 395 int w = h_scale * target_width / 100;
373 int h = v_scale * target_height / 100; 396 int h = v_scale * target_height / 100;
397
398 TIMING_TEST_START (asim);
374 399
375 if (original_asim) 400 if (original_asim)
376 { 401 {
377 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);
378 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);
483 result = tmp; 508 result = tmp;
484 } 509 }
485 free (layers); 510 free (layers);
486 } 511 }
487 } 512 }
513 TIMING_TEST_PRINT_RESULT (asim);
488 514
489 if (pixmap) 515 if (pixmap)
490 { 516 {
491 if (result == NULL 517 if (result == NULL
492 || pmap_width != new_pmap_width 518 || pmap_width != new_pmap_width
538 564
539 if (result != background && result != original_asim) 565 if (result != background && result != original_asim)
540 destroy_asimage (&result); 566 destroy_asimage (&result);
541 567
542 XFreeGC (target->dpy, gc); 568 XFreeGC (target->dpy, gc);
543 if (background) 569 TIMING_TEST_PRINT_RESULT (asim);
544 flags |= bgPmap_Transparent;
545 else
546 flags &= ~bgPmap_Transparent;
547 } 570 }
548 571
549 return true; 572 return true;
550} 573}
551# endif /* HAVE_AFTERIMAGE */ 574# endif /* HAVE_AFTERIMAGE */
552 575
553void 576bool
554rxvt_term::resize_pixmap () 577bgPixmap_t::set_file (const char *file)
555{ 578{
579 char *f;
556 580
557# ifdef ENABLE_TRANSPARENCY 581 assert (file != NULL);
558 if (option(Opt_transparent) && am_transparent) 582
559 { 583 if (*file != '\0')
560 /* we need to re-generate transparency pixmap in that case ! */
561 check_our_parents ();
562 return;
563 } 584 {
564# endif
565# ifdef HAVE_AFTERIMAGE 585# 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) 586 if (target->asimman == NULL)
589 asimman = create_generic_imageman(rs[Rs_path]); 587 target->asimman = create_generic_imageman (target->rs[Rs_path]);
590 if ((f = strchr (file, ';')) == NULL) 588 if ((f = strchr (file, ';')) == NULL)
591 bgPixmap.original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); 589 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
592 else 590 else
593 { 591 {
594 size_t len = f - file; 592 size_t len = f - file;
595 f = (char *)malloc (len + 1); 593 f = (char *)malloc (len + 1);
596 strncpy (f, file, len); 594 strncpy (f, file, len);
597 f[len] = '\0'; 595 f[len] = '\0';
598 bgPixmap.original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 596 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
599 free( f ); 597 free (f);
600 } 598 }
599 return (original_asim != NULL);
601# endif 600# endif
602 } 601 }
603 resize_pixmap (); /* TODO: temporary fix - should be done by the caller! */ 602 return false;
604} 603}
605 604
606# endif /* XPM_BACKGROUND */ 605# endif /* XPM_BACKGROUND */
607 606
608# ifdef ENABLE_TRANSPARENCY 607# ifdef ENABLE_TRANSPARENCY
608bool
609bgPixmap_t::set_transparent ()
610{
611 if (!(flags & isTransparent))
612 {
613 flags |= isTransparent;
614 return true;
615 }
616 return false;
617}
618
619bool
620bgPixmap_t::set_blur_radius (const char *geom)
621{
622 int changed = 0;
623 unsigned int hr, vr;
624 int junk;
625 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
626 if (!(geom_flags&WidthValue))
627 hr = 1;
628 if (!(geom_flags&HeightValue))
629 vr = hr;
630
631 if (h_blurRadius != hr)
632 {
633 ++changed;
634 h_blurRadius = hr;
635 }
636 if (v_blurRadius != vr)
637 {
638 ++changed;
639 v_blurRadius = vr;
640 }
641 if (v_blurRadius == 0 && h_blurRadius == 0)
642 flags &= ~blurNeeded;
643 else
644 flags |= blurNeeded;
645 return (changed>0);
646}
647
648static inline unsigned long
649compute_tint_shade_flags (rxvt_color *tint, int shade)
650{
651 unsigned long flags = 0;
652 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
653
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))
666 flags |= bgPixmap_t::tintNeeded;
667 else if (tint)
668 {
669 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
670 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
671 {
672 flags |= bgPixmap_t::tintNeeded;
673 }
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
686 return flags;
687}
688
689bool
690bgPixmap_t::set_tint (rxvt_color &new_tint)
691{
692 if (tint != new_tint)
693 {
694 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
695 tint = new_tint;
696 flags = (flags & ~tintFlags) | new_flags | tintSet;
697 return true;
698 }
699 return false;
700}
701
702bool
703bgPixmap_t::unset_tint ()
704{
705 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
706
707 if (new_flags != (flags & tintFlags))
708 {
709 flags = (flags&~tintFlags)|new_flags;
710 return true;
711 }
712 return false;
713}
714
715bool
716bgPixmap_t::set_shade (const char *shade_str)
717{
718 int new_shade = (shade_str) ? atoi (shade_str) : 0;
719
720 if (new_shade == 100)
721 new_shade = 0;
722
723 if (new_shade != shade)
724 {
725 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
726 shade = new_shade;
727 flags = (flags & ~tintFlags) | new_flags;
728 return true;
729 }
730 return false;
731}
732
733
609/* make_transparency_pixmap() 734/* make_transparency_pixmap()
610 * Builds a pixmap sized the same as terminal window, with depth same as the root window 735 * Builds a pixmap sized the same as terminal window, with depth same as the root window
611 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 736 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
612 * our window. 737 * our window.
613 */ 738 */
614#if 0 739unsigned long
740bgPixmap_t::make_transparency_pixmap ()
741{
742 unsigned long result = 0;
743
744 if (target == NULL)
745 return 0;
746
747 /* root dimentions may change from call to call - but Display structure should
748 * be always up-to-date, so let's use it :
749 */
750 Window root = target->display->root;
751 int screen = target->display->screen;
752 Display *dpy = target->dpy;
753 int root_width = DisplayWidth (dpy, screen);
754 int root_height = DisplayHeight (dpy, screen);
755 unsigned int root_pmap_width, root_pmap_height;
756 int window_width = target->szHint.width;
757 int window_height = target->szHint.height;
758 int sx, sy;
759 XGCValues gcv;
760
761 TIMING_TEST_START (tp);
762 target->get_window_origin (sx, sy);
763
764 /* check if we are outside of the visible part of the virtual screen : */
765 if (sx + window_width <= 0 || sy + window_height <= 0
766 || sx >= root_width || sy >= root_height)
767 return 0;
768
769 if (root_pixmap != None)
770 {/* we want to validate the pixmap and get it's size at the same time : */
771 int junk;
772 unsigned int ujunk;
773 /* root pixmap may be bad - allow a error */
774 target->allowedxerror = -1;
775 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk))
776 root_pixmap = None;
777 target->allowedxerror = 0;
778 }
779
780 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
781 GC gc = NULL;
782
783 if (tiled_root_pmap == None) /* something really bad happened - abort */
784 return 0;
785
786 if (root_pixmap == None)
787 { /* use tricks to obtain the root background image :*/
788 /* we want to create Overrideredirect window overlapping out window
789 with background type of Parent Relative and then grab it */
790 XSetWindowAttributes attr;
791 Window src;
792 bool success = false;
793
794 attr.background_pixmap = ParentRelative;
795 attr.backing_store = Always;
796 attr.event_mask = ExposureMask;
797 attr.override_redirect = True;
798 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
799 CopyFromParent, CopyFromParent, CopyFromParent,
800 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
801 &attr);
802
803 if (src != None)
804 {
805 XEvent event;
806 int ev_count = 0;
807 XGrabServer (dpy);
808 XMapRaised (dpy, src);
809 XSync (dpy, False);
810 /* XSync should get window where it's properly exposed,
811 * but to be on the safe side - let's check for the actuall event to arrive : */
812 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
813 ++ev_count;
814 if (ev_count > 0);
815 { /* hooray! - we can grab the image! */
816 gc = XCreateGC (dpy, root, 0, NULL);
817 if (gc)
818 {
819 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
820 success = true;
821 }
822 }
823 XDestroyWindow (dpy, src);
824 XUngrabServer (dpy);
825 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
826 }
827 if (!success)
828 {
829 XFreePixmap (dpy, tiled_root_pmap);
830 tiled_root_pmap = None;
831 }
832 else
833 result |= transpPmapTiled;
834 }
835 else
836 {/* strightforward pixmap copy */
837 gcv.tile = root_pixmap;
838 gcv.fill_style = FillTiled;
839 while (sx < 0) sx += (int)window_width;
840 while (sy < 0) sy += (int)window_height;
841 gcv.ts_x_origin = -sx;
842 gcv.ts_y_origin = -sy;
843 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
844 if (gc)
845 {
846 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
847 result |= transpPmapTiled;
848 }
849 }
850 TIMING_TEST_PRINT_RESULT (tp);
851
852 if (tiled_root_pmap != None)
853 {
854 if ((flags & tintNeeded) && !need_client_side_rendering ())
855 {
856 if (flags & tintWholesome)
857 {
858 /* In this case we can tint image server-side getting significant
859 * performance improvements, as we eliminate XImage transfer
860 */
861 gcv.foreground = Pixel (tint);
862 gcv.function = GXand;
863 gcv.fill_style = FillSolid;
864 if (gc)
865 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
866 else
867 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
868 if (gc)
869 {
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 }
955 result |= transpPmapTinted;
956 }
957 XRenderFreePicture (dpy, mask_pic);
958 XRenderFreePicture (dpy, overlay_pic);
959 XRenderFreePicture (dpy, back_pic);
960#endif
961 }
962 }
963 if (pixmap)
964 XFreePixmap (dpy, pixmap);
965 pixmap = tiled_root_pmap;
966 pmap_width = window_width;
967 pmap_height = window_height;
968 pmap_depth = root_depth;
969 }
970
971 if (gc)
972 XFreeGC (dpy, gc);
973
974 TIMING_TEST_PRINT_RESULT (tp);
975
976 return result;
977}
978
615bool 979bool
616bgPixmap_t::make_transparency_pixmap() 980bgPixmap_t::set_root_pixmap ()
617{ 981{
982 Pixmap new_root_pixmap = None;
983
984 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
985 if (new_root_pixmap == None)
986 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
987
988 if (new_root_pixmap != root_pixmap)
989 {
990 root_pixmap = new_root_pixmap;
991 return true;
992 }
993 return false;
994}
995# endif /* ENABLE_TRANSPARENCY */
996
997# ifndef HAVE_AFTERIMAGE
998static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm);
999# endif
1000
1001
1002bool
1003bgPixmap_t::render ()
1004{
1005 unsigned long background_flags = 0;
1006
618 if (target == NULL) 1007 if (target == NULL)
619 return false; 1008 return false;
620 1009
621 int sx, sy; 1010 invalidate();
622 Window cr; 1011# ifdef ENABLE_TRANSPARENCY
623 XTranslateCoordinates (target->dpy, target->parent[0], target->display->root, 1012 if (flags & isTransparent)
624 0, 0, &sx, &sy, &cr); 1013 {
1014 /* we need to re-generate transparency pixmap in that case ! */
1015 background_flags = make_transparency_pixmap ();
1016 if (background_flags == 0)
1017 return false;
1018 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1019 && pmap_depth == target->depth)
1020 flags = flags & ~isInvalid;
1021 }
1022# endif
625 1023
626 /* check if we are outside of the visible part of the virtual screen : */ 1024 XImage *result = NULL;
627 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0 1025# ifdef HAVE_AFTERIMAGE
628 || sx >= wrootattr.width || sy >= wrootattr.height ) 1026 if (original_asim
1027 || (background_flags & transpTransformations) != (flags & transpTransformations))
1028 {
1029 ASImage *background = NULL;
1030 ARGB32 as_tint = TINT_LEAVE_SAME;
1031 if (background_flags)
1032 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1033
1034# ifdef ENABLE_TRANSPARENCY
1035 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1036 {
1037 ShadingInfo as_shade;
1038 as_shade.shading = (shade == 0) ? 100 : shade;
1039
1040 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1041 if (flags & tintSet)
1042 tint.get (c);
1043 as_shade.tintColor.red = c.r;
1044 as_shade.tintColor.green = c.g;
1045 as_shade.tintColor.blue = c.b;
1046
1047 as_tint = shading2tint32 (&as_shade);
1048 }
1049 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1050 {
1051 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1052 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1053 100, ASIMAGE_QUALITY_DEFAULT);
1054 if (tmp)
1055 {
1056 destroy_asimage (&background);
1057 background = tmp;
1058 }
1059 }
1060# endif
1061
1062 if (render_asim (background, as_tint))
1063 flags = flags & ~isInvalid;
1064 if (background)
1065 destroy_asimage (&background);
1066 }
1067 else if (background_flags && pmap_depth != target->depth)
1068 {
1069 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1070 }
1071# else /* our own client-side tinting */
1072 if (background_flags && (flags & isInvalid))
1073 {
1074 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1075 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1076 {
1077 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1078 if (flags & tintSet)
1079 tint.get (c);
1080 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1081 }
1082 }
1083# endif /* HAVE_AFTERIMAGE */
1084 if (result != NULL)
1085 {
1086 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1087 if (gc)
1088 {
1089 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1090 {
1091 XFreePixmap (target->dpy, pixmap);
1092 pixmap = None;
1093 }
1094 if (pixmap == None)
1095 {
1096 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1097 pmap_width = result->width;
1098 pmap_height = result->height;
1099 pmap_depth = target->depth;
1100 }
1101 if (pmap_depth != result->depth)
1102 { /* Bad Match error will ensue ! stupid X !!!! */
1103 if( result->depth == 24 && pmap_depth == 32)
1104 result->depth = 32;
1105 else if( result->depth == 32 && pmap_depth == 24)
1106 result->depth = 24;
1107 else
1108 {
1109 /* TODO: implement image recoding */
1110 }
1111 }
1112 if (pmap_depth == result->depth)
1113 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1114 XFreeGC (target->dpy, gc);
1115 flags = flags & ~isInvalid;
1116 }
1117 XDestroyImage (result);
1118 }
1119
1120 if (flags & isInvalid)
1121 {
1122 if (pixmap != None)
1123 {
1124 XFreePixmap (target->dpy, pixmap);
1125 pixmap = None;
1126 }
1127 }
1128
1129 apply ();
1130
1131 return true;
1132}
1133
1134bool
1135bgPixmap_t::set_target (rxvt_term *new_target)
1136{
1137 if (new_target)
1138 if (target != new_target)
1139 {
1140 target = new_target;
1141# ifdef ENABLE_TRANSPARENCY
1142 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1143# endif
1144 return true;
1145 }
629 return false ; 1146 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} 1147}
655#endif /* 0 */
656# endif /* ENABLE_TRANSPARENCY */
657 1148
658void 1149void
659bgPixmap_t::apply_background() 1150bgPixmap_t::apply()
660{ 1151{
661 if (target) 1152 if (target)
662 { 1153 {
663 if (pixmap != None) 1154 if (pixmap != None)
664 { /* set target's background to pixmap */ 1155 { /* set target's background to pixmap */
665# ifdef ENABLE_TRANSPARENCY 1156# ifdef ENABLE_TRANSPARENCY
666 if (flags & bgPmap_Transparent) 1157 if (flags & isTransparent)
667 { 1158 {
668 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1159 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
669 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1160 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1161# if HAVE_SCROLLBARS
670 if (target->scrollBar.win) 1162 if (target->scrollBar.win)
671 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1163 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1164# endif
672 } 1165 }
673 else 1166 else
674# endif 1167# endif
675 { 1168 {
676 /* force old pixmap dereference in case it was transparent before :*/ 1169 /* force old pixmap dereference in case it was transparent before :*/
677 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_bg]); 1170 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
678 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1171 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
679 /* do we also need to set scrollbar's background here ? */ 1172 /* do we also need to set scrollbar's background here ? */
1173# if HAVE_SCROLLBARS
1174 if (target->scrollBar.win)
1175 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1176# endif
680 } 1177 }
681 } 1178 }
682 else 1179 else
683 { /* set target background to a pixel */ 1180 { /* set target background to a pixel */
684 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_bg]); 1181 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
685 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1182 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
686 /* do we also need to set scrollbar's background here ? */ 1183 /* do we also need to set scrollbar's background here ? */
1184# if HAVE_SCROLLBARS
1185 if (target->scrollBar.win)
1186 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1187# endif
687 } 1188 }
688 /* don't want Expose on the parent */ 1189 /* don't want Expose on the parent */
689 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False); 1190 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False);
690 /* do want Expose on the vt */ 1191 /* do want Expose on the vt */
691 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, True); 1192 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, True);
692 } 1193# if HAVE_SCROLLBARS
693} 1194 if (target->scrollBar.win)
694#endif /* HAVE_BG_PIXMAP */ 1195 {
695 1196 target->scrollBar.setIdle ();
696 1197 target->scrollbar_show (0);
697 1198 }
1199# endif
1200 /* Is that really neccessary? we did a XClearArea to generate Expose events alreday ! */
1201 target->want_refresh = 1;
698#ifdef ENABLE_TRANSPARENCY 1202# ifdef ENABLE_TRANSPARENCY
699#ifndef HAVE_AFTERIMAGE 1203 target->want_full_refresh = 1;
1204# endif
1205 /* TODO: why do we need a flush here ??? It causes segfault on resize ! */
1206// target->flush ();
1207 }
1208}
1209
1210void
1211rxvt_term::get_window_origin (int &x, int &y)
1212{
1213 Window cr;
1214 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1215/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1216}
1217
1218Pixmap
1219rxvt_term::get_pixmap_property (int prop_id)
1220{
1221 if (prop_id > 0 && prop_id < NUM_XA)
1222 if (xa[prop_id])
1223 {
1224 int aformat;
1225 unsigned long nitems, bytes_after;
1226 Atom atype;
1227 unsigned char *prop = NULL;
1228 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1229 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1230 &nitems, &bytes_after, &prop);
1231 if (result == Success && prop && atype == XA_PIXMAP)
1232 {
1233 return *(Pixmap *)prop;
1234 }
1235 }
1236 return None;
1237}
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}
1262
1263void
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)
700/* taken from aterm-0.4.2 */ 1271/* taken from aterm-0.4.2 */
701 1272
702typedef uint32_t RUINT32T; 1273typedef uint32_t RUINT32T;
703 1274
704static void 1275static void
711 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1282 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
712 int i; 1283 int i;
713 1284
714 Visual *visual = term->visual; 1285 Visual *visual = term->visual;
715 1286
716 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 1287 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1288
1289 if (shade == 0)
1290 shade = 100;
717 1291
718 /* for convenience */ 1292 /* for convenience */
719 mask_r = visual->red_mask; 1293 mask_r = visual->red_mask;
720 mask_g = visual->green_mask; 1294 mask_g = visual->green_mask;
721 mask_b = visual->blue_mask; 1295 mask_b = visual->blue_mask;
924 } 1498 }
925 } 1499 }
926 1500
927 free (lookup); 1501 free (lookup);
928} 1502}
929#endif 1503#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */
930 1504
931/* 1505#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 1506void
944rxvt_term::check_our_parents_cb (time_watcher &w) 1507rxvt_term::check_our_parents_cb (time_watcher &w)
945{ 1508{
1509
946 int i, aformat, rootdepth; 1510 int i, aformat, rootdepth;
947 unsigned long nitems, bytes_after; 1511 unsigned long nitems, bytes_after;
948 Atom atype; 1512 Atom atype;
949 unsigned char *prop = NULL; 1513 unsigned char *prop = NULL;
950 Window root, oldp, *list; 1514 Window root, oldp, *list;
954 Window cr; 1518 Window cr;
955 unsigned int rootpixmap_w = 0, rootpixmap_h = 0; 1519 unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
956 1520
957 if (!option (Opt_transparent)) 1521 if (!option (Opt_transparent))
958 return; /* Don't try any more */ 1522 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 1523
971 XGetWindowAttributes (dpy, display->root, &wrootattr); 1524 XGetWindowAttributes (dpy, display->root, &wrootattr);
972 rootdepth = wrootattr.depth; 1525 rootdepth = wrootattr.depth;
973 1526
974 XGetWindowAttributes (dpy, parent[0], &wattr); 1527 XGetWindowAttributes (dpy, parent[0], &wattr);
1047 whole_tint = (IS_COMPONENT_WHOLESOME(c.r) 1600 whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
1048 && IS_COMPONENT_WHOLESOME(c.g) 1601 && IS_COMPONENT_WHOLESOME(c.g)
1049 && IS_COMPONENT_WHOLESOME(c.b)); 1602 && IS_COMPONENT_WHOLESOME(c.b));
1050 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700); 1603 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700);
1051#undef IS_COMPONENT_WHOLESOME 1604#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 1605
1060#if 0 /* TODO : identify cases where this will be detrimental to performance : */ 1606 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 1607
1076 if (whole_tint && !no_tint) 1608 if (whole_tint && !no_tint)
1077 { 1609 {
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 } 1610 }
1087 success = True; 1611 success = True;
1088#ifdef HAVE_AFTERIMAGE 1612#ifdef HAVE_AFTERIMAGE
1089 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100))) 1613 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100)))
1090 { 1614 {
1137 { 1661 {
1138 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);
1139 success = False; 1663 success = False;
1140 if (image != NULL) 1664 if (image != NULL)
1141 { 1665 {
1142 PRINT_BACKGROUND_OP_TIME;
1143 if (gc == NULL) 1666 if (gc == NULL)
1144 gc = XCreateGC (dpy, vt, 0UL, &gcvalue); 1667 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1145 if (ISSET_PIXCOLOR (Color_tint) || shade != 100) 1668 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
1146 ShadeXImage (this, image, shade, c.r, c.g, c.b); 1669 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); 1670 XPutImage (dpy, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
1148 XDestroyImage (image); 1671 XDestroyImage (image);
1149 success = True; 1672 success = True;
1150 } 1673 }
1151 } 1674 }
1152#endif /* HAVE_AFTERIMAGE */ 1675#endif /* HAVE_AFTERIMAGE */
1153 PRINT_BACKGROUND_OP_TIME;
1154 1676
1155 if (gc != NULL) 1677 if (gc != NULL)
1156 XFreeGC (dpy, gc); 1678 XFreeGC (dpy, gc);
1157 1679
1158 bgPixmap.apply_background(); 1680 bgPixmap.apply();
1159 if (!success) 1681 if (!success)
1160 am_pixmap_trans = 0; 1682 am_pixmap_trans = 0;
1161 else 1683 else
1162 { 1684 {
1163 am_transparent = am_pixmap_trans = 1; 1685 am_transparent = am_pixmap_trans = 1;
1178 if (am_pixmap_trans) 1700 if (am_pixmap_trans)
1179 flush (); 1701 flush ();
1180 } 1702 }
1181 } 1703 }
1182} 1704}
1183#endif 1705#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines