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

Diff Legend

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