ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

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