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.46 by sf-exg, Mon Aug 30 23:08:06 2010 UTC vs.
Revision 1.60 by sf-exg, Sun Oct 3 20:41:32 2010 UTC

… …
52 * 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
53 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
54 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
55 * effects on the background image : 55 * effects on the background image :
56 * 56 *
57 * 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%.
58 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
59 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
60 * the image in the window. 60 * the image in the window.
61 * WxH+X Assumes Y == X 61 * WxH+X Assumes Y == X
62 * WxH Assumes Y == X == 50 (centers the image) 62 * WxH Assumes Y == X == 50 (centers the image)
63 * W+X+Y Assumes H == W 63 * W+X+Y Assumes H == W
64 * W+X Assumes H == W and Y == X 64 * W+X Assumes H == W and Y == X
65 * W Assumes H == W and Y == X == 50 65 * W Assumes H == W and Y == X == 50
66 * 66 *
67 * Adjusting position only : 67 * Adjusting position only :
68 * =+X+Y Set position to X% by Y% (absolute). 68 * =+X+Y Set position to X% by Y% (absolute).
69 * =+X Set position to X% by X%. 69 * =+X Set position to X% by X%.
70 * +X+Y Adjust position horizontally X% and vertically Y% 70 * +X+Y Adjust position horizontally X% and vertically Y%
71 * from current position (relative). 71 * from current position (relative).
72 * +X Adjust position horizontally X% and vertically X% 72 * +X Adjust position horizontally X% and vertically X%
73 * from current position. 73 * from current position.
74 * 74 *
75 * Adjusting scale only : 75 * Adjusting scale only :
76 * Wx0 Multiply horizontal scaling factor by W% 76 * Wx0 Multiply horizontal scaling factor by W%
77 * 0xH Multiply vertical scaling factor by H% 77 * 0xH Multiply vertical scaling factor by H%
78 * 0x0 No scaling (show image at normal size). 78 * 0x0 No scaling (show image at normal size).
79 * 79 *
80 * Pixmap Operations : (should be prepended by a colon) 80 * Pixmap Operations : (should be prepended by a colon)
81 * tile Tile image. Scaling/position modifiers above will affect 81 * tile Tile image. Scaling/position modifiers above will affect
82 * the tile size and origin. 82 * the tile size and origin.
83 * propscale When scaling, scale proportionally. That is, maintain the 83 * propscale When scaling, scale proportionally. That is, maintain the
84 * proper aspect ratio for the image. Any portion of the 84 * proper aspect ratio for the image. Any portion of the
85 * background not covered by the image is filled with the 85 * background not covered by the image is filled with the
86 * current background color. 86 * current background color.
87 * hscale Scale horizontally, tile vertically ? 87 * hscale Scale horizontally, tile vertically ?
88 * vscale Tile horizontally, scale vertically ? 88 * vscale Tile horizontally, scale vertically ?
… …
96 // this is basically redundant as bgPixmap_t is only used in 96 // this is basically redundant as bgPixmap_t is only used in
97 // zero_initialised-derived structs 97 // zero_initialised-derived structs
98#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
99 original_asim = NULL; 99 original_asim = NULL;
100#endif 100#endif
101#ifdef HAVE_PIXBUF
102 pixbuf = NULL;
103#endif
101#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
105 have_image = false;
102 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
103 h_align = v_align = 0; 107 h_align = v_align = 0;
104#endif 108#endif
105 flags = 0; 109 flags = 0;
106 pixmap = None; 110 pixmap = None;
… …
114#ifdef HAVE_AFTERIMAGE 118#ifdef HAVE_AFTERIMAGE
115 if (original_asim) 119 if (original_asim)
116 safe_asimage_destroy (original_asim); 120 safe_asimage_destroy (original_asim);
117#endif 121#endif
118 122
123#ifdef HAVE_PIXBUF
124 if (pixbuf)
125 g_object_unref (pixbuf);
126#endif
127
119 if (pixmap && target) 128 if (pixmap && target)
120 XFreePixmap (target->dpy, pixmap); 129 XFreePixmap (target->dpy, pixmap);
121} 130}
122 131
123bool 132bool
… …
127 if (flags & isTransparent) 136 if (flags & isTransparent)
128 return true; 137 return true;
129# endif 138# endif
130 139
131# ifdef BG_IMAGE_FROM_FILE 140# ifdef BG_IMAGE_FROM_FILE
132# ifdef HAVE_AFTERIMAGE 141 if (have_image)
133 if (original_asim)
134# endif
135 { 142 {
136 if (h_scale != 0 || v_scale != 0 143 if (h_scale != 0 || v_scale != 0
137 || h_align != 0 || v_align != 0) 144 || h_align != 0 || v_align != 0)
138 return true; 145 return true;
139 } 146 }
… …
149 if (flags & isTransparent) 156 if (flags & isTransparent)
150 return true; 157 return true;
151# endif 158# endif
152 159
153# ifdef BG_IMAGE_FROM_FILE 160# ifdef BG_IMAGE_FROM_FILE
154# ifdef HAVE_AFTERIMAGE 161 if (have_image)
155 if (original_asim)
156# endif
157 { 162 {
158 if (h_align == rootAlign || v_align == rootAlign) 163 if (h_align == rootAlign || v_align == rootAlign)
159 return true; 164 return true;
160 } 165 }
161# endif 166# endif
… …
223 228
224static inline int 229static inline int
225make_align_position (int align, int window_size, int image_size) 230make_align_position (int align, int window_size, int image_size)
226{ 231{
227 int diff = window_size - image_size; 232 int diff = window_size - image_size;
228 int smaller = MIN (image_size,window_size); 233 int smaller = min (image_size, window_size);
229 234
230 if (align >= 0 && align <= 50) 235 if (align >= 0 && align <= 50)
231 return diff * align / 100; 236 return diff * align / 100;
232 else if (align > 50 && align <= 100) 237 else if (align > 50 && align <= 100)
233 return window_size - image_size - diff * (100 - align) / 100; 238 return window_size - image_size - diff * (100 - align) / 100;
… …
242make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 247make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
243{ 248{
244 int src_pos = 0; 249 int src_pos = 0;
245 dst_pos = 0; 250 dst_pos = 0;
246 dst_size = size; 251 dst_size = size;
247 if (pos < 0 && size > target_size) 252 if (pos < 0)
248 { 253 {
249 src_pos = -pos; 254 src_pos = -pos;
250 dst_size += pos; 255 dst_size += pos;
251 } 256 }
252 else if (pos > 0) 257 else if (pos > 0)
… …
441 { 446 {
442 flags = new_flags; 447 flags = new_flags;
443 changed++; 448 changed++;
444 } 449 }
445 450
446//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
447// flags, h_scale, v_scale, h_align, v_align); 452 // flags, h_scale, v_scale, h_align, v_align);
448 return (changed > 0); 453 return (changed > 0);
454}
455
456void
457bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
458{
459 int target_width = target->szHint.width;
460 int target_height = target->szHint.height;
461
462 w = h_scale * target_width / 100;
463 h = v_scale * target_height / 100;
464
465 if (h_align == rootAlign || v_align == rootAlign)
466 {
467 target->get_window_origin (x, y);
468 x = -x;
469 y = -y;
470 }
471
472 if (h_align != rootAlign)
473 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
474
475 if (v_align != rootAlign)
476 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
449} 477}
450 478
451# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
452bool 480bool
453bgPixmap_t::render_asim (unsigned long background_flags) 481bgPixmap_t::render_image (unsigned long background_flags)
454{ 482{
455 if (target == NULL) 483 if (target == NULL)
456 return false; 484 return false;
457 485
458 target->init_asv (); 486 target->init_asv ();
… …
480 } 508 }
481 509
482 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 510 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
483 { 511 {
484 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
485 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, 513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
486 100, ASIMAGE_QUALITY_DEFAULT); 514 100, ASIMAGE_QUALITY_DEFAULT);
487 if (tmp) 515 if (tmp)
488 { 516 {
489 destroy_asimage (&background); 517 destroy_asimage (&background);
490 background = tmp; 518 background = tmp;
… …
499 int new_pmap_width = target_width; 527 int new_pmap_width = target_width;
500 int new_pmap_height = target_height; 528 int new_pmap_height = target_height;
501 529
502 int x = 0; 530 int x = 0;
503 int y = 0; 531 int y = 0;
504 int w = h_scale * target_width / 100; 532 int w = 0;
505 int h = v_scale * target_height / 100; 533 int h = 0;
506 534
507 TIMING_TEST_START (asim); 535 TIMING_TEST_START (asim);
508 536
509 if (original_asim) 537 if (original_asim)
510 { 538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
511 if (h_align == rootAlign || v_align == rootAlign)
512 {
513 target->get_window_origin(x, y);
514 x = -x;
515 y = -y;
516 }
517
518 if (h_align != rootAlign)
519 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
520
521 if (v_align != rootAlign)
522 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
523 }
524 539
525 if (!original_asim 540 if (!original_asim
526 || x >= target_width 541 || x >= target_width
527 || y >= target_height 542 || y >= target_height
528 || (w > 0 && x + w <= 0) 543 || (w > 0 && x + w <= 0)
… …
560 100, ASIMAGE_QUALITY_DEFAULT); 575 100, ASIMAGE_QUALITY_DEFAULT);
561 } 576 }
562 577
563 if (background == NULL) 578 if (background == NULL)
564 { 579 {
565 /* if tiling - pixmap has to be sized exactly as the image,
566 but there is no need to make it bigger than the window! */
567 if (h_scale == 0)
568 new_pmap_width = min (result->width, target_width);
569 if (v_scale == 0)
570 new_pmap_height = min (result->height, target_height);
571 /* we also need to tile our image in one or both directions */
572 if (h_scale == 0 || v_scale == 0) 580 if (h_scale == 0 || v_scale == 0)
573 { 581 {
582 /* if tiling - pixmap has to be sized exactly as the image,
583 but there is no need to make it bigger than the window! */
584 new_pmap_width = min (result->width, target_width);
585 new_pmap_height = min (result->height, target_height);
586
587 /* we also need to tile our image in both directions */
574 ASImage *tmp = tile_asimage (target->asv, result, 588 ASImage *tmp = tile_asimage (target->asv, result,
575 (h_scale > 0) ? 0 : (int)result->width - x, 589 (int)result->width - x,
576 (v_scale > 0) ? 0 : (int)result->height - y, 590 (int)result->height - y,
577 new_pmap_width, 591 new_pmap_width,
578 new_pmap_height, 592 new_pmap_height,
579 TINT_LEAVE_SAME, ASA_XImage, 593 TINT_LEAVE_SAME, ASA_XImage,
580 100, ASIMAGE_QUALITY_DEFAULT); 594 100, ASIMAGE_QUALITY_DEFAULT);
581 if (tmp) 595 if (tmp)
… …
645 free (layers); 659 free (layers);
646 } 660 }
647 } 661 }
648 TIMING_TEST_PRINT_RESULT (asim); 662 TIMING_TEST_PRINT_RESULT (asim);
649 663
650 if (pixmap) 664 bool ret = false;
651 {
652 if (result == NULL
653 || pmap_width != new_pmap_width
654 || pmap_height != new_pmap_height
655 || pmap_depth != target->depth)
656 {
657 XFreePixmap (target->dpy, pixmap);
658 pixmap = None;
659 }
660 }
661 665
662 if (result) 666 if (result)
663 { 667 {
664 XGCValues gcv; 668 XGCValues gcv;
665 GC gc; 669 GC gc;
670
671 if (pixmap)
672 {
673 if (pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
676 {
677 XFreePixmap (target->dpy, pixmap);
678 pixmap = None;
679 }
680 }
666 681
667 /* create Pixmap */ 682 /* create Pixmap */
668 if (pixmap == None) 683 if (pixmap == None)
669 { 684 {
670 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 685 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
671 pmap_width = new_pmap_width; 686 pmap_width = new_pmap_width;
672 pmap_height = new_pmap_height; 687 pmap_height = new_pmap_height;
673 pmap_depth = target->depth; 688 pmap_depth = target->depth;
674 } 689 }
675 /* fill with background color ( if result's not completely overlapping it)*/ 690 /* fill with background color (if result's not completely overlapping it) */
676 gcv.foreground = target->pix_colors[Color_bg]; 691 gcv.foreground = target->pix_colors[Color_bg];
677 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 692 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
678 693
679 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 694 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
680 int dst_width = result->width, dst_height = result->height; 695 int dst_width = result->width, dst_height = result->height;
681 if (background == NULL) 696 if (background == NULL)
682 { 697 {
698 if (!(h_scale == 0 || v_scale == 0))
699 {
683 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 700 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
684 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 701 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
702 }
685 703
686 if (dst_x > 0 || dst_y > 0 704 if (dst_x > 0 || dst_y > 0
687 || dst_x + dst_width < new_pmap_width 705 || dst_x + dst_width < new_pmap_width
688 || dst_y + dst_height < new_pmap_height) 706 || dst_y + dst_height < new_pmap_height)
689 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 707 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
… …
696 if (result != background && result != original_asim) 714 if (result != background && result != original_asim)
697 destroy_asimage (&result); 715 destroy_asimage (&result);
698 716
699 XFreeGC (target->dpy, gc); 717 XFreeGC (target->dpy, gc);
700 TIMING_TEST_PRINT_RESULT (asim); 718 TIMING_TEST_PRINT_RESULT (asim);
719
720 ret = true;
701 } 721 }
702 722
703 if (background) 723 if (background)
704 destroy_asimage (&background); 724 destroy_asimage (&background);
705 725
706 return true; 726 return ret;
707} 727}
708# endif /* HAVE_AFTERIMAGE */ 728# endif /* HAVE_AFTERIMAGE */
729
730# ifdef HAVE_PIXBUF
731bool
732bgPixmap_t::render_image (unsigned long background_flags)
733{
734 if (target == NULL)
735 return false;
736
737 if (!pixbuf)
738 return false;
739
740 // TODO: add alpha blending
741 if (background_flags)
742 return false;
743
744 GdkPixbuf *result;
745
746 int image_width = gdk_pixbuf_get_width (pixbuf);
747 int image_height = gdk_pixbuf_get_height (pixbuf);
748
749 int target_width = target->szHint.width;
750 int target_height = target->szHint.height;
751 int new_pmap_width = target_width;
752 int new_pmap_height = target_height;
753
754 int x = 0;
755 int y = 0;
756 int w = 0;
757 int h = 0;
758
759 get_image_geometry (image_width, image_height, w, h, x, y);
760
761 if (x >= target_width
762 || y >= target_height
763 || (w > 0 && x + w <= 0)
764 || (h > 0 && y + h <= 0))
765 return false;
766
767 result = pixbuf;
768
769 if ((w > 0 && w != image_width)
770 || (h > 0 && h != image_height))
771 {
772 result = gdk_pixbuf_scale_simple (pixbuf,
773 w > 0 ? w : image_width,
774 h > 0 ? h : image_height,
775 GDK_INTERP_BILINEAR);
776 }
777
778 bool ret = false;
779
780 if (result)
781 {
782 XGCValues gcv;
783 GC gc;
784
785 image_width = gdk_pixbuf_get_width (result);
786 image_height = gdk_pixbuf_get_height (result);
787
788 if (h_scale == 0 || v_scale == 0)
789 {
790 new_pmap_width = min (image_width, target_width);
791 new_pmap_height = min (image_height, target_height);
792 }
793
794 if (pixmap)
795 {
796 if (pmap_width != new_pmap_width
797 || pmap_height != new_pmap_height
798 || pmap_depth != target->depth)
799 {
800 XFreePixmap (target->dpy, pixmap);
801 pixmap = None;
802 }
803 }
804
805 if (pixmap == None)
806 {
807 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
808 pmap_width = new_pmap_width;
809 pmap_height = new_pmap_height;
810 pmap_depth = target->depth;
811 }
812
813 gcv.foreground = target->pix_colors[Color_bg];
814 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
815
816 if (h_scale == 0 || v_scale == 0)
817 {
818 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
819 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
820 0, 0,
821 0, 0,
822 image_width, image_height,
823 XLIB_RGB_DITHER_NONE,
824 0, 0);
825
826 gcv.tile = tile;
827 gcv.fill_style = FillTiled;
828 gcv.ts_x_origin = x;
829 gcv.ts_y_origin = y;
830 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
831
832 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
833 XFreePixmap (target->dpy, tile);
834 }
835 else
836 {
837 int src_x, src_y, dst_x, dst_y;
838 int dst_width, dst_height;
839
840 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
841 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
842
843 if (dst_x > 0 || dst_y > 0
844 || dst_x + dst_width < new_pmap_width
845 || dst_y + dst_height < new_pmap_height)
846 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
847
848 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
849 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
850 src_x, src_y,
851 dst_x, dst_y,
852 dst_width, dst_height,
853 XLIB_RGB_DITHER_NONE,
854 0, 0);
855 }
856
857 if (result != pixbuf)
858 g_object_unref (result);
859
860 XFreeGC (target->dpy, gc);
861
862 ret = true;
863 }
864
865 return ret;
866}
867# endif /* HAVE_PIXBUF */
709 868
710bool 869bool
711bgPixmap_t::set_file (const char *file) 870bgPixmap_t::set_file (const char *file)
712{ 871{
713 assert (file); 872 assert (file);
… …
725 884
726# ifdef HAVE_AFTERIMAGE 885# ifdef HAVE_AFTERIMAGE
727 if (!target->asimman) 886 if (!target->asimman)
728 target->asimman = create_generic_imageman (target->rs[Rs_path]); 887 target->asimman = create_generic_imageman (target->rs[Rs_path]);
729 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 888 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
730 return original_asim; 889 if (original_asim)
890 have_image = true;
891 return have_image;
892# endif
893
894# ifdef HAVE_PIXBUF
895 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
896 if (pixbuf)
897 have_image = true;
898 return have_image;
731# endif 899# endif
732 } 900 }
733 901
734 return false; 902 return false;
735} 903}
… …
755 int changed = 0; 923 int changed = 0;
756 unsigned int hr, vr; 924 unsigned int hr, vr;
757 int junk; 925 int junk;
758 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 926 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
759 927
760 if (!(geom_flags&WidthValue)) 928 if (!(geom_flags & WidthValue))
761 hr = 1; 929 hr = 1;
762 if (!(geom_flags&HeightValue)) 930 if (!(geom_flags & HeightValue))
763 vr = hr; 931 vr = hr;
764 932
765 if (h_blurRadius != hr) 933 if (h_blurRadius != hr)
766 { 934 {
767 ++changed; 935 ++changed;
… …
777 if (v_blurRadius == 0 && h_blurRadius == 0) 945 if (v_blurRadius == 0 && h_blurRadius == 0)
778 flags &= ~blurNeeded; 946 flags &= ~blurNeeded;
779 else 947 else
780 flags |= blurNeeded; 948 flags |= blurNeeded;
781 949
782 return (changed>0); 950 return (changed > 0);
783} 951}
784 952
785static inline unsigned long 953static inline unsigned long
786compute_tint_shade_flags (rxvt_color *tint, int shade) 954compute_tint_shade_flags (rxvt_color *tint, int shade)
787{ 955{
… …
804 flags |= bgPixmap_t::tintNeeded; 972 flags |= bgPixmap_t::tintNeeded;
805 else if (tint) 973 else if (tint)
806 { 974 {
807 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 975 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
808 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 976 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
809 { 977 {
810 flags |= bgPixmap_t::tintNeeded; 978 flags |= bgPixmap_t::tintNeeded;
811 } 979 }
812 } 980 }
813 981
814 if (flags & bgPixmap_t::tintNeeded) 982 if (flags & bgPixmap_t::tintNeeded)
815 { 983 {
816 if (flags & bgPixmap_t::tintWholesome) 984 if (flags & bgPixmap_t::tintWholesome)
… …
845{ 1013{
846 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1014 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
847 1015
848 if (new_flags != (flags & tintFlags)) 1016 if (new_flags != (flags & tintFlags))
849 { 1017 {
850 flags = (flags&~tintFlags)|new_flags; 1018 flags = (flags & ~tintFlags) | new_flags;
851 return true; 1019 return true;
852 } 1020 }
853 1021
854 return false; 1022 return false;
855} 1023}
856 1024
… …
941 1109
942 attr.background_pixmap = ParentRelative; 1110 attr.background_pixmap = ParentRelative;
943 attr.backing_store = Always; 1111 attr.backing_store = Always;
944 attr.event_mask = ExposureMask; 1112 attr.event_mask = ExposureMask;
945 attr.override_redirect = True; 1113 attr.override_redirect = True;
946 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1114 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
947 CopyFromParent, CopyFromParent, CopyFromParent, 1115 CopyFromParent, CopyFromParent, CopyFromParent,
948 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1116 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
949 &attr); 1117 &attr);
950 1118
951 if (src != None) 1119 if (src != None)
… …
975 XDestroyWindow (dpy, src); 1143 XDestroyWindow (dpy, src);
976 XUngrabServer (dpy); 1144 XUngrabServer (dpy);
977 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1145 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
978 } 1146 }
979 1147
980 if (!success) 1148 if (!success)
981 { 1149 {
982 XFreePixmap (dpy, tiled_root_pmap); 1150 XFreePixmap (dpy, tiled_root_pmap);
983 tiled_root_pmap = None; 1151 tiled_root_pmap = None;
984 } 1152 }
985 else 1153 else
986 result |= transpPmapTiled; 1154 result |= transpPmapTiled;
987 } 1155 }
988 else 1156 else
989 { 1157 {
990 /* straightforward pixmap copy */ 1158 /* straightforward pixmap copy */
991 gcv.tile = root_pixmap; 1159 gcv.tile = root_pixmap;
… …
1108# if DO_TIMING_TEST 1276# if DO_TIMING_TEST
1109 XSync (dpy, False); 1277 XSync (dpy, False);
1110# endif 1278# endif
1111# endif 1279# endif
1112 } 1280 }
1113 } 1281 }
1114 } /* server side rendering completed */ 1282 } /* server side rendering completed */
1115 1283
1116 if (pixmap) 1284 if (pixmap)
1117 XFreePixmap (dpy, pixmap); 1285 XFreePixmap (dpy, pixmap);
1118 1286
… …
1168 /* we need to re-generate transparency pixmap in that case ! */ 1336 /* we need to re-generate transparency pixmap in that case ! */
1169 background_flags = make_transparency_pixmap (); 1337 background_flags = make_transparency_pixmap ();
1170 if (background_flags == 0) 1338 if (background_flags == 0)
1171 return false; 1339 return false;
1172 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1340 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1173 && pmap_depth == target->depth) 1341 && pmap_depth == target->depth)
1174 flags = flags & ~isInvalid; 1342 flags = flags & ~isInvalid;
1175 } 1343 }
1176# endif 1344# endif
1177 1345
1178# ifdef HAVE_AFTERIMAGE 1346# ifdef BG_IMAGE_FROM_FILE
1179 if (original_asim 1347 if (have_image
1180 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1348 || (background_flags & transpTransformations) != (flags & transpTransformations))
1181 { 1349 {
1182 if (render_asim (background_flags)) 1350 if (render_image (background_flags))
1183 flags = flags & ~isInvalid; 1351 flags = flags & ~isInvalid;
1184 } 1352 }
1185# endif 1353# endif
1186 1354
1187 XImage *result = NULL; 1355 XImage *result = NULL;
1188 1356
1189 if (background_flags && (flags & isInvalid)) 1357 if (background_flags && (flags & isInvalid))
1190 { 1358 {
1191 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1359 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1360 }
1192 1361
1362 if (result)
1363 {
1193# if !defined(HAVE_AFTERIMAGE) && !XFT 1364# if !defined(HAVE_AFTERIMAGE) && !XFT
1194 /* our own client-side tinting */ 1365 /* our own client-side tinting */
1195 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side. 1366 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1196 This may need to be changed in need_client_side_rendering() logic is altered !!! */ 1367 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1197 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1368 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1198 { 1369 {
1199 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1370 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1200 if (flags & tintSet) 1371 if (flags & tintSet)
1201 tint.get (c); 1372 tint.get (c);
1202 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1373 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1203 } 1374 }
1204# endif 1375# endif
1205 }
1206 1376
1207 if (result)
1208 {
1209 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1377 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1210 1378
1211 if (gc) 1379 if (gc)
1212 { 1380 {
1213 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1381 if (/*pmap_depth != target->depth &&*/ pixmap != None)
… …
1242 1410
1243 XFreeGC (target->dpy, gc); 1411 XFreeGC (target->dpy, gc);
1244 flags = flags & ~isInvalid; 1412 flags = flags & ~isInvalid;
1245 } 1413 }
1246 1414
1247 XDestroyImage (result); 1415 XDestroyImage (result);
1248 } 1416 }
1249 1417
1250 if (flags & isInvalid) 1418 if (flags & isInvalid)
1251 { 1419 {
1252 if (pixmap != None) 1420 if (pixmap != None)

Diff Legend

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