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

Diff Legend

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