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

Diff Legend

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