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

Diff Legend

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