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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.32 by root, Tue Nov 4 14:38:29 2008 UTC vs.
Revision 1.55 by sf-exg, Thu Sep 2 15:48:10 2010 UTC

… …
27#define DO_TIMING_TEST 0 27#define DO_TIMING_TEST 0
28 28
29#if DO_TIMING_TEST 29#if DO_TIMING_TEST
30# include <sys/time.h> 30# include <sys/time.h>
31#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
32 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv; \
33 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
34 34
35#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
36 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\ 36 do { \
37 struct timeval tv; \
38 gettimeofday (&tv, NULL); \
39 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
37 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 40 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
38 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0) 41 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
42 } while (0)
39 43
40#else 44#else
41#define TIMING_TEST_START(id) do{}while (0) 45#define TIMING_TEST_START(id) do {} while (0)
42#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 46#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
43#endif 47#endif
44 48
45/* 49/*
46 * Pixmap geometry string interpretation : 50 * Pixmap geometry string interpretation :
47 * Each geometry string contains zero or one scale/position 51 * Each geometry string contains zero or one scale/position
48 * adjustment and may optionally be followed by a colon and one or more 52 * adjustment and may optionally be followed by a colon and one or more
49 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
50 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
51 * affects on the background image : 55 * effects on the background image :
52 * 56 *
53 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 57 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
54 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
55 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
56 * the image in the window. 60 * the image in the window.
57 * WxH+X Assumes Y == X 61 * WxH+X Assumes Y == X
58 * WxH Assumes Y == X == 50 (centers the image) 62 * WxH Assumes Y == X == 50 (centers the image)
59 * W+X+Y Assumes H == W 63 * W+X+Y Assumes H == W
60 * W+X Assumes H == W and Y == X 64 * W+X Assumes H == W and Y == X
61 * W Assumes H == W and Y == X == 50 65 * W Assumes H == W and Y == X == 50
62 * 66 *
63 * Adjusting position only : 67 * Adjusting position only :
64 * =+X+Y Set position to X% by Y% (absolute). 68 * =+X+Y Set position to X% by Y% (absolute).
65 * =+X Set position to X% by X%. 69 * =+X Set position to X% by X%.
66 * +X+Y Adjust position horizontally X% and vertically Y% 70 * +X+Y Adjust position horizontally X% and vertically Y%
67 * from current position (relative). 71 * from current position (relative).
68 * +X Adjust position horizontally X% and vertically X% 72 * +X Adjust position horizontally X% and vertically X%
69 * from current position. 73 * from current position.
70 * 74 *
71 * Adjusting scale only : 75 * Adjusting scale only :
72 * Wx0 Multiply horizontal scaling factor by W% 76 * Wx0 Multiply horizontal scaling factor by W%
73 * 0xH Multiply vertical scaling factor by H% 77 * 0xH Multiply vertical scaling factor by H%
74 * 0x0 No scaling (show image at normal size). 78 * 0x0 No scaling (show image at normal size).
75 * 79 *
76 * Pixmap Operations : (should be prepended by a colon) 80 * Pixmap Operations : (should be prepended by a colon)
77 * tile Tile image. Scaling/position modifiers above will affect 81 * tile Tile image. Scaling/position modifiers above will affect
78 * the tile size and origin. 82 * the tile size and origin.
79 * propscale When scaling, scale proportionally. That is, maintain the 83 * propscale When scaling, scale proportionally. That is, maintain the
80 * proper aspect ratio for the image. Any portion of the 84 * proper aspect ratio for the image. Any portion of the
81 * background not covered by the image is filled with the 85 * background not covered by the image is filled with the
82 * current background color. 86 * current background color.
83 * hscale Scale horizontally, tile vertically ? 87 * hscale Scale horizontally, tile vertically ?
84 * vscale Tile horizontally, scale vertically ? 88 * vscale Tile horizontally, scale vertically ?
… …
92 // this is basically redundant as bgPixmap_t is only used in 96 // this is basically redundant as bgPixmap_t is only used in
93 // zero_initialised-derived structs 97 // zero_initialised-derived structs
94#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL; 99 original_asim = NULL;
96#endif 100#endif
101#ifdef HAVE_PIXBUF
102 pixbuf = NULL;
103#endif
97#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
105 have_image = false;
98 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
99 h_align = v_align = 0; 107 h_align = v_align = 0;
100#endif 108#endif
101 flags = 0; 109 flags = 0;
102 pixmap = None; 110 pixmap = None;
… …
110#ifdef HAVE_AFTERIMAGE 118#ifdef HAVE_AFTERIMAGE
111 if (original_asim) 119 if (original_asim)
112 safe_asimage_destroy (original_asim); 120 safe_asimage_destroy (original_asim);
113#endif 121#endif
114 122
123#ifdef HAVE_PIXBUF
124 if (pixbuf)
125 g_object_unref (pixbuf);
126#endif
127
115 if (pixmap && target) 128 if (pixmap && target)
116 XFreePixmap (target->dpy, pixmap); 129 XFreePixmap (target->dpy, pixmap);
117} 130}
118 131
119bool 132bool
… …
123 if (flags & isTransparent) 136 if (flags & isTransparent)
124 return true; 137 return true;
125# endif 138# endif
126 139
127# ifdef BG_IMAGE_FROM_FILE 140# ifdef BG_IMAGE_FROM_FILE
128# ifdef HAVE_AFTERIMAGE 141 if (have_image)
129 if (original_asim)
130# endif
131 { 142 {
132 if (h_scale != 0 || v_scale != 0 143 if (h_scale != 0 || v_scale != 0
133 || h_align != 0 || v_align != 0) 144 || h_align != 0 || v_align != 0)
134 return true; 145 return true;
135 } 146 }
136# endif 147# endif
137 148
138 return false; 149 return false;
139} 150}
140 151
141bool 152bool
142bgPixmap_t::window_position_sensitive () 153bgPixmap_t::window_position_sensitive ()
143{ 154{
144# ifdef ENABLE_TRANSPARENCY 155# ifdef ENABLE_TRANSPARENCY
145 if (flags & isTransparent) 156 if (flags & isTransparent)
146 return true; 157 return true;
147# endif 158# endif
148 159
149# ifdef BG_IMAGE_FROM_FILE 160# ifdef BG_IMAGE_FROM_FILE
150# ifdef HAVE_AFTERIMAGE 161 if (have_image)
151 if (original_asim)
152# endif
153 { 162 {
154 if (h_align == rootAlign || v_align == rootAlign) 163 if (h_align == rootAlign || v_align == rootAlign)
155 return true; 164 return true;
156 } 165 }
157# endif 166# endif
… …
259 int geom_flags = 0, changed = 0; 268 int geom_flags = 0, changed = 0;
260 int x = 0, y = 0; 269 int x = 0, y = 0;
261 unsigned int w = 0, h = 0; 270 unsigned int w = 0, h = 0;
262 unsigned int n; 271 unsigned int n;
263 unsigned long new_flags = (flags & (~geometryFlags)); 272 unsigned long new_flags = (flags & (~geometryFlags));
264 char *p; 273 const char *p;
265# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 274# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
266 275
267 if (geom == NULL) 276 if (geom == NULL)
268 return false; 277 return false;
269 278
… …
437 { 446 {
438 flags = new_flags; 447 flags = new_flags;
439 changed++; 448 changed++;
440 } 449 }
441 450
442//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
443// flags, h_scale, v_scale, h_align, v_align); 452 // flags, h_scale, v_scale, h_align, v_align);
444 return (changed > 0); 453 return (changed > 0);
445} 454}
446 455
447# ifdef HAVE_AFTERIMAGE 456# ifdef HAVE_AFTERIMAGE
448bool 457bool
449bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 458bgPixmap_t::render_image (unsigned long background_flags)
450{ 459{
451 if (target == NULL) 460 if (target == NULL)
452 return false; 461 return false;
453 462
454 target->init_asv (); 463 target->init_asv ();
464
465 ASImage *background = NULL;
466 ARGB32 background_tint = TINT_LEAVE_SAME;
467
468# ifdef ENABLE_TRANSPARENCY
469 if (background_flags)
470 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
471
472 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
473 {
474 ShadingInfo as_shade;
475 as_shade.shading = (shade == 0) ? 100 : shade;
476
477 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
478 if (flags & tintSet)
479 tint.get (c);
480 as_shade.tintColor.red = c.r;
481 as_shade.tintColor.green = c.g;
482 as_shade.tintColor.blue = c.b;
483
484 background_tint = shading2tint32 (&as_shade);
485 }
486
487 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
488 {
489 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
490 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
491 100, ASIMAGE_QUALITY_DEFAULT);
492 if (tmp)
493 {
494 destroy_asimage (&background);
495 background = tmp;
496 }
497 }
498# endif
455 499
456 ASImage *result = 0; 500 ASImage *result = 0;
457 501
458 int target_width = target->szHint.width; 502 int target_width = target->szHint.width;
459 int target_height = target->szHint.height; 503 int target_height = target->szHint.height;
… …
469 513
470 if (original_asim) 514 if (original_asim)
471 { 515 {
472 if (h_align == rootAlign || v_align == rootAlign) 516 if (h_align == rootAlign || v_align == rootAlign)
473 { 517 {
474 target->get_window_origin(x, y); 518 target->get_window_origin (x, y);
475 x = -x; 519 x = -x;
476 y = -y; 520 y = -y;
477 } 521 }
478 522
479 if (h_align != rootAlign) 523 if (h_align != rootAlign)
… …
495 new_pmap_height = background->height; 539 new_pmap_height = background->height;
496 result = background; 540 result = background;
497 541
498 if (background_tint != TINT_LEAVE_SAME) 542 if (background_tint != TINT_LEAVE_SAME)
499 { 543 {
500 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 544 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
501 target_width, target_height, background_tint, 545 target_width, target_height, background_tint,
502 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 546 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
503 if (tmp) 547 if (tmp)
504 result = tmp; 548 result = tmp;
505 } 549 }
… …
533 if (h_scale == 0 || v_scale == 0) 577 if (h_scale == 0 || v_scale == 0)
534 { 578 {
535 ASImage *tmp = tile_asimage (target->asv, result, 579 ASImage *tmp = tile_asimage (target->asv, result,
536 (h_scale > 0) ? 0 : (int)result->width - x, 580 (h_scale > 0) ? 0 : (int)result->width - x,
537 (v_scale > 0) ? 0 : (int)result->height - y, 581 (v_scale > 0) ? 0 : (int)result->height - y,
538 new_pmap_width, 582 new_pmap_width,
539 new_pmap_height, 583 new_pmap_height,
540 TINT_LEAVE_SAME, ASA_XImage, 584 TINT_LEAVE_SAME, ASA_XImage,
541 100, ASIMAGE_QUALITY_DEFAULT); 585 100, ASIMAGE_QUALITY_DEFAULT);
542 if (tmp) 586 if (tmp)
543 { 587 {
… …
550 } 594 }
551 else 595 else
552 { 596 {
553 /* if blending background and image - pixmap has to be sized same as target window */ 597 /* if blending background and image - pixmap has to be sized same as target window */
554 ASImageLayer *layers = create_image_layers (2); 598 ASImageLayer *layers = create_image_layers (2);
555 ASImage *merged_im = NULL;
556 599
557 layers[0].im = background; 600 layers[0].im = background;
558 layers[0].clip_width = target_width; 601 layers[0].clip_width = target_width;
559 layers[0].clip_height = target_height; 602 layers[0].clip_height = target_height;
560 layers[0].tint = background_tint; 603 layers[0].tint = background_tint;
… …
607 free (layers); 650 free (layers);
608 } 651 }
609 } 652 }
610 TIMING_TEST_PRINT_RESULT (asim); 653 TIMING_TEST_PRINT_RESULT (asim);
611 654
612 if (pixmap) 655 bool ret = false;
613 {
614 if (result == NULL
615 || pmap_width != new_pmap_width
616 || pmap_height != new_pmap_height
617 || pmap_depth != target->depth)
618 {
619 XFreePixmap (target->dpy, pixmap);
620 pixmap = None;
621 }
622 }
623 656
624 if (result) 657 if (result)
625 { 658 {
626 XGCValues gcv; 659 XGCValues gcv;
627 GC gc; 660 GC gc;
661
662 if (pixmap)
663 {
664 if (pmap_width != new_pmap_width
665 || pmap_height != new_pmap_height
666 || pmap_depth != target->depth)
667 {
668 XFreePixmap (target->dpy, pixmap);
669 pixmap = None;
670 }
671 }
628 672
629 /* create Pixmap */ 673 /* create Pixmap */
630 if (pixmap == None) 674 if (pixmap == None)
631 { 675 {
632 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 676 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
633 pmap_width = new_pmap_width; 677 pmap_width = new_pmap_width;
634 pmap_height = new_pmap_height; 678 pmap_height = new_pmap_height;
635 pmap_depth = target->depth; 679 pmap_depth = target->depth;
636 } 680 }
637 /* fill with background color ( if result's not completely overlapping it)*/ 681 /* fill with background color (if result's not completely overlapping it) */
638 gcv.foreground = target->pix_colors[Color_bg]; 682 gcv.foreground = target->pix_colors[Color_bg];
639 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 683 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
640 684
641 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 685 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
642 int dst_width = result->width, dst_height = result->height; 686 int dst_width = result->width, dst_height = result->height;
… …
658 if (result != background && result != original_asim) 702 if (result != background && result != original_asim)
659 destroy_asimage (&result); 703 destroy_asimage (&result);
660 704
661 XFreeGC (target->dpy, gc); 705 XFreeGC (target->dpy, gc);
662 TIMING_TEST_PRINT_RESULT (asim); 706 TIMING_TEST_PRINT_RESULT (asim);
663 }
664 707
708 ret = true;
709 }
710
711 if (background)
712 destroy_asimage (&background);
713
665 return true; 714 return ret;
666} 715}
667# endif /* HAVE_AFTERIMAGE */ 716# endif /* HAVE_AFTERIMAGE */
717
718# ifdef HAVE_PIXBUF
719bool
720bgPixmap_t::render_image (unsigned long background_flags)
721{
722 if (target == NULL)
723 return false;
724
725 if (!pixbuf)
726 return false;
727
728 // TODO: add alpha blending
729 if (background_flags)
730 return false;
731
732 GdkPixbuf *result;
733
734 int image_width = gdk_pixbuf_get_width (pixbuf);
735 int image_height = gdk_pixbuf_get_height (pixbuf);
736
737 int target_width = target->szHint.width;
738 int target_height = target->szHint.height;
739 int new_pmap_width = target_width;
740 int new_pmap_height = target_height;
741
742 int x = 0;
743 int y = 0;
744 int w = h_scale * target_width / 100;
745 int h = v_scale * target_height / 100;
746
747 if (h_align == rootAlign || v_align == rootAlign)
748 {
749 target->get_window_origin (x, y);
750 x = -x;
751 y = -y;
752 }
753
754 if (h_align != rootAlign)
755 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
756
757 if (v_align != rootAlign)
758 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
759
760 if (x >= target_width
761 || y >= target_height
762 || (w > 0 && x + w <= 0)
763 || (h > 0 && y + h <= 0))
764 return false;
765
766 result = pixbuf;
767
768 if ((w > 0 && w != image_width)
769 || (h > 0 && h != image_height))
770 {
771 result = gdk_pixbuf_scale_simple (pixbuf,
772 w > 0 ? w : image_width,
773 h > 0 ? h : image_height,
774 GDK_INTERP_BILINEAR);
775 }
776
777 bool ret = false;
778
779 if (result)
780 {
781 XGCValues gcv;
782 GC gc;
783
784 image_width = gdk_pixbuf_get_width (result);
785 image_height = gdk_pixbuf_get_height (result);
786
787 if (h_scale == 0)
788 new_pmap_width = min (image_width, target_width);
789 if (v_scale == 0)
790 new_pmap_height = min (image_height, target_height);
791
792 if (pixmap)
793 {
794 if (pmap_width != new_pmap_width
795 || pmap_height != new_pmap_height
796 || pmap_depth != target->depth)
797 {
798 XFreePixmap (target->dpy, pixmap);
799 pixmap = None;
800 }
801 }
802
803 if (pixmap == None)
804 {
805 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
806 pmap_width = new_pmap_width;
807 pmap_height = new_pmap_height;
808 pmap_depth = target->depth;
809 }
810
811 gcv.foreground = target->pix_colors[Color_bg];
812 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
813
814 if (h_scale == 0 || v_scale == 0)
815 {
816 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
817 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
818 0, 0,
819 0, 0,
820 image_width, image_height,
821 XLIB_RGB_DITHER_NONE,
822 0, 0);
823
824 gcv.tile = tile;
825 gcv.fill_style = FillTiled;
826 gcv.ts_x_origin = x;
827 gcv.ts_y_origin = y;
828 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
829
830 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
831 XFreePixmap (target->dpy, tile);
832 }
833 else
834 {
835 int src_x, src_y, dst_x, dst_y;
836 int dst_width, dst_height;
837
838 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
839 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
840
841 if (dst_x > 0 || dst_y > 0
842 || dst_x + dst_width < new_pmap_width
843 || dst_y + dst_height < new_pmap_height)
844 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
845
846 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
847 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
848 src_x, src_y,
849 dst_x, dst_y,
850 dst_width, dst_height,
851 XLIB_RGB_DITHER_NONE,
852 0, 0);
853 }
854
855 if (result != pixbuf)
856 g_object_unref (result);
857
858 XFreeGC (target->dpy, gc);
859
860 ret = true;
861 }
862
863 return ret;
864}
865# endif /* HAVE_PIXBUF */
668 866
669bool 867bool
670bgPixmap_t::set_file (const char *file) 868bgPixmap_t::set_file (const char *file)
671{ 869{
672 assert (file); 870 assert (file);
673 871
674 if (*file) 872 if (*file)
675 { 873 {
874 if (const char *p = strchr (file, ';'))
875 {
876 size_t len = p - file;
877 char *f = rxvt_temp_buf<char> (len + 1);
878 memcpy (f, file, len);
879 f[len] = '\0';
880 file = f;
881 }
882
676# ifdef HAVE_AFTERIMAGE 883# ifdef HAVE_AFTERIMAGE
677 if (!target->asimman) 884 if (!target->asimman)
678 target->asimman = create_generic_imageman (target->rs[Rs_path]); 885 target->asimman = create_generic_imageman (target->rs[Rs_path]);
679
680 if (char *f = strchr (file, ';'))
681 {
682 size_t len = f - file;
683 f = (char *)malloc (len + 1);
684 memcpy (f, file, len);
685 f[len] = '\0';
686 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
687 free (f);
688 }
689 else
690 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 886 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
887 if (original_asim)
888 have_image = true;
889 return have_image;
890# endif
691 891
692 return original_asim; 892# ifdef HAVE_PIXBUF
893 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
894 if (pixbuf)
895 have_image = true;
896 return have_image;
693# endif 897# endif
694 } 898 }
695 899
696 return false; 900 return false;
697} 901}
… …
717 int changed = 0; 921 int changed = 0;
718 unsigned int hr, vr; 922 unsigned int hr, vr;
719 int junk; 923 int junk;
720 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 924 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
721 925
722 if (!(geom_flags&WidthValue)) 926 if (!(geom_flags & WidthValue))
723 hr = 1; 927 hr = 1;
724 if (!(geom_flags&HeightValue)) 928 if (!(geom_flags & HeightValue))
725 vr = hr; 929 vr = hr;
726 930
727 if (h_blurRadius != hr) 931 if (h_blurRadius != hr)
728 { 932 {
729 ++changed; 933 ++changed;
… …
739 if (v_blurRadius == 0 && h_blurRadius == 0) 943 if (v_blurRadius == 0 && h_blurRadius == 0)
740 flags &= ~blurNeeded; 944 flags &= ~blurNeeded;
741 else 945 else
742 flags |= blurNeeded; 946 flags |= blurNeeded;
743 947
744 return (changed>0); 948 return (changed > 0);
745} 949}
746 950
747static inline unsigned long 951static inline unsigned long
748compute_tint_shade_flags (rxvt_color *tint, int shade) 952compute_tint_shade_flags (rxvt_color *tint, int shade)
749{ 953{
… …
766 flags |= bgPixmap_t::tintNeeded; 970 flags |= bgPixmap_t::tintNeeded;
767 else if (tint) 971 else if (tint)
768 { 972 {
769 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 973 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
770 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 974 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
771 { 975 {
772 flags |= bgPixmap_t::tintNeeded; 976 flags |= bgPixmap_t::tintNeeded;
773 } 977 }
774 } 978 }
775 979
776 if (flags & bgPixmap_t::tintNeeded) 980 if (flags & bgPixmap_t::tintNeeded)
777 { 981 {
778 if (flags & bgPixmap_t::tintWholesome) 982 if (flags & bgPixmap_t::tintWholesome)
… …
807{ 1011{
808 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1012 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
809 1013
810 if (new_flags != (flags & tintFlags)) 1014 if (new_flags != (flags & tintFlags))
811 { 1015 {
812 flags = (flags&~tintFlags)|new_flags; 1016 flags = (flags & ~tintFlags) | new_flags;
813 return true; 1017 return true;
814 } 1018 }
815 1019
816 return false; 1020 return false;
817} 1021}
818 1022
… …
848 unsigned long result = 0; 1052 unsigned long result = 0;
849 1053
850 if (target == NULL) 1054 if (target == NULL)
851 return 0; 1055 return 0;
852 1056
853 /* root dimentions may change from call to call - but Display structure should 1057 /* root dimensions may change from call to call - but Display structure should
854 * be always up-to-date, so let's use it : 1058 * be always up-to-date, so let's use it :
855 */ 1059 */
856 Window root = target->display->root; 1060 Window root = target->display->root;
857 int screen = target->display->screen; 1061 int screen = target->display->screen;
858 Display *dpy = target->dpy; 1062 Display *dpy = target->dpy;
… …
903 1107
904 attr.background_pixmap = ParentRelative; 1108 attr.background_pixmap = ParentRelative;
905 attr.backing_store = Always; 1109 attr.backing_store = Always;
906 attr.event_mask = ExposureMask; 1110 attr.event_mask = ExposureMask;
907 attr.override_redirect = True; 1111 attr.override_redirect = True;
908 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1112 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
909 CopyFromParent, CopyFromParent, CopyFromParent, 1113 CopyFromParent, CopyFromParent, CopyFromParent,
910 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1114 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
911 &attr); 1115 &attr);
912 1116
913 if (src != None) 1117 if (src != None)
… …
937 XDestroyWindow (dpy, src); 1141 XDestroyWindow (dpy, src);
938 XUngrabServer (dpy); 1142 XUngrabServer (dpy);
939 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1143 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
940 } 1144 }
941 1145
942 if (!success) 1146 if (!success)
943 { 1147 {
944 XFreePixmap (dpy, tiled_root_pmap); 1148 XFreePixmap (dpy, tiled_root_pmap);
945 tiled_root_pmap = None; 1149 tiled_root_pmap = None;
946 } 1150 }
947 else 1151 else
948 result |= transpPmapTiled; 1152 result |= transpPmapTiled;
949 } 1153 }
950 else 1154 else
951 { 1155 {
952 /* strightforward pixmap copy */ 1156 /* straightforward pixmap copy */
953 gcv.tile = root_pixmap; 1157 gcv.tile = root_pixmap;
954 gcv.fill_style = FillTiled; 1158 gcv.fill_style = FillTiled;
955 1159
956 while (sx < 0) sx += (int)root_width; 1160 while (sx < 0) sx += (int)root_width;
957 while (sy < 0) sy += (int)root_height; 1161 while (sy < 0) sy += (int)root_height;
… …
1070# if DO_TIMING_TEST 1274# if DO_TIMING_TEST
1071 XSync (dpy, False); 1275 XSync (dpy, False);
1072# endif 1276# endif
1073# endif 1277# endif
1074 } 1278 }
1075 } 1279 }
1076 } /* server side rendering completed */ 1280 } /* server side rendering completed */
1077 1281
1078 if (pixmap) 1282 if (pixmap)
1079 XFreePixmap (dpy, pixmap); 1283 XFreePixmap (dpy, pixmap);
1080 1284
… …
1108 return false; 1312 return false;
1109} 1313}
1110# endif /* ENABLE_TRANSPARENCY */ 1314# endif /* ENABLE_TRANSPARENCY */
1111 1315
1112# ifndef HAVE_AFTERIMAGE 1316# ifndef HAVE_AFTERIMAGE
1113static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1317static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1114# endif 1318# endif
1115 1319
1116bool 1320bool
1117bgPixmap_t::render () 1321bgPixmap_t::render ()
1118{ 1322{
… …
1130 /* we need to re-generate transparency pixmap in that case ! */ 1334 /* we need to re-generate transparency pixmap in that case ! */
1131 background_flags = make_transparency_pixmap (); 1335 background_flags = make_transparency_pixmap ();
1132 if (background_flags == 0) 1336 if (background_flags == 0)
1133 return false; 1337 return false;
1134 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1338 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1135 && pmap_depth == target->depth) 1339 && pmap_depth == target->depth)
1136 flags = flags & ~isInvalid; 1340 flags = flags & ~isInvalid;
1137 } 1341 }
1138# endif 1342# endif
1139 1343
1344# ifdef BG_IMAGE_FROM_FILE
1345 if (have_image
1346 || (background_flags & transpTransformations) != (flags & transpTransformations))
1347 {
1348 if (render_image (background_flags))
1349 flags = flags & ~isInvalid;
1350 }
1351# endif
1352
1140 XImage *result = NULL; 1353 XImage *result = NULL;
1141# ifdef HAVE_AFTERIMAGE
1142 target->init_asv ();
1143 1354
1144 if (original_asim 1355 if (background_flags && (flags & isInvalid))
1145 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1356 {
1357 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1146 { 1358 }
1147 ASImage *background = NULL;
1148 ARGB32 as_tint = TINT_LEAVE_SAME;
1149 if (background_flags)
1150 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1151 1359
1152# ifdef ENABLE_TRANSPARENCY 1360 if (result)
1361 {
1362# if !defined(HAVE_AFTERIMAGE) && !XFT
1363 /* our own client-side tinting */
1364 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1365 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1153 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1366 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1154 {
1155 ShadingInfo as_shade;
1156 as_shade.shading = (shade == 0) ? 100 : shade;
1157
1158 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1159 if (flags & tintSet)
1160 tint.get (c);
1161 as_shade.tintColor.red = c.r;
1162 as_shade.tintColor.green = c.g;
1163 as_shade.tintColor.blue = c.b;
1164
1165 as_tint = shading2tint32 (&as_shade);
1166 }
1167
1168 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1169 {
1170 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1171 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1172 100, ASIMAGE_QUALITY_DEFAULT);
1173 if (tmp)
1174 {
1175 destroy_asimage (&background);
1176 background = tmp;
1177 }
1178 }
1179# endif
1180
1181 if (render_asim (background, as_tint))
1182 flags = flags & ~isInvalid;
1183 if (background)
1184 destroy_asimage (&background);
1185 }
1186 else if (background_flags && pmap_depth != target->depth)
1187 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1188
1189# elif !XFT /* our own client-side tinting */
1190
1191 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1192 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1193
1194 if (background_flags && (flags & isInvalid))
1195 {
1196 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1197
1198 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1199 { 1367 {
1200 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1368 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1201 if (flags & tintSet) 1369 if (flags & tintSet)
1202 tint.get (c); 1370 tint.get (c);
1203 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1371 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1204 } 1372 }
1205 } 1373# endif
1206# endif /* HAVE_AFTERIMAGE */
1207 1374
1208 if (result)
1209 {
1210 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1375 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1211 1376
1212 if (gc) 1377 if (gc)
1213 { 1378 {
1214 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1379 if (/*pmap_depth != target->depth &&*/ pixmap != None)
… …
1243 1408
1244 XFreeGC (target->dpy, gc); 1409 XFreeGC (target->dpy, gc);
1245 flags = flags & ~isInvalid; 1410 flags = flags & ~isInvalid;
1246 } 1411 }
1247 1412
1248 XDestroyImage (result); 1413 XDestroyImage (result);
1249 } 1414 }
1250 1415
1251 if (flags & isInvalid) 1416 if (flags & isInvalid)
1252 { 1417 {
1253 if (pixmap != None) 1418 if (pixmap != None)
… …
1327 1492
1328 /* don't want Expose on the parent or vt. It is better to use 1493 /* don't want Expose on the parent or vt. It is better to use
1329 scr_touch or we get a great deal of flicker otherwise: */ 1494 scr_touch or we get a great deal of flicker otherwise: */
1330 XClearWindow (target->dpy, target->parent[0]); 1495 XClearWindow (target->dpy, target->parent[0]);
1331 1496
1332 if (target->scrollBar.win) 1497 if (target->scrollBar.state && target->scrollBar.win)
1333 { 1498 {
1334 target->scrollBar.state = STATE_IDLE; 1499 target->scrollBar.state = STATE_IDLE;
1335 target->scrollBar.show (0); 1500 target->scrollBar.show (0);
1336 } 1501 }
1337 1502
… …
1346/* taken from aterm-0.4.2 */ 1511/* taken from aterm-0.4.2 */
1347 1512
1348typedef uint32_t RUINT32T; 1513typedef uint32_t RUINT32T;
1349 1514
1350static void 1515static void
1351ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1516ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1352{ 1517{
1353 int sh_r, sh_g, sh_b; 1518 int sh_r, sh_g, sh_b;
1354 RUINT32T mask_r, mask_g, mask_b; 1519 RUINT32T mask_r, mask_g, mask_b;
1355 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1520 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1356 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1521 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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