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.80 by sf-exg, Wed Oct 13 23:04:57 2010 UTC vs.
Revision 1.117 by sf-exg, Fri Nov 12 22:00:05 2010 UTC

… …
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
… …
22 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
23 24
24#include <cmath> 25#include <cmath>
25#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
26#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
27 32
28#define DO_TIMING_TEST 0 33#define DO_TIMING_TEST 0
29 34
30#if DO_TIMING_TEST 35#if DO_TIMING_TEST
31# include <sys/time.h> 36# include <sys/time.h>
… …
167 return true; 172 return true;
168 } 173 }
169# endif 174# endif
170 175
171 return false; 176 return false;
172}; 177}
173 178
174bool bgPixmap_t::need_client_side_rendering () 179bool bgPixmap_t::need_client_side_rendering ()
175{ 180{
176# ifdef HAVE_AFTERIMAGE 181# ifdef HAVE_AFTERIMAGE
177 if (original_asim) 182 if (original_asim)
178 return true; 183 return true;
179# endif
180# ifdef ENABLE_TRANSPARENCY
181 if (flags & isTransparent)
182 {
183# ifdef HAVE_AFTERIMAGE
184 if ((flags & blurNeeded) && !(flags & blurServerSide))
185 return true;
186# endif
187 if ((flags & tintNeeded) && !(flags & tintServerSide))
188 return true;
189 }
190# endif 184# endif
191 return false; 185 return false;
192} 186}
193 187
194# ifdef BG_IMAGE_FROM_FILE 188# ifdef BG_IMAGE_FROM_FILE
… …
232 int diff = window_size - image_size; 226 int diff = window_size - image_size;
233 int smaller = min (image_size, window_size); 227 int smaller = min (image_size, window_size);
234 228
235 if (align >= 0 && align <= 100) 229 if (align >= 0 && align <= 100)
236 return diff * align / 100; 230 return diff * align / 100;
237 else if (align > 100 && align <= 200 ) 231 else if (align > 100 && align <= 200)
238 return ((align - 100) * smaller / 100) + window_size - smaller; 232 return ((align - 100) * smaller / 100) + window_size - smaller;
239 else if (align >= -100 && align < 0) 233 else if (align >= -100 && align < 0)
240 return ((align + 100) * smaller / 100) - image_size; 234 return ((align + 100) * smaller / 100) - image_size;
241 return 0; 235 return 0;
242} 236}
… …
260} 254}
261 255
262bool 256bool
263bgPixmap_t::set_geometry (const char *geom) 257bgPixmap_t::set_geometry (const char *geom)
264{ 258{
259 bool changed = false;
265 int geom_flags = 0, changed = 0; 260 int geom_flags = 0;
266 int x = 0, y = 0; 261 int x = 0, y = 0;
267 unsigned int w = 0, h = 0; 262 unsigned int w = 0, h = 0;
268 unsigned int n; 263 unsigned int n;
269 unsigned long new_flags = (flags & (~geometryFlags)); 264 unsigned long new_flags = (flags & (~geometryFlags));
270 const char *p; 265 const char *p;
… …
426 421
427 while (*ops != ':' && *ops != '\0') ++ops; 422 while (*ops != ':' && *ops != '\0') ++ops;
428 } /* done parsing ops */ 423 } /* done parsing ops */
429 } 424 }
430 425
431 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;
432 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;
433 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;
434 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;
435 } 430 }
436 431
437 if (new_flags != flags) 432 if (new_flags != flags)
438 { 433 {
439 flags = new_flags; 434 flags = new_flags;
440 changed++; 435 changed = true;
441 } 436 }
442 437
443 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
444 // flags, h_scale, v_scale, h_align, v_align);
445 return (changed > 0); 438 return changed;
446} 439}
447 440
448void 441void
449bgPixmap_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)
450{ 443{
… …
478 x = make_align_position (h_align, target_width, w); 471 x = make_align_position (h_align, target_width, w);
479 y = make_align_position (v_align, target_height, h); 472 y = make_align_position (v_align, target_height, h);
480 } 473 }
481 474
482 flags &= ~sizeSensitive; 475 flags &= ~sizeSensitive;
483 if (h_scale != 0 || v_scale != 0 476 if ((flags & propScale) || h_scale || v_scale
484 || h_align != 0 || v_align != 0 477 || (!(flags & rootAlign) && (h_align || v_align))
485 || w > target_width || h > target_height) 478 || w > target_width || h > target_height)
486 flags |= sizeSensitive; 479 flags |= sizeSensitive;
487} 480}
488 481
489# ifdef HAVE_AFTERIMAGE 482# ifdef HAVE_AFTERIMAGE
… …
539 532
540 int x = 0; 533 int x = 0;
541 int y = 0; 534 int y = 0;
542 int w = 0; 535 int w = 0;
543 int h = 0; 536 int h = 0;
544
545 TIMING_TEST_START (asim);
546 537
547 if (original_asim) 538 if (original_asim)
548 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);
549 540
550 if (!original_asim 541 if (!original_asim
… …
667 } 658 }
668 659
669 free (layers); 660 free (layers);
670 } 661 }
671 } 662 }
672 TIMING_TEST_PRINT_RESULT (asim);
673 663
674 bool ret = false; 664 bool ret = false;
675 665
676 if (result) 666 if (result)
677 { 667 {
678 XGCValues gcv; 668 XGCValues gcv;
679 GC gc; 669 GC gc;
680 670
681 if (pixmap)
682 {
683 if (pmap_width != new_pmap_width
684 || pmap_height != new_pmap_height
685 || pmap_depth != target->depth)
686 {
687 XFreePixmap (target->dpy, pixmap);
688 pixmap = None;
689 }
690 }
691
692 /* create Pixmap */ 671 /* create Pixmap */
693 if (pixmap == None) 672 if (pixmap == None
673 || pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
694 { 676 {
677 if (pixmap)
678 XFreePixmap (target->dpy, pixmap);
695 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 679 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
696 pmap_width = new_pmap_width; 680 pmap_width = new_pmap_width;
697 pmap_height = new_pmap_height; 681 pmap_height = new_pmap_height;
698 pmap_depth = target->depth; 682 pmap_depth = target->depth;
699 } 683 }
… …
723 707
724 if (result != background && result != original_asim) 708 if (result != background && result != original_asim)
725 destroy_asimage (&result); 709 destroy_asimage (&result);
726 710
727 XFreeGC (target->dpy, gc); 711 XFreeGC (target->dpy, gc);
728 TIMING_TEST_PRINT_RESULT (asim);
729 712
730 ret = true; 713 ret = true;
731 } 714 }
732 715
733 if (background) 716 if (background)
… …
745 return false; 728 return false;
746 729
747 if (!pixbuf) 730 if (!pixbuf)
748 return false; 731 return false;
749 732
750#if !XFT
751 if (background_flags) 733 if (background_flags
734 && !(flags & HAS_RENDER))
752 return false; 735 return false;
753#endif
754 736
755 GdkPixbuf *result; 737 GdkPixbuf *result;
756 738
757 int image_width = gdk_pixbuf_get_width (pixbuf); 739 int image_width = gdk_pixbuf_get_width (pixbuf);
758 int image_height = gdk_pixbuf_get_height (pixbuf); 740 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
809 new_pmap_width = min (image_width, target_width); 791 new_pmap_width = min (image_width, target_width);
810 new_pmap_height = min (image_height, target_height); 792 new_pmap_height = min (image_height, target_height);
811 } 793 }
812 } 794 }
813 795
814 if (pixmap)
815 {
816 if (pmap_width != new_pmap_width
817 || pmap_height != new_pmap_height
818 || pmap_depth != target->depth)
819 {
820 XFreePixmap (target->dpy, pixmap);
821 pixmap = None;
822 }
823 }
824
825 if (pixmap == None) 796 if (pixmap == None
797 || pmap_width != new_pmap_width
798 || pmap_height != new_pmap_height
799 || pmap_depth != target->depth)
826 { 800 {
801 if (pixmap)
802 XFreePixmap (target->dpy, pixmap);
827 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 803 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
828 pmap_width = new_pmap_width; 804 pmap_width = new_pmap_width;
829 pmap_height = new_pmap_height; 805 pmap_height = new_pmap_height;
830 pmap_depth = target->depth; 806 pmap_depth = target->depth;
831 } 807 }
… …
872 dst_width, dst_height, 848 dst_width, dst_height,
873 XLIB_RGB_DITHER_NONE, 849 XLIB_RGB_DITHER_NONE,
874 0, 0); 850 0, 0);
875 } 851 }
876 852
877#if XFT 853#if XRENDER
878 if (background_flags) 854 if (background_flags)
879 { 855 {
880 Display *dpy = target->dpy; 856 Display *dpy = target->dpy;
881 XRenderPictureAttributes pa; 857 XRenderPictureAttributes pa;
882 858
883 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 859 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
884 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 860 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
885 861
886 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 862 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
887 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 863 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
888 864
… …
925# endif /* HAVE_PIXBUF */ 901# endif /* HAVE_PIXBUF */
926 902
927bool 903bool
928bgPixmap_t::set_file (const char *file) 904bgPixmap_t::set_file (const char *file)
929{ 905{
930 assert (file); 906 if (!file || !*file)
907 return false;
931 908
932 if (*file)
933 {
934 if (const char *p = strchr (file, ';')) 909 if (const char *p = strchr (file, ';'))
935 { 910 {
936 size_t len = p - file; 911 size_t len = p - file;
937 char *f = rxvt_temp_buf<char> (len + 1); 912 char *f = rxvt_temp_buf<char> (len + 1);
938 memcpy (f, file, len); 913 memcpy (f, file, len);
939 f[len] = '\0'; 914 f[len] = '\0';
940 file = f; 915 file = f;
941 } 916 }
942 917
943# ifdef HAVE_AFTERIMAGE 918# ifdef HAVE_AFTERIMAGE
944 if (!target->asimman) 919 if (!target->asimman)
945 target->asimman = create_generic_imageman (target->rs[Rs_path]); 920 target->asimman = create_generic_imageman (target->rs[Rs_path]);
946 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 921 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
922 if (image)
923 {
947 if (original_asim) 924 if (original_asim)
925 safe_asimage_destroy (original_asim);
926 original_asim = image;
948 have_image = true; 927 have_image = true;
949 return have_image; 928 return true;
929 }
950# endif 930# endif
951 931
952# ifdef HAVE_PIXBUF 932# ifdef HAVE_PIXBUF
953 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 933 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
934 if (image)
935 {
954 if (pixbuf) 936 if (pixbuf)
937 g_object_unref (pixbuf);
938 pixbuf = image;
955 have_image = true; 939 have_image = true;
956 return have_image; 940 return true;
941 }
957# endif 942# endif
958 }
959 943
960 return false; 944 return false;
961} 945}
962 946
963# endif /* BG_IMAGE_FROM_FILE */ 947# endif /* BG_IMAGE_FROM_FILE */
… …
976} 960}
977 961
978bool 962bool
979bgPixmap_t::set_blur_radius (const char *geom) 963bgPixmap_t::set_blur_radius (const char *geom)
980{ 964{
981 int changed = 0; 965 bool changed = false;
982 unsigned int hr, vr; 966 unsigned int hr, vr;
983 int junk; 967 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 968 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 969
986 if (!(geom_flags & WidthValue)) 970 if (!(geom_flags & WidthValue))
… …
991 min_it (hr, 128); 975 min_it (hr, 128);
992 min_it (vr, 128); 976 min_it (vr, 128);
993 977
994 if (h_blurRadius != hr) 978 if (h_blurRadius != hr)
995 { 979 {
996 ++changed; 980 changed = true;
997 h_blurRadius = hr; 981 h_blurRadius = hr;
998 } 982 }
999 983
1000 if (v_blurRadius != vr) 984 if (v_blurRadius != vr)
1001 { 985 {
1002 ++changed; 986 changed = true;
1003 v_blurRadius = vr; 987 v_blurRadius = vr;
1004 } 988 }
1005 989
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 990 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 991 flags &= ~blurNeeded;
1008 else 992 else
1009 flags |= blurNeeded; 993 flags |= blurNeeded;
1010 994
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1022
1023 return (changed > 0); 995 return changed;
1024} 996}
1025 997
1026static inline unsigned long 998static inline unsigned long
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 999compute_tint_shade_flags (rxvt_color *tint, int shade)
1028{ 1000{
… …
1050 { 1022 {
1051 flags |= bgPixmap_t::tintNeeded; 1023 flags |= bgPixmap_t::tintNeeded;
1052 } 1024 }
1053 } 1025 }
1054 1026
1055 if (flags & bgPixmap_t::tintNeeded)
1056 {
1057 if (flags & bgPixmap_t::tintWholesome)
1058 flags |= bgPixmap_t::tintServerSide;
1059 else
1060 {
1061#if XFT
1062 flags |= bgPixmap_t::tintServerSide;
1063#endif
1064 }
1065 }
1066
1067 return flags; 1027 return flags;
1068} 1028}
1069 1029
1070bool 1030bool
1071bgPixmap_t::set_tint (rxvt_color &new_tint) 1031bgPixmap_t::set_tint (rxvt_color &new_tint)
… …
1113 } 1073 }
1114 1074
1115 return false; 1075 return false;
1116} 1076}
1117 1077
1078#if XRENDER
1118static void 1079static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1080get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{ 1081{
1121 double sigma = radius / 2.0; 1082 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma; 1083 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0; 1084 double sum = 0.0;
1124 1085
1125 for (int i = 0; i < width; i++) 1086 for (int i = 0; i < width; i++)
1126 { 1087 {
1127 double x = i - width / 2; 1088 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1089 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i]; 1090 sum += kernel[i];
1130 } 1091 }
1131 1092
1132 params[0] = XDoubleToFixed (width); 1093 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1); 1094 params[1] = XDoubleToFixed (1);
1134 1095
1135 for (int i = 0; i < width; i++) 1096 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1097 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137} 1098}
1099#endif
1138 1100
1139bool 1101bool
1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1102bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1141{ 1103{
1142 bool ret = false; 1104 bool ret = false;
1143#if XFT 1105#if XRENDER
1144 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1106 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1145 double *kernel = (double *)malloc (size * sizeof (double)); 1107 double *kernel = (double *)malloc (size * sizeof (double));
1146 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1108 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1147 1109
1148 Display *dpy = target->dpy; 1110 Display *dpy = target->dpy;
1149 XRenderPictureAttributes pa; 1111 XRenderPictureAttributes pa;
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); 1112 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1151 1113
1152 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1114 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1153 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1115 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154 1116
1155 if (kernel && params && src && dst) 1117 if (kernel && params && src && dst)
… …
1225 XFreeGC (dpy, gc); 1187 XFreeGC (dpy, gc);
1226 } 1188 }
1227 } 1189 }
1228 else 1190 else
1229 { 1191 {
1230# if XFT 1192# if XRENDER
1231 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1193 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1232 1194
1233 if (flags & tintSet) 1195 if (flags & tintSet)
1234 tint.get (c); 1196 tint.get (c);
1235 1197
… …
1265 1227
1266 if (mask_pic && overlay_pic && back_pic) 1228 if (mask_pic && overlay_pic && back_pic)
1267 { 1229 {
1268 XRenderColor mask_c; 1230 XRenderColor mask_c;
1269 1231
1270 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1232 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1271 mask_c.alpha = 0xffff; 1233 mask_c.alpha = 0xffff;
1272 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1234 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1273 1235
1274 mask_c.alpha = 0; 1236 mask_c.alpha = 0;
1275 mask_c.red = 0xffff - c.r; 1237 mask_c.red = 0xffff - c.r;
… …
1281 } 1243 }
1282 1244
1283 XRenderFreePicture (dpy, mask_pic); 1245 XRenderFreePicture (dpy, mask_pic);
1284 XRenderFreePicture (dpy, overlay_pic); 1246 XRenderFreePicture (dpy, overlay_pic);
1285 XRenderFreePicture (dpy, back_pic); 1247 XRenderFreePicture (dpy, back_pic);
1286# if DO_TIMING_TEST
1287 XSync (dpy, False);
1288# endif
1289# endif 1248# endif
1290 } 1249 }
1291 1250
1292 return ret; 1251 return ret;
1293} 1252}
1294 1253
1295/* make_transparency_pixmap() 1254/* make_transparency_pixmap()
1296 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1255 * Builds a pixmap of the same size as the terminal window that contains
1297 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1256 * the tiled portion of the root pixmap that is supposed to be covered by
1298 * our window. 1257 * our window.
1299 */ 1258 */
1300unsigned long 1259unsigned long
1301bgPixmap_t::make_transparency_pixmap () 1260bgPixmap_t::make_transparency_pixmap ()
1302{ 1261{
… …
1306 return 0; 1265 return 0;
1307 1266
1308 /* root dimensions may change from call to call - but Display structure should 1267 /* root dimensions may change from call to call - but Display structure should
1309 * be always up-to-date, so let's use it : 1268 * be always up-to-date, so let's use it :
1310 */ 1269 */
1311 Window root = target->display->root;
1312 int screen = target->display->screen; 1270 int screen = target->display->screen;
1313 Display *dpy = target->dpy; 1271 Display *dpy = target->dpy;
1272 int root_depth = DefaultDepth (dpy, screen);
1314 int root_width = DisplayWidth (dpy, screen); 1273 int root_width = DisplayWidth (dpy, screen);
1315 int root_height = DisplayHeight (dpy, screen); 1274 int root_height = DisplayHeight (dpy, screen);
1316 unsigned int root_pmap_width, root_pmap_height; 1275 unsigned int root_pmap_width, root_pmap_height;
1317 int window_width = target->szHint.width; 1276 int window_width = target->szHint.width;
1318 int window_height = target->szHint.height; 1277 int window_height = target->szHint.height;
1319 int sx, sy; 1278 int sx, sy;
1320 XGCValues gcv; 1279 XGCValues gcv;
1280 GC gc;
1321 1281
1322 TIMING_TEST_START (tp);
1323 target->get_window_origin (sx, sy); 1282 target->get_window_origin (sx, sy);
1324 1283
1325 /* check if we are outside of the visible part of the virtual screen : */ 1284 /* check if we are outside of the visible part of the virtual screen : */
1326 if (sx + window_width <= 0 || sy + window_height <= 0 1285 if (sx + window_width <= 0 || sy + window_height <= 0
1327 || sx >= root_width || sy >= root_height) 1286 || sx >= root_width || sy >= root_height)
1328 return 0; 1287 return 0;
1329 1288
1289 // validate root pixmap and get its size
1330 if (root_pixmap != None) 1290 if (root_pixmap != None)
1331 { 1291 {
1332 /* we want to validate the pixmap and get its size at the same time : */ 1292 Window wdummy;
1333 int junk; 1293 int idummy;
1334 unsigned int ujunk; 1294 unsigned int udummy;
1335 /* root pixmap may be bad - allow a error */ 1295
1336 target->allowedxerror = -1; 1296 target->allowedxerror = -1;
1337 1297
1338 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1298 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1339 root_pixmap = None; 1299 root_pixmap = None;
1340 1300
1341 target->allowedxerror = 0; 1301 target->allowedxerror = 0;
1342 } 1302 }
1343 1303
1304 Pixmap recoded_root_pmap = root_pixmap;
1305
1306 if (root_pixmap != None && root_depth != target->depth)
1307 {
1308#if XRENDER
1309 if (flags & HAS_RENDER)
1310 {
1311 XRenderPictureAttributes pa;
1312
1313 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1314 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1315
1316 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1317 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1318 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1319
1320 if (src && dst)
1321 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1322 else
1323 {
1324 XFreePixmap (dpy, recoded_root_pmap);
1325 root_pixmap = None;
1326 }
1327
1328 XRenderFreePicture (dpy, src);
1329 XRenderFreePicture (dpy, dst);
1330 }
1331 else
1332#endif
1333 root_pixmap = None;
1334 }
1335
1336 if (root_pixmap == None)
1337 return 0;
1338
1344 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1339 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1345 GC gc = NULL;
1346 1340
1347 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1341 if (tiled_root_pmap == None) /* something really bad happened - abort */
1348 return 0; 1342 return 0;
1349 1343
1350 if (root_pixmap == None)
1351 {
1352 /* use tricks to obtain the root background image :*/
1353 /* we want to create Overrideredirect window overlapping out window
1354 with background type of Parent Relative and then grab it */
1355 XSetWindowAttributes attr;
1356 Window src;
1357 bool success = false;
1358
1359 attr.background_pixmap = ParentRelative;
1360 attr.backing_store = Always;
1361 attr.event_mask = ExposureMask;
1362 attr.override_redirect = True;
1363 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1364 CopyFromParent, CopyFromParent, CopyFromParent,
1365 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1366 &attr);
1367
1368 if (src != None)
1369 {
1370 XEvent event;
1371 int ev_count = 0;
1372 XGrabServer (dpy);
1373 XMapRaised (dpy, src);
1374 XSync (dpy, False);
1375
1376 /* XSync should get window where it's properly exposed,
1377 * but to be on the safe side - let's check for the actual event to arrive : */
1378 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1379 ++ev_count;
1380
1381 if (ev_count > 0);
1382 {
1383 /* hooray! - we can grab the image! */
1384 gc = XCreateGC (dpy, root, 0, NULL);
1385 if (gc)
1386 {
1387 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1388 success = true;
1389 }
1390 }
1391
1392 XDestroyWindow (dpy, src);
1393 XUngrabServer (dpy);
1394 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1395 }
1396
1397 if (!success)
1398 {
1399 XFreePixmap (dpy, tiled_root_pmap);
1400 tiled_root_pmap = None;
1401 }
1402 else
1403 result |= transpPmapTiled;
1404 }
1405 else
1406 {
1407 /* straightforward pixmap copy */ 1344 /* straightforward pixmap copy */
1408 gcv.tile = root_pixmap; 1345 gcv.tile = recoded_root_pmap;
1409 gcv.fill_style = FillTiled; 1346 gcv.fill_style = FillTiled;
1410 1347
1411 while (sx < 0) sx += (int)root_width; 1348 while (sx < 0) sx += (int)root_width;
1412 while (sy < 0) sy += (int)root_height; 1349 while (sy < 0) sy += (int)root_height;
1413 1350
1414 gcv.ts_x_origin = -sx; 1351 gcv.ts_x_origin = -sx;
1415 gcv.ts_y_origin = -sy; 1352 gcv.ts_y_origin = -sy;
1416 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1353 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1417 1354
1418 if (gc) 1355 if (gc)
1419 { 1356 {
1420 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1357 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1421 result |= transpPmapTiled; 1358 result |= transpPmapTiled;
1422 } 1359 XFreeGC (dpy, gc);
1423 }
1424 TIMING_TEST_PRINT_RESULT (tp);
1425 1360
1426 if (tiled_root_pmap != None)
1427 {
1428 if (!need_client_side_rendering ()) 1361 if (!need_client_side_rendering ())
1429 { 1362 {
1430 if ((flags & blurNeeded)) 1363 if ((flags & blurNeeded)
1364 && (flags & HAS_RENDER_CONV))
1431 { 1365 {
1432 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1366 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1433 result |= transpPmapBlurred; 1367 result |= transpPmapBlurred;
1434 } 1368 }
1435 if ((flags & tintNeeded)) 1369 if ((flags & tintNeeded)
1370 && (flags & (tintWholesome | HAS_RENDER)))
1436 { 1371 {
1437 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1372 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1438 result |= transpPmapTinted; 1373 result |= transpPmapTinted;
1439 } 1374 }
1440 } /* server side rendering completed */ 1375 } /* server side rendering completed */
1441 1376
1442 if (pixmap) 1377 if (pixmap)
1443 XFreePixmap (dpy, pixmap); 1378 XFreePixmap (dpy, pixmap);
1444 1379
1445 pixmap = tiled_root_pmap; 1380 pixmap = tiled_root_pmap;
1446 pmap_width = window_width; 1381 pmap_width = window_width;
1447 pmap_height = window_height; 1382 pmap_height = window_height;
1448 pmap_depth = root_depth; 1383 pmap_depth = target->depth;
1449 } 1384 }
1385 else
1386 XFreePixmap (dpy, tiled_root_pmap);
1450 1387
1451 if (gc) 1388 if (recoded_root_pmap != root_pixmap)
1452 XFreeGC (dpy, gc); 1389 XFreePixmap (dpy, recoded_root_pmap);
1453
1454 TIMING_TEST_PRINT_RESULT (tp);
1455 1390
1456 return result; 1391 return result;
1457} 1392}
1458 1393
1459bool 1394void
1460bgPixmap_t::set_root_pixmap () 1395bgPixmap_t::set_root_pixmap ()
1461{ 1396{
1462 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1397 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1463 if (new_root_pixmap == None) 1398 if (new_root_pixmap == None)
1464 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1399 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1465 1400
1466 if (new_root_pixmap != root_pixmap)
1467 {
1468 root_pixmap = new_root_pixmap; 1401 root_pixmap = new_root_pixmap;
1469 return true;
1470 }
1471
1472 return false;
1473} 1402}
1474# endif /* ENABLE_TRANSPARENCY */ 1403# endif /* ENABLE_TRANSPARENCY */
1475 1404
1476# ifndef HAVE_AFTERIMAGE 1405#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1477static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1406static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1478# endif 1407# endif
1479 1408
1480bool 1409bool
1481bgPixmap_t::render () 1410bgPixmap_t::render ()
1482{ 1411{
1483 unsigned long background_flags = 0; 1412 unsigned long background_flags = 0;
1484 1413
1485 if (target == NULL) 1414 if (target == NULL)
1486 return false; 1415 return false;
1487
1488 TIMING_TEST_START (tp);
1489 1416
1490 invalidate (); 1417 invalidate ();
1491# ifdef ENABLE_TRANSPARENCY 1418# ifdef ENABLE_TRANSPARENCY
1492 if (flags & isTransparent) 1419 if (flags & isTransparent)
1493 { 1420 {
1494 /* we need to re-generate transparency pixmap in that case ! */ 1421 /* we need to re-generate transparency pixmap in that case ! */
1495 background_flags = make_transparency_pixmap (); 1422 background_flags = make_transparency_pixmap ();
1496 if (background_flags == 0) 1423 if (background_flags == 0)
1497 return false; 1424 return false;
1498 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1425 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1499 && pmap_depth == target->depth)
1500 flags = flags & ~isInvalid; 1426 flags = flags & ~isInvalid;
1501 } 1427 }
1502# endif 1428# endif
1503 1429
1504# ifdef BG_IMAGE_FROM_FILE 1430# ifdef BG_IMAGE_FROM_FILE
… …
1508 if (render_image (background_flags)) 1434 if (render_image (background_flags))
1509 flags = flags & ~isInvalid; 1435 flags = flags & ~isInvalid;
1510 } 1436 }
1511# endif 1437# endif
1512 1438
1439# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1513 XImage *result = NULL; 1440 XImage *result = NULL;
1514 1441
1515 if (background_flags && (flags & isInvalid)) 1442 if (background_flags && (flags & isInvalid))
1516 { 1443 {
1517 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1444 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1518 } 1445 }
1519 1446
1520 if (result) 1447 if (result)
1521 { 1448 {
1522# if !defined(HAVE_AFTERIMAGE) && !XFT
1523 /* our own client-side tinting */ 1449 /* our own client-side tinting */
1524 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1525 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1526 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1450 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1527 { 1451 {
1528 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1452 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1529 if (flags & tintSet) 1453 if (flags & tintSet)
1530 tint.get (c); 1454 tint.get (c);
1531 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1455 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1532 } 1456 }
1533# endif
1534 1457
1535 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1536 1459
1537 if (gc) 1460 if (gc)
1538 { 1461 {
1539 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1540 {
1541 XFreePixmap (target->dpy, pixmap);
1542 pixmap = None;
1543 }
1544
1545 if (pixmap == None)
1546 {
1547 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1548 pmap_width = result->width;
1549 pmap_height = result->height;
1550 pmap_depth = target->depth;
1551 }
1552
1553 if (pmap_depth != result->depth)
1554 {
1555 /* Bad Match error will ensue ! stupid X !!!! */
1556 if (result->depth == 24 && pmap_depth == 32)
1557 result->depth = 32;
1558 else if (result->depth == 32 && pmap_depth == 24)
1559 result->depth = 24;
1560 else
1561 {
1562 /* TODO: implement image recoding */
1563 }
1564 }
1565
1566 if (pmap_depth == result->depth)
1567 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1462 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1568 1463
1569 XFreeGC (target->dpy, gc); 1464 XFreeGC (target->dpy, gc);
1570 flags = flags & ~isInvalid; 1465 flags = flags & ~isInvalid;
1571 } 1466 }
1572 1467
1573 XDestroyImage (result); 1468 XDestroyImage (result);
1574 } 1469 }
1470# endif
1575 1471
1576 if (flags & isInvalid) 1472 if (flags & isInvalid)
1577 { 1473 {
1578 if (pixmap != None) 1474 if (pixmap != None)
1579 { 1475 {
… …
1582 } 1478 }
1583 } 1479 }
1584 1480
1585 apply (); 1481 apply ();
1586 1482
1587 XSync (target->dpy, False);
1588 valid_since = ev::now (); 1483 valid_since = ev::now ();
1589 1484
1590 TIMING_TEST_PRINT_RESULT (tp);
1591
1592 return true; 1485 return true;
1593} 1486}
1594 1487
1595bool 1488void
1596bgPixmap_t::set_target (rxvt_term *new_target) 1489bgPixmap_t::set_target (rxvt_term *new_target)
1597{ 1490{
1598 if (new_target)
1599 if (target != new_target)
1600 {
1601 target = new_target; 1491 target = new_target;
1602# ifdef ENABLE_TRANSPARENCY 1492
1603 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1493 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1494#if XRENDER
1495 int major, minor;
1496 if (XRenderQueryVersion (target->dpy, &major, &minor))
1497 flags |= HAS_RENDER;
1498 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1499 if (filters)
1500 {
1501 for (int i = 0; i < filters->nfilter; i++)
1502 if (!strcmp (filters->filter[i], FilterConvolution))
1503 flags |= HAS_RENDER_CONV;
1504
1505 XFree (filters);
1506 }
1604# endif 1507#endif
1605 return true;
1606 }
1607
1608 return false;
1609} 1508}
1610 1509
1611void 1510void
1612bgPixmap_t::apply () 1511bgPixmap_t::apply ()
1613{ 1512{
1614 if (target) 1513 if (target == NULL)
1615 { 1514 return;
1616 flags &= ~isVtOrigin;
1617 1515
1618 if (pixmap != None) 1516 if (pixmap != None)
1619 { 1517 {
1620 /* set target's background to pixmap */ 1518 /* set target's background to pixmap */
1621# ifdef ENABLE_TRANSPARENCY 1519# ifdef ENABLE_TRANSPARENCY
1622 if (flags & isTransparent) 1520 if (flags & isTransparent)
1623 { 1521 {
1624 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1522 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1625 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1523 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1626 1524
1627 if (target->scrollBar.win) 1525 if (target->scrollBar.win)
1628 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1526 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1629 } 1527 }
1630 else 1528 else
1631# endif 1529# endif
1632 { 1530 {
1633 flags |= isVtOrigin;
1634 /* force old pixmap dereference in case it was transparent before :*/ 1531 /* force old pixmap dereference in case it was transparent before :*/
1635 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1636 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1637 /* do we also need to set scrollbar's background here ? */
1638
1639 if (target->scrollBar.win)
1640 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1641 }
1642 }
1643 else
1644 {
1645 /* set target background to a pixel */
1646 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1532 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1647 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1533 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1648 /* do we also need to set scrollbar's background here ? */ 1534 /* do we also need to set scrollbar's background here ? */
1535
1649 if (target->scrollBar.win) 1536 if (target->scrollBar.win)
1650 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1537 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1651 } 1538 }
1539 }
1540 else
1541 {
1542 /* set target background to a pixel */
1543 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1544 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1545 /* do we also need to set scrollbar's background here ? */
1546 if (target->scrollBar.win)
1547 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1548 }
1652 1549
1653 /* don't want Expose on the parent or vt. It is better to use 1550 /* don't want Expose on the parent or vt. It is better to use
1654 scr_touch or we get a great deal of flicker otherwise: */ 1551 scr_touch or we get a great deal of flicker otherwise: */
1655 XClearWindow (target->dpy, target->parent[0]); 1552 XClearWindow (target->dpy, target->parent[0]);
1656 1553
1657 if (target->scrollBar.state && target->scrollBar.win) 1554 if (target->scrollBar.state && target->scrollBar.win)
1658 { 1555 {
1659 target->scrollBar.state = STATE_IDLE; 1556 target->scrollBar.state = STATE_IDLE;
1660 target->scrollBar.show (0); 1557 target->scrollBar.show (0);
1661 } 1558 }
1662 1559
1663 target->want_refresh = 1; 1560 target->want_refresh = 1;
1664 flags |= hasChanged; 1561 flags |= hasChanged;
1665 }
1666} 1562}
1667 1563
1668#endif /* HAVE_BG_PIXMAP */ 1564#endif /* HAVE_BG_PIXMAP */
1669 1565
1670#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1566#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1671/* taken from aterm-0.4.2 */ 1567/* taken from aterm-0.4.2 */
1672 1568
1673typedef uint32_t RUINT32T;
1674
1675static void 1569static void
1676ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1570ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1677{ 1571{
1678 int sh_r, sh_g, sh_b; 1572 int sh_r, sh_g, sh_b;
1679 RUINT32T mask_r, mask_g, mask_b; 1573 uint32_t mask_r, mask_g, mask_b;
1680 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1574 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1681 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1575 rgba low;
1682 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1576 rgba high;
1683 int i; 1577 int i;
1578 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1684 1579
1685 Visual *visual = term->visual;
1686
1687 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1580 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1688 1581
1689 /* for convenience */ 1582 /* for convenience */
1690 mask_r = visual->red_mask; 1583 mask_r = visual->red_mask;
1691 mask_g = visual->green_mask; 1584 mask_g = visual->green_mask;
1692 mask_b = visual->blue_mask; 1585 mask_b = visual->blue_mask;
1693 1586
1694 /* boring lookup table pre-initialization */ 1587 /* boring lookup table pre-initialization */
1695 switch (srcImage->bits_per_pixel) { 1588 switch (srcImage->depth)
1589 {
1696 case 15: 1590 case 15:
1697 if ((mask_r != 0x7c00) || 1591 if ((mask_r != 0x7c00) ||
1698 (mask_g != 0x03e0) || 1592 (mask_g != 0x03e0) ||
1699 (mask_b != 0x001f)) 1593 (mask_b != 0x001f))
1700 return; 1594 return;
1701 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1595 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1702 lookup_r = lookup; 1596 lookup_r = lookup;
1703 lookup_g = lookup+32; 1597 lookup_g = lookup+32;
1704 lookup_b = lookup+32+32; 1598 lookup_b = lookup+32+32;
1705 sh_r = 10; 1599 sh_r = 10;
1706 sh_g = 5; 1600 sh_g = 5;
1707 sh_b = 0; 1601 sh_b = 0;
1708 break; 1602 break;
1709 case 16: 1603 case 16:
1710 if ((mask_r != 0xf800) || 1604 if ((mask_r != 0xf800) ||
1711 (mask_g != 0x07e0) || 1605 (mask_g != 0x07e0) ||
1712 (mask_b != 0x001f)) 1606 (mask_b != 0x001f))
1713 return; 1607 return;
1714 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1608 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1715 lookup_r = lookup; 1609 lookup_r = lookup;
1716 lookup_g = lookup+32; 1610 lookup_g = lookup+32;
1717 lookup_b = lookup+32+64; 1611 lookup_b = lookup+32+64;
1718 sh_r = 11; 1612 sh_r = 11;
1719 sh_g = 5; 1613 sh_g = 5;
1720 sh_b = 0; 1614 sh_b = 0;
1721 break; 1615 break;
1722 case 24: 1616 case 24:
1723 if ((mask_r != 0xff0000) || 1617 if ((mask_r != 0xff0000) ||
1724 (mask_g != 0x00ff00) || 1618 (mask_g != 0x00ff00) ||
1725 (mask_b != 0x0000ff)) 1619 (mask_b != 0x0000ff))
1726 return; 1620 return;
1727 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1621 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1728 lookup_r = lookup; 1622 lookup_r = lookup;
1729 lookup_g = lookup+256; 1623 lookup_g = lookup+256;
1730 lookup_b = lookup+256+256; 1624 lookup_b = lookup+256+256;
1731 sh_r = 16; 1625 sh_r = 16;
1732 sh_g = 8; 1626 sh_g = 8;
1733 sh_b = 0; 1627 sh_b = 0;
1734 break; 1628 break;
1735 case 32: 1629 case 32:
1736 if ((mask_r != 0xff0000) || 1630 if ((mask_r != 0xff0000) ||
1737 (mask_g != 0x00ff00) || 1631 (mask_g != 0x00ff00) ||
1738 (mask_b != 0x0000ff)) 1632 (mask_b != 0x0000ff))
1739 return; 1633 return;
1740 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1634 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1741 lookup_r = lookup; 1635 lookup_r = lookup;
1742 lookup_g = lookup+256; 1636 lookup_g = lookup+256;
1743 lookup_b = lookup+256+256; 1637 lookup_b = lookup+256+256;
1744 sh_r = 16; 1638 sh_r = 16;
1745 sh_g = 8; 1639 sh_g = 8;
1746 sh_b = 0; 1640 sh_b = 0;
1747 break; 1641 break;
1748 default: 1642 default:
1749 return; /* we do not support this color depth */ 1643 return; /* we do not support this color depth */
1750 } 1644 }
1751 1645
1752 /* prepare limits for color transformation (each channel is handled separately) */ 1646 /* prepare limits for color transformation (each channel is handled separately) */
1753 if (shade > 100) { 1647 if (shade > 100)
1648 {
1754 shade = 200 - shade; 1649 shade = 200 - shade;
1755 1650
1756 lower_lim_r = 65535-rm; 1651 high.r = (65535 - c.r) * shade / 100;
1757 lower_lim_g = 65535-gm; 1652 high.g = (65535 - c.g) * shade / 100;
1758 lower_lim_b = 65535-bm; 1653 high.b = (65535 - c.b) * shade / 100;
1759 1654
1760 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1655 low.r = 65535 - high.r;
1761 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1656 low.g = 65535 - high.g;
1762 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1657 low.b = 65535 - high.b;
1763
1764 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1765 } else {
1766
1767 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1768
1769 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1770 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1771 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1772 } 1658 }
1773 1659 else
1774 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1775 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1776 { 1660 {
1777 unsigned int tmp; 1661 high.r = c.r * shade / 100;
1662 high.g = c.g * shade / 100;
1663 high.b = c.b * shade / 100;
1778 1664
1779 tmp = lower_lim_r; 1665 low.r = low.g = low.b = 0;
1780 lower_lim_r = lower_lim_b;
1781 lower_lim_b = tmp;
1782
1783 tmp = upper_lim_r;
1784 upper_lim_r = upper_lim_b;
1785 upper_lim_b = tmp;
1786 } 1666 }
1787 1667
1788 /* fill our lookup tables */ 1668 /* fill our lookup tables */
1789 for (i = 0; i <= mask_r>>sh_r; i++) 1669 for (i = 0; i <= mask_r>>sh_r; i++)
1790 { 1670 {
1791 RUINT32T tmp; 1671 uint32_t tmp;
1792 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1672 tmp = i * high.r;
1793 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1673 tmp += (mask_r>>sh_r) * low.r;
1794 lookup_r[i] = (tmp/65535)<<sh_r; 1674 lookup_r[i] = (tmp/65535)<<sh_r;
1795 } 1675 }
1796 for (i = 0; i <= mask_g>>sh_g; i++) 1676 for (i = 0; i <= mask_g>>sh_g; i++)
1797 { 1677 {
1798 RUINT32T tmp; 1678 uint32_t tmp;
1799 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1679 tmp = i * high.g;
1800 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1680 tmp += (mask_g>>sh_g) * low.g;
1801 lookup_g[i] = (tmp/65535)<<sh_g; 1681 lookup_g[i] = (tmp/65535)<<sh_g;
1802 } 1682 }
1803 for (i = 0; i <= mask_b>>sh_b; i++) 1683 for (i = 0; i <= mask_b>>sh_b; i++)
1804 { 1684 {
1805 RUINT32T tmp; 1685 uint32_t tmp;
1806 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1686 tmp = i * high.b;
1807 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1687 tmp += (mask_b>>sh_b) * low.b;
1808 lookup_b[i] = (tmp/65535)<<sh_b; 1688 lookup_b[i] = (tmp/65535)<<sh_b;
1809 } 1689 }
1810 1690
1811 /* apply table to input image (replacing colors by newly calculated ones) */ 1691 /* apply table to input image (replacing colors by newly calculated ones) */
1812 switch (srcImage->bits_per_pixel) 1692 if (srcImage->bits_per_pixel == 32
1693 && (srcImage->depth == 24 || srcImage->depth == 32)
1694 && srcImage->byte_order == host_byte_order)
1813 { 1695 {
1814 case 15:
1815 {
1816 unsigned short *p1, *pf, *p, *pl; 1696 uint32_t *p1, *pf, *p, *pl;
1817 p1 = (unsigned short *) srcImage->data; 1697 p1 = (uint32_t *) srcImage->data;
1818 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1698 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1699
1819 while (p1 < pf) 1700 while (p1 < pf)
1820 { 1701 {
1821 p = p1; 1702 p = p1;
1822 pl = p1 + srcImage->width; 1703 pl = p1 + srcImage->width;
1823 for (; p < pl; p++) 1704 for (; p < pl; p++)
1824 { 1705 {
1825 *p = lookup_r[(*p & 0x7c00)>>10] |
1826 lookup_g[(*p & 0x03e0)>> 5] |
1827 lookup_b[(*p & 0x001f)];
1828 }
1829 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1830 }
1831 break;
1832 }
1833 case 16:
1834 {
1835 unsigned short *p1, *pf, *p, *pl;
1836 p1 = (unsigned short *) srcImage->data;
1837 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1838 while (p1 < pf)
1839 {
1840 p = p1;
1841 pl = p1 + srcImage->width;
1842 for (; p < pl; p++)
1843 {
1844 *p = lookup_r[(*p & 0xf800)>>11] |
1845 lookup_g[(*p & 0x07e0)>> 5] |
1846 lookup_b[(*p & 0x001f)];
1847 }
1848 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1849 }
1850 break;
1851 }
1852 case 24:
1853 {
1854 unsigned char *p1, *pf, *p, *pl;
1855 p1 = (unsigned char *) srcImage->data;
1856 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1857 while (p1 < pf)
1858 {
1859 p = p1;
1860 pl = p1 + srcImage->width * 3;
1861 for (; p < pl; p += 3)
1862 {
1863 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1864 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1865 p[2] = lookup_r[(p[2] & 0x0000ff)];
1866 }
1867 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1868 }
1869 break;
1870 }
1871 case 32:
1872 {
1873 RUINT32T *p1, *pf, *p, *pl;
1874 p1 = (RUINT32T *) srcImage->data;
1875 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1876
1877 while (p1 < pf)
1878 {
1879 p = p1;
1880 pl = p1 + srcImage->width;
1881 for (; p < pl; p++)
1882 {
1883 *p = lookup_r[(*p & 0xff0000)>>16] | 1706 *p = lookup_r[(*p & 0xff0000) >> 16] |
1884 lookup_g[(*p & 0x00ff00)>> 8] | 1707 lookup_g[(*p & 0x00ff00) >> 8] |
1885 lookup_b[(*p & 0x0000ff)] | 1708 lookup_b[(*p & 0x0000ff)] |
1886 (*p & ~0xffffff); 1709 (*p & 0xff000000);
1710 }
1711 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1712 }
1713 }
1714 else
1715 {
1716 for (int y = 0; y < srcImage->height; y++)
1717 for (int x = 0; x < srcImage->width; x++)
1718 {
1719 unsigned long pixel = XGetPixel (srcImage, x, y);
1720 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1721 lookup_g[(pixel & mask_g) >> sh_g] |
1722 lookup_b[(pixel & mask_b) >> sh_b];
1723 XPutPixel (srcImage, x, y, pixel);
1887 } 1724 }
1888 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1889 } 1725 }
1890 break;
1891 }
1892 }
1893 1726
1894 free (lookup); 1727 free (lookup);
1895} 1728}
1896#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1729#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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