ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.74 by sf-exg, Sun Oct 10 21:56:09 2010 UTC vs.
Revision 1.97 by sf-exg, Fri Oct 22 18:03:10 2010 UTC

… …
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
… …
19 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
23 24
25#include <cmath>
24#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
26 28
27#define DO_TIMING_TEST 0 29#define DO_TIMING_TEST 0
28 30
… …
104#ifdef BG_IMAGE_FROM_FILE 106#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 107 have_image = false;
106 h_scale = v_scale = 0; 108 h_scale = v_scale = 0;
107 h_align = v_align = 0; 109 h_align = v_align = 0;
108#endif 110#endif
111#ifdef ENABLE_TRANSPARENCY
112 shade = 100;
113#endif
109 flags = 0; 114 flags = 0;
110 pixmap = None; 115 pixmap = None;
111 valid_since = invalid_since = 0; 116 valid_since = invalid_since = 0;
112 target = 0; 117 target = 0;
113} 118}
… …
170bool bgPixmap_t::need_client_side_rendering () 175bool bgPixmap_t::need_client_side_rendering ()
171{ 176{
172# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
173 if (original_asim) 178 if (original_asim)
174 return true; 179 return true;
175# endif
176# ifdef ENABLE_TRANSPARENCY
177 if (flags & isTransparent)
178 {
179# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
180 if ((flags & blurNeeded) && !(flags & blurServerSide))
181 return true;
182# endif
183 if ((flags & tintNeeded) && !(flags & tintServerSide))
184 return true;
185 }
186# endif 180# endif
187 return false; 181 return false;
188} 182}
189 183
190# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
… …
228 int diff = window_size - image_size; 222 int diff = window_size - image_size;
229 int smaller = min (image_size, window_size); 223 int smaller = min (image_size, window_size);
230 224
231 if (align >= 0 && align <= 100) 225 if (align >= 0 && align <= 100)
232 return diff * align / 100; 226 return diff * align / 100;
233 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200)
234 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
235 else if (align >= -100 && align < 0) 229 else if (align >= -100 && align < 0)
236 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
237 return 0; 231 return 0;
238} 232}
… …
434 { 428 {
435 flags = new_flags; 429 flags = new_flags;
436 changed++; 430 changed++;
437 } 431 }
438 432
439 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
440 // flags, h_scale, v_scale, h_align, v_align);
441 return (changed > 0); 433 return (changed > 0);
442} 434}
443 435
444void 436void
445bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
… …
474 x = make_align_position (h_align, target_width, w); 466 x = make_align_position (h_align, target_width, w);
475 y = make_align_position (v_align, target_height, h); 467 y = make_align_position (v_align, target_height, h);
476 } 468 }
477 469
478 flags &= ~sizeSensitive; 470 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0 471 if ((flags & propScale) || h_scale || v_scale
480 || h_align != 0 || v_align != 0 472 || (!(flags & rootAlign) && (h_align || v_align))
481 || w > target_width || h > target_height) 473 || w > target_width || h > target_height)
482 flags |= sizeSensitive; 474 flags |= sizeSensitive;
483} 475}
484 476
485# ifdef HAVE_AFTERIMAGE 477# ifdef HAVE_AFTERIMAGE
… …
499 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 491 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
500 492
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 493 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 { 494 {
503 ShadingInfo as_shade; 495 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade; 496 as_shade.shading = shade;
505 497
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 498 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet) 499 if (flags & tintSet)
508 tint.get (c); 500 tint.get (c);
509 as_shade.tintColor.red = c.r; 501 as_shade.tintColor.red = c.r;
… …
511 as_shade.tintColor.blue = c.b; 503 as_shade.tintColor.blue = c.b;
512 504
513 background_tint = shading2tint32 (&as_shade); 505 background_tint = shading2tint32 (&as_shade);
514 } 506 }
515 507
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 508 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
517 { 509 {
518 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 510 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
519 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 511 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
520 100, ASIMAGE_QUALITY_DEFAULT); 512 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp) 513 if (tmp)
… …
535 527
536 int x = 0; 528 int x = 0;
537 int y = 0; 529 int y = 0;
538 int w = 0; 530 int w = 0;
539 int h = 0; 531 int h = 0;
540
541 TIMING_TEST_START (asim);
542 532
543 if (original_asim) 533 if (original_asim)
544 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 534 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
545 535
546 if (!original_asim 536 if (!original_asim
… …
663 } 653 }
664 654
665 free (layers); 655 free (layers);
666 } 656 }
667 } 657 }
668 TIMING_TEST_PRINT_RESULT (asim);
669 658
670 bool ret = false; 659 bool ret = false;
671 660
672 if (result) 661 if (result)
673 { 662 {
… …
719 708
720 if (result != background && result != original_asim) 709 if (result != background && result != original_asim)
721 destroy_asimage (&result); 710 destroy_asimage (&result);
722 711
723 XFreeGC (target->dpy, gc); 712 XFreeGC (target->dpy, gc);
724 TIMING_TEST_PRINT_RESULT (asim);
725 713
726 ret = true; 714 ret = true;
727 } 715 }
728 716
729 if (background) 717 if (background)
… …
741 return false; 729 return false;
742 730
743 if (!pixbuf) 731 if (!pixbuf)
744 return false; 732 return false;
745 733
746 // TODO: add alpha blending 734#if !XFT
747 if (background_flags) 735 if (background_flags)
748 return false; 736 return false;
737#endif
749 738
750 GdkPixbuf *result; 739 GdkPixbuf *result;
751 740
752 int image_width = gdk_pixbuf_get_width (pixbuf); 741 int image_width = gdk_pixbuf_get_width (pixbuf);
753 int image_height = gdk_pixbuf_get_height (pixbuf); 742 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
785 774
786 if (result) 775 if (result)
787 { 776 {
788 XGCValues gcv; 777 XGCValues gcv;
789 GC gc; 778 GC gc;
779 Pixmap root_pmap;
790 780
791 image_width = gdk_pixbuf_get_width (result); 781 image_width = gdk_pixbuf_get_width (result);
792 image_height = gdk_pixbuf_get_height (result); 782 image_height = gdk_pixbuf_get_height (result);
793 783
784 if (background_flags)
785 {
786 root_pmap = pixmap;
787 pixmap = None;
788 }
789 else
790 {
794 if (h_scale == 0 || v_scale == 0) 791 if (h_scale == 0 || v_scale == 0)
795 { 792 {
796 new_pmap_width = min (image_width, target_width); 793 new_pmap_width = min (image_width, target_width);
797 new_pmap_height = min (image_height, target_height); 794 new_pmap_height = min (image_height, target_height);
795 }
798 } 796 }
799 797
800 if (pixmap) 798 if (pixmap)
801 { 799 {
802 if (pmap_width != new_pmap_width 800 if (pmap_width != new_pmap_width
… …
858 dst_width, dst_height, 856 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE, 857 XLIB_RGB_DITHER_NONE,
860 0, 0); 858 0, 0);
861 } 859 }
862 860
861#if XFT
862 if (background_flags)
863 {
864 Display *dpy = target->dpy;
865 XRenderPictureAttributes pa;
866
867 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
868 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
869
870 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
871 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
872
873 pa.repeat = True;
874 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
875 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
876 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
877 XFreePixmap (dpy, mask_pmap);
878
879 if (src && dst && mask)
880 {
881 XRenderColor mask_c;
882
883 mask_c.alpha = 0x8000;
884 mask_c.red = 0;
885 mask_c.green = 0;
886 mask_c.blue = 0;
887 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
888 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
889 }
890
891 XRenderFreePicture (dpy, src);
892 XRenderFreePicture (dpy, dst);
893 XRenderFreePicture (dpy, mask);
894
895 XFreePixmap (dpy, root_pmap);
896 }
897#endif
898
863 if (result != pixbuf) 899 if (result != pixbuf)
864 g_object_unref (result); 900 g_object_unref (result);
865 901
866 XFreeGC (target->dpy, gc); 902 XFreeGC (target->dpy, gc);
867 903
… …
889 } 925 }
890 926
891# ifdef HAVE_AFTERIMAGE 927# ifdef HAVE_AFTERIMAGE
892 if (!target->asimman) 928 if (!target->asimman)
893 target->asimman = create_generic_imageman (target->rs[Rs_path]); 929 target->asimman = create_generic_imageman (target->rs[Rs_path]);
894 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image)
932 {
895 if (original_asim) 933 if (original_asim)
934 safe_asimage_destroy (original_asim);
935 original_asim = image;
896 have_image = true; 936 have_image = true;
897 return have_image; 937 return true;
938 }
898# endif 939# endif
899 940
900# ifdef HAVE_PIXBUF 941# ifdef HAVE_PIXBUF
901 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image)
944 {
902 if (pixbuf) 945 if (pixbuf)
946 g_object_unref (pixbuf);
947 pixbuf = image;
903 have_image = true; 948 have_image = true;
904 return have_image; 949 return true;
950 }
905# endif 951# endif
906 } 952 }
907 953
908 return false; 954 return false;
909} 955}
… …
934 if (!(geom_flags & WidthValue)) 980 if (!(geom_flags & WidthValue))
935 hr = 1; 981 hr = 1;
936 if (!(geom_flags & HeightValue)) 982 if (!(geom_flags & HeightValue))
937 vr = hr; 983 vr = hr;
938 984
985 min_it (hr, 128);
986 min_it (vr, 128);
987
939 if (h_blurRadius != hr) 988 if (h_blurRadius != hr)
940 { 989 {
941 ++changed; 990 ++changed;
942 h_blurRadius = hr; 991 h_blurRadius = hr;
943 } 992 }
… …
951 if (v_blurRadius == 0 && h_blurRadius == 0) 1000 if (v_blurRadius == 0 && h_blurRadius == 0)
952 flags &= ~blurNeeded; 1001 flags &= ~blurNeeded;
953 else 1002 else
954 flags |= blurNeeded; 1003 flags |= blurNeeded;
955 1004
1005#if XFT
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1007 if (filters)
1008 {
1009 for (int i = 0; i < filters->nfilter; i++)
1010 if (!strcmp (filters->filter[i], FilterConvolution))
1011 flags |= bgPixmap_t::blurServerSide;
1012
1013 XFree (filters);
1014 }
1015#endif
1016
956 return (changed > 0); 1017 return (changed > 0);
957} 1018}
958 1019
959static inline unsigned long 1020static inline unsigned long
960compute_tint_shade_flags (rxvt_color *tint, int shade) 1021compute_tint_shade_flags (rxvt_color *tint, int shade)
961{ 1022{
962 unsigned long flags = 0; 1023 unsigned long flags = 0;
963 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1024 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
964 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1025 bool has_shade = shade != 100;
965 1026
966 if (tint) 1027 if (tint)
967 { 1028 {
968 tint->get (c); 1029 tint->get (c);
969# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1030# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
1029} 1090}
1030 1091
1031bool 1092bool
1032bgPixmap_t::set_shade (const char *shade_str) 1093bgPixmap_t::set_shade (const char *shade_str)
1033{ 1094{
1034 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1095 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1035 1096
1036 if (new_shade < 0 && new_shade > -100) 1097 clamp_it (new_shade, -100, 200);
1098 if (new_shade < 0)
1037 new_shade = 200 - (100 + new_shade); 1099 new_shade = 200 - (100 + new_shade);
1038 else if (new_shade == 100)
1039 new_shade = 0;
1040 1100
1041 if (new_shade != shade) 1101 if (new_shade != shade)
1042 { 1102 {
1043 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1103 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1044 shade = new_shade; 1104 shade = new_shade;
… …
1047 } 1107 }
1048 1108
1049 return false; 1109 return false;
1050} 1110}
1051 1111
1112#if XFT
1113static void
1114get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1115{
1116 double sigma = radius / 2.0;
1117 double scale = sqrt (2.0 * M_PI) * sigma;
1118 double sum = 0.0;
1119
1120 for (int i = 0; i < width; i++)
1121 {
1122 double x = i - width / 2;
1123 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1124 sum += kernel[i];
1125 }
1126
1127 params[0] = XDoubleToFixed (width);
1128 params[1] = XDoubleToFixed (1);
1129
1130 for (int i = 0; i < width; i++)
1131 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1132}
1133#endif
1134
1052bool 1135bool
1136bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1137{
1138 bool ret = false;
1139#if XFT
1140 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1141 double *kernel = (double *)malloc (size * sizeof (double));
1142 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1143
1144 Display *dpy = target->dpy;
1145 XRenderPictureAttributes pa;
1146 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1147
1148 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1149 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1150
1151 if (kernel && params && src && dst)
1152 {
1153 if (h_blurRadius)
1154 {
1155 size = h_blurRadius * 2 + 1;
1156 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1157
1158 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1159 XRenderComposite (dpy,
1160 PictOpSrc,
1161 src,
1162 None,
1163 dst,
1164 0, 0,
1165 0, 0,
1166 0, 0,
1167 width, height);
1168 }
1169
1170 if (v_blurRadius)
1171 {
1172 size = v_blurRadius * 2 + 1;
1173 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1174 swap (params[0], params[1]);
1175
1176 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1177 XRenderComposite (dpy,
1178 PictOpSrc,
1179 src,
1180 None,
1181 dst,
1182 0, 0,
1183 0, 0,
1184 0, 0,
1185 width, height);
1186 }
1187
1188 ret = true;
1189 }
1190
1191 free (kernel);
1192 free (params);
1193 XRenderFreePicture (dpy, src);
1194 XRenderFreePicture (dpy, dst);
1195#endif
1196 return ret;
1197}
1198
1199bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap, Window root, int width, int height) 1200bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1054{ 1201{
1055 Display *dpy = target->dpy; 1202 Display *dpy = target->dpy;
1056 bool ret = false; 1203 bool ret = false;
1057 1204
1058 if (flags & tintWholesome) 1205 if (flags & tintWholesome)
… …
1064 * performance improvements, as we eliminate XImage transfer 1211 * performance improvements, as we eliminate XImage transfer
1065 */ 1212 */
1066 gcv.foreground = Pixel (tint); 1213 gcv.foreground = Pixel (tint);
1067 gcv.function = GXand; 1214 gcv.function = GXand;
1068 gcv.fill_style = FillSolid; 1215 gcv.fill_style = FillSolid;
1069 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 1216 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1070 if (gc) 1217 if (gc)
1071 { 1218 {
1072 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1219 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1073 ret = true; 1220 ret = true;
1074 XFreeGC (dpy, gc); 1221 XFreeGC (dpy, gc);
… …
1080 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1227 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1081 1228
1082 if (flags & tintSet) 1229 if (flags & tintSet)
1083 tint.get (c); 1230 tint.get (c);
1084 1231
1085 if (shade > 0 && shade < 100) 1232 if (shade <= 100)
1086 { 1233 {
1087 c.r = (c.r * shade) / 100; 1234 c.r = (c.r * shade) / 100;
1088 c.g = (c.g * shade) / 100; 1235 c.g = (c.g * shade) / 100;
1089 c.b = (c.b * shade) / 100; 1236 c.b = (c.b * shade) / 100;
1090 } 1237 }
1091 else if (shade > 100 && shade < 200) 1238 else
1092 { 1239 {
1093 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1240 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1094 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1241 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1095 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1242 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1096 } 1243 }
1097 1244
1098 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1245 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1099 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); 1246 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1100 XRenderPictureAttributes pa; 1247 XRenderPictureAttributes pa;
1101 1248
1102 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1249 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1103 1250
1104 pa.repeat = True; 1251 pa.repeat = True;
1105 1252
1106 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1253 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1107 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1254 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1108 XFreePixmap (dpy, overlay_pmap); 1255 XFreePixmap (dpy, overlay_pmap);
1109 1256
1110 pa.component_alpha = True; 1257 pa.component_alpha = True;
1111 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1258 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1112 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1259 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1113 XFreePixmap (dpy, mask_pmap); 1260 XFreePixmap (dpy, mask_pmap);
1114 1261
1115 if (mask_pic && overlay_pic && back_pic) 1262 if (mask_pic && overlay_pic && back_pic)
1116 { 1263 {
… …
1130 } 1277 }
1131 1278
1132 XRenderFreePicture (dpy, mask_pic); 1279 XRenderFreePicture (dpy, mask_pic);
1133 XRenderFreePicture (dpy, overlay_pic); 1280 XRenderFreePicture (dpy, overlay_pic);
1134 XRenderFreePicture (dpy, back_pic); 1281 XRenderFreePicture (dpy, back_pic);
1135# if DO_TIMING_TEST
1136 XSync (dpy, False);
1137# endif
1138# endif 1282# endif
1139 } 1283 }
1140 1284
1141 return ret; 1285 return ret;
1142} 1286}
… …
1165 unsigned int root_pmap_width, root_pmap_height; 1309 unsigned int root_pmap_width, root_pmap_height;
1166 int window_width = target->szHint.width; 1310 int window_width = target->szHint.width;
1167 int window_height = target->szHint.height; 1311 int window_height = target->szHint.height;
1168 int sx, sy; 1312 int sx, sy;
1169 XGCValues gcv; 1313 XGCValues gcv;
1314 GC gc;
1170 1315
1171 TIMING_TEST_START (tp);
1172 target->get_window_origin (sx, sy); 1316 target->get_window_origin (sx, sy);
1173 1317
1174 /* check if we are outside of the visible part of the virtual screen : */ 1318 /* check if we are outside of the visible part of the virtual screen : */
1175 if (sx + window_width <= 0 || sy + window_height <= 0 1319 if (sx + window_width <= 0 || sy + window_height <= 0
1176 || sx >= root_width || sy >= root_height) 1320 || sx >= root_width || sy >= root_height)
1177 return 0; 1321 return 0;
1178 1322
1179 if (root_pixmap != None) 1323 if (root_pixmap != None)
1180 { 1324 {
1181 /* we want to validate the pixmap and get it's size at the same time : */ 1325 /* we want to validate the pixmap and get its size at the same time : */
1182 int junk; 1326 int junk;
1183 unsigned int ujunk; 1327 unsigned int ujunk;
1184 /* root pixmap may be bad - allow a error */ 1328 /* root pixmap may be bad - allow a error */
1185 target->allowedxerror = -1; 1329 target->allowedxerror = -1;
1186 1330
… …
1188 root_pixmap = None; 1332 root_pixmap = None;
1189 1333
1190 target->allowedxerror = 0; 1334 target->allowedxerror = 0;
1191 } 1335 }
1192 1336
1337 if (root_pixmap == None)
1338 return 0;
1339
1193 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1340 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
1194 GC gc = NULL;
1195 1341
1196 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1342 if (tiled_root_pmap == None) /* something really bad happened - abort */
1197 return 0; 1343 return 0;
1198 1344
1199 if (root_pixmap == None)
1200 {
1201 /* use tricks to obtain the root background image :*/
1202 /* we want to create Overrideredirect window overlapping out window
1203 with background type of Parent Relative and then grab it */
1204 XSetWindowAttributes attr;
1205 Window src;
1206 bool success = false;
1207
1208 attr.background_pixmap = ParentRelative;
1209 attr.backing_store = Always;
1210 attr.event_mask = ExposureMask;
1211 attr.override_redirect = True;
1212 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1213 CopyFromParent, CopyFromParent, CopyFromParent,
1214 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1215 &attr);
1216
1217 if (src != None)
1218 {
1219 XEvent event;
1220 int ev_count = 0;
1221 XGrabServer (dpy);
1222 XMapRaised (dpy, src);
1223 XSync (dpy, False);
1224
1225 /* XSync should get window where it's properly exposed,
1226 * but to be on the safe side - let's check for the actual event to arrive : */
1227 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
1228 ++ev_count;
1229
1230 if (ev_count > 0);
1231 {
1232 /* hooray! - we can grab the image! */
1233 gc = XCreateGC (dpy, root, 0, NULL);
1234 if (gc)
1235 {
1236 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
1237 success = true;
1238 }
1239 }
1240
1241 XDestroyWindow (dpy, src);
1242 XUngrabServer (dpy);
1243 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1244 }
1245
1246 if (!success)
1247 {
1248 XFreePixmap (dpy, tiled_root_pmap);
1249 tiled_root_pmap = None;
1250 }
1251 else
1252 result |= transpPmapTiled;
1253 }
1254 else
1255 {
1256 /* straightforward pixmap copy */ 1345 /* straightforward pixmap copy */
1257 gcv.tile = root_pixmap; 1346 gcv.tile = root_pixmap;
1258 gcv.fill_style = FillTiled; 1347 gcv.fill_style = FillTiled;
1259 1348
1260 while (sx < 0) sx += (int)root_width; 1349 while (sx < 0) sx += (int)root_width;
1261 while (sy < 0) sy += (int)root_height; 1350 while (sy < 0) sy += (int)root_height;
1262 1351
1263 gcv.ts_x_origin = -sx; 1352 gcv.ts_x_origin = -sx;
1264 gcv.ts_y_origin = -sy; 1353 gcv.ts_y_origin = -sy;
1265 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1354 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1266 1355
1267 if (gc) 1356 if (gc)
1268 { 1357 {
1269 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1358 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1270 result |= transpPmapTiled; 1359 result |= transpPmapTiled;
1271 } 1360 XFreeGC (dpy, gc);
1272 } 1361 }
1273 TIMING_TEST_PRINT_RESULT (tp);
1274 1362
1275 if (tiled_root_pmap != None) 1363 if (tiled_root_pmap != None)
1276 { 1364 {
1277 if (!need_client_side_rendering ()) 1365 if (!need_client_side_rendering ())
1278 { 1366 {
1279 if ((flags & tintNeeded)) 1367 if (flags & (blurNeeded | blurServerSide))
1368 {
1369 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1370 result |= transpPmapBlurred;
1280 { 1371 }
1372 if (flags & (tintNeeded | tintServerSide))
1373 {
1281 if (tint_pixmap (tiled_root_pmap, root, window_width, window_height)) 1374 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1282 result |= transpPmapTinted; 1375 result |= transpPmapTinted;
1283 } 1376 }
1284 } /* server side rendering completed */ 1377 } /* server side rendering completed */
1285 1378
1286 if (pixmap) 1379 if (pixmap)
… …
1290 pmap_width = window_width; 1383 pmap_width = window_width;
1291 pmap_height = window_height; 1384 pmap_height = window_height;
1292 pmap_depth = root_depth; 1385 pmap_depth = root_depth;
1293 } 1386 }
1294 1387
1295 if (gc)
1296 XFreeGC (dpy, gc);
1297
1298 TIMING_TEST_PRINT_RESULT (tp);
1299
1300 return result; 1388 return result;
1301} 1389}
1302 1390
1303bool 1391bool
1304bgPixmap_t::set_root_pixmap () 1392bgPixmap_t::set_root_pixmap ()
… …
1316 return false; 1404 return false;
1317} 1405}
1318# endif /* ENABLE_TRANSPARENCY */ 1406# endif /* ENABLE_TRANSPARENCY */
1319 1407
1320# ifndef HAVE_AFTERIMAGE 1408# ifndef HAVE_AFTERIMAGE
1321static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1409static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1322# endif 1410# endif
1323 1411
1324bool 1412bool
1325bgPixmap_t::render () 1413bgPixmap_t::render ()
1326{ 1414{
1327 unsigned long background_flags = 0; 1415 unsigned long background_flags = 0;
1328 1416
1329 if (target == NULL) 1417 if (target == NULL)
1330 return false; 1418 return false;
1331
1332 TIMING_TEST_START (tp);
1333 1419
1334 invalidate (); 1420 invalidate ();
1335# ifdef ENABLE_TRANSPARENCY 1421# ifdef ENABLE_TRANSPARENCY
1336 if (flags & isTransparent) 1422 if (flags & isTransparent)
1337 { 1423 {
… …
1370 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1456 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1371 { 1457 {
1372 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1458 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1373 if (flags & tintSet) 1459 if (flags & tintSet)
1374 tint.get (c); 1460 tint.get (c);
1375 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1461 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1376 } 1462 }
1377# endif 1463# endif
1378 1464
1379 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1465 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1380 1466
… …
1426 } 1512 }
1427 } 1513 }
1428 1514
1429 apply (); 1515 apply ();
1430 1516
1431 XSync (target->dpy, False);
1432 valid_since = ev::now (); 1517 valid_since = ev::now ();
1433
1434 TIMING_TEST_PRINT_RESULT (tp);
1435 1518
1436 return true; 1519 return true;
1437} 1520}
1438 1521
1439bool 1522bool
… …
1455void 1538void
1456bgPixmap_t::apply () 1539bgPixmap_t::apply ()
1457{ 1540{
1458 if (target) 1541 if (target)
1459 { 1542 {
1460 flags &= ~isVtOrigin;
1461
1462 if (pixmap != None) 1543 if (pixmap != None)
1463 { 1544 {
1464 /* set target's background to pixmap */ 1545 /* set target's background to pixmap */
1465# ifdef ENABLE_TRANSPARENCY 1546# ifdef ENABLE_TRANSPARENCY
1466 if (flags & isTransparent) 1547 if (flags & isTransparent)
… …
1472 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1553 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1473 } 1554 }
1474 else 1555 else
1475# endif 1556# endif
1476 { 1557 {
1477 flags |= isVtOrigin;
1478 /* force old pixmap dereference in case it was transparent before :*/ 1558 /* force old pixmap dereference in case it was transparent before :*/
1479 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1559 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1480 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1560 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1481 /* do we also need to set scrollbar's background here ? */ 1561 /* do we also need to set scrollbar's background here ? */
1482 1562
… …
1512#endif /* HAVE_BG_PIXMAP */ 1592#endif /* HAVE_BG_PIXMAP */
1513 1593
1514#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1594#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1515/* taken from aterm-0.4.2 */ 1595/* taken from aterm-0.4.2 */
1516 1596
1517typedef uint32_t RUINT32T;
1518
1519static void 1597static void
1520ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1598ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm)
1521{ 1599{
1522 int sh_r, sh_g, sh_b; 1600 int sh_r, sh_g, sh_b;
1523 RUINT32T mask_r, mask_g, mask_b; 1601 uint32_t mask_r, mask_g, mask_b;
1524 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1602 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1525 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1603 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1526 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1604 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1527 int i; 1605 int i;
1606 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1528 1607
1529 Visual *visual = term->visual;
1530
1531 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1608 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1532
1533 if (shade == 0)
1534 shade = 100;
1535 1609
1536 /* for convenience */ 1610 /* for convenience */
1537 mask_r = visual->red_mask; 1611 mask_r = visual->red_mask;
1538 mask_g = visual->green_mask; 1612 mask_g = visual->green_mask;
1539 mask_b = visual->blue_mask; 1613 mask_b = visual->blue_mask;
1540 1614
1541 /* boring lookup table pre-initialization */ 1615 /* boring lookup table pre-initialization */
1542 switch (srcImage->bits_per_pixel) { 1616 switch (srcImage->depth)
1617 {
1543 case 15: 1618 case 15:
1544 if ((mask_r != 0x7c00) || 1619 if ((mask_r != 0x7c00) ||
1545 (mask_g != 0x03e0) || 1620 (mask_g != 0x03e0) ||
1546 (mask_b != 0x001f)) 1621 (mask_b != 0x001f))
1547 return; 1622 return;
1548 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1623 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1549 lookup_r = lookup; 1624 lookup_r = lookup;
1550 lookup_g = lookup+32; 1625 lookup_g = lookup+32;
1551 lookup_b = lookup+32+32; 1626 lookup_b = lookup+32+32;
1552 sh_r = 10; 1627 sh_r = 10;
1553 sh_g = 5; 1628 sh_g = 5;
1554 sh_b = 0; 1629 sh_b = 0;
1555 break; 1630 break;
1556 case 16: 1631 case 16:
1557 if ((mask_r != 0xf800) || 1632 if ((mask_r != 0xf800) ||
1558 (mask_g != 0x07e0) || 1633 (mask_g != 0x07e0) ||
1559 (mask_b != 0x001f)) 1634 (mask_b != 0x001f))
1560 return; 1635 return;
1561 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1636 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1562 lookup_r = lookup; 1637 lookup_r = lookup;
1563 lookup_g = lookup+32; 1638 lookup_g = lookup+32;
1564 lookup_b = lookup+32+64; 1639 lookup_b = lookup+32+64;
1565 sh_r = 11; 1640 sh_r = 11;
1566 sh_g = 5; 1641 sh_g = 5;
1567 sh_b = 0; 1642 sh_b = 0;
1568 break; 1643 break;
1569 case 24: 1644 case 24:
1570 if ((mask_r != 0xff0000) || 1645 if ((mask_r != 0xff0000) ||
1571 (mask_g != 0x00ff00) || 1646 (mask_g != 0x00ff00) ||
1572 (mask_b != 0x0000ff)) 1647 (mask_b != 0x0000ff))
1573 return; 1648 return;
1574 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1649 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1575 lookup_r = lookup; 1650 lookup_r = lookup;
1576 lookup_g = lookup+256; 1651 lookup_g = lookup+256;
1577 lookup_b = lookup+256+256; 1652 lookup_b = lookup+256+256;
1578 sh_r = 16; 1653 sh_r = 16;
1579 sh_g = 8; 1654 sh_g = 8;
1580 sh_b = 0; 1655 sh_b = 0;
1581 break; 1656 break;
1582 case 32: 1657 case 32:
1583 if ((mask_r != 0xff0000) || 1658 if ((mask_r != 0xff0000) ||
1584 (mask_g != 0x00ff00) || 1659 (mask_g != 0x00ff00) ||
1585 (mask_b != 0x0000ff)) 1660 (mask_b != 0x0000ff))
1586 return; 1661 return;
1587 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1662 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1588 lookup_r = lookup; 1663 lookup_r = lookup;
1589 lookup_g = lookup+256; 1664 lookup_g = lookup+256;
1590 lookup_b = lookup+256+256; 1665 lookup_b = lookup+256+256;
1591 sh_r = 16; 1666 sh_r = 16;
1592 sh_g = 8; 1667 sh_g = 8;
1593 sh_b = 0; 1668 sh_b = 0;
1594 break; 1669 break;
1595 default: 1670 default:
1596 return; /* we do not support this color depth */ 1671 return; /* we do not support this color depth */
1597 } 1672 }
1598 1673
1599 /* prepare limits for color transformation (each channel is handled separately) */ 1674 /* prepare limits for color transformation (each channel is handled separately) */
1600 if (shade < 0) { 1675 if (shade > 100)
1676 {
1601 shade = -shade; 1677 shade = 200 - shade;
1602 if (shade < 0) shade = 0;
1603 if (shade > 100) shade = 100;
1604 1678
1605 lower_lim_r = 65535-rm; 1679 lower_lim_r = 65535-rm;
1606 lower_lim_g = 65535-gm; 1680 lower_lim_g = 65535-gm;
1607 lower_lim_b = 65535-bm; 1681 lower_lim_b = 65535-bm;
1608 1682
1609 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1683 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1610 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1684 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1611 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1685 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1612 1686
1613 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1687 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1688 }
1614 } else { 1689 else
1615 if (shade < 0) shade = 0; 1690 {
1616 if (shade > 100) shade = 100;
1617 1691
1618 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1692 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1619 1693
1620 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1694 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1621 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1695 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1622 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1696 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1623 } 1697 }
1624
1625 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1626 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1627 {
1628 unsigned int tmp;
1629
1630 tmp = lower_lim_r;
1631 lower_lim_r = lower_lim_b;
1632 lower_lim_b = tmp;
1633
1634 tmp = upper_lim_r;
1635 upper_lim_r = upper_lim_b;
1636 upper_lim_b = tmp;
1637 }
1638 1698
1639 /* fill our lookup tables */ 1699 /* fill our lookup tables */
1640 for (i = 0; i <= mask_r>>sh_r; i++) 1700 for (i = 0; i <= mask_r>>sh_r; i++)
1641 { 1701 {
1642 RUINT32T tmp; 1702 uint32_t tmp;
1643 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1703 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1644 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1704 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1645 lookup_r[i] = (tmp/65535)<<sh_r; 1705 lookup_r[i] = (tmp/65535)<<sh_r;
1646 } 1706 }
1647 for (i = 0; i <= mask_g>>sh_g; i++) 1707 for (i = 0; i <= mask_g>>sh_g; i++)
1648 { 1708 {
1649 RUINT32T tmp; 1709 uint32_t tmp;
1650 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1710 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1651 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1711 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1652 lookup_g[i] = (tmp/65535)<<sh_g; 1712 lookup_g[i] = (tmp/65535)<<sh_g;
1653 } 1713 }
1654 for (i = 0; i <= mask_b>>sh_b; i++) 1714 for (i = 0; i <= mask_b>>sh_b; i++)
1655 { 1715 {
1656 RUINT32T tmp; 1716 uint32_t tmp;
1657 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1717 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1658 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1718 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1659 lookup_b[i] = (tmp/65535)<<sh_b; 1719 lookup_b[i] = (tmp/65535)<<sh_b;
1660 } 1720 }
1661 1721
1662 /* apply table to input image (replacing colors by newly calculated ones) */ 1722 /* apply table to input image (replacing colors by newly calculated ones) */
1663 switch (srcImage->bits_per_pixel) 1723 if (srcImage->bits_per_pixel == 32
1724 && (srcImage->depth == 24 || srcImage->depth == 32)
1725 && srcImage->byte_order == host_byte_order)
1664 { 1726 {
1665 case 15:
1666 {
1667 unsigned short *p1, *pf, *p, *pl; 1727 uint32_t *p1, *pf, *p, *pl;
1668 p1 = (unsigned short *) srcImage->data; 1728 p1 = (uint32_t *) srcImage->data;
1669 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1729 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1730
1670 while (p1 < pf) 1731 while (p1 < pf)
1671 { 1732 {
1672 p = p1; 1733 p = p1;
1673 pl = p1 + srcImage->width; 1734 pl = p1 + srcImage->width;
1674 for (; p < pl; p++) 1735 for (; p < pl; p++)
1675 { 1736 {
1676 *p = lookup_r[(*p & 0x7c00)>>10] |
1677 lookup_g[(*p & 0x03e0)>> 5] |
1678 lookup_b[(*p & 0x001f)];
1679 }
1680 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1681 }
1682 break;
1683 }
1684 case 16:
1685 {
1686 unsigned short *p1, *pf, *p, *pl;
1687 p1 = (unsigned short *) srcImage->data;
1688 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1689 while (p1 < pf)
1690 {
1691 p = p1;
1692 pl = p1 + srcImage->width;
1693 for (; p < pl; p++)
1694 {
1695 *p = lookup_r[(*p & 0xf800)>>11] |
1696 lookup_g[(*p & 0x07e0)>> 5] |
1697 lookup_b[(*p & 0x001f)];
1698 }
1699 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1700 }
1701 break;
1702 }
1703 case 24:
1704 {
1705 unsigned char *p1, *pf, *p, *pl;
1706 p1 = (unsigned char *) srcImage->data;
1707 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1708 while (p1 < pf)
1709 {
1710 p = p1;
1711 pl = p1 + srcImage->width * 3;
1712 for (; p < pl; p += 3)
1713 {
1714 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1715 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1716 p[2] = lookup_r[(p[2] & 0x0000ff)];
1717 }
1718 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1719 }
1720 break;
1721 }
1722 case 32:
1723 {
1724 RUINT32T *p1, *pf, *p, *pl;
1725 p1 = (RUINT32T *) srcImage->data;
1726 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1727
1728 while (p1 < pf)
1729 {
1730 p = p1;
1731 pl = p1 + srcImage->width;
1732 for (; p < pl; p++)
1733 {
1734 *p = lookup_r[(*p & 0xff0000)>>16] | 1737 *p = lookup_r[(*p & 0xff0000) >> 16] |
1735 lookup_g[(*p & 0x00ff00)>> 8] | 1738 lookup_g[(*p & 0x00ff00) >> 8] |
1736 lookup_b[(*p & 0x0000ff)] | 1739 lookup_b[(*p & 0x0000ff)] |
1737 (*p & ~0xffffff); 1740 (*p & 0xff000000);
1741 }
1742 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1743 }
1744 }
1745 else
1746 {
1747 for (int y = 0; y < srcImage->height; y++)
1748 for (int x = 0; x < srcImage->width; x++)
1749 {
1750 unsigned long pixel = XGetPixel (srcImage, x, y);
1751 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1752 lookup_g[(pixel & mask_g) >> sh_g] |
1753 lookup_b[(pixel & mask_b) >> sh_b];
1754 XPutPixel (srcImage, x, y, pixel);
1738 } 1755 }
1739 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1740 } 1756 }
1741 break;
1742 }
1743 }
1744 1757
1745 free (lookup); 1758 free (lookup);
1746} 1759}
1747#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1760#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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