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

Diff Legend

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