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.81 by sf-exg, Wed Oct 13 23:08:11 2010 UTC vs.
Revision 1.110 by sf-exg, Wed Nov 3 11:58:03 2010 UTC

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

Diff Legend

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