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

Diff Legend

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