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.67 by sf-exg, Mon Oct 4 21:56:42 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}
… …
170bool bgPixmap_t::need_client_side_rendering () 175bool bgPixmap_t::need_client_side_rendering ()
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
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 180# endif
187 return false; 181 return false;
188} 182}
189 183
190# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
… …
228 int diff = window_size - image_size; 222 int diff = window_size - image_size;
229 int smaller = min (image_size, window_size); 223 int smaller = min (image_size, window_size);
230 224
231 if (align >= 0 && align <= 100) 225 if (align >= 0 && align <= 100)
232 return diff * align / 100; 226 return diff * align / 100;
233 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
234 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
235 else if (align >= -100 && align < 0) 229 else if (align >= -100 && align < 0)
236 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
237 return 0; 231 return 0;
238} 232}
… …
434 { 428 {
435 flags = new_flags; 429 flags = new_flags;
436 changed++; 430 changed++;
437 } 431 }
438 432
439 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
440 // flags, h_scale, v_scale, h_align, v_align);
441 return (changed > 0); 433 return (changed > 0);
442} 434}
443 435
444void 436void
445bgPixmap_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)
… …
458 { 450 {
459 w = h_scale * target_width / 100; 451 w = h_scale * target_width / 100;
460 h = v_scale * target_height / 100; 452 h = v_scale * target_height / 100;
461 } 453 }
462 454
455 if (!w) w = image_width;
456 if (!h) h = image_height;
457
463 if (flags & rootAlign) 458 if (flags & rootAlign)
464 { 459 {
465 target->get_window_origin (x, y); 460 target->get_window_origin (x, y);
466 x = -x; 461 x = -x;
467 y = -y; 462 y = -y;
468 } 463 }
469 else 464 else
470 { 465 {
471 x = make_align_position (h_align, target_width, w > 0 ? w : image_width); 466 x = make_align_position (h_align, target_width, w);
472 y = make_align_position (v_align, target_height, h > 0 ? h : image_height); 467 y = make_align_position (v_align, target_height, h);
473 } 468 }
474 469
475 flags &= ~sizeSensitive; 470 flags &= ~sizeSensitive;
476 if (h_scale != 0 || v_scale != 0 471 if ((flags & propScale) || h_scale || v_scale
477 || h_align != 0 || v_align != 0 472 || (!(flags & rootAlign) && (h_align || v_align))
478 || image_width > target_width || image_height > target_height) 473 || w > target_width || h > target_height)
479 flags |= sizeSensitive; 474 flags |= sizeSensitive;
480} 475}
481 476
482# ifdef HAVE_AFTERIMAGE 477# ifdef HAVE_AFTERIMAGE
483bool 478bool
… …
496 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);
497 492
498 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 493 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
499 { 494 {
500 ShadingInfo as_shade; 495 ShadingInfo as_shade;
501 as_shade.shading = (shade == 0) ? 100 : shade; 496 as_shade.shading = shade;
502 497
503 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 498 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
504 if (flags & tintSet) 499 if (flags & tintSet)
505 tint.get (c); 500 tint.get (c);
506 as_shade.tintColor.red = c.r; 501 as_shade.tintColor.red = c.r;
… …
508 as_shade.tintColor.blue = c.b; 503 as_shade.tintColor.blue = c.b;
509 504
510 background_tint = shading2tint32 (&as_shade); 505 background_tint = shading2tint32 (&as_shade);
511 } 506 }
512 507
513 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 508 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
514 { 509 {
515 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,
516 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 511 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
517 100, ASIMAGE_QUALITY_DEFAULT); 512 100, ASIMAGE_QUALITY_DEFAULT);
518 if (tmp) 513 if (tmp)
… …
533 int x = 0; 528 int x = 0;
534 int y = 0; 529 int y = 0;
535 int w = 0; 530 int w = 0;
536 int h = 0; 531 int h = 0;
537 532
538 TIMING_TEST_START (asim);
539
540 if (original_asim) 533 if (original_asim)
541 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);
542 535
543 if (!original_asim 536 if (!original_asim
544 || (!(flags & rootAlign) 537 || (!(flags & rootAlign)
545 && (x >= target_width 538 && (x >= target_width
546 || y >= target_height 539 || y >= target_height
547 || (w > 0 && x + w <= 0)
548 || (h > 0 && y + h <= 0)))) 540 || (x + w <= 0)
541 || (y + h <= 0))))
549 { 542 {
550 if (background) 543 if (background)
551 { 544 {
552 new_pmap_width = background->width; 545 new_pmap_width = background->width;
553 new_pmap_height = background->height; 546 new_pmap_height = background->height;
… …
567 } 560 }
568 else 561 else
569 { 562 {
570 result = original_asim; 563 result = original_asim;
571 564
572 if ((w > 0 && w != original_asim->width) 565 if ((w != original_asim->width)
573 || (h > 0 && h != original_asim->height)) 566 || (h != original_asim->height))
574 { 567 {
575 result = scale_asimage (target->asv, original_asim, 568 result = scale_asimage (target->asv, original_asim,
576 w > 0 ? w : original_asim->width, 569 w, h,
577 h > 0 ? h : original_asim->height,
578 background ? ASA_ASImage : ASA_XImage, 570 background ? ASA_ASImage : ASA_XImage,
579 100, ASIMAGE_QUALITY_DEFAULT); 571 100, ASIMAGE_QUALITY_DEFAULT);
580 } 572 }
581 573
582 if (background == NULL) 574 if (background == NULL)
… …
614 layers[0].clip_width = target_width; 606 layers[0].clip_width = target_width;
615 layers[0].clip_height = target_height; 607 layers[0].clip_height = target_height;
616 layers[0].tint = background_tint; 608 layers[0].tint = background_tint;
617 layers[1].im = result; 609 layers[1].im = result;
618 610
619 if (w <= 0) 611 if (h_scale == 0 || v_scale == 0)
620 { 612 {
621 /* tile horizontally */ 613 /* tile horizontally */
622 while (x > 0) x -= (int)result->width; 614 while (x > 0) x -= (int)result->width;
623 layers[1].dst_x = x; 615 layers[1].dst_x = x;
624 layers[1].clip_width = result->width+target_width; 616 layers[1].clip_width = result->width+target_width;
… …
628 /* clip horizontally */ 620 /* clip horizontally */
629 layers[1].dst_x = x; 621 layers[1].dst_x = x;
630 layers[1].clip_width = result->width; 622 layers[1].clip_width = result->width;
631 } 623 }
632 624
633 if (h <= 0) 625 if (h_scale == 0 || v_scale == 0)
634 { 626 {
635 while (y > 0) y -= (int)result->height; 627 while (y > 0) y -= (int)result->height;
636 layers[1].dst_y = y; 628 layers[1].dst_y = y;
637 layers[1].clip_height = result->height + target_height; 629 layers[1].clip_height = result->height + target_height;
638 } 630 }
… …
661 } 653 }
662 654
663 free (layers); 655 free (layers);
664 } 656 }
665 } 657 }
666 TIMING_TEST_PRINT_RESULT (asim);
667 658
668 bool ret = false; 659 bool ret = false;
669 660
670 if (result) 661 if (result)
671 { 662 {
… …
717 708
718 if (result != background && result != original_asim) 709 if (result != background && result != original_asim)
719 destroy_asimage (&result); 710 destroy_asimage (&result);
720 711
721 XFreeGC (target->dpy, gc); 712 XFreeGC (target->dpy, gc);
722 TIMING_TEST_PRINT_RESULT (asim);
723 713
724 ret = true; 714 ret = true;
725 } 715 }
726 716
727 if (background) 717 if (background)
… …
739 return false; 729 return false;
740 730
741 if (!pixbuf) 731 if (!pixbuf)
742 return false; 732 return false;
743 733
744 // TODO: add alpha blending 734#if !XRENDER
745 if (background_flags) 735 if (background_flags)
746 return false; 736 return false;
737#endif
747 738
748 GdkPixbuf *result; 739 GdkPixbuf *result;
749 740
750 int image_width = gdk_pixbuf_get_width (pixbuf); 741 int image_width = gdk_pixbuf_get_width (pixbuf);
751 int image_height = gdk_pixbuf_get_height (pixbuf); 742 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
763 get_image_geometry (image_width, image_height, w, h, x, y); 754 get_image_geometry (image_width, image_height, w, h, x, y);
764 755
765 if (!(flags & rootAlign) 756 if (!(flags & rootAlign)
766 && (x >= target_width 757 && (x >= target_width
767 || y >= target_height 758 || y >= target_height
768 || (w > 0 && x + w <= 0)
769 || (h > 0 && y + h <= 0))) 759 || (x + w <= 0)
760 || (y + h <= 0)))
770 return false; 761 return false;
771 762
772 result = pixbuf; 763 result = pixbuf;
773 764
774 if ((w > 0 && w != image_width) 765 if ((w != image_width)
775 || (h > 0 && h != image_height)) 766 || (h != image_height))
776 { 767 {
777 result = gdk_pixbuf_scale_simple (pixbuf, 768 result = gdk_pixbuf_scale_simple (pixbuf,
778 w > 0 ? w : image_width, 769 w, h,
779 h > 0 ? h : image_height,
780 GDK_INTERP_BILINEAR); 770 GDK_INTERP_BILINEAR);
781 } 771 }
782 772
783 bool ret = false; 773 bool ret = false;
784 774
785 if (result) 775 if (result)
786 { 776 {
787 XGCValues gcv; 777 XGCValues gcv;
788 GC gc; 778 GC gc;
779 Pixmap root_pmap;
789 780
790 image_width = gdk_pixbuf_get_width (result); 781 image_width = gdk_pixbuf_get_width (result);
791 image_height = gdk_pixbuf_get_height (result); 782 image_height = gdk_pixbuf_get_height (result);
792 783
784 if (background_flags)
785 {
786 root_pmap = pixmap;
787 pixmap = None;
788 }
789 else
790 {
793 if (h_scale == 0 || v_scale == 0) 791 if (h_scale == 0 || v_scale == 0)
794 { 792 {
795 new_pmap_width = min (image_width, target_width); 793 new_pmap_width = min (image_width, target_width);
796 new_pmap_height = min (image_height, target_height); 794 new_pmap_height = min (image_height, target_height);
795 }
797 } 796 }
798 797
799 if (pixmap) 798 if (pixmap)
800 { 799 {
801 if (pmap_width != new_pmap_width 800 if (pmap_width != new_pmap_width
… …
857 dst_width, dst_height, 856 dst_width, dst_height,
858 XLIB_RGB_DITHER_NONE, 857 XLIB_RGB_DITHER_NONE,
859 0, 0); 858 0, 0);
860 } 859 }
861 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
862 if (result != pixbuf) 899 if (result != pixbuf)
863 g_object_unref (result); 900 g_object_unref (result);
864 901
865 XFreeGC (target->dpy, gc); 902 XFreeGC (target->dpy, gc);
866 903
… …
888 } 925 }
889 926
890# ifdef HAVE_AFTERIMAGE 927# ifdef HAVE_AFTERIMAGE
891 if (!target->asimman) 928 if (!target->asimman)
892 target->asimman = create_generic_imageman (target->rs[Rs_path]); 929 target->asimman = create_generic_imageman (target->rs[Rs_path]);
893 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image)
932 {
894 if (original_asim) 933 if (original_asim)
934 safe_asimage_destroy (original_asim);
935 original_asim = image;
895 have_image = true; 936 have_image = true;
896 return have_image; 937 return true;
938 }
897# endif 939# endif
898 940
899# ifdef HAVE_PIXBUF 941# ifdef HAVE_PIXBUF
900 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image)
944 {
901 if (pixbuf) 945 if (pixbuf)
946 g_object_unref (pixbuf);
947 pixbuf = image;
902 have_image = true; 948 have_image = true;
903 return have_image; 949 return true;
950 }
904# endif 951# endif
905 } 952 }
906 953
907 return false; 954 return false;
908} 955}
… …
933 if (!(geom_flags & WidthValue)) 980 if (!(geom_flags & WidthValue))
934 hr = 1; 981 hr = 1;
935 if (!(geom_flags & HeightValue)) 982 if (!(geom_flags & HeightValue))
936 vr = hr; 983 vr = hr;
937 984
985 min_it (hr, 128);
986 min_it (vr, 128);
987
938 if (h_blurRadius != hr) 988 if (h_blurRadius != hr)
939 { 989 {
940 ++changed; 990 ++changed;
941 h_blurRadius = hr; 991 h_blurRadius = hr;
942 } 992 }
… …
950 if (v_blurRadius == 0 && h_blurRadius == 0) 1000 if (v_blurRadius == 0 && h_blurRadius == 0)
951 flags &= ~blurNeeded; 1001 flags &= ~blurNeeded;
952 else 1002 else
953 flags |= blurNeeded; 1003 flags |= blurNeeded;
954 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
955 return (changed > 0); 1017 return (changed > 0);
956} 1018}
957 1019
958static inline unsigned long 1020static inline unsigned long
959compute_tint_shade_flags (rxvt_color *tint, int shade) 1021compute_tint_shade_flags (rxvt_color *tint, int shade)
960{ 1022{
961 unsigned long flags = 0; 1023 unsigned long flags = 0;
962 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1024 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
963 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1025 bool has_shade = shade != 100;
964 1026
965 if (tint) 1027 if (tint)
966 { 1028 {
967 tint->get (c); 1029 tint->get (c);
968# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1030# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
988 { 1050 {
989 if (flags & bgPixmap_t::tintWholesome) 1051 if (flags & bgPixmap_t::tintWholesome)
990 flags |= bgPixmap_t::tintServerSide; 1052 flags |= bgPixmap_t::tintServerSide;
991 else 1053 else
992 { 1054 {
993#if XFT 1055#if XRENDER
994 flags |= bgPixmap_t::tintServerSide; 1056 flags |= bgPixmap_t::tintServerSide;
995#endif 1057#endif
996 } 1058 }
997 } 1059 }
998 1060
… …
1000} 1062}
1001 1063
1002bool 1064bool
1003bgPixmap_t::set_tint (rxvt_color &new_tint) 1065bgPixmap_t::set_tint (rxvt_color &new_tint)
1004{ 1066{
1005 if (tint != new_tint) 1067 if (!(flags & tintSet) || tint != new_tint)
1006 { 1068 {
1007 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1069 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1008 tint = new_tint; 1070 tint = new_tint;
1009 flags = (flags & ~tintFlags) | new_flags | tintSet; 1071 flags = (flags & ~tintFlags) | new_flags | tintSet;
1010 return true; 1072 return true;
… …
1028} 1090}
1029 1091
1030bool 1092bool
1031bgPixmap_t::set_shade (const char *shade_str) 1093bgPixmap_t::set_shade (const char *shade_str)
1032{ 1094{
1033 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1095 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1034 1096
1035 if (new_shade < 0 && new_shade > -100) 1097 clamp_it (new_shade, -100, 200);
1098 if (new_shade < 0)
1036 new_shade = 200 - (100 + new_shade); 1099 new_shade = 200 - (100 + new_shade);
1037 else if (new_shade == 100)
1038 new_shade = 0;
1039 1100
1040 if (new_shade != shade) 1101 if (new_shade != shade)
1041 { 1102 {
1042 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);
1043 shade = new_shade; 1104 shade = new_shade;
… …
1046 } 1107 }
1047 1108
1048 return false; 1109 return false;
1049} 1110}
1050 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
1051bool 1135bool
1052bgPixmap_t::tint_pixmap (Pixmap pixmap) 1136bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1053{ 1137{
1054 Window root = target->display->root; 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
1055 Display *dpy = target->dpy; 1144 Display *dpy = target->dpy;
1056 int window_width = target->szHint.width; 1145 XRenderPictureAttributes pa;
1057 int window_height = target->szHint.height; 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;
1058 bool ret = false; 1203 bool ret = false;
1059 1204
1060 if (flags & tintWholesome) 1205 if (flags & tintWholesome)
1061 { 1206 {
1062 XGCValues gcv; 1207 XGCValues gcv;
… …
1066 * performance improvements, as we eliminate XImage transfer 1211 * performance improvements, as we eliminate XImage transfer
1067 */ 1212 */
1068 gcv.foreground = Pixel (tint); 1213 gcv.foreground = Pixel (tint);
1069 gcv.function = GXand; 1214 gcv.function = GXand;
1070 gcv.fill_style = FillSolid; 1215 gcv.fill_style = FillSolid;
1071 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 1216 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1072 if (gc) 1217 if (gc)
1073 { 1218 {
1074 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height); 1219 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1075 ret = true; 1220 ret = true;
1076 XFreeGC (dpy, gc); 1221 XFreeGC (dpy, gc);
1077 } 1222 }
1078 } 1223 }
1079 else 1224 else
1080 { 1225 {
1081# if XFT 1226# if XRENDER
1082 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1227 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1083 1228
1084 if (flags & tintSet) 1229 if (flags & tintSet)
1085 tint.get (c); 1230 tint.get (c);
1086 1231
1087 if (shade > 0 && shade < 100) 1232 if (shade <= 100)
1088 { 1233 {
1089 c.r = (c.r * shade) / 100; 1234 c.r = (c.r * shade) / 100;
1090 c.g = (c.g * shade) / 100; 1235 c.g = (c.g * shade) / 100;
1091 c.b = (c.b * shade) / 100; 1236 c.b = (c.b * shade) / 100;
1092 } 1237 }
1093 else if (shade > 100 && shade < 200) 1238 else
1094 {
1095 c.r = (c.r * (200 - shade)) / 100;
1096 c.g = (c.g * (200 - shade)) / 100;
1097 c.b = (c.b * (200 - shade)) / 100;
1098 } 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 }
1099 1244
1100 XRenderPictFormat pf; 1245 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1101 pf.type = PictTypeDirect;
1102 pf.depth = 32;
1103 pf.direct.redMask = 0xff;
1104 pf.direct.greenMask = 0xff;
1105 pf.direct.blueMask = 0xff;
1106 pf.direct.alphaMask = 0xff;
1107
1108 XRenderPictFormat *solid_format = XRenderFindFormat (dpy, 1246 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1109 (PictFormatType|
1110 PictFormatDepth|
1111 PictFormatRedMask|
1112 PictFormatGreenMask|
1113 PictFormatBlueMask|
1114 PictFormatAlphaMask),
1115 &pf,
1116 0);
1117 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1118 XRenderPictureAttributes pa; 1247 XRenderPictureAttributes pa;
1119 1248
1120 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1249 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1121 1250
1122 pa.repeat = True; 1251 pa.repeat = True;
1123 1252
1124 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1253 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1125 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1254 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1126 XFreePixmap (dpy, overlay_pmap); 1255 XFreePixmap (dpy, overlay_pmap);
1127 1256
1128 pa.component_alpha = True; 1257 pa.component_alpha = True;
1129 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1258 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1130 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1259 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1131 XFreePixmap (dpy, mask_pmap); 1260 XFreePixmap (dpy, mask_pmap);
1132 1261
1133 if (mask_pic && overlay_pic && back_pic) 1262 if (mask_pic && overlay_pic && back_pic)
1134 { 1263 {
… …
1141 mask_c.alpha = 0; 1270 mask_c.alpha = 0;
1142 mask_c.red = 0xffff - c.r; 1271 mask_c.red = 0xffff - c.r;
1143 mask_c.green = 0xffff - c.g; 1272 mask_c.green = 0xffff - c.g;
1144 mask_c.blue = 0xffff - c.b; 1273 mask_c.blue = 0xffff - c.b;
1145 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1274 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1146 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); 1275 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1147 ret = true; 1276 ret = true;
1148 } 1277 }
1149 1278
1150 XRenderFreePicture (dpy, mask_pic); 1279 XRenderFreePicture (dpy, mask_pic);
1151 XRenderFreePicture (dpy, overlay_pic); 1280 XRenderFreePicture (dpy, overlay_pic);
1152 XRenderFreePicture (dpy, back_pic); 1281 XRenderFreePicture (dpy, back_pic);
1153# if DO_TIMING_TEST
1154 XSync (dpy, False);
1155# endif
1156# endif 1282# endif
1157 } 1283 }
1158 1284
1159 return ret; 1285 return ret;
1160} 1286}
1161 1287
1162/* make_transparency_pixmap() 1288/* make_transparency_pixmap()
1163 * 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
1164 * 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
1165 * our window. 1291 * our window.
1166 */ 1292 */
1167unsigned long 1293unsigned long
1168bgPixmap_t::make_transparency_pixmap () 1294bgPixmap_t::make_transparency_pixmap ()
1169{ 1295{
… …
1173 return 0; 1299 return 0;
1174 1300
1175 /* 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
1176 * be always up-to-date, so let's use it : 1302 * be always up-to-date, so let's use it :
1177 */ 1303 */
1178 Window root = target->display->root;
1179 int screen = target->display->screen; 1304 int screen = target->display->screen;
1180 Display *dpy = target->dpy; 1305 Display *dpy = target->dpy;
1306 int root_depth = DefaultDepth (dpy, screen);
1181 int root_width = DisplayWidth (dpy, screen); 1307 int root_width = DisplayWidth (dpy, screen);
1182 int root_height = DisplayHeight (dpy, screen); 1308 int root_height = DisplayHeight (dpy, screen);
1183 unsigned int root_pmap_width, root_pmap_height; 1309 unsigned int root_pmap_width, root_pmap_height;
1184 int window_width = target->szHint.width; 1310 int window_width = target->szHint.width;
1185 int window_height = target->szHint.height; 1311 int window_height = target->szHint.height;
1186 int sx, sy; 1312 int sx, sy;
1187 XGCValues gcv; 1313 XGCValues gcv;
1314 GC gc;
1188 1315
1189 TIMING_TEST_START (tp);
1190 target->get_window_origin (sx, sy); 1316 target->get_window_origin (sx, sy);
1191 1317
1192 /* 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 : */
1193 if (sx + window_width <= 0 || sy + window_height <= 0 1319 if (sx + window_width <= 0 || sy + window_height <= 0
1194 || sx >= root_width || sy >= root_height) 1320 || sx >= root_width || sy >= root_height)
1195 return 0; 1321 return 0;
1196 1322
1323 // validate root pixmap and get its size
1197 if (root_pixmap != None) 1324 if (root_pixmap != None)
1198 { 1325 {
1199 /* we want to validate the pixmap and get it's size at the same time : */ 1326 Window wdummy;
1200 int junk; 1327 int idummy;
1201 unsigned int ujunk; 1328 unsigned int udummy;
1202 /* root pixmap may be bad - allow a error */ 1329
1203 target->allowedxerror = -1; 1330 target->allowedxerror = -1;
1204 1331
1205 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))
1206 root_pixmap = None; 1333 root_pixmap = None;
1207 1334
1208 target->allowedxerror = 0; 1335 target->allowedxerror = 0;
1209 } 1336 }
1210 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
1211 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);
1212 GC gc = NULL;
1213 1368
1214 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1369 if (tiled_root_pmap == None) /* something really bad happened - abort */
1215 return 0; 1370 return 0;
1216 1371
1217 if (root_pixmap == None)
1218 {
1219 /* use tricks to obtain the root background image :*/
1220 /* we want to create Overrideredirect window overlapping out window
1221 with background type of Parent Relative and then grab it */
1222 XSetWindowAttributes attr;
1223 Window src;
1224 bool success = false;
1225
1226 attr.background_pixmap = ParentRelative;
1227 attr.backing_store = Always;
1228 attr.event_mask = ExposureMask;
1229 attr.override_redirect = True;
1230 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1231 CopyFromParent, CopyFromParent, CopyFromParent,
1232 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1233 &attr);
1234
1235 if (src != None)
1236 {
1237 XEvent event;
1238 int ev_count = 0;
1239 XGrabServer (dpy);
1240 XMapRaised (dpy, src);
1241 XSync (dpy, False);
1242
1243 /* XSync should get window where it's properly exposed,
1244 * but to be on the safe side - let's check for the actual event to arrive : */
1245 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1246 ++ev_count;
1247
1248 if (ev_count > 0);
1249 {
1250 /* hooray! - we can grab the image! */
1251 gc = XCreateGC (dpy, root, 0, NULL);
1252 if (gc)
1253 {
1254 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1255 success = true;
1256 }
1257 }
1258
1259 XDestroyWindow (dpy, src);
1260 XUngrabServer (dpy);
1261 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1262 }
1263
1264 if (!success)
1265 {
1266 XFreePixmap (dpy, tiled_root_pmap);
1267 tiled_root_pmap = None;
1268 }
1269 else
1270 result |= transpPmapTiled;
1271 }
1272 else
1273 {
1274 /* straightforward pixmap copy */ 1372 /* straightforward pixmap copy */
1275 gcv.tile = root_pixmap; 1373 gcv.tile = recoded_root_pmap;
1276 gcv.fill_style = FillTiled; 1374 gcv.fill_style = FillTiled;
1277 1375
1278 while (sx < 0) sx += (int)root_width; 1376 while (sx < 0) sx += (int)root_width;
1279 while (sy < 0) sy += (int)root_height; 1377 while (sy < 0) sy += (int)root_height;
1280 1378
1281 gcv.ts_x_origin = -sx; 1379 gcv.ts_x_origin = -sx;
1282 gcv.ts_y_origin = -sy; 1380 gcv.ts_y_origin = -sy;
1283 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1381 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1284 1382
1285 if (gc) 1383 if (gc)
1286 { 1384 {
1287 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);
1288 result |= transpPmapTiled; 1386 result |= transpPmapTiled;
1289 } 1387 XFreeGC (dpy, gc);
1290 } 1388 }
1291 TIMING_TEST_PRINT_RESULT (tp);
1292 1389
1293 if (tiled_root_pmap != None) 1390 if (tiled_root_pmap != None)
1294 { 1391 {
1295 if (!need_client_side_rendering ()) 1392 if (!need_client_side_rendering ())
1296 { 1393 {
1297 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;
1298 { 1398 }
1299 if (tint_pixmap (tiled_root_pmap)) 1399 if (flags & (tintNeeded | tintServerSide))
1400 {
1401 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1300 result |= transpPmapTinted; 1402 result |= transpPmapTinted;
1301 } 1403 }
1302 } /* server side rendering completed */ 1404 } /* server side rendering completed */
1303 1405
1304 if (pixmap) 1406 if (pixmap)
1305 XFreePixmap (dpy, pixmap); 1407 XFreePixmap (dpy, pixmap);
1306 1408
1307 pixmap = tiled_root_pmap; 1409 pixmap = tiled_root_pmap;
1308 pmap_width = window_width; 1410 pmap_width = window_width;
1309 pmap_height = window_height; 1411 pmap_height = window_height;
1310 pmap_depth = root_depth; 1412 pmap_depth = target->depth;
1311 } 1413 }
1312 1414
1313 if (gc) 1415 if (recoded_root_pmap != root_pixmap)
1314 XFreeGC (dpy, gc); 1416 XFreePixmap (dpy, recoded_root_pmap);
1315
1316 TIMING_TEST_PRINT_RESULT (tp);
1317 1417
1318 return result; 1418 return result;
1319} 1419}
1320 1420
1321bool 1421void
1322bgPixmap_t::set_root_pixmap () 1422bgPixmap_t::set_root_pixmap ()
1323{ 1423{
1324 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1424 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1325 if (new_root_pixmap == None) 1425 if (new_root_pixmap == None)
1326 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1426 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1327 1427
1328 if (new_root_pixmap != root_pixmap)
1329 {
1330 root_pixmap = new_root_pixmap; 1428 root_pixmap = new_root_pixmap;
1331 return true;
1332 }
1333
1334 return false;
1335} 1429}
1336# endif /* ENABLE_TRANSPARENCY */ 1430# endif /* ENABLE_TRANSPARENCY */
1337 1431
1338# ifndef HAVE_AFTERIMAGE 1432# ifndef HAVE_AFTERIMAGE
1339static 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);
1340# endif 1434# endif
1341 1435
1342bool 1436bool
1343bgPixmap_t::render () 1437bgPixmap_t::render ()
1344{ 1438{
1345 unsigned long background_flags = 0; 1439 unsigned long background_flags = 0;
1346 1440
1347 if (target == NULL) 1441 if (target == NULL)
1348 return false; 1442 return false;
1349
1350 TIMING_TEST_START (tp);
1351 1443
1352 invalidate (); 1444 invalidate ();
1353# ifdef ENABLE_TRANSPARENCY 1445# ifdef ENABLE_TRANSPARENCY
1354 if (flags & isTransparent) 1446 if (flags & isTransparent)
1355 { 1447 {
1356 /* we need to re-generate transparency pixmap in that case ! */ 1448 /* we need to re-generate transparency pixmap in that case ! */
1357 background_flags = make_transparency_pixmap (); 1449 background_flags = make_transparency_pixmap ();
1358 if (background_flags == 0) 1450 if (background_flags == 0)
1359 return false; 1451 return false;
1360 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1452 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1361 && pmap_depth == target->depth)
1362 flags = flags & ~isInvalid; 1453 flags = flags & ~isInvalid;
1363 } 1454 }
1364# endif 1455# endif
1365 1456
1366# ifdef BG_IMAGE_FROM_FILE 1457# ifdef BG_IMAGE_FROM_FILE
… …
1379 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);
1380 } 1471 }
1381 1472
1382 if (result) 1473 if (result)
1383 { 1474 {
1384# if !defined(HAVE_AFTERIMAGE) && !XFT 1475# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1385 /* our own client-side tinting */ 1476 /* our own client-side tinting */
1386 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1387 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1388 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1477 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1389 { 1478 {
1390 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1479 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1391 if (flags & tintSet) 1480 if (flags & tintSet)
1392 tint.get (c); 1481 tint.get (c);
1393 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);
1394 } 1483 }
1395# endif 1484# endif
1396 1485
1397 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1486 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1398 1487
1399 if (gc) 1488 if (gc)
1400 { 1489 {
1401 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1402 {
1403 XFreePixmap (target->dpy, pixmap);
1404 pixmap = None;
1405 }
1406
1407 if (pixmap == None)
1408 {
1409 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1410 pmap_width = result->width;
1411 pmap_height = result->height;
1412 pmap_depth = target->depth;
1413 }
1414
1415 if (pmap_depth != result->depth)
1416 {
1417 /* Bad Match error will ensue ! stupid X !!!! */
1418 if (result->depth == 24 && pmap_depth == 32)
1419 result->depth = 32;
1420 else if (result->depth == 32 && pmap_depth == 24)
1421 result->depth = 24;
1422 else
1423 {
1424 /* TODO: implement image recoding */
1425 }
1426 }
1427
1428 if (pmap_depth == result->depth)
1429 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);
1430 1491
1431 XFreeGC (target->dpy, gc); 1492 XFreeGC (target->dpy, gc);
1432 flags = flags & ~isInvalid; 1493 flags = flags & ~isInvalid;
1433 } 1494 }
1434 1495
… …
1444 } 1505 }
1445 } 1506 }
1446 1507
1447 apply (); 1508 apply ();
1448 1509
1449 XSync (target->dpy, False);
1450 valid_since = ev::now (); 1510 valid_since = ev::now ();
1451
1452 TIMING_TEST_PRINT_RESULT (tp);
1453 1511
1454 return true; 1512 return true;
1455} 1513}
1456 1514
1457bool 1515bool
… …
1459{ 1517{
1460 if (new_target) 1518 if (new_target)
1461 if (target != new_target) 1519 if (target != new_target)
1462 { 1520 {
1463 target = new_target; 1521 target = new_target;
1464# ifdef ENABLE_TRANSPARENCY
1465 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1466# endif
1467 return true; 1522 return true;
1468 } 1523 }
1469 1524
1470 return false; 1525 return false;
1471} 1526}
… …
1473void 1528void
1474bgPixmap_t::apply () 1529bgPixmap_t::apply ()
1475{ 1530{
1476 if (target) 1531 if (target)
1477 { 1532 {
1478 flags &= ~isVtOrigin;
1479
1480 if (pixmap != None) 1533 if (pixmap != None)
1481 { 1534 {
1482 /* set target's background to pixmap */ 1535 /* set target's background to pixmap */
1483# ifdef ENABLE_TRANSPARENCY 1536# ifdef ENABLE_TRANSPARENCY
1484 if (flags & isTransparent) 1537 if (flags & isTransparent)
… …
1490 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1543 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1491 } 1544 }
1492 else 1545 else
1493# endif 1546# endif
1494 { 1547 {
1495 flags |= isVtOrigin;
1496 /* force old pixmap dereference in case it was transparent before :*/ 1548 /* force old pixmap dereference in case it was transparent before :*/
1497 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1549 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1498 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1550 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1499 /* do we also need to set scrollbar's background here ? */ 1551 /* do we also need to set scrollbar's background here ? */
1500 1552
… …
1527 } 1579 }
1528} 1580}
1529 1581
1530#endif /* HAVE_BG_PIXMAP */ 1582#endif /* HAVE_BG_PIXMAP */
1531 1583
1532#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1584#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER
1533/* taken from aterm-0.4.2 */ 1585/* taken from aterm-0.4.2 */
1534 1586
1535typedef uint32_t RUINT32T;
1536
1537static void 1587static void
1538ShadeXImage(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)
1539{ 1589{
1540 int sh_r, sh_g, sh_b; 1590 int sh_r, sh_g, sh_b;
1541 RUINT32T mask_r, mask_g, mask_b; 1591 uint32_t mask_r, mask_g, mask_b;
1542 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1592 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1543 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1593 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1544 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1594 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1545 int i; 1595 int i;
1596 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1546 1597
1547 Visual *visual = term->visual;
1548
1549 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1598 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1550
1551 if (shade == 0)
1552 shade = 100;
1553 1599
1554 /* for convenience */ 1600 /* for convenience */
1555 mask_r = visual->red_mask; 1601 mask_r = visual->red_mask;
1556 mask_g = visual->green_mask; 1602 mask_g = visual->green_mask;
1557 mask_b = visual->blue_mask; 1603 mask_b = visual->blue_mask;
1558 1604
1559 /* boring lookup table pre-initialization */ 1605 /* boring lookup table pre-initialization */
1560 switch (srcImage->bits_per_pixel) { 1606 switch (srcImage->depth)
1607 {
1561 case 15: 1608 case 15:
1562 if ((mask_r != 0x7c00) || 1609 if ((mask_r != 0x7c00) ||
1563 (mask_g != 0x03e0) || 1610 (mask_g != 0x03e0) ||
1564 (mask_b != 0x001f)) 1611 (mask_b != 0x001f))
1565 return; 1612 return;
1566 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1613 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1567 lookup_r = lookup; 1614 lookup_r = lookup;
1568 lookup_g = lookup+32; 1615 lookup_g = lookup+32;
1569 lookup_b = lookup+32+32; 1616 lookup_b = lookup+32+32;
1570 sh_r = 10; 1617 sh_r = 10;
1571 sh_g = 5; 1618 sh_g = 5;
1572 sh_b = 0; 1619 sh_b = 0;
1573 break; 1620 break;
1574 case 16: 1621 case 16:
1575 if ((mask_r != 0xf800) || 1622 if ((mask_r != 0xf800) ||
1576 (mask_g != 0x07e0) || 1623 (mask_g != 0x07e0) ||
1577 (mask_b != 0x001f)) 1624 (mask_b != 0x001f))
1578 return; 1625 return;
1579 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1626 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1580 lookup_r = lookup; 1627 lookup_r = lookup;
1581 lookup_g = lookup+32; 1628 lookup_g = lookup+32;
1582 lookup_b = lookup+32+64; 1629 lookup_b = lookup+32+64;
1583 sh_r = 11; 1630 sh_r = 11;
1584 sh_g = 5; 1631 sh_g = 5;
1585 sh_b = 0; 1632 sh_b = 0;
1586 break; 1633 break;
1587 case 24: 1634 case 24:
1588 if ((mask_r != 0xff0000) || 1635 if ((mask_r != 0xff0000) ||
1589 (mask_g != 0x00ff00) || 1636 (mask_g != 0x00ff00) ||
1590 (mask_b != 0x0000ff)) 1637 (mask_b != 0x0000ff))
1591 return; 1638 return;
1592 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1639 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1593 lookup_r = lookup; 1640 lookup_r = lookup;
1594 lookup_g = lookup+256; 1641 lookup_g = lookup+256;
1595 lookup_b = lookup+256+256; 1642 lookup_b = lookup+256+256;
1596 sh_r = 16; 1643 sh_r = 16;
1597 sh_g = 8; 1644 sh_g = 8;
1598 sh_b = 0; 1645 sh_b = 0;
1599 break; 1646 break;
1600 case 32: 1647 case 32:
1601 if ((mask_r != 0xff0000) || 1648 if ((mask_r != 0xff0000) ||
1602 (mask_g != 0x00ff00) || 1649 (mask_g != 0x00ff00) ||
1603 (mask_b != 0x0000ff)) 1650 (mask_b != 0x0000ff))
1604 return; 1651 return;
1605 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1652 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1606 lookup_r = lookup; 1653 lookup_r = lookup;
1607 lookup_g = lookup+256; 1654 lookup_g = lookup+256;
1608 lookup_b = lookup+256+256; 1655 lookup_b = lookup+256+256;
1609 sh_r = 16; 1656 sh_r = 16;
1610 sh_g = 8; 1657 sh_g = 8;
1611 sh_b = 0; 1658 sh_b = 0;
1612 break; 1659 break;
1613 default: 1660 default:
1614 return; /* we do not support this color depth */ 1661 return; /* we do not support this color depth */
1615 } 1662 }
1616 1663
1617 /* prepare limits for color transformation (each channel is handled separately) */ 1664 /* prepare limits for color transformation (each channel is handled separately) */
1618 if (shade < 0) { 1665 if (shade > 100)
1666 {
1619 shade = -shade; 1667 shade = 200 - shade;
1620 if (shade < 0) shade = 0;
1621 if (shade > 100) shade = 100;
1622 1668
1623 lower_lim_r = 65535-rm; 1669 lower_lim_r = 65535-rm;
1624 lower_lim_g = 65535-gm; 1670 lower_lim_g = 65535-gm;
1625 lower_lim_b = 65535-bm; 1671 lower_lim_b = 65535-bm;
1626 1672
1627 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);
1628 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);
1629 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);
1630 1676
1631 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1677 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1678 }
1632 } else { 1679 else
1633 if (shade < 0) shade = 0; 1680 {
1634 if (shade > 100) shade = 100;
1635 1681
1636 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1682 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1637 1683
1638 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1684 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1639 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1685 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1640 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1686 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1641 } 1687 }
1642
1643 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1644 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1645 {
1646 unsigned int tmp;
1647
1648 tmp = lower_lim_r;
1649 lower_lim_r = lower_lim_b;
1650 lower_lim_b = tmp;
1651
1652 tmp = upper_lim_r;
1653 upper_lim_r = upper_lim_b;
1654 upper_lim_b = tmp;
1655 }
1656 1688
1657 /* fill our lookup tables */ 1689 /* fill our lookup tables */
1658 for (i = 0; i <= mask_r>>sh_r; i++) 1690 for (i = 0; i <= mask_r>>sh_r; i++)
1659 { 1691 {
1660 RUINT32T tmp; 1692 uint32_t tmp;
1661 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1693 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1662 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1694 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1663 lookup_r[i] = (tmp/65535)<<sh_r; 1695 lookup_r[i] = (tmp/65535)<<sh_r;
1664 } 1696 }
1665 for (i = 0; i <= mask_g>>sh_g; i++) 1697 for (i = 0; i <= mask_g>>sh_g; i++)
1666 { 1698 {
1667 RUINT32T tmp; 1699 uint32_t tmp;
1668 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1700 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1669 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1701 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1670 lookup_g[i] = (tmp/65535)<<sh_g; 1702 lookup_g[i] = (tmp/65535)<<sh_g;
1671 } 1703 }
1672 for (i = 0; i <= mask_b>>sh_b; i++) 1704 for (i = 0; i <= mask_b>>sh_b; i++)
1673 { 1705 {
1674 RUINT32T tmp; 1706 uint32_t tmp;
1675 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1707 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1676 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1708 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1677 lookup_b[i] = (tmp/65535)<<sh_b; 1709 lookup_b[i] = (tmp/65535)<<sh_b;
1678 } 1710 }
1679 1711
1680 /* apply table to input image (replacing colors by newly calculated ones) */ 1712 /* apply table to input image (replacing colors by newly calculated ones) */
1681 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)
1682 { 1716 {
1683 case 15:
1684 {
1685 unsigned short *p1, *pf, *p, *pl; 1717 uint32_t *p1, *pf, *p, *pl;
1686 p1 = (unsigned short *) srcImage->data; 1718 p1 = (uint32_t *) srcImage->data;
1687 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1719 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1720
1688 while (p1 < pf) 1721 while (p1 < pf)
1689 { 1722 {
1690 p = p1; 1723 p = p1;
1691 pl = p1 + srcImage->width; 1724 pl = p1 + srcImage->width;
1692 for (; p < pl; p++) 1725 for (; p < pl; p++)
1693 { 1726 {
1694 *p = lookup_r[(*p & 0x7c00)>>10] |
1695 lookup_g[(*p & 0x03e0)>> 5] |
1696 lookup_b[(*p & 0x001f)];
1697 }
1698 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1699 }
1700 break;
1701 }
1702 case 16:
1703 {
1704 unsigned short *p1, *pf, *p, *pl;
1705 p1 = (unsigned short *) srcImage->data;
1706 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1707 while (p1 < pf)
1708 {
1709 p = p1;
1710 pl = p1 + srcImage->width;
1711 for (; p < pl; p++)
1712 {
1713 *p = lookup_r[(*p & 0xf800)>>11] |
1714 lookup_g[(*p & 0x07e0)>> 5] |
1715 lookup_b[(*p & 0x001f)];
1716 }
1717 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1718 }
1719 break;
1720 }
1721 case 24:
1722 {
1723 unsigned char *p1, *pf, *p, *pl;
1724 p1 = (unsigned char *) srcImage->data;
1725 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1726 while (p1 < pf)
1727 {
1728 p = p1;
1729 pl = p1 + srcImage->width * 3;
1730 for (; p < pl; p += 3)
1731 {
1732 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1733 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1734 p[2] = lookup_r[(p[2] & 0x0000ff)];
1735 }
1736 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1737 }
1738 break;
1739 }
1740 case 32:
1741 {
1742 RUINT32T *p1, *pf, *p, *pl;
1743 p1 = (RUINT32T *) srcImage->data;
1744 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1745
1746 while (p1 < pf)
1747 {
1748 p = p1;
1749 pl = p1 + srcImage->width;
1750 for (; p < pl; p++)
1751 {
1752 *p = lookup_r[(*p & 0xff0000)>>16] | 1727 *p = lookup_r[(*p & 0xff0000) >> 16] |
1753 lookup_g[(*p & 0x00ff00)>> 8] | 1728 lookup_g[(*p & 0x00ff00) >> 8] |
1754 lookup_b[(*p & 0x0000ff)] | 1729 lookup_b[(*p & 0x0000ff)] |
1755 (*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);
1756 } 1745 }
1757 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1758 } 1746 }
1759 break;
1760 }
1761 }
1762 1747
1763 free (lookup); 1748 free (lookup);
1764} 1749}
1765#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