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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines