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.62 by sf-exg, Sun Oct 3 21:44:13 2010 UTC vs.
Revision 1.103 by sf-exg, Sun Oct 31 11:15:29 2010 UTC

3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
19 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
23 24
25#include <cmath>
24#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
26 28
27#define DO_TIMING_TEST 0 29#define DO_TIMING_TEST 0
28 30
104#ifdef BG_IMAGE_FROM_FILE 106#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 107 have_image = false;
106 h_scale = v_scale = 0; 108 h_scale = v_scale = 0;
107 h_align = v_align = 0; 109 h_align = v_align = 0;
108#endif 110#endif
111#ifdef ENABLE_TRANSPARENCY
112 shade = 100;
113#endif
109 flags = 0; 114 flags = 0;
110 pixmap = None; 115 pixmap = None;
111 valid_since = invalid_since = 0; 116 valid_since = invalid_since = 0;
112 target = 0; 117 target = 0;
113} 118}
157# endif 162# endif
158 163
159# ifdef BG_IMAGE_FROM_FILE 164# ifdef BG_IMAGE_FROM_FILE
160 if (have_image) 165 if (have_image)
161 { 166 {
162 if (h_align == rootAlign || v_align == rootAlign) 167 if (flags & rootAlign)
163 return true; 168 return true;
164 } 169 }
165# endif 170# endif
166 171
167 return false; 172 return false;
171{ 176{
172# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
173 if (original_asim) 178 if (original_asim)
174 return true; 179 return true;
175# endif 180# endif
176# ifdef ENABLE_TRANSPARENCY
177 if (flags & isTransparent)
178 {
179# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
180 if ((flags & blurNeeded) && !(flags & blurServerSide))
181 return true;
182# endif
183 if ((flags & tintNeeded) && !(flags & tintServerSide))
184 return true;
185 }
186# endif
187 return false; 181 return false;
188} 182}
189 183
190# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
191static inline bool 185static inline bool
207static inline bool 201static inline bool
208check_set_align_value (int geom_flags, int flag, int &align, int new_value) 202check_set_align_value (int geom_flags, int flag, int &align, int new_value)
209{ 203{
210 if (geom_flags & flag) 204 if (geom_flags & flag)
211 { 205 {
212 if (new_value != bgPixmap_t::rootAlign)
213 {
214 if (new_value < -100) 206 if (new_value < -100)
215 new_value = -100; 207 new_value = -100;
216 else if (new_value > 200) 208 else if (new_value > 200)
217 new_value = 200; 209 new_value = 200;
218 }
219 if (new_value != align) 210 if (new_value != align)
220 { 211 {
221 align = new_value; 212 align = new_value;
222 return true; 213 return true;
223 } 214 }
229make_align_position (int align, int window_size, int image_size) 220make_align_position (int align, int window_size, int image_size)
230{ 221{
231 int diff = window_size - image_size; 222 int diff = window_size - image_size;
232 int smaller = min (image_size, window_size); 223 int smaller = min (image_size, window_size);
233 224
234 if (align >= 0 && align <= 50) 225 if (align >= 0 && align <= 100)
235 return diff * align / 100; 226 return diff * align / 100;
236 else if (align > 50 && align <= 100)
237 return window_size - image_size - diff * (100 - align) / 100;
238 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
239 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
240 else if (align > -100 && align < 0) 229 else if (align >= -100 && align < 0)
241 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
242 return 0; 231 return 0;
243} 232}
244 233
245static inline int 234static inline int
246make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 235make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
247{ 236{
248 int src_pos = 0; 237 int src_pos = 0;
249 dst_pos = 0; 238 dst_pos = pos;
250 dst_size = size; 239 dst_size = size;
251 if (pos < 0) 240 if (pos < 0)
252 { 241 {
253 src_pos = -pos; 242 src_pos = -pos;
243 dst_pos = 0;
254 dst_size += pos; 244 dst_size += pos;
255 } 245 }
256 else if (pos > 0)
257 dst_pos = pos;
258 246
259 if (dst_pos + dst_size > target_size) 247 if (dst_pos + dst_size > target_size)
260 dst_size = target_size - dst_pos; 248 dst_size = target_size - dst_pos;
261 return src_pos; 249 return src_pos;
262} 250}
418 x = y = centerAlign; 406 x = y = centerAlign;
419 geom_flags |= WidthValue|HeightValue|XValue|YValue; 407 geom_flags |= WidthValue|HeightValue|XValue|YValue;
420 } 408 }
421 else if (CHECK_GEOM_OPS ("root")) 409 else if (CHECK_GEOM_OPS ("root"))
422 { 410 {
411 new_flags |= rootAlign;
423 w = h = noScale; 412 w = h = noScale;
424 x = y = rootAlign;
425 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue;
426 } 414 }
427# undef CHECK_GEOM_OPS 415# undef CHECK_GEOM_OPS
428 416
429 while (*ops != ':' && *ops != '\0') ++ops; 417 while (*ops != ':' && *ops != '\0') ++ops;
430 } /* done parsing ops */ 418 } /* done parsing ops */
440 { 428 {
441 flags = new_flags; 429 flags = new_flags;
442 changed++; 430 changed++;
443 } 431 }
444 432
445 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
446 // flags, h_scale, v_scale, h_align, v_align);
447 return (changed > 0); 433 return (changed > 0);
448} 434}
449 435
450void 436void
451bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
464 { 450 {
465 w = h_scale * target_width / 100; 451 w = h_scale * target_width / 100;
466 h = v_scale * target_height / 100; 452 h = v_scale * target_height / 100;
467 } 453 }
468 454
469 if (h_align == rootAlign || v_align == rootAlign) 455 if (!w) w = image_width;
456 if (!h) h = image_height;
457
458 if (flags & rootAlign)
470 { 459 {
471 target->get_window_origin (x, y); 460 target->get_window_origin (x, y);
472 x = -x; 461 x = -x;
473 y = -y; 462 y = -y;
474 } 463 }
475 464 else
476 if (h_align != rootAlign) 465 {
477 x = make_align_position (h_align, target_width, w > 0 ? w : image_width); 466 x = make_align_position (h_align, target_width, w);
478
479 if (v_align != rootAlign)
480 y = make_align_position (v_align, target_height, h > 0 ? h : image_height); 467 y = make_align_position (v_align, target_height, h);
468 }
481 469
482 flags &= ~sizeSensitive; 470 flags &= ~sizeSensitive;
483 if (h_scale != 0 || v_scale != 0 471 if ((flags & propScale) || h_scale || v_scale
484 || h_align != 0 || v_align != 0 472 || (!(flags & rootAlign) && (h_align || v_align))
485 || image_width > target_width || image_height > target_height) 473 || w > target_width || h > target_height)
486 flags |= sizeSensitive; 474 flags |= sizeSensitive;
487} 475}
488 476
489# ifdef HAVE_AFTERIMAGE 477# ifdef HAVE_AFTERIMAGE
490bool 478bool
503 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 491 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
504 492
505 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 493 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
506 { 494 {
507 ShadingInfo as_shade; 495 ShadingInfo as_shade;
508 as_shade.shading = (shade == 0) ? 100 : shade; 496 as_shade.shading = shade;
509 497
510 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 498 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
511 if (flags & tintSet) 499 if (flags & tintSet)
512 tint.get (c); 500 tint.get (c);
513 as_shade.tintColor.red = c.r; 501 as_shade.tintColor.red = c.r;
515 as_shade.tintColor.blue = c.b; 503 as_shade.tintColor.blue = c.b;
516 504
517 background_tint = shading2tint32 (&as_shade); 505 background_tint = shading2tint32 (&as_shade);
518 } 506 }
519 507
520 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 508 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
521 { 509 {
522 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 510 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
523 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 511 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
524 100, ASIMAGE_QUALITY_DEFAULT); 512 100, ASIMAGE_QUALITY_DEFAULT);
525 if (tmp) 513 if (tmp)
540 int x = 0; 528 int x = 0;
541 int y = 0; 529 int y = 0;
542 int w = 0; 530 int w = 0;
543 int h = 0; 531 int h = 0;
544 532
545 TIMING_TEST_START (asim);
546
547 if (original_asim) 533 if (original_asim)
548 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 534 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
549 535
550 if (!original_asim 536 if (!original_asim
537 || (!(flags & rootAlign)
551 || x >= target_width 538 && (x >= target_width
552 || y >= target_height 539 || y >= target_height
553 || (w > 0 && x + w <= 0) 540 || (x + w <= 0)
554 || (h > 0 && y + h <= 0)) 541 || (y + h <= 0))))
555 { 542 {
556 if (background) 543 if (background)
557 { 544 {
558 new_pmap_width = background->width; 545 new_pmap_width = background->width;
559 new_pmap_height = background->height; 546 new_pmap_height = background->height;
573 } 560 }
574 else 561 else
575 { 562 {
576 result = original_asim; 563 result = original_asim;
577 564
578 if ((w > 0 && w != original_asim->width) 565 if ((w != original_asim->width)
579 || (h > 0 && h != original_asim->height)) 566 || (h != original_asim->height))
580 { 567 {
581 result = scale_asimage (target->asv, original_asim, 568 result = scale_asimage (target->asv, original_asim,
582 w > 0 ? w : original_asim->width, 569 w, h,
583 h > 0 ? h : original_asim->height,
584 background ? ASA_ASImage : ASA_XImage, 570 background ? ASA_ASImage : ASA_XImage,
585 100, ASIMAGE_QUALITY_DEFAULT); 571 100, ASIMAGE_QUALITY_DEFAULT);
586 } 572 }
587 573
588 if (background == NULL) 574 if (background == NULL)
620 layers[0].clip_width = target_width; 606 layers[0].clip_width = target_width;
621 layers[0].clip_height = target_height; 607 layers[0].clip_height = target_height;
622 layers[0].tint = background_tint; 608 layers[0].tint = background_tint;
623 layers[1].im = result; 609 layers[1].im = result;
624 610
625 if (w <= 0) 611 if (h_scale == 0 || v_scale == 0)
626 { 612 {
627 /* tile horizontally */ 613 /* tile horizontally */
628 while (x > 0) x -= (int)result->width; 614 while (x > 0) x -= (int)result->width;
629 layers[1].dst_x = x; 615 layers[1].dst_x = x;
630 layers[1].clip_width = result->width+target_width; 616 layers[1].clip_width = result->width+target_width;
634 /* clip horizontally */ 620 /* clip horizontally */
635 layers[1].dst_x = x; 621 layers[1].dst_x = x;
636 layers[1].clip_width = result->width; 622 layers[1].clip_width = result->width;
637 } 623 }
638 624
639 if (h <= 0) 625 if (h_scale == 0 || v_scale == 0)
640 { 626 {
641 while (y > 0) y -= (int)result->height; 627 while (y > 0) y -= (int)result->height;
642 layers[1].dst_y = y; 628 layers[1].dst_y = y;
643 layers[1].clip_height = result->height + target_height; 629 layers[1].clip_height = result->height + target_height;
644 } 630 }
667 } 653 }
668 654
669 free (layers); 655 free (layers);
670 } 656 }
671 } 657 }
672 TIMING_TEST_PRINT_RESULT (asim);
673 658
674 bool ret = false; 659 bool ret = false;
675 660
676 if (result) 661 if (result)
677 { 662 {
723 708
724 if (result != background && result != original_asim) 709 if (result != background && result != original_asim)
725 destroy_asimage (&result); 710 destroy_asimage (&result);
726 711
727 XFreeGC (target->dpy, gc); 712 XFreeGC (target->dpy, gc);
728 TIMING_TEST_PRINT_RESULT (asim);
729 713
730 ret = true; 714 ret = true;
731 } 715 }
732 716
733 if (background) 717 if (background)
745 return false; 729 return false;
746 730
747 if (!pixbuf) 731 if (!pixbuf)
748 return false; 732 return false;
749 733
750 // TODO: add alpha blending 734#if !XRENDER
751 if (background_flags) 735 if (background_flags)
752 return false; 736 return false;
737#endif
753 738
754 GdkPixbuf *result; 739 GdkPixbuf *result;
755 740
756 int image_width = gdk_pixbuf_get_width (pixbuf); 741 int image_width = gdk_pixbuf_get_width (pixbuf);
757 int image_height = gdk_pixbuf_get_height (pixbuf); 742 int image_height = gdk_pixbuf_get_height (pixbuf);
766 int w = 0; 751 int w = 0;
767 int h = 0; 752 int h = 0;
768 753
769 get_image_geometry (image_width, image_height, w, h, x, y); 754 get_image_geometry (image_width, image_height, w, h, x, y);
770 755
756 if (!(flags & rootAlign)
771 if (x >= target_width 757 && (x >= target_width
772 || y >= target_height 758 || y >= target_height
773 || (w > 0 && x + w <= 0) 759 || (x + w <= 0)
774 || (h > 0 && y + h <= 0)) 760 || (y + h <= 0)))
775 return false; 761 return false;
776 762
777 result = pixbuf; 763 result = pixbuf;
778 764
779 if ((w > 0 && w != image_width) 765 if ((w != image_width)
780 || (h > 0 && h != image_height)) 766 || (h != image_height))
781 { 767 {
782 result = gdk_pixbuf_scale_simple (pixbuf, 768 result = gdk_pixbuf_scale_simple (pixbuf,
783 w > 0 ? w : image_width, 769 w, h,
784 h > 0 ? h : image_height,
785 GDK_INTERP_BILINEAR); 770 GDK_INTERP_BILINEAR);
786 } 771 }
787 772
788 bool ret = false; 773 bool ret = false;
789 774
790 if (result) 775 if (result)
791 { 776 {
792 XGCValues gcv; 777 XGCValues gcv;
793 GC gc; 778 GC gc;
779 Pixmap root_pmap;
794 780
795 image_width = gdk_pixbuf_get_width (result); 781 image_width = gdk_pixbuf_get_width (result);
796 image_height = gdk_pixbuf_get_height (result); 782 image_height = gdk_pixbuf_get_height (result);
797 783
784 if (background_flags)
785 {
786 root_pmap = pixmap;
787 pixmap = None;
788 }
789 else
790 {
798 if (h_scale == 0 || v_scale == 0) 791 if (h_scale == 0 || v_scale == 0)
799 { 792 {
800 new_pmap_width = min (image_width, target_width); 793 new_pmap_width = min (image_width, target_width);
801 new_pmap_height = min (image_height, target_height); 794 new_pmap_height = min (image_height, target_height);
795 }
802 } 796 }
803 797
804 if (pixmap) 798 if (pixmap)
805 { 799 {
806 if (pmap_width != new_pmap_width 800 if (pmap_width != new_pmap_width
862 dst_width, dst_height, 856 dst_width, dst_height,
863 XLIB_RGB_DITHER_NONE, 857 XLIB_RGB_DITHER_NONE,
864 0, 0); 858 0, 0);
865 } 859 }
866 860
861#if XRENDER
862 if (background_flags)
863 {
864 Display *dpy = target->dpy;
865 XRenderPictureAttributes pa;
866
867 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
868 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
869
870 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
871 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
872
873 pa.repeat = True;
874 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
875 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
876 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
877 XFreePixmap (dpy, mask_pmap);
878
879 if (src && dst && mask)
880 {
881 XRenderColor mask_c;
882
883 mask_c.alpha = 0x8000;
884 mask_c.red = 0;
885 mask_c.green = 0;
886 mask_c.blue = 0;
887 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
888 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
889 }
890
891 XRenderFreePicture (dpy, src);
892 XRenderFreePicture (dpy, dst);
893 XRenderFreePicture (dpy, mask);
894
895 XFreePixmap (dpy, root_pmap);
896 }
897#endif
898
867 if (result != pixbuf) 899 if (result != pixbuf)
868 g_object_unref (result); 900 g_object_unref (result);
869 901
870 XFreeGC (target->dpy, gc); 902 XFreeGC (target->dpy, gc);
871 903
893 } 925 }
894 926
895# ifdef HAVE_AFTERIMAGE 927# ifdef HAVE_AFTERIMAGE
896 if (!target->asimman) 928 if (!target->asimman)
897 target->asimman = create_generic_imageman (target->rs[Rs_path]); 929 target->asimman = create_generic_imageman (target->rs[Rs_path]);
898 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image)
932 {
899 if (original_asim) 933 if (original_asim)
934 safe_asimage_destroy (original_asim);
935 original_asim = image;
900 have_image = true; 936 have_image = true;
901 return have_image; 937 return true;
938 }
902# endif 939# endif
903 940
904# ifdef HAVE_PIXBUF 941# ifdef HAVE_PIXBUF
905 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image)
944 {
906 if (pixbuf) 945 if (pixbuf)
946 g_object_unref (pixbuf);
947 pixbuf = image;
907 have_image = true; 948 have_image = true;
908 return have_image; 949 return true;
950 }
909# endif 951# endif
910 } 952 }
911 953
912 return false; 954 return false;
913} 955}
938 if (!(geom_flags & WidthValue)) 980 if (!(geom_flags & WidthValue))
939 hr = 1; 981 hr = 1;
940 if (!(geom_flags & HeightValue)) 982 if (!(geom_flags & HeightValue))
941 vr = hr; 983 vr = hr;
942 984
985 min_it (hr, 128);
986 min_it (vr, 128);
987
943 if (h_blurRadius != hr) 988 if (h_blurRadius != hr)
944 { 989 {
945 ++changed; 990 ++changed;
946 h_blurRadius = hr; 991 h_blurRadius = hr;
947 } 992 }
955 if (v_blurRadius == 0 && h_blurRadius == 0) 1000 if (v_blurRadius == 0 && h_blurRadius == 0)
956 flags &= ~blurNeeded; 1001 flags &= ~blurNeeded;
957 else 1002 else
958 flags |= blurNeeded; 1003 flags |= blurNeeded;
959 1004
1005#if XRENDER
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1007 if (filters)
1008 {
1009 for (int i = 0; i < filters->nfilter; i++)
1010 if (!strcmp (filters->filter[i], FilterConvolution))
1011 flags |= bgPixmap_t::blurServerSide;
1012
1013 XFree (filters);
1014 }
1015#endif
1016
960 return (changed > 0); 1017 return (changed > 0);
961} 1018}
962 1019
963static inline unsigned long 1020static inline unsigned long
964compute_tint_shade_flags (rxvt_color *tint, int shade) 1021compute_tint_shade_flags (rxvt_color *tint, int shade)
965{ 1022{
966 unsigned long flags = 0; 1023 unsigned long flags = 0;
967 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1024 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
968 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1025 bool has_shade = shade != 100;
969 1026
970 if (tint) 1027 if (tint)
971 { 1028 {
972 tint->get (c); 1029 tint->get (c);
973# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1030# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
993 { 1050 {
994 if (flags & bgPixmap_t::tintWholesome) 1051 if (flags & bgPixmap_t::tintWholesome)
995 flags |= bgPixmap_t::tintServerSide; 1052 flags |= bgPixmap_t::tintServerSide;
996 else 1053 else
997 { 1054 {
998#if XFT 1055#if XRENDER
999 flags |= bgPixmap_t::tintServerSide; 1056 flags |= bgPixmap_t::tintServerSide;
1000#endif 1057#endif
1001 } 1058 }
1002 } 1059 }
1003 1060
1005} 1062}
1006 1063
1007bool 1064bool
1008bgPixmap_t::set_tint (rxvt_color &new_tint) 1065bgPixmap_t::set_tint (rxvt_color &new_tint)
1009{ 1066{
1010 if (tint != new_tint) 1067 if (!(flags & tintSet) || tint != new_tint)
1011 { 1068 {
1012 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1069 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1013 tint = new_tint; 1070 tint = new_tint;
1014 flags = (flags & ~tintFlags) | new_flags | tintSet; 1071 flags = (flags & ~tintFlags) | new_flags | tintSet;
1015 return true; 1072 return true;
1033} 1090}
1034 1091
1035bool 1092bool
1036bgPixmap_t::set_shade (const char *shade_str) 1093bgPixmap_t::set_shade (const char *shade_str)
1037{ 1094{
1038 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1095 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1039 1096
1040 if (new_shade < 0 && new_shade > -100) 1097 clamp_it (new_shade, -100, 200);
1098 if (new_shade < 0)
1041 new_shade = 200 - (100 + new_shade); 1099 new_shade = 200 - (100 + new_shade);
1042 else if (new_shade == 100)
1043 new_shade = 0;
1044 1100
1045 if (new_shade != shade) 1101 if (new_shade != shade)
1046 { 1102 {
1047 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1103 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1048 shade = new_shade; 1104 shade = new_shade;
1051 } 1107 }
1052 1108
1053 return false; 1109 return false;
1054} 1110}
1055 1111
1112#if XRENDER
1113static void
1114get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1115{
1116 double sigma = radius / 2.0;
1117 double scale = sqrt (2.0 * M_PI) * sigma;
1118 double sum = 0.0;
1119
1120 for (int i = 0; i < width; i++)
1121 {
1122 double x = i - width / 2;
1123 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1124 sum += kernel[i];
1125 }
1126
1127 params[0] = XDoubleToFixed (width);
1128 params[1] = XDoubleToFixed (1);
1129
1130 for (int i = 0; i < width; i++)
1131 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1132}
1133#endif
1134
1135bool
1136bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1137{
1138 bool ret = false;
1139#if XRENDER
1140 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1141 double *kernel = (double *)malloc (size * sizeof (double));
1142 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1143
1144 Display *dpy = target->dpy;
1145 XRenderPictureAttributes pa;
1146 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1147
1148 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1149 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1150
1151 if (kernel && params && src && dst)
1152 {
1153 if (h_blurRadius)
1154 {
1155 size = h_blurRadius * 2 + 1;
1156 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1157
1158 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1159 XRenderComposite (dpy,
1160 PictOpSrc,
1161 src,
1162 None,
1163 dst,
1164 0, 0,
1165 0, 0,
1166 0, 0,
1167 width, height);
1168 }
1169
1170 if (v_blurRadius)
1171 {
1172 size = v_blurRadius * 2 + 1;
1173 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1174 swap (params[0], params[1]);
1175
1176 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1177 XRenderComposite (dpy,
1178 PictOpSrc,
1179 src,
1180 None,
1181 dst,
1182 0, 0,
1183 0, 0,
1184 0, 0,
1185 width, height);
1186 }
1187
1188 ret = true;
1189 }
1190
1191 free (kernel);
1192 free (params);
1193 XRenderFreePicture (dpy, src);
1194 XRenderFreePicture (dpy, dst);
1195#endif
1196 return ret;
1197}
1198
1199bool
1200bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1201{
1202 Display *dpy = target->dpy;
1203 bool ret = false;
1204
1205 if (flags & tintWholesome)
1206 {
1207 XGCValues gcv;
1208 GC gc;
1209
1210 /* In this case we can tint image server-side getting significant
1211 * performance improvements, as we eliminate XImage transfer
1212 */
1213 gcv.foreground = Pixel (tint);
1214 gcv.function = GXand;
1215 gcv.fill_style = FillSolid;
1216 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1217 if (gc)
1218 {
1219 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1220 ret = true;
1221 XFreeGC (dpy, gc);
1222 }
1223 }
1224 else
1225 {
1226# if XRENDER
1227 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1228
1229 if (flags & tintSet)
1230 tint.get (c);
1231
1232 if (shade <= 100)
1233 {
1234 c.r = (c.r * shade) / 100;
1235 c.g = (c.g * shade) / 100;
1236 c.b = (c.b * shade) / 100;
1237 }
1238 else
1239 {
1240 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1241 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1242 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1243 }
1244
1245 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1246 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1247 XRenderPictureAttributes pa;
1248
1249 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1250
1251 pa.repeat = True;
1252
1253 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1254 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1255 XFreePixmap (dpy, overlay_pmap);
1256
1257 pa.component_alpha = True;
1258 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1259 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1260 XFreePixmap (dpy, mask_pmap);
1261
1262 if (mask_pic && overlay_pic && back_pic)
1263 {
1264 XRenderColor mask_c;
1265
1266 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1267 mask_c.alpha = 0xffff;
1268 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1269
1270 mask_c.alpha = 0;
1271 mask_c.red = 0xffff - c.r;
1272 mask_c.green = 0xffff - c.g;
1273 mask_c.blue = 0xffff - c.b;
1274 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1275 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1276 ret = true;
1277 }
1278
1279 XRenderFreePicture (dpy, mask_pic);
1280 XRenderFreePicture (dpy, overlay_pic);
1281 XRenderFreePicture (dpy, back_pic);
1282# endif
1283 }
1284
1285 return ret;
1286}
1287
1056/* make_transparency_pixmap() 1288/* make_transparency_pixmap()
1057 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1289 * Builds a pixmap of the same size as the terminal window that contains
1058 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1290 * the tiled portion of the root pixmap that is supposed to be covered by
1059 * our window. 1291 * our window.
1060 */ 1292 */
1061unsigned long 1293unsigned long
1062bgPixmap_t::make_transparency_pixmap () 1294bgPixmap_t::make_transparency_pixmap ()
1063{ 1295{
1067 return 0; 1299 return 0;
1068 1300
1069 /* root dimensions may change from call to call - but Display structure should 1301 /* root dimensions may change from call to call - but Display structure should
1070 * be always up-to-date, so let's use it : 1302 * be always up-to-date, so let's use it :
1071 */ 1303 */
1072 Window root = target->display->root;
1073 int screen = target->display->screen; 1304 int screen = target->display->screen;
1074 Display *dpy = target->dpy; 1305 Display *dpy = target->dpy;
1306 int root_depth = DefaultDepth (dpy, screen);
1075 int root_width = DisplayWidth (dpy, screen); 1307 int root_width = DisplayWidth (dpy, screen);
1076 int root_height = DisplayHeight (dpy, screen); 1308 int root_height = DisplayHeight (dpy, screen);
1077 unsigned int root_pmap_width, root_pmap_height; 1309 unsigned int root_pmap_width, root_pmap_height;
1078 int window_width = target->szHint.width; 1310 int window_width = target->szHint.width;
1079 int window_height = target->szHint.height; 1311 int window_height = target->szHint.height;
1080 int sx, sy; 1312 int sx, sy;
1081 XGCValues gcv; 1313 XGCValues gcv;
1314 GC gc;
1082 1315
1083 TIMING_TEST_START (tp);
1084 target->get_window_origin (sx, sy); 1316 target->get_window_origin (sx, sy);
1085 1317
1086 /* check if we are outside of the visible part of the virtual screen : */ 1318 /* check if we are outside of the visible part of the virtual screen : */
1087 if (sx + window_width <= 0 || sy + window_height <= 0 1319 if (sx + window_width <= 0 || sy + window_height <= 0
1088 || sx >= root_width || sy >= root_height) 1320 || sx >= root_width || sy >= root_height)
1089 return 0; 1321 return 0;
1090 1322
1323 // validate root pixmap and get its size
1091 if (root_pixmap != None) 1324 if (root_pixmap != None)
1092 { 1325 {
1093 /* we want to validate the pixmap and get it's size at the same time : */ 1326 Window wdummy;
1094 int junk; 1327 int idummy;
1095 unsigned int ujunk; 1328 unsigned int udummy;
1096 /* root pixmap may be bad - allow a error */ 1329
1097 target->allowedxerror = -1; 1330 target->allowedxerror = -1;
1098 1331
1099 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1332 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1100 root_pixmap = None; 1333 root_pixmap = None;
1101 1334
1102 target->allowedxerror = 0; 1335 target->allowedxerror = 0;
1103 } 1336 }
1104 1337
1338 Pixmap recoded_root_pmap = root_pixmap;
1339
1340 if (root_pixmap != None && root_depth != target->depth)
1341 {
1342#if XRENDER
1343 XRenderPictureAttributes pa;
1344
1345 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1346 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1347
1348 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1349 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1350 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1351
1352 if (src && dst)
1353 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1354 else
1355 root_pixmap = None;
1356
1357 XRenderFreePicture (dpy, src);
1358 XRenderFreePicture (dpy, dst);
1359#else
1360 root_pixmap = None;
1361#endif
1362 }
1363
1364 if (root_pixmap == None)
1365 return 0;
1366
1105 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1367 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1106 GC gc = NULL;
1107 1368
1108 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1369 if (tiled_root_pmap == None) /* something really bad happened - abort */
1109 return 0; 1370 return 0;
1110 1371
1111 if (root_pixmap == None)
1112 {
1113 /* use tricks to obtain the root background image :*/
1114 /* we want to create Overrideredirect window overlapping out window
1115 with background type of Parent Relative and then grab it */
1116 XSetWindowAttributes attr;
1117 Window src;
1118 bool success = false;
1119
1120 attr.background_pixmap = ParentRelative;
1121 attr.backing_store = Always;
1122 attr.event_mask = ExposureMask;
1123 attr.override_redirect = True;
1124 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1125 CopyFromParent, CopyFromParent, CopyFromParent,
1126 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1127 &attr);
1128
1129 if (src != None)
1130 {
1131 XEvent event;
1132 int ev_count = 0;
1133 XGrabServer (dpy);
1134 XMapRaised (dpy, src);
1135 XSync (dpy, False);
1136
1137 /* XSync should get window where it's properly exposed,
1138 * but to be on the safe side - let's check for the actual event to arrive : */
1139 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1140 ++ev_count;
1141
1142 if (ev_count > 0);
1143 {
1144 /* hooray! - we can grab the image! */
1145 gc = XCreateGC (dpy, root, 0, NULL);
1146 if (gc)
1147 {
1148 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1149 success = true;
1150 }
1151 }
1152
1153 XDestroyWindow (dpy, src);
1154 XUngrabServer (dpy);
1155 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1156 }
1157
1158 if (!success)
1159 {
1160 XFreePixmap (dpy, tiled_root_pmap);
1161 tiled_root_pmap = None;
1162 }
1163 else
1164 result |= transpPmapTiled;
1165 }
1166 else
1167 {
1168 /* straightforward pixmap copy */ 1372 /* straightforward pixmap copy */
1169 gcv.tile = root_pixmap; 1373 gcv.tile = recoded_root_pmap;
1170 gcv.fill_style = FillTiled; 1374 gcv.fill_style = FillTiled;
1171 1375
1172 while (sx < 0) sx += (int)root_width; 1376 while (sx < 0) sx += (int)root_width;
1173 while (sy < 0) sy += (int)root_height; 1377 while (sy < 0) sy += (int)root_height;
1174 1378
1175 gcv.ts_x_origin = -sx; 1379 gcv.ts_x_origin = -sx;
1176 gcv.ts_y_origin = -sy; 1380 gcv.ts_y_origin = -sy;
1177 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1381 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1178 1382
1179 if (gc) 1383 if (gc)
1180 { 1384 {
1181 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1385 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1182 result |= transpPmapTiled; 1386 result |= transpPmapTiled;
1183 } 1387 XFreeGC (dpy, gc);
1184 } 1388 }
1185 TIMING_TEST_PRINT_RESULT (tp);
1186 1389
1187 if (tiled_root_pmap != None) 1390 if (tiled_root_pmap != None)
1188 { 1391 {
1189 if (!need_client_side_rendering ()) 1392 if (!need_client_side_rendering ())
1190 { 1393 {
1191 if ((flags & tintNeeded)) 1394 if (flags & (blurNeeded | blurServerSide))
1395 {
1396 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1397 result |= transpPmapBlurred;
1192 { 1398 }
1193 if (flags & tintWholesome) 1399 if (flags & (tintNeeded | tintServerSide))
1194 { 1400 {
1195 /* In this case we can tint image server-side getting significant 1401 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1196 * performance improvements, as we eliminate XImage transfer
1197 */
1198 gcv.foreground = Pixel (tint);
1199 gcv.function = GXand;
1200 gcv.fill_style = FillSolid;
1201 if (gc)
1202 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
1203 else
1204 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1205 if (gc)
1206 {
1207 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1208 result |= transpPmapTinted; 1402 result |= transpPmapTinted;
1209 }
1210 }
1211 else
1212 {
1213# if XFT
1214 Picture back_pic = 0;
1215 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1216
1217 if (flags & tintSet)
1218 tint.get (c);
1219
1220 if (shade > 0 && shade < 100)
1221 {
1222 c.r = (c.r * shade) / 100;
1223 c.g = (c.g * shade) / 100;
1224 c.b = (c.b * shade) / 100;
1225 }
1226 else if (shade > 100 && shade < 200)
1227 {
1228 c.r = (c.r * (200 - shade)) / 100;
1229 c.g = (c.g * (200 - shade)) / 100;
1230 c.b = (c.b * (200 - shade)) / 100;
1231 }
1232
1233 XRenderPictFormat pf;
1234 pf.type = PictTypeDirect;
1235 pf.depth = 32;
1236 pf.direct.redMask = 0xff;
1237 pf.direct.greenMask = 0xff;
1238 pf.direct.blueMask = 0xff;
1239 pf.direct.alphaMask = 0xff;
1240
1241 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1242 (PictFormatType|
1243 PictFormatDepth|
1244 PictFormatRedMask|
1245 PictFormatGreenMask|
1246 PictFormatBlueMask|
1247 PictFormatAlphaMask),
1248 &pf,
1249 0);
1250 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1251 XRenderPictureAttributes pa ;
1252
1253 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1254
1255 pa.repeat = True;
1256
1257 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1258 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1259 XFreePixmap (dpy, overlay_pmap);
1260
1261 pa.component_alpha = True;
1262 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1263 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1264 XFreePixmap (dpy, mask_pmap);
1265
1266 if (mask_pic && overlay_pic && back_pic)
1267 {
1268 XRenderColor mask_c;
1269
1270 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1271 mask_c.alpha = 0xffff;
1272 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1273
1274 mask_c.alpha = 0;
1275 mask_c.red = 0xffff - c.r;
1276 mask_c.green = 0xffff - c.g;
1277 mask_c.blue = 0xffff - c.b;
1278 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1279 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1280 result |= transpPmapTinted;
1281 }
1282
1283 XRenderFreePicture (dpy, mask_pic);
1284 XRenderFreePicture (dpy, overlay_pic);
1285 XRenderFreePicture (dpy, back_pic);
1286# if DO_TIMING_TEST
1287 XSync (dpy, False);
1288# endif
1289# endif
1290 }
1291 } 1403 }
1292 } /* server side rendering completed */ 1404 } /* server side rendering completed */
1293 1405
1294 if (pixmap) 1406 if (pixmap)
1295 XFreePixmap (dpy, pixmap); 1407 XFreePixmap (dpy, pixmap);
1296 1408
1297 pixmap = tiled_root_pmap; 1409 pixmap = tiled_root_pmap;
1298 pmap_width = window_width; 1410 pmap_width = window_width;
1299 pmap_height = window_height; 1411 pmap_height = window_height;
1300 pmap_depth = root_depth; 1412 pmap_depth = target->depth;
1301 } 1413 }
1302 1414
1303 if (gc) 1415 if (recoded_root_pmap != root_pixmap)
1304 XFreeGC (dpy, gc); 1416 XFreePixmap (dpy, recoded_root_pmap);
1305
1306 TIMING_TEST_PRINT_RESULT (tp);
1307 1417
1308 return result; 1418 return result;
1309} 1419}
1310 1420
1311bool 1421void
1312bgPixmap_t::set_root_pixmap () 1422bgPixmap_t::set_root_pixmap ()
1313{ 1423{
1314 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1424 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1315 if (new_root_pixmap == None) 1425 if (new_root_pixmap == None)
1316 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1426 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1317 1427
1318 if (new_root_pixmap != root_pixmap)
1319 {
1320 root_pixmap = new_root_pixmap; 1428 root_pixmap = new_root_pixmap;
1321 return true;
1322 }
1323
1324 return false;
1325} 1429}
1326# endif /* ENABLE_TRANSPARENCY */ 1430# endif /* ENABLE_TRANSPARENCY */
1327 1431
1328# ifndef HAVE_AFTERIMAGE 1432# ifndef HAVE_AFTERIMAGE
1329static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1433static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1330# endif 1434# endif
1331 1435
1332bool 1436bool
1333bgPixmap_t::render () 1437bgPixmap_t::render ()
1334{ 1438{
1335 unsigned long background_flags = 0; 1439 unsigned long background_flags = 0;
1336 1440
1337 if (target == NULL) 1441 if (target == NULL)
1338 return false; 1442 return false;
1339
1340 TIMING_TEST_START (tp);
1341 1443
1342 invalidate (); 1444 invalidate ();
1343# ifdef ENABLE_TRANSPARENCY 1445# ifdef ENABLE_TRANSPARENCY
1344 if (flags & isTransparent) 1446 if (flags & isTransparent)
1345 { 1447 {
1346 /* we need to re-generate transparency pixmap in that case ! */ 1448 /* we need to re-generate transparency pixmap in that case ! */
1347 background_flags = make_transparency_pixmap (); 1449 background_flags = make_transparency_pixmap ();
1348 if (background_flags == 0) 1450 if (background_flags == 0)
1349 return false; 1451 return false;
1350 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1452 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1351 && pmap_depth == target->depth)
1352 flags = flags & ~isInvalid; 1453 flags = flags & ~isInvalid;
1353 } 1454 }
1354# endif 1455# endif
1355 1456
1356# ifdef BG_IMAGE_FROM_FILE 1457# ifdef BG_IMAGE_FROM_FILE
1369 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1470 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1370 } 1471 }
1371 1472
1372 if (result) 1473 if (result)
1373 { 1474 {
1374# if !defined(HAVE_AFTERIMAGE) && !XFT 1475# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1375 /* our own client-side tinting */ 1476 /* our own client-side tinting */
1376 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1377 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1378 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1477 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1379 { 1478 {
1380 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1479 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1381 if (flags & tintSet) 1480 if (flags & tintSet)
1382 tint.get (c); 1481 tint.get (c);
1383 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1482 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1384 } 1483 }
1385# endif 1484# endif
1386 1485
1387 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1486 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1388 1487
1389 if (gc) 1488 if (gc)
1390 { 1489 {
1391 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1392 {
1393 XFreePixmap (target->dpy, pixmap);
1394 pixmap = None;
1395 }
1396
1397 if (pixmap == None)
1398 {
1399 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1400 pmap_width = result->width;
1401 pmap_height = result->height;
1402 pmap_depth = target->depth;
1403 }
1404
1405 if (pmap_depth != result->depth)
1406 {
1407 /* Bad Match error will ensue ! stupid X !!!! */
1408 if (result->depth == 24 && pmap_depth == 32)
1409 result->depth = 32;
1410 else if (result->depth == 32 && pmap_depth == 24)
1411 result->depth = 24;
1412 else
1413 {
1414 /* TODO: implement image recoding */
1415 }
1416 }
1417
1418 if (pmap_depth == result->depth)
1419 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1490 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1420 1491
1421 XFreeGC (target->dpy, gc); 1492 XFreeGC (target->dpy, gc);
1422 flags = flags & ~isInvalid; 1493 flags = flags & ~isInvalid;
1423 } 1494 }
1424 1495
1434 } 1505 }
1435 } 1506 }
1436 1507
1437 apply (); 1508 apply ();
1438 1509
1439 XSync (target->dpy, False);
1440 valid_since = ev::now (); 1510 valid_since = ev::now ();
1441
1442 TIMING_TEST_PRINT_RESULT (tp);
1443 1511
1444 return true; 1512 return true;
1445} 1513}
1446 1514
1447bool 1515bool
1449{ 1517{
1450 if (new_target) 1518 if (new_target)
1451 if (target != new_target) 1519 if (target != new_target)
1452 { 1520 {
1453 target = new_target; 1521 target = new_target;
1454# ifdef ENABLE_TRANSPARENCY
1455 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1456# endif
1457 return true; 1522 return true;
1458 } 1523 }
1459 1524
1460 return false; 1525 return false;
1461} 1526}
1463void 1528void
1464bgPixmap_t::apply () 1529bgPixmap_t::apply ()
1465{ 1530{
1466 if (target) 1531 if (target)
1467 { 1532 {
1468 flags &= ~isVtOrigin;
1469
1470 if (pixmap != None) 1533 if (pixmap != None)
1471 { 1534 {
1472 /* set target's background to pixmap */ 1535 /* set target's background to pixmap */
1473# ifdef ENABLE_TRANSPARENCY 1536# ifdef ENABLE_TRANSPARENCY
1474 if (flags & isTransparent) 1537 if (flags & isTransparent)
1480 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1543 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1481 } 1544 }
1482 else 1545 else
1483# endif 1546# endif
1484 { 1547 {
1485 flags |= isVtOrigin;
1486 /* force old pixmap dereference in case it was transparent before :*/ 1548 /* force old pixmap dereference in case it was transparent before :*/
1487 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1549 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1488 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1550 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1489 /* do we also need to set scrollbar's background here ? */ 1551 /* do we also need to set scrollbar's background here ? */
1490 1552
1517 } 1579 }
1518} 1580}
1519 1581
1520#endif /* HAVE_BG_PIXMAP */ 1582#endif /* HAVE_BG_PIXMAP */
1521 1583
1522#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1584#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER
1523/* taken from aterm-0.4.2 */ 1585/* taken from aterm-0.4.2 */
1524 1586
1525typedef uint32_t RUINT32T;
1526
1527static void 1587static void
1528ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1588ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1529{ 1589{
1530 int sh_r, sh_g, sh_b; 1590 int sh_r, sh_g, sh_b;
1531 RUINT32T mask_r, mask_g, mask_b; 1591 uint32_t mask_r, mask_g, mask_b;
1532 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1592 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1533 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1593 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1534 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1594 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1535 int i; 1595 int i;
1596 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1536 1597
1537 Visual *visual = term->visual;
1538
1539 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1598 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1540
1541 if (shade == 0)
1542 shade = 100;
1543 1599
1544 /* for convenience */ 1600 /* for convenience */
1545 mask_r = visual->red_mask; 1601 mask_r = visual->red_mask;
1546 mask_g = visual->green_mask; 1602 mask_g = visual->green_mask;
1547 mask_b = visual->blue_mask; 1603 mask_b = visual->blue_mask;
1548 1604
1549 /* boring lookup table pre-initialization */ 1605 /* boring lookup table pre-initialization */
1550 switch (srcImage->bits_per_pixel) { 1606 switch (srcImage->depth)
1607 {
1551 case 15: 1608 case 15:
1552 if ((mask_r != 0x7c00) || 1609 if ((mask_r != 0x7c00) ||
1553 (mask_g != 0x03e0) || 1610 (mask_g != 0x03e0) ||
1554 (mask_b != 0x001f)) 1611 (mask_b != 0x001f))
1555 return; 1612 return;
1556 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1613 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1557 lookup_r = lookup; 1614 lookup_r = lookup;
1558 lookup_g = lookup+32; 1615 lookup_g = lookup+32;
1559 lookup_b = lookup+32+32; 1616 lookup_b = lookup+32+32;
1560 sh_r = 10; 1617 sh_r = 10;
1561 sh_g = 5; 1618 sh_g = 5;
1562 sh_b = 0; 1619 sh_b = 0;
1563 break; 1620 break;
1564 case 16: 1621 case 16:
1565 if ((mask_r != 0xf800) || 1622 if ((mask_r != 0xf800) ||
1566 (mask_g != 0x07e0) || 1623 (mask_g != 0x07e0) ||
1567 (mask_b != 0x001f)) 1624 (mask_b != 0x001f))
1568 return; 1625 return;
1569 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1626 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1570 lookup_r = lookup; 1627 lookup_r = lookup;
1571 lookup_g = lookup+32; 1628 lookup_g = lookup+32;
1572 lookup_b = lookup+32+64; 1629 lookup_b = lookup+32+64;
1573 sh_r = 11; 1630 sh_r = 11;
1574 sh_g = 5; 1631 sh_g = 5;
1575 sh_b = 0; 1632 sh_b = 0;
1576 break; 1633 break;
1577 case 24: 1634 case 24:
1578 if ((mask_r != 0xff0000) || 1635 if ((mask_r != 0xff0000) ||
1579 (mask_g != 0x00ff00) || 1636 (mask_g != 0x00ff00) ||
1580 (mask_b != 0x0000ff)) 1637 (mask_b != 0x0000ff))
1581 return; 1638 return;
1582 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1639 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1583 lookup_r = lookup; 1640 lookup_r = lookup;
1584 lookup_g = lookup+256; 1641 lookup_g = lookup+256;
1585 lookup_b = lookup+256+256; 1642 lookup_b = lookup+256+256;
1586 sh_r = 16; 1643 sh_r = 16;
1587 sh_g = 8; 1644 sh_g = 8;
1588 sh_b = 0; 1645 sh_b = 0;
1589 break; 1646 break;
1590 case 32: 1647 case 32:
1591 if ((mask_r != 0xff0000) || 1648 if ((mask_r != 0xff0000) ||
1592 (mask_g != 0x00ff00) || 1649 (mask_g != 0x00ff00) ||
1593 (mask_b != 0x0000ff)) 1650 (mask_b != 0x0000ff))
1594 return; 1651 return;
1595 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1652 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1596 lookup_r = lookup; 1653 lookup_r = lookup;
1597 lookup_g = lookup+256; 1654 lookup_g = lookup+256;
1598 lookup_b = lookup+256+256; 1655 lookup_b = lookup+256+256;
1599 sh_r = 16; 1656 sh_r = 16;
1600 sh_g = 8; 1657 sh_g = 8;
1601 sh_b = 0; 1658 sh_b = 0;
1602 break; 1659 break;
1603 default: 1660 default:
1604 return; /* we do not support this color depth */ 1661 return; /* we do not support this color depth */
1605 } 1662 }
1606 1663
1607 /* prepare limits for color transformation (each channel is handled separately) */ 1664 /* prepare limits for color transformation (each channel is handled separately) */
1608 if (shade < 0) { 1665 if (shade > 100)
1666 {
1609 shade = -shade; 1667 shade = 200 - shade;
1610 if (shade < 0) shade = 0;
1611 if (shade > 100) shade = 100;
1612 1668
1613 lower_lim_r = 65535-rm; 1669 lower_lim_r = 65535-rm;
1614 lower_lim_g = 65535-gm; 1670 lower_lim_g = 65535-gm;
1615 lower_lim_b = 65535-bm; 1671 lower_lim_b = 65535-bm;
1616 1672
1617 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1673 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1618 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1674 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1619 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1675 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1620 1676
1621 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1677 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1678 }
1622 } else { 1679 else
1623 if (shade < 0) shade = 0; 1680 {
1624 if (shade > 100) shade = 100;
1625 1681
1626 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1682 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1627 1683
1628 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1684 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1629 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1685 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1630 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1686 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1631 } 1687 }
1632
1633 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1634 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1635 {
1636 unsigned int tmp;
1637
1638 tmp = lower_lim_r;
1639 lower_lim_r = lower_lim_b;
1640 lower_lim_b = tmp;
1641
1642 tmp = upper_lim_r;
1643 upper_lim_r = upper_lim_b;
1644 upper_lim_b = tmp;
1645 }
1646 1688
1647 /* fill our lookup tables */ 1689 /* fill our lookup tables */
1648 for (i = 0; i <= mask_r>>sh_r; i++) 1690 for (i = 0; i <= mask_r>>sh_r; i++)
1649 { 1691 {
1650 RUINT32T tmp; 1692 uint32_t tmp;
1651 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1693 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1652 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1694 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1653 lookup_r[i] = (tmp/65535)<<sh_r; 1695 lookup_r[i] = (tmp/65535)<<sh_r;
1654 } 1696 }
1655 for (i = 0; i <= mask_g>>sh_g; i++) 1697 for (i = 0; i <= mask_g>>sh_g; i++)
1656 { 1698 {
1657 RUINT32T tmp; 1699 uint32_t tmp;
1658 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1700 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1659 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1701 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1660 lookup_g[i] = (tmp/65535)<<sh_g; 1702 lookup_g[i] = (tmp/65535)<<sh_g;
1661 } 1703 }
1662 for (i = 0; i <= mask_b>>sh_b; i++) 1704 for (i = 0; i <= mask_b>>sh_b; i++)
1663 { 1705 {
1664 RUINT32T tmp; 1706 uint32_t tmp;
1665 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1707 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1666 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1708 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1667 lookup_b[i] = (tmp/65535)<<sh_b; 1709 lookup_b[i] = (tmp/65535)<<sh_b;
1668 } 1710 }
1669 1711
1670 /* apply table to input image (replacing colors by newly calculated ones) */ 1712 /* apply table to input image (replacing colors by newly calculated ones) */
1671 switch (srcImage->bits_per_pixel) 1713 if (srcImage->bits_per_pixel == 32
1714 && (srcImage->depth == 24 || srcImage->depth == 32)
1715 && srcImage->byte_order == host_byte_order)
1672 { 1716 {
1673 case 15:
1674 {
1675 unsigned short *p1, *pf, *p, *pl; 1717 uint32_t *p1, *pf, *p, *pl;
1676 p1 = (unsigned short *) srcImage->data; 1718 p1 = (uint32_t *) srcImage->data;
1677 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1719 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1720
1678 while (p1 < pf) 1721 while (p1 < pf)
1679 { 1722 {
1680 p = p1; 1723 p = p1;
1681 pl = p1 + srcImage->width; 1724 pl = p1 + srcImage->width;
1682 for (; p < pl; p++) 1725 for (; p < pl; p++)
1683 { 1726 {
1684 *p = lookup_r[(*p & 0x7c00)>>10] |
1685 lookup_g[(*p & 0x03e0)>> 5] |
1686 lookup_b[(*p & 0x001f)];
1687 }
1688 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1689 }
1690 break;
1691 }
1692 case 16:
1693 {
1694 unsigned short *p1, *pf, *p, *pl;
1695 p1 = (unsigned short *) srcImage->data;
1696 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1697 while (p1 < pf)
1698 {
1699 p = p1;
1700 pl = p1 + srcImage->width;
1701 for (; p < pl; p++)
1702 {
1703 *p = lookup_r[(*p & 0xf800)>>11] |
1704 lookup_g[(*p & 0x07e0)>> 5] |
1705 lookup_b[(*p & 0x001f)];
1706 }
1707 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1708 }
1709 break;
1710 }
1711 case 24:
1712 {
1713 unsigned char *p1, *pf, *p, *pl;
1714 p1 = (unsigned char *) srcImage->data;
1715 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1716 while (p1 < pf)
1717 {
1718 p = p1;
1719 pl = p1 + srcImage->width * 3;
1720 for (; p < pl; p += 3)
1721 {
1722 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1723 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1724 p[2] = lookup_r[(p[2] & 0x0000ff)];
1725 }
1726 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1727 }
1728 break;
1729 }
1730 case 32:
1731 {
1732 RUINT32T *p1, *pf, *p, *pl;
1733 p1 = (RUINT32T *) srcImage->data;
1734 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1735
1736 while (p1 < pf)
1737 {
1738 p = p1;
1739 pl = p1 + srcImage->width;
1740 for (; p < pl; p++)
1741 {
1742 *p = lookup_r[(*p & 0xff0000)>>16] | 1727 *p = lookup_r[(*p & 0xff0000) >> 16] |
1743 lookup_g[(*p & 0x00ff00)>> 8] | 1728 lookup_g[(*p & 0x00ff00) >> 8] |
1744 lookup_b[(*p & 0x0000ff)] | 1729 lookup_b[(*p & 0x0000ff)] |
1745 (*p & ~0xffffff); 1730 (*p & 0xff000000);
1731 }
1732 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1733 }
1734 }
1735 else
1736 {
1737 for (int y = 0; y < srcImage->height; y++)
1738 for (int x = 0; x < srcImage->width; x++)
1739 {
1740 unsigned long pixel = XGetPixel (srcImage, x, y);
1741 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1742 lookup_g[(pixel & mask_g) >> sh_g] |
1743 lookup_b[(pixel & mask_b) >> sh_b];
1744 XPutPixel (srcImage, x, y, pixel);
1746 } 1745 }
1747 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1748 } 1746 }
1749 break;
1750 }
1751 }
1752 1747
1753 free (lookup); 1748 free (lookup);
1754} 1749}
1755#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1750#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines