ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xpm.C
(Generate patch)

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.64 by sasha, Thu Aug 9 22:08:21 2007 UTC vs.
Revision 1.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
… …
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}
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
609/* make_transparency_pixmap() 733/* make_transparency_pixmap()
610 * Builds a pixmap sized the same as terminal window, with depth same as the root window 734 * 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 735 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
612 * our window. 736 * our window.
613 */ 737 */
614bool 738unsigned long
615bgPixmap_t::make_transparency_pixmap() 739bgPixmap_t::make_transparency_pixmap ()
616{ 740{
741 unsigned long result = 0;
742
617 if (target == NULL) 743 if (target == NULL)
618 return false; 744 return 0;
619 745
620 /* root dimentions may change from call to call - but Display structure should 746 /* root dimentions may change from call to call - but Display structure should
621 * be always up-to-date, so let's use it : 747 * be always up-to-date, so let's use it :
622 */ 748 */
623 Window root = target->display->root; 749 Window root = target->display->root;
… …
627 int root_height = DisplayHeight (dpy, screen); 753 int root_height = DisplayHeight (dpy, screen);
628 unsigned int root_pmap_width, root_pmap_height; 754 unsigned int root_pmap_width, root_pmap_height;
629 int window_width = target->szHint.width; 755 int window_width = target->szHint.width;
630 int window_height = target->szHint.height; 756 int window_height = target->szHint.height;
631 int sx, sy; 757 int sx, sy;
758 XGCValues gcv;
632 759
760 TIMING_TEST_START (tp);
633 target->get_window_origin (sx, sy); 761 target->get_window_origin (sx, sy);
634 762
635 /* check if we are outside of the visible part of the virtual screen : */ 763 /* check if we are outside of the visible part of the virtual screen : */
636 if (sx + window_width <= 0 || sy + window_height <= 0 764 if (sx + window_width <= 0 || sy + window_height <= 0
637 || sx >= root_width || sy >= root_height) 765 || sx >= root_width || sy >= root_height)
638 return false; 766 return 0;
639 767
640 if (root_pixmap != None) 768 if (root_pixmap != None)
641 {/* we want to validate the pixmap and get it's size at the same time : */ 769 {/* we want to validate the pixmap and get it's size at the same time : */
642 int junk; 770 int junk;
643 unsigned int ujunk; 771 unsigned int ujunk;
… …
650 778
651 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 779 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
652 GC gc = NULL; 780 GC gc = NULL;
653 781
654 if (tiled_root_pmap == None) /* something really bad happened - abort */ 782 if (tiled_root_pmap == None) /* something really bad happened - abort */
655 return false; 783 return 0;
656 784
657 if (root_pixmap == None) 785 if (root_pixmap == None)
658 { /* use tricks to obtain the root background image :*/ 786 { /* use tricks to obtain the root background image :*/
659 /* we want to create Overrideredirect window overlapping out window 787 /* we want to create Overrideredirect window overlapping out window
660 with background type of Parent Relative and then grab it */ 788 with background type of Parent Relative and then grab it */
… …
683 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 811 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
684 ++ev_count; 812 ++ev_count;
685 if (ev_count > 0); 813 if (ev_count > 0);
686 { /* hooray! - we can grab the image! */ 814 { /* hooray! - we can grab the image! */
687 gc = XCreateGC (dpy, root, 0, NULL); 815 gc = XCreateGC (dpy, root, 0, NULL);
816 if (gc)
817 {
688 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 818 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
689 success = true; 819 success = true;
820 }
690 } 821 }
691 XDestroyWindow (dpy, src); 822 XDestroyWindow (dpy, src);
692 XUngrabServer (dpy); 823 XUngrabServer (dpy);
693 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 824 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
694 } 825 }
695 if (!success) 826 if (!success)
696 { 827 {
697 XFreePixmap (dpy, tiled_root_pmap); 828 XFreePixmap (dpy, tiled_root_pmap);
698 tiled_root_pmap = None; 829 tiled_root_pmap = None;
699 } 830 }
831 else
832 result |= transpPmapTiled;
700 } 833 }
701 else 834 else
702 {/* strightforward pixmap copy */ 835 {/* strightforward pixmap copy */
703 XGCValues gcv;
704 gcv.tile = root_pixmap; 836 gcv.tile = root_pixmap;
705 gcv.fill_style = FillTiled; 837 gcv.fill_style = FillTiled;
706 while (sx < 0) sx += (int)window_width; 838 while (sx < 0) sx += (int)window_width;
707 while (sy < 0) sy += (int)window_height; 839 while (sy < 0) sy += (int)window_height;
708 gcv.ts_x_origin = -sx; 840 gcv.ts_x_origin = -sx;
709 gcv.ts_y_origin = -sy; 841 gcv.ts_y_origin = -sy;
710 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 842 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
843 if (gc)
844 {
711 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 845 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
846 result |= transpPmapTiled;
847 }
712 } 848 }
849 TIMING_TEST_PRINT_RESULT (tp);
713 850
714 if (gc)
715 XFreeGC (dpy, gc);
716
717 if (tiled_root_pmap != None) 851 if (tiled_root_pmap != None)
852 {
853 if ((flags & tintNeeded) && !need_client_side_rendering ())
718 { 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 }
719 if (pixmap) 962 if (pixmap)
720 XFreePixmap (dpy, pixmap); 963 XFreePixmap (dpy, pixmap);
721 pixmap = tiled_root_pmap; 964 pixmap = tiled_root_pmap;
722 pmap_width = window_width; 965 pmap_width = window_width;
723 pmap_height = window_height; 966 pmap_height = window_height;
724 pmap_depth = root_depth; 967 pmap_depth = root_depth;
968 }
725 } 969
726} 970 if (gc)
971 XFreeGC (dpy, gc);
727 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}
728# endif /* ENABLE_TRANSPARENCY */ 994# endif /* ENABLE_TRANSPARENCY */
995
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}
729 1132
730bool 1133bool
731bgPixmap_t::set_target (rxvt_term *new_target) 1134bgPixmap_t::set_target (rxvt_term *new_target)
732{ 1135{
733 if (new_target) 1136 if (new_target)
734 if (target != new_target) 1137 if (target != new_target)
735 { 1138 {
736 target = new_target; 1139 target = new_target;
737# ifdef ENABLE_TRANSPARENCY 1140# ifdef ENABLE_TRANSPARENCY
738 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1141 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
739 root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
740 if (root_pixmap == None)
741 root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
742# endif 1142# endif
743 return true; 1143 return true;
744 } 1144 }
745 return false; 1145 return false;
746} 1146}
747 1147
748void 1148void
749bgPixmap_t::apply_background() 1149bgPixmap_t::apply()
750{ 1150{
751 if (target) 1151 if (target)
752 { 1152 {
753 if (pixmap != None) 1153 if (pixmap != None)
754 { /* set target's background to pixmap */ 1154 { /* set target's background to pixmap */
755# ifdef ENABLE_TRANSPARENCY 1155# ifdef ENABLE_TRANSPARENCY
756 if (flags & bgPmap_Transparent) 1156 if (flags & isTransparent)
757 { 1157 {
758 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1158 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
759 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1159 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1160# if HAVE_SCROLLBARS
760 if (target->scrollBar.win) 1161 if (target->scrollBar.win)
761 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1162 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1163# endif
762 } 1164 }
763 else 1165 else
764# endif 1166# endif
765 { 1167 {
766 /* force old pixmap dereference in case it was transparent before :*/ 1168 /* force old pixmap dereference in case it was transparent before :*/
767 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_bg]); 1169 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
768 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1170 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
769 /* do we also need to set scrollbar's background here ? */ 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
770 } 1176 }
771 } 1177 }
772 else 1178 else
773 { /* set target background to a pixel */ 1179 { /* set target background to a pixel */
774 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_bg]); 1180 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
775 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1181 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
776 /* do we also need to set scrollbar's background here ? */ 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
777 } 1187 }
778 /* don't want Expose on the parent */ 1188 /* don't want Expose on the parent */
779 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False); 1189 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False);
780 /* do want Expose on the vt */ 1190 /* do want Expose on the vt */
781 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, True); 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 ();
782 } 1206 }
783} 1207}
784#endif /* HAVE_BG_PIXMAP */
785
786 1208
787void 1209void
788rxvt_term::get_window_origin (int &x, int &y) 1210rxvt_term::get_window_origin (int &x, int &y)
789{ 1211{
790 Window cr; 1212 Window cr;
791 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1213 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1214/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
792} 1215}
793 1216
794Pixmap 1217Pixmap
795rxvt_term::get_pixmap_property (int prop_id) 1218rxvt_term::get_pixmap_property (int prop_id)
796{ 1219{
… …
810 } 1233 }
811 } 1234 }
812 return None; 1235 return None;
813} 1236}
814 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}
815 1261
816#ifdef ENABLE_TRANSPARENCY 1262void
817#ifndef HAVE_AFTERIMAGE 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)
818/* taken from aterm-0.4.2 */ 1270/* taken from aterm-0.4.2 */
819 1271
820typedef uint32_t RUINT32T; 1272typedef uint32_t RUINT32T;
821 1273
822static void 1274static void
… …
829 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1281 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
830 int i; 1282 int i;
831 1283
832 Visual *visual = term->visual; 1284 Visual *visual = term->visual;
833 1285
834 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;
835 1290
836 /* for convenience */ 1291 /* for convenience */
837 mask_r = visual->red_mask; 1292 mask_r = visual->red_mask;
838 mask_g = visual->green_mask; 1293 mask_g = visual->green_mask;
839 mask_b = visual->blue_mask; 1294 mask_b = visual->blue_mask;
… …
1042 } 1497 }
1043 } 1498 }
1044 1499
1045 free (lookup); 1500 free (lookup);
1046} 1501}
1047#endif 1502#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */
1048 1503
1049/* 1504#if 0 /* replaced by a bgPixmap_t::render() - leve here temporarily for reference */
1050 * Check our parents are still who we think they are.
1051 * Do transparency updates if required
1052 */
1053int
1054rxvt_term::check_our_parents ()
1055{
1056 check_our_parents_ev.stop ();
1057 check_our_parents_ev.start (NOW + .1);
1058 return 0;
1059}
1060
1061void 1505void
1062rxvt_term::check_our_parents_cb (time_watcher &w) 1506rxvt_term::check_our_parents_cb (time_watcher &w)
1063{ 1507{
1508
1064 int i, aformat, rootdepth; 1509 int i, aformat, rootdepth;
1065 unsigned long nitems, bytes_after; 1510 unsigned long nitems, bytes_after;
1066 Atom atype; 1511 Atom atype;
1067 unsigned char *prop = NULL; 1512 unsigned char *prop = NULL;
1068 Window root, oldp, *list; 1513 Window root, oldp, *list;
… …
1072 Window cr; 1517 Window cr;
1073 unsigned int rootpixmap_w = 0, rootpixmap_h = 0; 1518 unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
1074 1519
1075 if (!option (Opt_transparent)) 1520 if (!option (Opt_transparent))
1076 return; /* Don't try any more */ 1521 return; /* Don't try any more */
1077#if 0
1078 struct timeval stv;
1079 gettimeofday (&stv,NULL);
1080#define PRINT_BACKGROUND_OP_TIME do{ struct timeval tv;gettimeofday (&tv,NULL); tv.tv_sec-= stv.tv_sec;\
1081 fprintf (stderr,"%d: elapsed %ld usec\n",__LINE__,\
1082 tv.tv_sec*1000000+tv.tv_usec-stv.tv_usec );}while(0)
1083#else
1084#define PRINT_BACKGROUND_OP_TIME do{}while(0)
1085#endif
1086
1087 1522
1088 XGetWindowAttributes (dpy, display->root, &wrootattr); 1523 XGetWindowAttributes (dpy, display->root, &wrootattr);
1089 rootdepth = wrootattr.depth; 1524 rootdepth = wrootattr.depth;
1090 1525
1091 XGetWindowAttributes (dpy, parent[0], &wattr); 1526 XGetWindowAttributes (dpy, parent[0], &wattr);
… …
1169 1604
1170 bgPixmap.make_transparency_pixmap(); 1605 bgPixmap.make_transparency_pixmap();
1171 1606
1172 if (whole_tint && !no_tint) 1607 if (whole_tint && !no_tint)
1173 { 1608 {
1174 /* In this case we can tint image server-side getting significant
1175 * performance improvements, as we eliminate XImage transfer
1176 */
1177 gcvalue.foreground = Pixel (pix_colors_focused [Color_tint]);
1178 gcvalue.function = GXand;
1179 gcvalue.fill_style = FillSolid;
1180 if (gc)
1181 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcvalue);
1182 else
1183 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcvalue);
1184 XFillRectangle (dpy, bgPixmap.pixmap, gc, 0, 0, szHint.width, szHint.height);
1185 } 1609 }
1186 success = True; 1610 success = True;
1187#ifdef HAVE_AFTERIMAGE 1611#ifdef HAVE_AFTERIMAGE
1188 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)))
1189 { 1613 {
… …
1236 { 1660 {
1237 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);
1238 success = False; 1662 success = False;
1239 if (image != NULL) 1663 if (image != NULL)
1240 { 1664 {
1241 PRINT_BACKGROUND_OP_TIME;
1242 if (gc == NULL) 1665 if (gc == NULL)
1243 gc = XCreateGC (dpy, vt, 0UL, &gcvalue); 1666 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1244 if (ISSET_PIXCOLOR (Color_tint) || shade != 100) 1667 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
1245 ShadeXImage (this, image, shade, c.r, c.g, c.b); 1668 ShadeXImage (this, image, shade, c.r, c.g, c.b);
1246 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);
1247 XDestroyImage (image); 1670 XDestroyImage (image);
1248 success = True; 1671 success = True;
1249 } 1672 }
1250 } 1673 }
1251#endif /* HAVE_AFTERIMAGE */ 1674#endif /* HAVE_AFTERIMAGE */
1252 PRINT_BACKGROUND_OP_TIME;
1253 1675
1254 if (gc != NULL) 1676 if (gc != NULL)
1255 XFreeGC (dpy, gc); 1677 XFreeGC (dpy, gc);
1256 1678
1257 bgPixmap.apply_background(); 1679 bgPixmap.apply();
1258 if (!success) 1680 if (!success)
1259 am_pixmap_trans = 0; 1681 am_pixmap_trans = 0;
1260 else 1682 else
1261 { 1683 {
1262 am_transparent = am_pixmap_trans = 1; 1684 am_transparent = am_pixmap_trans = 1;
… …
1277 if (am_pixmap_trans) 1699 if (am_pixmap_trans)
1278 flush (); 1700 flush ();
1279 } 1701 }
1280 } 1702 }
1281} 1703}
1282#endif 1704#endif

Diff Legend

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