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.74 by sf-exg, Sun Oct 10 21:56:09 2010 UTC vs.
Revision 1.92 by sf-exg, Mon Oct 18 23:28:48 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}
… …
474 x = make_align_position (h_align, target_width, w); 468 x = make_align_position (h_align, target_width, w);
475 y = make_align_position (v_align, target_height, h); 469 y = make_align_position (v_align, target_height, h);
476 } 470 }
477 471
478 flags &= ~sizeSensitive; 472 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0 473 if ((flags & propScale) || h_scale || v_scale
480 || h_align != 0 || v_align != 0 474 || (!(flags & rootAlign) && (h_align || v_align))
481 || w > target_width || h > target_height) 475 || w > target_width || h > target_height)
482 flags |= sizeSensitive; 476 flags |= sizeSensitive;
483} 477}
484 478
485# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
… …
499 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
500 494
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 { 496 {
503 ShadingInfo as_shade; 497 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade; 498 as_shade.shading = shade;
505 499
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet) 501 if (flags & tintSet)
508 tint.get (c); 502 tint.get (c);
509 as_shade.tintColor.red = c.r; 503 as_shade.tintColor.red = c.r;
… …
511 as_shade.tintColor.blue = c.b; 505 as_shade.tintColor.blue = c.b;
512 506
513 background_tint = shading2tint32 (&as_shade); 507 background_tint = shading2tint32 (&as_shade);
514 } 508 }
515 509
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 510 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
517 { 511 {
518 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
519 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
520 100, ASIMAGE_QUALITY_DEFAULT); 514 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp) 515 if (tmp)
… …
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 !XFT
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 XFT
868 if (background_flags)
869 {
870 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa;
872
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
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 XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
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)
… …
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 XFT
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 XFT
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);
… …
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 *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1251 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1099 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); 1252 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1100 XRenderPictureAttributes pa; 1253 XRenderPictureAttributes pa;
1101 1254
1102 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1255 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1103 1256
1104 pa.repeat = True; 1257 pa.repeat = True;
1105 1258
1106 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1259 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1107 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1260 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1108 XFreePixmap (dpy, overlay_pmap); 1261 XFreePixmap (dpy, overlay_pmap);
1109 1262
1110 pa.component_alpha = True; 1263 pa.component_alpha = True;
1111 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1264 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1112 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);
1113 XFreePixmap (dpy, mask_pmap); 1266 XFreePixmap (dpy, mask_pmap);
1114 1267
1115 if (mask_pic && overlay_pic && back_pic) 1268 if (mask_pic && overlay_pic && back_pic)
1116 { 1269 {
… …
1165 unsigned int root_pmap_width, root_pmap_height; 1318 unsigned int root_pmap_width, root_pmap_height;
1166 int window_width = target->szHint.width; 1319 int window_width = target->szHint.width;
1167 int window_height = target->szHint.height; 1320 int window_height = target->szHint.height;
1168 int sx, sy; 1321 int sx, sy;
1169 XGCValues gcv; 1322 XGCValues gcv;
1323 GC gc;
1170 1324
1171 TIMING_TEST_START (tp); 1325 TIMING_TEST_START (tp);
1172 target->get_window_origin (sx, sy); 1326 target->get_window_origin (sx, sy);
1173 1327
1174 /* check if we are outside of the visible part of the virtual screen : */ 1328 /* check if we are outside of the visible part of the virtual screen : */
… …
1176 || sx >= root_width || sy >= root_height) 1330 || sx >= root_width || sy >= root_height)
1177 return 0; 1331 return 0;
1178 1332
1179 if (root_pixmap != None) 1333 if (root_pixmap != None)
1180 { 1334 {
1181 /* we want to validate the pixmap and get it's size at the same time : */ 1335 /* we want to validate the pixmap and get its size at the same time : */
1182 int junk; 1336 int junk;
1183 unsigned int ujunk; 1337 unsigned int ujunk;
1184 /* root pixmap may be bad - allow a error */ 1338 /* root pixmap may be bad - allow a error */
1185 target->allowedxerror = -1; 1339 target->allowedxerror = -1;
1186 1340
… …
1188 root_pixmap = None; 1342 root_pixmap = None;
1189 1343
1190 target->allowedxerror = 0; 1344 target->allowedxerror = 0;
1191 } 1345 }
1192 1346
1347 if (root_pixmap == None)
1348 return 0;
1349
1193 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
1194 GC gc = NULL;
1195 1351
1196 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1352 if (tiled_root_pmap == None) /* something really bad happened - abort */
1197 return 0; 1353 return 0;
1198 1354
1199 if (root_pixmap == None)
1200 {
1201 /* use tricks to obtain the root background image :*/
1202 /* we want to create Overrideredirect window overlapping out window
1203 with background type of Parent Relative and then grab it */
1204 XSetWindowAttributes attr;
1205 Window src;
1206 bool success = false;
1207
1208 attr.background_pixmap = ParentRelative;
1209 attr.backing_store = Always;
1210 attr.event_mask = ExposureMask;
1211 attr.override_redirect = True;
1212 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1213 CopyFromParent, CopyFromParent, CopyFromParent,
1214 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1215 &attr);
1216
1217 if (src != None)
1218 {
1219 XEvent event;
1220 int ev_count = 0;
1221 XGrabServer (dpy);
1222 XMapRaised (dpy, src);
1223 XSync (dpy, False);
1224
1225 /* XSync should get window where it's properly exposed,
1226 * but to be on the safe side - let's check for the actual event to arrive : */
1227 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1228 ++ev_count;
1229
1230 if (ev_count > 0);
1231 {
1232 /* hooray! - we can grab the image! */
1233 gc = XCreateGC (dpy, root, 0, NULL);
1234 if (gc)
1235 {
1236 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1237 success = true;
1238 }
1239 }
1240
1241 XDestroyWindow (dpy, src);
1242 XUngrabServer (dpy);
1243 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1244 }
1245
1246 if (!success)
1247 {
1248 XFreePixmap (dpy, tiled_root_pmap);
1249 tiled_root_pmap = None;
1250 }
1251 else
1252 result |= transpPmapTiled;
1253 }
1254 else
1255 {
1256 /* straightforward pixmap copy */ 1355 /* straightforward pixmap copy */
1257 gcv.tile = root_pixmap; 1356 gcv.tile = root_pixmap;
1258 gcv.fill_style = FillTiled; 1357 gcv.fill_style = FillTiled;
1259 1358
1260 while (sx < 0) sx += (int)root_width; 1359 while (sx < 0) sx += (int)root_width;
1261 while (sy < 0) sy += (int)root_height; 1360 while (sy < 0) sy += (int)root_height;
1262 1361
1263 gcv.ts_x_origin = -sx; 1362 gcv.ts_x_origin = -sx;
1264 gcv.ts_y_origin = -sy; 1363 gcv.ts_y_origin = -sy;
1265 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1266 1365
1267 if (gc) 1366 if (gc)
1268 { 1367 {
1269 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1270 result |= transpPmapTiled; 1369 result |= transpPmapTiled;
1271 } 1370 XFreeGC (dpy, gc);
1272 } 1371 }
1273 TIMING_TEST_PRINT_RESULT (tp); 1372 TIMING_TEST_PRINT_RESULT (tp);
1274 1373
1275 if (tiled_root_pmap != None) 1374 if (tiled_root_pmap != None)
1276 { 1375 {
1277 if (!need_client_side_rendering ()) 1376 if (!need_client_side_rendering ())
1278 { 1377 {
1279 if ((flags & tintNeeded)) 1378 if (flags & (blurNeeded | blurServerSide))
1379 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1381 result |= transpPmapBlurred;
1280 { 1382 }
1383 if (flags & (tintNeeded | tintServerSide))
1384 {
1281 if (tint_pixmap (tiled_root_pmap, root, window_width, window_height)) 1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1282 result |= transpPmapTinted; 1386 result |= transpPmapTinted;
1283 } 1387 }
1284 } /* server side rendering completed */ 1388 } /* server side rendering completed */
1285 1389
1286 if (pixmap) 1390 if (pixmap)
… …
1290 pmap_width = window_width; 1394 pmap_width = window_width;
1291 pmap_height = window_height; 1395 pmap_height = window_height;
1292 pmap_depth = root_depth; 1396 pmap_depth = root_depth;
1293 } 1397 }
1294 1398
1295 if (gc)
1296 XFreeGC (dpy, gc);
1297
1298 TIMING_TEST_PRINT_RESULT (tp); 1399 TIMING_TEST_PRINT_RESULT (tp);
1299 1400
1300 return result; 1401 return result;
1301} 1402}
1302 1403
… …
1316 return false; 1417 return false;
1317} 1418}
1318# endif /* ENABLE_TRANSPARENCY */ 1419# endif /* ENABLE_TRANSPARENCY */
1319 1420
1320# ifndef HAVE_AFTERIMAGE 1421# ifndef HAVE_AFTERIMAGE
1321static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1422static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1322# endif 1423# endif
1323 1424
1324bool 1425bool
1325bgPixmap_t::render () 1426bgPixmap_t::render ()
1326{ 1427{
… …
1370 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1371 { 1472 {
1372 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1373 if (flags & tintSet) 1474 if (flags & tintSet)
1374 tint.get (c); 1475 tint.get (c);
1375 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1476 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1376 } 1477 }
1377# endif 1478# endif
1378 1479
1379 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1380 1481
… …
1515/* taken from aterm-0.4.2 */ 1616/* taken from aterm-0.4.2 */
1516 1617
1517typedef uint32_t RUINT32T; 1618typedef uint32_t RUINT32T;
1518 1619
1519static void 1620static void
1520ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1621ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1521{ 1622{
1522 int sh_r, sh_g, sh_b; 1623 int sh_r, sh_g, sh_b;
1523 RUINT32T mask_r, mask_g, mask_b; 1624 RUINT32T mask_r, mask_g, mask_b;
1524 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1525 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1526 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1527 int i; 1628 int i;
1528 1629
1529 Visual *visual = term->visual;
1530
1531 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1532
1533 if (shade == 0)
1534 shade = 100;
1535 1631
1536 /* for convenience */ 1632 /* for convenience */
1537 mask_r = visual->red_mask; 1633 mask_r = visual->red_mask;
1538 mask_g = visual->green_mask; 1634 mask_g = visual->green_mask;
1539 mask_b = visual->blue_mask; 1635 mask_b = visual->blue_mask;
1540 1636
1541 /* boring lookup table pre-initialization */ 1637 /* boring lookup table pre-initialization */
1542 switch (srcImage->bits_per_pixel) { 1638 switch (srcImage->depth)
1639 {
1543 case 15: 1640 case 15:
1544 if ((mask_r != 0x7c00) || 1641 if ((mask_r != 0x7c00) ||
1545 (mask_g != 0x03e0) || 1642 (mask_g != 0x03e0) ||
1546 (mask_b != 0x001f)) 1643 (mask_b != 0x001f))
1547 return; 1644 return;
1548 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1645 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1549 lookup_r = lookup; 1646 lookup_r = lookup;
1550 lookup_g = lookup+32; 1647 lookup_g = lookup+32;
1551 lookup_b = lookup+32+32; 1648 lookup_b = lookup+32+32;
1552 sh_r = 10; 1649 sh_r = 10;
1553 sh_g = 5; 1650 sh_g = 5;
1554 sh_b = 0; 1651 sh_b = 0;
1555 break; 1652 break;
1556 case 16: 1653 case 16:
1557 if ((mask_r != 0xf800) || 1654 if ((mask_r != 0xf800) ||
1558 (mask_g != 0x07e0) || 1655 (mask_g != 0x07e0) ||
1559 (mask_b != 0x001f)) 1656 (mask_b != 0x001f))
1560 return; 1657 return;
1561 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1658 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1562 lookup_r = lookup; 1659 lookup_r = lookup;
1563 lookup_g = lookup+32; 1660 lookup_g = lookup+32;
1564 lookup_b = lookup+32+64; 1661 lookup_b = lookup+32+64;
1565 sh_r = 11; 1662 sh_r = 11;
1566 sh_g = 5; 1663 sh_g = 5;
1567 sh_b = 0; 1664 sh_b = 0;
1568 break; 1665 break;
1569 case 24: 1666 case 24:
1570 if ((mask_r != 0xff0000) || 1667 if ((mask_r != 0xff0000) ||
1571 (mask_g != 0x00ff00) || 1668 (mask_g != 0x00ff00) ||
1572 (mask_b != 0x0000ff)) 1669 (mask_b != 0x0000ff))
1573 return; 1670 return;
1574 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1671 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1575 lookup_r = lookup; 1672 lookup_r = lookup;
1576 lookup_g = lookup+256; 1673 lookup_g = lookup+256;
1577 lookup_b = lookup+256+256; 1674 lookup_b = lookup+256+256;
1578 sh_r = 16; 1675 sh_r = 16;
1579 sh_g = 8; 1676 sh_g = 8;
1580 sh_b = 0; 1677 sh_b = 0;
1581 break; 1678 break;
1582 case 32: 1679 case 32:
1583 if ((mask_r != 0xff0000) || 1680 if ((mask_r != 0xff0000) ||
1584 (mask_g != 0x00ff00) || 1681 (mask_g != 0x00ff00) ||
1585 (mask_b != 0x0000ff)) 1682 (mask_b != 0x0000ff))
1586 return; 1683 return;
1587 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1684 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1588 lookup_r = lookup; 1685 lookup_r = lookup;
1589 lookup_g = lookup+256; 1686 lookup_g = lookup+256;
1590 lookup_b = lookup+256+256; 1687 lookup_b = lookup+256+256;
1591 sh_r = 16; 1688 sh_r = 16;
1592 sh_g = 8; 1689 sh_g = 8;
1593 sh_b = 0; 1690 sh_b = 0;
1594 break; 1691 break;
1595 default: 1692 default:
1596 return; /* we do not support this color depth */ 1693 return; /* we do not support this color depth */
1597 } 1694 }
1598 1695
1599 /* prepare limits for color transformation (each channel is handled separately) */ 1696 /* prepare limits for color transformation (each channel is handled separately) */
1600 if (shade < 0) { 1697 if (shade > 100)
1698 {
1601 shade = -shade; 1699 shade = 200 - shade;
1602 if (shade < 0) shade = 0;
1603 if (shade > 100) shade = 100;
1604 1700
1605 lower_lim_r = 65535-rm; 1701 lower_lim_r = 65535-rm;
1606 lower_lim_g = 65535-gm; 1702 lower_lim_g = 65535-gm;
1607 lower_lim_b = 65535-bm; 1703 lower_lim_b = 65535-bm;
1608 1704
1609 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1705 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1610 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1706 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1611 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1707 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1612 1708
1613 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1709 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1710 }
1614 } else { 1711 else
1615 if (shade < 0) shade = 0; 1712 {
1616 if (shade > 100) shade = 100;
1617 1713
1618 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1714 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1619 1715
1620 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1716 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1621 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1717 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1622 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1718 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1623 } 1719 }
1624
1625 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1626 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1627 {
1628 unsigned int tmp;
1629
1630 tmp = lower_lim_r;
1631 lower_lim_r = lower_lim_b;
1632 lower_lim_b = tmp;
1633
1634 tmp = upper_lim_r;
1635 upper_lim_r = upper_lim_b;
1636 upper_lim_b = tmp;
1637 }
1638 1720
1639 /* fill our lookup tables */ 1721 /* fill our lookup tables */
1640 for (i = 0; i <= mask_r>>sh_r; i++) 1722 for (i = 0; i <= mask_r>>sh_r; i++)
1641 { 1723 {
1642 RUINT32T tmp; 1724 RUINT32T tmp;
1643 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1725 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1644 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1726 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1645 lookup_r[i] = (tmp/65535)<<sh_r; 1727 lookup_r[i] = (tmp/65535)<<sh_r;
1646 } 1728 }
1647 for (i = 0; i <= mask_g>>sh_g; i++) 1729 for (i = 0; i <= mask_g>>sh_g; i++)
1648 { 1730 {
1649 RUINT32T tmp; 1731 RUINT32T tmp;
1650 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1732 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1651 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1733 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1652 lookup_g[i] = (tmp/65535)<<sh_g; 1734 lookup_g[i] = (tmp/65535)<<sh_g;
1653 } 1735 }
1654 for (i = 0; i <= mask_b>>sh_b; i++) 1736 for (i = 0; i <= mask_b>>sh_b; i++)
1655 { 1737 {
1656 RUINT32T tmp; 1738 RUINT32T tmp;
1657 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1739 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1658 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1740 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1659 lookup_b[i] = (tmp/65535)<<sh_b; 1741 lookup_b[i] = (tmp/65535)<<sh_b;
1660 } 1742 }
1661 1743
1662 /* apply table to input image (replacing colors by newly calculated ones) */ 1744 /* apply table to input image (replacing colors by newly calculated ones) */
1663 switch (srcImage->bits_per_pixel) 1745 switch (srcImage->bits_per_pixel)
1664 {
1665 case 15:
1666 {
1667 unsigned short *p1, *pf, *p, *pl;
1668 p1 = (unsigned short *) srcImage->data;
1669 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1670 while (p1 < pf)
1671 { 1746 {
1672 p = p1;
1673 pl = p1 + srcImage->width;
1674 for (; p < pl; p++)
1675 {
1676 *p = lookup_r[(*p & 0x7c00)>>10] |
1677 lookup_g[(*p & 0x03e0)>> 5] |
1678 lookup_b[(*p & 0x001f)];
1679 }
1680 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1681 }
1682 break;
1683 }
1684 case 16:
1685 {
1686 unsigned short *p1, *pf, *p, *pl;
1687 p1 = (unsigned short *) srcImage->data;
1688 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1689 while (p1 < pf)
1690 {
1691 p = p1;
1692 pl = p1 + srcImage->width;
1693 for (; p < pl; p++)
1694 {
1695 *p = lookup_r[(*p & 0xf800)>>11] |
1696 lookup_g[(*p & 0x07e0)>> 5] |
1697 lookup_b[(*p & 0x001f)];
1698 }
1699 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1700 }
1701 break;
1702 }
1703 case 24:
1704 {
1705 unsigned char *p1, *pf, *p, *pl;
1706 p1 = (unsigned char *) srcImage->data;
1707 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1708 while (p1 < pf)
1709 {
1710 p = p1;
1711 pl = p1 + srcImage->width * 3;
1712 for (; p < pl; p += 3)
1713 {
1714 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1715 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1716 p[2] = lookup_r[(p[2] & 0x0000ff)];
1717 }
1718 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1719 }
1720 break;
1721 }
1722 case 32: 1747 case 32:
1723 { 1748 {
1724 RUINT32T *p1, *pf, *p, *pl; 1749 RUINT32T *p1, *pf, *p, *pl;
1725 p1 = (RUINT32T *) srcImage->data; 1750 p1 = (RUINT32T *) srcImage->data;
1726 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1751 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1727 1752
1728 while (p1 < pf) 1753 while (p1 < pf)
1729 { 1754 {
1730 p = p1; 1755 p = p1;
1731 pl = p1 + srcImage->width; 1756 pl = p1 + srcImage->width;
1732 for (; p < pl; p++) 1757 for (; p < pl; p++)
1733 { 1758 {
1734 *p = lookup_r[(*p & 0xff0000)>>16] | 1759 *p = lookup_r[(*p & 0xff0000)>>16] |
1735 lookup_g[(*p & 0x00ff00)>> 8] | 1760 lookup_g[(*p & 0x00ff00)>> 8] |
1736 lookup_b[(*p & 0x0000ff)] | 1761 lookup_b[(*p & 0x0000ff)] |
1737 (*p & ~0xffffff); 1762 (*p & ~0xffffff);
1738 } 1763 }
1739 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); 1764 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1765 }
1766 break;
1740 } 1767 }
1768 default:
1769 for (int y = 0; y < srcImage->height; y++)
1770 for (int x = 0; x < srcImage->width; x++)
1771 {
1772 unsigned long pixel = XGetPixel (srcImage, x, y);
1773 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1774 lookup_g[(pixel & mask_g) >> sh_g] |
1775 lookup_b[(pixel & mask_b) >> sh_b];
1776 XPutPixel (srcImage, x, y, pixel);
1777 }
1741 break; 1778 break;
1742 }
1743 } 1779 }
1744 1780
1745 free (lookup); 1781 free (lookup);
1746} 1782}
1747#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1783#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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