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.63 by sf-exg, Sun Oct 3 21:44:39 2010 UTC vs.
Revision 1.107 by sf-exg, Mon Nov 1 14:29:33 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
873# endif /* HAVE_PIXBUF */ 909# endif /* HAVE_PIXBUF */
874 910
875bool 911bool
876bgPixmap_t::set_file (const char *file) 912bgPixmap_t::set_file (const char *file)
877{ 913{
878 assert (file); 914 if (!file || !*file)
915 return false;
879 916
880 if (*file)
881 {
882 if (const char *p = strchr (file, ';')) 917 if (const char *p = strchr (file, ';'))
883 { 918 {
884 size_t len = p - file; 919 size_t len = p - file;
885 char *f = rxvt_temp_buf<char> (len + 1); 920 char *f = rxvt_temp_buf<char> (len + 1);
886 memcpy (f, file, len); 921 memcpy (f, file, len);
887 f[len] = '\0'; 922 f[len] = '\0';
888 file = f; 923 file = f;
889 } 924 }
890 925
891# ifdef HAVE_AFTERIMAGE 926# ifdef HAVE_AFTERIMAGE
892 if (!target->asimman) 927 if (!target->asimman)
893 target->asimman = create_generic_imageman (target->rs[Rs_path]); 928 target->asimman = create_generic_imageman (target->rs[Rs_path]);
894 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 929 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
930 if (image)
931 {
895 if (original_asim) 932 if (original_asim)
933 safe_asimage_destroy (original_asim);
934 original_asim = image;
896 have_image = true; 935 have_image = true;
897 return have_image; 936 return true;
937 }
898# endif 938# endif
899 939
900# ifdef HAVE_PIXBUF 940# ifdef HAVE_PIXBUF
901 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 941 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
942 if (image)
943 {
902 if (pixbuf) 944 if (pixbuf)
945 g_object_unref (pixbuf);
946 pixbuf = image;
903 have_image = true; 947 have_image = true;
904 return have_image; 948 return true;
949 }
905# endif 950# endif
906 }
907 951
908 return false; 952 return false;
909} 953}
910 954
911# endif /* BG_IMAGE_FROM_FILE */ 955# endif /* BG_IMAGE_FROM_FILE */
934 if (!(geom_flags & WidthValue)) 978 if (!(geom_flags & WidthValue))
935 hr = 1; 979 hr = 1;
936 if (!(geom_flags & HeightValue)) 980 if (!(geom_flags & HeightValue))
937 vr = hr; 981 vr = hr;
938 982
983 min_it (hr, 128);
984 min_it (vr, 128);
985
939 if (h_blurRadius != hr) 986 if (h_blurRadius != hr)
940 { 987 {
941 ++changed; 988 ++changed;
942 h_blurRadius = hr; 989 h_blurRadius = hr;
943 } 990 }
951 if (v_blurRadius == 0 && h_blurRadius == 0) 998 if (v_blurRadius == 0 && h_blurRadius == 0)
952 flags &= ~blurNeeded; 999 flags &= ~blurNeeded;
953 else 1000 else
954 flags |= blurNeeded; 1001 flags |= blurNeeded;
955 1002
1003#if XRENDER
1004 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1005 if (filters)
1006 {
1007 for (int i = 0; i < filters->nfilter; i++)
1008 if (!strcmp (filters->filter[i], FilterConvolution))
1009 flags |= bgPixmap_t::blurServerSide;
1010
1011 XFree (filters);
1012 }
1013#endif
1014
956 return (changed > 0); 1015 return (changed > 0);
957} 1016}
958 1017
959static inline unsigned long 1018static inline unsigned long
960compute_tint_shade_flags (rxvt_color *tint, int shade) 1019compute_tint_shade_flags (rxvt_color *tint, int shade)
961{ 1020{
962 unsigned long flags = 0; 1021 unsigned long flags = 0;
963 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1022 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
964 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1023 bool has_shade = shade != 100;
965 1024
966 if (tint) 1025 if (tint)
967 { 1026 {
968 tint->get (c); 1027 tint->get (c);
969# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1028# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
989 { 1048 {
990 if (flags & bgPixmap_t::tintWholesome) 1049 if (flags & bgPixmap_t::tintWholesome)
991 flags |= bgPixmap_t::tintServerSide; 1050 flags |= bgPixmap_t::tintServerSide;
992 else 1051 else
993 { 1052 {
994#if XFT 1053#if XRENDER
995 flags |= bgPixmap_t::tintServerSide; 1054 flags |= bgPixmap_t::tintServerSide;
996#endif 1055#endif
997 } 1056 }
998 } 1057 }
999 1058
1001} 1060}
1002 1061
1003bool 1062bool
1004bgPixmap_t::set_tint (rxvt_color &new_tint) 1063bgPixmap_t::set_tint (rxvt_color &new_tint)
1005{ 1064{
1006 if (tint != new_tint) 1065 if (!(flags & tintSet) || tint != new_tint)
1007 { 1066 {
1008 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1067 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1009 tint = new_tint; 1068 tint = new_tint;
1010 flags = (flags & ~tintFlags) | new_flags | tintSet; 1069 flags = (flags & ~tintFlags) | new_flags | tintSet;
1011 return true; 1070 return true;
1029} 1088}
1030 1089
1031bool 1090bool
1032bgPixmap_t::set_shade (const char *shade_str) 1091bgPixmap_t::set_shade (const char *shade_str)
1033{ 1092{
1034 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1093 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1035 1094
1036 if (new_shade < 0 && new_shade > -100) 1095 clamp_it (new_shade, -100, 200);
1096 if (new_shade < 0)
1037 new_shade = 200 - (100 + new_shade); 1097 new_shade = 200 - (100 + new_shade);
1038 else if (new_shade == 100)
1039 new_shade = 0;
1040 1098
1041 if (new_shade != shade) 1099 if (new_shade != shade)
1042 { 1100 {
1043 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1101 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1044 shade = new_shade; 1102 shade = new_shade;
1047 } 1105 }
1048 1106
1049 return false; 1107 return false;
1050} 1108}
1051 1109
1110#if XRENDER
1111static void
1112get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1113{
1114 double sigma = radius / 2.0;
1115 double scale = sqrt (2.0 * M_PI) * sigma;
1116 double sum = 0.0;
1117
1118 for (int i = 0; i < width; i++)
1119 {
1120 double x = i - width / 2;
1121 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1122 sum += kernel[i];
1123 }
1124
1125 params[0] = XDoubleToFixed (width);
1126 params[1] = XDoubleToFixed (1);
1127
1128 for (int i = 0; i < width; i++)
1129 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1130}
1131#endif
1132
1133bool
1134bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1135{
1136 bool ret = false;
1137#if XRENDER
1138 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1139 double *kernel = (double *)malloc (size * sizeof (double));
1140 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1141
1142 Display *dpy = target->dpy;
1143 XRenderPictureAttributes pa;
1144 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1145
1146 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1147 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1148
1149 if (kernel && params && src && dst)
1150 {
1151 if (h_blurRadius)
1152 {
1153 size = h_blurRadius * 2 + 1;
1154 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1155
1156 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1157 XRenderComposite (dpy,
1158 PictOpSrc,
1159 src,
1160 None,
1161 dst,
1162 0, 0,
1163 0, 0,
1164 0, 0,
1165 width, height);
1166 }
1167
1168 if (v_blurRadius)
1169 {
1170 size = v_blurRadius * 2 + 1;
1171 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1172 swap (params[0], params[1]);
1173
1174 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1175 XRenderComposite (dpy,
1176 PictOpSrc,
1177 src,
1178 None,
1179 dst,
1180 0, 0,
1181 0, 0,
1182 0, 0,
1183 width, height);
1184 }
1185
1186 ret = true;
1187 }
1188
1189 free (kernel);
1190 free (params);
1191 XRenderFreePicture (dpy, src);
1192 XRenderFreePicture (dpy, dst);
1193#endif
1194 return ret;
1195}
1196
1197bool
1198bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1199{
1200 Display *dpy = target->dpy;
1201 bool ret = false;
1202
1203 if (flags & tintWholesome)
1204 {
1205 XGCValues gcv;
1206 GC gc;
1207
1208 /* In this case we can tint image server-side getting significant
1209 * performance improvements, as we eliminate XImage transfer
1210 */
1211 gcv.foreground = Pixel (tint);
1212 gcv.function = GXand;
1213 gcv.fill_style = FillSolid;
1214 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1215 if (gc)
1216 {
1217 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1218 ret = true;
1219 XFreeGC (dpy, gc);
1220 }
1221 }
1222 else
1223 {
1224# if XRENDER
1225 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1226
1227 if (flags & tintSet)
1228 tint.get (c);
1229
1230 if (shade <= 100)
1231 {
1232 c.r = (c.r * shade) / 100;
1233 c.g = (c.g * shade) / 100;
1234 c.b = (c.b * shade) / 100;
1235 }
1236 else
1237 {
1238 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1239 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1240 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1241 }
1242
1243 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1244 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1245 XRenderPictureAttributes pa;
1246
1247 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1248
1249 pa.repeat = True;
1250
1251 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1252 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1253 XFreePixmap (dpy, overlay_pmap);
1254
1255 pa.component_alpha = True;
1256 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1257 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1258 XFreePixmap (dpy, mask_pmap);
1259
1260 if (mask_pic && overlay_pic && back_pic)
1261 {
1262 XRenderColor mask_c;
1263
1264 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1265 mask_c.alpha = 0xffff;
1266 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1267
1268 mask_c.alpha = 0;
1269 mask_c.red = 0xffff - c.r;
1270 mask_c.green = 0xffff - c.g;
1271 mask_c.blue = 0xffff - c.b;
1272 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1273 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1274 ret = true;
1275 }
1276
1277 XRenderFreePicture (dpy, mask_pic);
1278 XRenderFreePicture (dpy, overlay_pic);
1279 XRenderFreePicture (dpy, back_pic);
1280# endif
1281 }
1282
1283 return ret;
1284}
1285
1052/* make_transparency_pixmap() 1286/* make_transparency_pixmap()
1053 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1287 * Builds a pixmap of the same size as the terminal window that contains
1054 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1288 * the tiled portion of the root pixmap that is supposed to be covered by
1055 * our window. 1289 * our window.
1056 */ 1290 */
1057unsigned long 1291unsigned long
1058bgPixmap_t::make_transparency_pixmap () 1292bgPixmap_t::make_transparency_pixmap ()
1059{ 1293{
1063 return 0; 1297 return 0;
1064 1298
1065 /* root dimensions may change from call to call - but Display structure should 1299 /* root dimensions may change from call to call - but Display structure should
1066 * be always up-to-date, so let's use it : 1300 * be always up-to-date, so let's use it :
1067 */ 1301 */
1068 Window root = target->display->root;
1069 int screen = target->display->screen; 1302 int screen = target->display->screen;
1070 Display *dpy = target->dpy; 1303 Display *dpy = target->dpy;
1304 int root_depth = DefaultDepth (dpy, screen);
1071 int root_width = DisplayWidth (dpy, screen); 1305 int root_width = DisplayWidth (dpy, screen);
1072 int root_height = DisplayHeight (dpy, screen); 1306 int root_height = DisplayHeight (dpy, screen);
1073 unsigned int root_pmap_width, root_pmap_height; 1307 unsigned int root_pmap_width, root_pmap_height;
1074 int window_width = target->szHint.width; 1308 int window_width = target->szHint.width;
1075 int window_height = target->szHint.height; 1309 int window_height = target->szHint.height;
1076 int sx, sy; 1310 int sx, sy;
1077 XGCValues gcv; 1311 XGCValues gcv;
1312 GC gc;
1078 1313
1079 TIMING_TEST_START (tp);
1080 target->get_window_origin (sx, sy); 1314 target->get_window_origin (sx, sy);
1081 1315
1082 /* check if we are outside of the visible part of the virtual screen : */ 1316 /* check if we are outside of the visible part of the virtual screen : */
1083 if (sx + window_width <= 0 || sy + window_height <= 0 1317 if (sx + window_width <= 0 || sy + window_height <= 0
1084 || sx >= root_width || sy >= root_height) 1318 || sx >= root_width || sy >= root_height)
1085 return 0; 1319 return 0;
1086 1320
1321 // validate root pixmap and get its size
1087 if (root_pixmap != None) 1322 if (root_pixmap != None)
1088 { 1323 {
1089 /* we want to validate the pixmap and get it's size at the same time : */ 1324 Window wdummy;
1090 int junk; 1325 int idummy;
1091 unsigned int ujunk; 1326 unsigned int udummy;
1092 /* root pixmap may be bad - allow a error */ 1327
1093 target->allowedxerror = -1; 1328 target->allowedxerror = -1;
1094 1329
1095 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1330 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1096 root_pixmap = None; 1331 root_pixmap = None;
1097 1332
1098 target->allowedxerror = 0; 1333 target->allowedxerror = 0;
1099 } 1334 }
1100 1335
1336 Pixmap recoded_root_pmap = root_pixmap;
1337
1338 if (root_pixmap != None && root_depth != target->depth)
1339 {
1340#if XRENDER
1341 XRenderPictureAttributes pa;
1342
1343 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1344 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1345
1346 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1347 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1348 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1349
1350 if (src && dst)
1351 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1352 else
1353 {
1354 XFreePixmap (dpy, recoded_root_pmap);
1355 root_pixmap = None;
1356 }
1357
1358 XRenderFreePicture (dpy, src);
1359 XRenderFreePicture (dpy, dst);
1360#else
1361 root_pixmap = None;
1362#endif
1363 }
1364
1365 if (root_pixmap == None)
1366 return 0;
1367
1101 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1368 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1102 GC gc = NULL;
1103 1369
1104 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1370 if (tiled_root_pmap == None) /* something really bad happened - abort */
1105 return 0; 1371 return 0;
1106 1372
1107 if (root_pixmap == None)
1108 {
1109 /* use tricks to obtain the root background image :*/
1110 /* we want to create Overrideredirect window overlapping out window
1111 with background type of Parent Relative and then grab it */
1112 XSetWindowAttributes attr;
1113 Window src;
1114 bool success = false;
1115
1116 attr.background_pixmap = ParentRelative;
1117 attr.backing_store = Always;
1118 attr.event_mask = ExposureMask;
1119 attr.override_redirect = True;
1120 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1121 CopyFromParent, CopyFromParent, CopyFromParent,
1122 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1123 &attr);
1124
1125 if (src != None)
1126 {
1127 XEvent event;
1128 int ev_count = 0;
1129 XGrabServer (dpy);
1130 XMapRaised (dpy, src);
1131 XSync (dpy, False);
1132
1133 /* XSync should get window where it's properly exposed,
1134 * but to be on the safe side - let's check for the actual event to arrive : */
1135 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1136 ++ev_count;
1137
1138 if (ev_count > 0);
1139 {
1140 /* hooray! - we can grab the image! */
1141 gc = XCreateGC (dpy, root, 0, NULL);
1142 if (gc)
1143 {
1144 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1145 success = true;
1146 }
1147 }
1148
1149 XDestroyWindow (dpy, src);
1150 XUngrabServer (dpy);
1151 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1152 }
1153
1154 if (!success)
1155 {
1156 XFreePixmap (dpy, tiled_root_pmap);
1157 tiled_root_pmap = None;
1158 }
1159 else
1160 result |= transpPmapTiled;
1161 }
1162 else
1163 {
1164 /* straightforward pixmap copy */ 1373 /* straightforward pixmap copy */
1165 gcv.tile = root_pixmap; 1374 gcv.tile = recoded_root_pmap;
1166 gcv.fill_style = FillTiled; 1375 gcv.fill_style = FillTiled;
1167 1376
1168 while (sx < 0) sx += (int)root_width; 1377 while (sx < 0) sx += (int)root_width;
1169 while (sy < 0) sy += (int)root_height; 1378 while (sy < 0) sy += (int)root_height;
1170 1379
1171 gcv.ts_x_origin = -sx; 1380 gcv.ts_x_origin = -sx;
1172 gcv.ts_y_origin = -sy; 1381 gcv.ts_y_origin = -sy;
1173 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1382 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1174 1383
1175 if (gc) 1384 if (gc)
1176 { 1385 {
1177 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1386 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1178 result |= transpPmapTiled; 1387 result |= transpPmapTiled;
1179 } 1388 XFreeGC (dpy, gc);
1180 } 1389 }
1181 TIMING_TEST_PRINT_RESULT (tp);
1182 1390
1183 if (tiled_root_pmap != None) 1391 if (tiled_root_pmap != None)
1184 { 1392 {
1185 if (!need_client_side_rendering ()) 1393 if (!need_client_side_rendering ())
1186 { 1394 {
1395 if ((flags & blurNeeded)
1396 && (flags & blurServerSide))
1397 {
1398 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1399 result |= transpPmapBlurred;
1400 }
1187 if ((flags & tintNeeded)) 1401 if ((flags & tintNeeded)
1188 {
1189 if (flags & tintWholesome) 1402 && (flags & tintServerSide))
1190 { 1403 {
1191 /* In this case we can tint image server-side getting significant 1404 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1192 * performance improvements, as we eliminate XImage transfer
1193 */
1194 gcv.foreground = Pixel (tint);
1195 gcv.function = GXand;
1196 gcv.fill_style = FillSolid;
1197 if (gc)
1198 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
1199 else
1200 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1201 if (gc)
1202 {
1203 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1204 result |= transpPmapTinted; 1405 result |= transpPmapTinted;
1205 }
1206 }
1207 else
1208 {
1209# if XFT
1210 Picture back_pic = 0;
1211 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1212
1213 if (flags & tintSet)
1214 tint.get (c);
1215
1216 if (shade > 0 && shade < 100)
1217 {
1218 c.r = (c.r * shade) / 100;
1219 c.g = (c.g * shade) / 100;
1220 c.b = (c.b * shade) / 100;
1221 }
1222 else if (shade > 100 && shade < 200)
1223 {
1224 c.r = (c.r * (200 - shade)) / 100;
1225 c.g = (c.g * (200 - shade)) / 100;
1226 c.b = (c.b * (200 - shade)) / 100;
1227 }
1228
1229 XRenderPictFormat pf;
1230 pf.type = PictTypeDirect;
1231 pf.depth = 32;
1232 pf.direct.redMask = 0xff;
1233 pf.direct.greenMask = 0xff;
1234 pf.direct.blueMask = 0xff;
1235 pf.direct.alphaMask = 0xff;
1236
1237 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1238 (PictFormatType|
1239 PictFormatDepth|
1240 PictFormatRedMask|
1241 PictFormatGreenMask|
1242 PictFormatBlueMask|
1243 PictFormatAlphaMask),
1244 &pf,
1245 0);
1246 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1247 XRenderPictureAttributes pa ;
1248
1249 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1250
1251 pa.repeat = True;
1252
1253 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1254 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1255 XFreePixmap (dpy, overlay_pmap);
1256
1257 pa.component_alpha = True;
1258 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1259 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1260 XFreePixmap (dpy, mask_pmap);
1261
1262 if (mask_pic && overlay_pic && back_pic)
1263 {
1264 XRenderColor mask_c;
1265
1266 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1267 mask_c.alpha = 0xffff;
1268 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1269
1270 mask_c.alpha = 0;
1271 mask_c.red = 0xffff - c.r;
1272 mask_c.green = 0xffff - c.g;
1273 mask_c.blue = 0xffff - c.b;
1274 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1275 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1276 result |= transpPmapTinted;
1277 }
1278
1279 XRenderFreePicture (dpy, mask_pic);
1280 XRenderFreePicture (dpy, overlay_pic);
1281 XRenderFreePicture (dpy, back_pic);
1282# if DO_TIMING_TEST
1283 XSync (dpy, False);
1284# endif
1285# endif
1286 }
1287 } 1406 }
1288 } /* server side rendering completed */ 1407 } /* server side rendering completed */
1289 1408
1290 if (pixmap) 1409 if (pixmap)
1291 XFreePixmap (dpy, pixmap); 1410 XFreePixmap (dpy, pixmap);
1292 1411
1293 pixmap = tiled_root_pmap; 1412 pixmap = tiled_root_pmap;
1294 pmap_width = window_width; 1413 pmap_width = window_width;
1295 pmap_height = window_height; 1414 pmap_height = window_height;
1296 pmap_depth = root_depth; 1415 pmap_depth = target->depth;
1297 } 1416 }
1298 1417
1299 if (gc) 1418 if (recoded_root_pmap != root_pixmap)
1300 XFreeGC (dpy, gc); 1419 XFreePixmap (dpy, recoded_root_pmap);
1301
1302 TIMING_TEST_PRINT_RESULT (tp);
1303 1420
1304 return result; 1421 return result;
1305} 1422}
1306 1423
1307bool 1424void
1308bgPixmap_t::set_root_pixmap () 1425bgPixmap_t::set_root_pixmap ()
1309{ 1426{
1310 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1427 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1311 if (new_root_pixmap == None) 1428 if (new_root_pixmap == None)
1312 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1429 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1313 1430
1314 if (new_root_pixmap != root_pixmap)
1315 {
1316 root_pixmap = new_root_pixmap; 1431 root_pixmap = new_root_pixmap;
1317 return true;
1318 }
1319
1320 return false;
1321} 1432}
1322# endif /* ENABLE_TRANSPARENCY */ 1433# endif /* ENABLE_TRANSPARENCY */
1323 1434
1324# ifndef HAVE_AFTERIMAGE 1435# ifndef HAVE_AFTERIMAGE
1325static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1436static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1326# endif 1437# endif
1327 1438
1328bool 1439bool
1329bgPixmap_t::render () 1440bgPixmap_t::render ()
1330{ 1441{
1331 unsigned long background_flags = 0; 1442 unsigned long background_flags = 0;
1332 1443
1333 if (target == NULL) 1444 if (target == NULL)
1334 return false; 1445 return false;
1335
1336 TIMING_TEST_START (tp);
1337 1446
1338 invalidate (); 1447 invalidate ();
1339# ifdef ENABLE_TRANSPARENCY 1448# ifdef ENABLE_TRANSPARENCY
1340 if (flags & isTransparent) 1449 if (flags & isTransparent)
1341 { 1450 {
1342 /* we need to re-generate transparency pixmap in that case ! */ 1451 /* we need to re-generate transparency pixmap in that case ! */
1343 background_flags = make_transparency_pixmap (); 1452 background_flags = make_transparency_pixmap ();
1344 if (background_flags == 0) 1453 if (background_flags == 0)
1345 return false; 1454 return false;
1346 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1455 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1347 && pmap_depth == target->depth)
1348 flags = flags & ~isInvalid; 1456 flags = flags & ~isInvalid;
1349 } 1457 }
1350# endif 1458# endif
1351 1459
1352# ifdef BG_IMAGE_FROM_FILE 1460# ifdef BG_IMAGE_FROM_FILE
1365 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1473 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1366 } 1474 }
1367 1475
1368 if (result) 1476 if (result)
1369 { 1477 {
1370# if !defined(HAVE_AFTERIMAGE) && !XFT 1478# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1371 /* our own client-side tinting */ 1479 /* our own client-side tinting */
1372 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1373 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1374 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1480 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1375 { 1481 {
1376 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1482 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1377 if (flags & tintSet) 1483 if (flags & tintSet)
1378 tint.get (c); 1484 tint.get (c);
1379 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1485 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1380 } 1486 }
1381# endif 1487# endif
1382 1488
1383 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1489 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1384 1490
1385 if (gc) 1491 if (gc)
1386 { 1492 {
1387 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1388 {
1389 XFreePixmap (target->dpy, pixmap);
1390 pixmap = None;
1391 }
1392
1393 if (pixmap == None)
1394 {
1395 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1396 pmap_width = result->width;
1397 pmap_height = result->height;
1398 pmap_depth = target->depth;
1399 }
1400
1401 if (pmap_depth != result->depth)
1402 {
1403 /* Bad Match error will ensue ! stupid X !!!! */
1404 if (result->depth == 24 && pmap_depth == 32)
1405 result->depth = 32;
1406 else if (result->depth == 32 && pmap_depth == 24)
1407 result->depth = 24;
1408 else
1409 {
1410 /* TODO: implement image recoding */
1411 }
1412 }
1413
1414 if (pmap_depth == result->depth)
1415 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1493 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1416 1494
1417 XFreeGC (target->dpy, gc); 1495 XFreeGC (target->dpy, gc);
1418 flags = flags & ~isInvalid; 1496 flags = flags & ~isInvalid;
1419 } 1497 }
1420 1498
1430 } 1508 }
1431 } 1509 }
1432 1510
1433 apply (); 1511 apply ();
1434 1512
1435 XSync (target->dpy, False);
1436 valid_since = ev::now (); 1513 valid_since = ev::now ();
1437 1514
1438 TIMING_TEST_PRINT_RESULT (tp);
1439
1440 return true; 1515 return true;
1441} 1516}
1442 1517
1443bool 1518void
1444bgPixmap_t::set_target (rxvt_term *new_target) 1519bgPixmap_t::set_target (rxvt_term *new_target)
1445{ 1520{
1446 if (new_target)
1447 if (target != new_target)
1448 {
1449 target = new_target; 1521 target = new_target;
1450# ifdef ENABLE_TRANSPARENCY
1451 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1452# endif
1453 return true;
1454 }
1455
1456 return false;
1457} 1522}
1458 1523
1459void 1524void
1460bgPixmap_t::apply () 1525bgPixmap_t::apply ()
1461{ 1526{
1462 if (target) 1527 if (target == NULL)
1463 { 1528 return;
1464 flags &= ~isVtOrigin;
1465 1529
1466 if (pixmap != None) 1530 if (pixmap != None)
1467 { 1531 {
1468 /* set target's background to pixmap */ 1532 /* set target's background to pixmap */
1469# ifdef ENABLE_TRANSPARENCY 1533# ifdef ENABLE_TRANSPARENCY
1470 if (flags & isTransparent) 1534 if (flags & isTransparent)
1471 { 1535 {
1472 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1536 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1473 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1537 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1474 1538
1475 if (target->scrollBar.win) 1539 if (target->scrollBar.win)
1476 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1540 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1477 } 1541 }
1478 else 1542 else
1479# endif 1543# endif
1480 { 1544 {
1481 flags |= isVtOrigin;
1482 /* force old pixmap dereference in case it was transparent before :*/ 1545 /* force old pixmap dereference in case it was transparent before :*/
1483 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1484 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1485 /* do we also need to set scrollbar's background here ? */
1486
1487 if (target->scrollBar.win)
1488 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1489 }
1490 }
1491 else
1492 {
1493 /* set target background to a pixel */
1494 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1546 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1495 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1547 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1496 /* do we also need to set scrollbar's background here ? */ 1548 /* do we also need to set scrollbar's background here ? */
1549
1497 if (target->scrollBar.win) 1550 if (target->scrollBar.win)
1498 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1551 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1499 } 1552 }
1553 }
1554 else
1555 {
1556 /* set target background to a pixel */
1557 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1558 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1559 /* do we also need to set scrollbar's background here ? */
1560 if (target->scrollBar.win)
1561 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1562 }
1500 1563
1501 /* don't want Expose on the parent or vt. It is better to use 1564 /* don't want Expose on the parent or vt. It is better to use
1502 scr_touch or we get a great deal of flicker otherwise: */ 1565 scr_touch or we get a great deal of flicker otherwise: */
1503 XClearWindow (target->dpy, target->parent[0]); 1566 XClearWindow (target->dpy, target->parent[0]);
1504 1567
1505 if (target->scrollBar.state && target->scrollBar.win) 1568 if (target->scrollBar.state && target->scrollBar.win)
1506 { 1569 {
1507 target->scrollBar.state = STATE_IDLE; 1570 target->scrollBar.state = STATE_IDLE;
1508 target->scrollBar.show (0); 1571 target->scrollBar.show (0);
1509 } 1572 }
1510 1573
1511 target->want_refresh = 1; 1574 target->want_refresh = 1;
1512 flags |= hasChanged; 1575 flags |= hasChanged;
1513 }
1514} 1576}
1515 1577
1516#endif /* HAVE_BG_PIXMAP */ 1578#endif /* HAVE_BG_PIXMAP */
1517 1579
1518#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1580#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER
1519/* taken from aterm-0.4.2 */ 1581/* taken from aterm-0.4.2 */
1520 1582
1521typedef uint32_t RUINT32T;
1522
1523static void 1583static void
1524ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1584ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1525{ 1585{
1526 int sh_r, sh_g, sh_b; 1586 int sh_r, sh_g, sh_b;
1527 RUINT32T mask_r, mask_g, mask_b; 1587 uint32_t mask_r, mask_g, mask_b;
1528 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1588 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1529 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1589 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1530 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1590 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1531 int i; 1591 int i;
1592 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1532 1593
1533 Visual *visual = term->visual;
1534
1535 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1594 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1536
1537 if (shade == 0)
1538 shade = 100;
1539 1595
1540 /* for convenience */ 1596 /* for convenience */
1541 mask_r = visual->red_mask; 1597 mask_r = visual->red_mask;
1542 mask_g = visual->green_mask; 1598 mask_g = visual->green_mask;
1543 mask_b = visual->blue_mask; 1599 mask_b = visual->blue_mask;
1544 1600
1545 /* boring lookup table pre-initialization */ 1601 /* boring lookup table pre-initialization */
1546 switch (srcImage->bits_per_pixel) { 1602 switch (srcImage->depth)
1603 {
1547 case 15: 1604 case 15:
1548 if ((mask_r != 0x7c00) || 1605 if ((mask_r != 0x7c00) ||
1549 (mask_g != 0x03e0) || 1606 (mask_g != 0x03e0) ||
1550 (mask_b != 0x001f)) 1607 (mask_b != 0x001f))
1551 return; 1608 return;
1552 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1609 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1553 lookup_r = lookup; 1610 lookup_r = lookup;
1554 lookup_g = lookup+32; 1611 lookup_g = lookup+32;
1555 lookup_b = lookup+32+32; 1612 lookup_b = lookup+32+32;
1556 sh_r = 10; 1613 sh_r = 10;
1557 sh_g = 5; 1614 sh_g = 5;
1558 sh_b = 0; 1615 sh_b = 0;
1559 break; 1616 break;
1560 case 16: 1617 case 16:
1561 if ((mask_r != 0xf800) || 1618 if ((mask_r != 0xf800) ||
1562 (mask_g != 0x07e0) || 1619 (mask_g != 0x07e0) ||
1563 (mask_b != 0x001f)) 1620 (mask_b != 0x001f))
1564 return; 1621 return;
1565 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1622 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1566 lookup_r = lookup; 1623 lookup_r = lookup;
1567 lookup_g = lookup+32; 1624 lookup_g = lookup+32;
1568 lookup_b = lookup+32+64; 1625 lookup_b = lookup+32+64;
1569 sh_r = 11; 1626 sh_r = 11;
1570 sh_g = 5; 1627 sh_g = 5;
1571 sh_b = 0; 1628 sh_b = 0;
1572 break; 1629 break;
1573 case 24: 1630 case 24:
1574 if ((mask_r != 0xff0000) || 1631 if ((mask_r != 0xff0000) ||
1575 (mask_g != 0x00ff00) || 1632 (mask_g != 0x00ff00) ||
1576 (mask_b != 0x0000ff)) 1633 (mask_b != 0x0000ff))
1577 return; 1634 return;
1578 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1635 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1579 lookup_r = lookup; 1636 lookup_r = lookup;
1580 lookup_g = lookup+256; 1637 lookup_g = lookup+256;
1581 lookup_b = lookup+256+256; 1638 lookup_b = lookup+256+256;
1582 sh_r = 16; 1639 sh_r = 16;
1583 sh_g = 8; 1640 sh_g = 8;
1584 sh_b = 0; 1641 sh_b = 0;
1585 break; 1642 break;
1586 case 32: 1643 case 32:
1587 if ((mask_r != 0xff0000) || 1644 if ((mask_r != 0xff0000) ||
1588 (mask_g != 0x00ff00) || 1645 (mask_g != 0x00ff00) ||
1589 (mask_b != 0x0000ff)) 1646 (mask_b != 0x0000ff))
1590 return; 1647 return;
1591 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1648 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1592 lookup_r = lookup; 1649 lookup_r = lookup;
1593 lookup_g = lookup+256; 1650 lookup_g = lookup+256;
1594 lookup_b = lookup+256+256; 1651 lookup_b = lookup+256+256;
1595 sh_r = 16; 1652 sh_r = 16;
1596 sh_g = 8; 1653 sh_g = 8;
1597 sh_b = 0; 1654 sh_b = 0;
1598 break; 1655 break;
1599 default: 1656 default:
1600 return; /* we do not support this color depth */ 1657 return; /* we do not support this color depth */
1601 } 1658 }
1602 1659
1603 /* prepare limits for color transformation (each channel is handled separately) */ 1660 /* prepare limits for color transformation (each channel is handled separately) */
1604 if (shade < 0) { 1661 if (shade > 100)
1662 {
1605 shade = -shade; 1663 shade = 200 - shade;
1606 if (shade < 0) shade = 0;
1607 if (shade > 100) shade = 100;
1608 1664
1609 lower_lim_r = 65535-rm; 1665 lower_lim_r = 65535-rm;
1610 lower_lim_g = 65535-gm; 1666 lower_lim_g = 65535-gm;
1611 lower_lim_b = 65535-bm; 1667 lower_lim_b = 65535-bm;
1612 1668
1613 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1669 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1614 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1670 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1615 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1671 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1616 1672
1617 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1673 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1674 }
1618 } else { 1675 else
1619 if (shade < 0) shade = 0; 1676 {
1620 if (shade > 100) shade = 100;
1621 1677
1622 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1678 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1623 1679
1624 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1680 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1625 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1681 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1626 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1682 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1627 } 1683 }
1628
1629 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1630 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1631 {
1632 unsigned int tmp;
1633
1634 tmp = lower_lim_r;
1635 lower_lim_r = lower_lim_b;
1636 lower_lim_b = tmp;
1637
1638 tmp = upper_lim_r;
1639 upper_lim_r = upper_lim_b;
1640 upper_lim_b = tmp;
1641 }
1642 1684
1643 /* fill our lookup tables */ 1685 /* fill our lookup tables */
1644 for (i = 0; i <= mask_r>>sh_r; i++) 1686 for (i = 0; i <= mask_r>>sh_r; i++)
1645 { 1687 {
1646 RUINT32T tmp; 1688 uint32_t tmp;
1647 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1689 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1648 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1690 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1649 lookup_r[i] = (tmp/65535)<<sh_r; 1691 lookup_r[i] = (tmp/65535)<<sh_r;
1650 } 1692 }
1651 for (i = 0; i <= mask_g>>sh_g; i++) 1693 for (i = 0; i <= mask_g>>sh_g; i++)
1652 { 1694 {
1653 RUINT32T tmp; 1695 uint32_t tmp;
1654 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1696 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1655 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1697 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1656 lookup_g[i] = (tmp/65535)<<sh_g; 1698 lookup_g[i] = (tmp/65535)<<sh_g;
1657 } 1699 }
1658 for (i = 0; i <= mask_b>>sh_b; i++) 1700 for (i = 0; i <= mask_b>>sh_b; i++)
1659 { 1701 {
1660 RUINT32T tmp; 1702 uint32_t tmp;
1661 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1703 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1662 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1704 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1663 lookup_b[i] = (tmp/65535)<<sh_b; 1705 lookup_b[i] = (tmp/65535)<<sh_b;
1664 } 1706 }
1665 1707
1666 /* apply table to input image (replacing colors by newly calculated ones) */ 1708 /* apply table to input image (replacing colors by newly calculated ones) */
1667 switch (srcImage->bits_per_pixel) 1709 if (srcImage->bits_per_pixel == 32
1710 && (srcImage->depth == 24 || srcImage->depth == 32)
1711 && srcImage->byte_order == host_byte_order)
1668 { 1712 {
1669 case 15:
1670 {
1671 unsigned short *p1, *pf, *p, *pl; 1713 uint32_t *p1, *pf, *p, *pl;
1672 p1 = (unsigned short *) srcImage->data; 1714 p1 = (uint32_t *) srcImage->data;
1673 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1715 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1716
1674 while (p1 < pf) 1717 while (p1 < pf)
1675 { 1718 {
1676 p = p1; 1719 p = p1;
1677 pl = p1 + srcImage->width; 1720 pl = p1 + srcImage->width;
1678 for (; p < pl; p++) 1721 for (; p < pl; p++)
1679 { 1722 {
1680 *p = lookup_r[(*p & 0x7c00)>>10] |
1681 lookup_g[(*p & 0x03e0)>> 5] |
1682 lookup_b[(*p & 0x001f)];
1683 }
1684 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1685 }
1686 break;
1687 }
1688 case 16:
1689 {
1690 unsigned short *p1, *pf, *p, *pl;
1691 p1 = (unsigned short *) srcImage->data;
1692 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1693 while (p1 < pf)
1694 {
1695 p = p1;
1696 pl = p1 + srcImage->width;
1697 for (; p < pl; p++)
1698 {
1699 *p = lookup_r[(*p & 0xf800)>>11] |
1700 lookup_g[(*p & 0x07e0)>> 5] |
1701 lookup_b[(*p & 0x001f)];
1702 }
1703 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1704 }
1705 break;
1706 }
1707 case 24:
1708 {
1709 unsigned char *p1, *pf, *p, *pl;
1710 p1 = (unsigned char *) srcImage->data;
1711 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1712 while (p1 < pf)
1713 {
1714 p = p1;
1715 pl = p1 + srcImage->width * 3;
1716 for (; p < pl; p += 3)
1717 {
1718 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1719 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1720 p[2] = lookup_r[(p[2] & 0x0000ff)];
1721 }
1722 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1723 }
1724 break;
1725 }
1726 case 32:
1727 {
1728 RUINT32T *p1, *pf, *p, *pl;
1729 p1 = (RUINT32T *) srcImage->data;
1730 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1731
1732 while (p1 < pf)
1733 {
1734 p = p1;
1735 pl = p1 + srcImage->width;
1736 for (; p < pl; p++)
1737 {
1738 *p = lookup_r[(*p & 0xff0000)>>16] | 1723 *p = lookup_r[(*p & 0xff0000) >> 16] |
1739 lookup_g[(*p & 0x00ff00)>> 8] | 1724 lookup_g[(*p & 0x00ff00) >> 8] |
1740 lookup_b[(*p & 0x0000ff)] | 1725 lookup_b[(*p & 0x0000ff)] |
1741 (*p & ~0xffffff); 1726 (*p & 0xff000000);
1727 }
1728 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1729 }
1730 }
1731 else
1732 {
1733 for (int y = 0; y < srcImage->height; y++)
1734 for (int x = 0; x < srcImage->width; x++)
1735 {
1736 unsigned long pixel = XGetPixel (srcImage, x, y);
1737 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1738 lookup_g[(pixel & mask_g) >> sh_g] |
1739 lookup_b[(pixel & mask_b) >> sh_b];
1740 XPutPixel (srcImage, x, y, pixel);
1742 } 1741 }
1743 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1744 } 1742 }
1745 break;
1746 }
1747 }
1748 1743
1749 free (lookup); 1744 free (lookup);
1750} 1745}
1751#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1746#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines