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

Diff Legend

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