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.85 by sf-exg, Mon Oct 18 08:19:03 2010 UTC vs.
Revision 1.112 by sf-exg, Sat Nov 6 17:16:15 2010 UTC

… …
23 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
24 24
25#include <cmath> 25#include <cmath>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
28 32
29#define DO_TIMING_TEST 0 33#define DO_TIMING_TEST 0
30 34
31#if DO_TIMING_TEST 35#if DO_TIMING_TEST
32# include <sys/time.h> 36# include <sys/time.h>
… …
222 int diff = window_size - image_size; 226 int diff = window_size - image_size;
223 int smaller = min (image_size, window_size); 227 int smaller = min (image_size, window_size);
224 228
225 if (align >= 0 && align <= 100) 229 if (align >= 0 && align <= 100)
226 return diff * align / 100; 230 return diff * align / 100;
227 else if (align > 100 && align <= 200 ) 231 else if (align > 100 && align <= 200)
228 return ((align - 100) * smaller / 100) + window_size - smaller; 232 return ((align - 100) * smaller / 100) + window_size - smaller;
229 else if (align >= -100 && align < 0) 233 else if (align >= -100 && align < 0)
230 return ((align + 100) * smaller / 100) - image_size; 234 return ((align + 100) * smaller / 100) - image_size;
231 return 0; 235 return 0;
232} 236}
… …
250} 254}
251 255
252bool 256bool
253bgPixmap_t::set_geometry (const char *geom) 257bgPixmap_t::set_geometry (const char *geom)
254{ 258{
259 bool changed = false;
255 int geom_flags = 0, changed = 0; 260 int geom_flags = 0;
256 int x = 0, y = 0; 261 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 262 unsigned int w = 0, h = 0;
258 unsigned int n; 263 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 264 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p; 265 const char *p;
… …
416 421
417 while (*ops != ':' && *ops != '\0') ++ops; 422 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 423 } /* done parsing ops */
419 } 424 }
420 425
421 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;
422 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;
423 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;
424 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;
425 } 430 }
426 431
427 if (new_flags != flags) 432 if (new_flags != flags)
428 { 433 {
429 flags = new_flags; 434 flags = new_flags;
430 changed++; 435 changed = true;
431 } 436 }
432 437
433 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
434 // flags, h_scale, v_scale, h_align, v_align);
435 return (changed > 0); 438 return changed;
436} 439}
437 440
438void 441void
439bgPixmap_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)
440{ 443{
… …
529 532
530 int x = 0; 533 int x = 0;
531 int y = 0; 534 int y = 0;
532 int w = 0; 535 int w = 0;
533 int h = 0; 536 int h = 0;
534
535 TIMING_TEST_START (asim);
536 537
537 if (original_asim) 538 if (original_asim)
538 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);
539 540
540 if (!original_asim 541 if (!original_asim
… …
657 } 658 }
658 659
659 free (layers); 660 free (layers);
660 } 661 }
661 } 662 }
662 TIMING_TEST_PRINT_RESULT (asim);
663 663
664 bool ret = false; 664 bool ret = false;
665 665
666 if (result) 666 if (result)
667 { 667 {
… …
713 713
714 if (result != background && result != original_asim) 714 if (result != background && result != original_asim)
715 destroy_asimage (&result); 715 destroy_asimage (&result);
716 716
717 XFreeGC (target->dpy, gc); 717 XFreeGC (target->dpy, gc);
718 TIMING_TEST_PRINT_RESULT (asim);
719 718
720 ret = true; 719 ret = true;
721 } 720 }
722 721
723 if (background) 722 if (background)
… …
735 return false; 734 return false;
736 735
737 if (!pixbuf) 736 if (!pixbuf)
738 return false; 737 return false;
739 738
740#if !XFT
741 if (background_flags) 739 if (background_flags
740 && !(flags & HAS_RENDER))
742 return false; 741 return false;
743#endif
744 742
745 GdkPixbuf *result; 743 GdkPixbuf *result;
746 744
747 int image_width = gdk_pixbuf_get_width (pixbuf); 745 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf); 746 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
862 dst_width, dst_height, 860 dst_width, dst_height,
863 XLIB_RGB_DITHER_NONE, 861 XLIB_RGB_DITHER_NONE,
864 0, 0); 862 0, 0);
865 } 863 }
866 864
867#if XFT 865#if XRENDER
868 if (background_flags) 866 if (background_flags)
869 { 867 {
870 Display *dpy = target->dpy; 868 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa; 869 XRenderPictureAttributes pa;
872 870
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 871 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 872 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875 873
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 874 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 875 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878 876
… …
915# endif /* HAVE_PIXBUF */ 913# endif /* HAVE_PIXBUF */
916 914
917bool 915bool
918bgPixmap_t::set_file (const char *file) 916bgPixmap_t::set_file (const char *file)
919{ 917{
920 assert (file); 918 if (!file || !*file)
919 return false;
921 920
922 if (*file)
923 {
924 if (const char *p = strchr (file, ';')) 921 if (const char *p = strchr (file, ';'))
925 { 922 {
926 size_t len = p - file; 923 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 924 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 925 memcpy (f, file, len);
929 f[len] = '\0'; 926 f[len] = '\0';
930 file = f; 927 file = f;
931 } 928 }
932 929
933# ifdef HAVE_AFTERIMAGE 930# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 931 if (!target->asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 932 target->asimman = create_generic_imageman (target->rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 933 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image) 934 if (image)
938 { 935 {
939 if (original_asim) 936 if (original_asim)
940 safe_asimage_destroy (original_asim); 937 safe_asimage_destroy (original_asim);
941 original_asim = image; 938 original_asim = image;
942 have_image = true; 939 have_image = true;
943 return true; 940 return true;
944 } 941 }
945# endif 942# endif
946 943
947# ifdef HAVE_PIXBUF 944# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 945 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 946 if (image)
950 { 947 {
951 if (pixbuf) 948 if (pixbuf)
952 g_object_unref (pixbuf); 949 g_object_unref (pixbuf);
953 pixbuf = image; 950 pixbuf = image;
954 have_image = true; 951 have_image = true;
955 return true; 952 return true;
956 } 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
1118#if XFT 1090#if XRENDER
1119static void 1091static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1092get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{ 1093{
1122 double sigma = radius / 2.0; 1094 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma; 1095 double scale = sqrt (2.0 * M_PI) * sigma;
1124 double sum = 0.0; 1096 double sum = 0.0;
1125 1097
1126 for (int i = 0; i < width; i++) 1098 for (int i = 0; i < width; i++)
1127 { 1099 {
1128 double x = i - width / 2; 1100 double x = i - width / 2;
1129 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1101 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1130 sum += kernel[i]; 1102 sum += kernel[i];
1131 } 1103 }
1132 1104
1133 params[0] = XDoubleToFixed (width); 1105 params[0] = XDoubleToFixed (width);
1134 params[1] = XDoubleToFixed (1); 1106 params[1] = XDoubleToFixed (1);
1135 1107
1136 for (int i = 0; i < width; i++) 1108 for (int i = 0; i < width; i++)
1137 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1109 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138} 1110}
1139#endif 1111#endif
1140 1112
1141bool 1113bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1114bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{ 1115{
1144 bool ret = false; 1116 bool ret = false;
1145#if XFT 1117#if XRENDER
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1118 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double)); 1119 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1120 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149 1121
1150 Display *dpy = target->dpy; 1122 Display *dpy = target->dpy;
1151 XRenderPictureAttributes pa; 1123 XRenderPictureAttributes pa;
1152 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); 1124 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1153 1125
1154 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1126 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1155 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1127 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1156 1128
1157 if (kernel && params && src && dst) 1129 if (kernel && params && src && dst)
… …
1227 XFreeGC (dpy, gc); 1199 XFreeGC (dpy, gc);
1228 } 1200 }
1229 } 1201 }
1230 else 1202 else
1231 { 1203 {
1232# if XFT 1204# if XRENDER
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1205 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234 1206
1235 if (flags & tintSet) 1207 if (flags & tintSet)
1236 tint.get (c); 1208 tint.get (c);
1237 1209
… …
1283 } 1255 }
1284 1256
1285 XRenderFreePicture (dpy, mask_pic); 1257 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic); 1258 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic); 1259 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST
1289 XSync (dpy, False);
1290# endif
1291# endif 1260# endif
1292 } 1261 }
1293 1262
1294 return ret; 1263 return ret;
1295} 1264}
1296 1265
1297/* make_transparency_pixmap() 1266/* make_transparency_pixmap()
1298 * 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
1299 * 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
1300 * our window. 1269 * our window.
1301 */ 1270 */
1302unsigned long 1271unsigned long
1303bgPixmap_t::make_transparency_pixmap () 1272bgPixmap_t::make_transparency_pixmap ()
1304{ 1273{
… …
1308 return 0; 1277 return 0;
1309 1278
1310 /* 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
1311 * be always up-to-date, so let's use it : 1280 * be always up-to-date, so let's use it :
1312 */ 1281 */
1313 Window root = target->display->root;
1314 int screen = target->display->screen; 1282 int screen = target->display->screen;
1315 Display *dpy = target->dpy; 1283 Display *dpy = target->dpy;
1284 int root_depth = DefaultDepth (dpy, screen);
1316 int root_width = DisplayWidth (dpy, screen); 1285 int root_width = DisplayWidth (dpy, screen);
1317 int root_height = DisplayHeight (dpy, screen); 1286 int root_height = DisplayHeight (dpy, screen);
1318 unsigned int root_pmap_width, root_pmap_height; 1287 unsigned int root_pmap_width, root_pmap_height;
1319 int window_width = target->szHint.width; 1288 int window_width = target->szHint.width;
1320 int window_height = target->szHint.height; 1289 int window_height = target->szHint.height;
1321 int sx, sy; 1290 int sx, sy;
1322 XGCValues gcv; 1291 XGCValues gcv;
1323 GC gc; 1292 GC gc;
1324 1293
1325 TIMING_TEST_START (tp);
1326 target->get_window_origin (sx, sy); 1294 target->get_window_origin (sx, sy);
1327 1295
1328 /* 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 : */
1329 if (sx + window_width <= 0 || sy + window_height <= 0 1297 if (sx + window_width <= 0 || sy + window_height <= 0
1330 || sx >= root_width || sy >= root_height) 1298 || sx >= root_width || sy >= root_height)
1331 return 0; 1299 return 0;
1332 1300
1301 // validate root pixmap and get its size
1333 if (root_pixmap != None) 1302 if (root_pixmap != None)
1334 { 1303 {
1335 /* we want to validate the pixmap and get its size at the same time : */ 1304 Window wdummy;
1336 int junk; 1305 int idummy;
1337 unsigned int ujunk; 1306 unsigned int udummy;
1338 /* root pixmap may be bad - allow a error */ 1307
1339 target->allowedxerror = -1; 1308 target->allowedxerror = -1;
1340 1309
1341 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))
1342 root_pixmap = None; 1311 root_pixmap = None;
1343 1312
1344 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;
1345 } 1346 }
1346 1347
1347 if (root_pixmap == None) 1348 if (root_pixmap == None)
1348 return 0; 1349 return 0;
1349 1350
1350 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);
1351 1352
1352 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1353 if (tiled_root_pmap == None) /* something really bad happened - abort */
1353 return 0; 1354 return 0;
1354 1355
1355 /* straightforward pixmap copy */ 1356 /* straightforward pixmap copy */
1356 gcv.tile = root_pixmap; 1357 gcv.tile = recoded_root_pmap;
1357 gcv.fill_style = FillTiled; 1358 gcv.fill_style = FillTiled;
1358 1359
1359 while (sx < 0) sx += (int)root_width; 1360 while (sx < 0) sx += (int)root_width;
1360 while (sy < 0) sy += (int)root_height; 1361 while (sy < 0) sy += (int)root_height;
1361 1362
1362 gcv.ts_x_origin = -sx; 1363 gcv.ts_x_origin = -sx;
1363 gcv.ts_y_origin = -sy; 1364 gcv.ts_y_origin = -sy;
1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1365 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1365 1366
1366 if (gc) 1367 if (gc)
1367 { 1368 {
1368 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);
1369 result |= transpPmapTiled; 1370 result |= transpPmapTiled;
1370 XFreeGC (dpy, gc); 1371 XFreeGC (dpy, gc);
1371 } 1372 }
1372 TIMING_TEST_PRINT_RESULT (tp);
1373 1373
1374 if (tiled_root_pmap != None) 1374 if (tiled_root_pmap != None)
1375 { 1375 {
1376 if (!need_client_side_rendering ()) 1376 if (!need_client_side_rendering ())
1377 { 1377 {
1378 if (flags & (blurNeeded | blurServerSide)) 1378 if ((flags & blurNeeded)
1379 && (flags & HAS_RENDER_CONV))
1379 { 1380 {
1380 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))
1381 result |= transpPmapBlurred; 1382 result |= transpPmapBlurred;
1382 } 1383 }
1383 if (flags & (tintNeeded | tintServerSide)) 1384 if ((flags & tintNeeded)
1385 && (flags & (tintWholesome | HAS_RENDER)))
1384 { 1386 {
1385 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))
1386 result |= transpPmapTinted; 1388 result |= transpPmapTinted;
1387 } 1389 }
1388 } /* server side rendering completed */ 1390 } /* server side rendering completed */
1389 1391
1390 if (pixmap) 1392 if (pixmap)
1391 XFreePixmap (dpy, pixmap); 1393 XFreePixmap (dpy, pixmap);
1392 1394
1393 pixmap = tiled_root_pmap; 1395 pixmap = tiled_root_pmap;
1394 pmap_width = window_width; 1396 pmap_width = window_width;
1395 pmap_height = window_height; 1397 pmap_height = window_height;
1396 pmap_depth = root_depth; 1398 pmap_depth = target->depth;
1397 } 1399 }
1398 1400
1399 TIMING_TEST_PRINT_RESULT (tp); 1401 if (recoded_root_pmap != root_pixmap)
1402 XFreePixmap (dpy, recoded_root_pmap);
1400 1403
1401 return result; 1404 return result;
1402} 1405}
1403 1406
1404bool 1407void
1405bgPixmap_t::set_root_pixmap () 1408bgPixmap_t::set_root_pixmap ()
1406{ 1409{
1407 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1410 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1408 if (new_root_pixmap == None) 1411 if (new_root_pixmap == None)
1409 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1412 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1410 1413
1411 if (new_root_pixmap != root_pixmap)
1412 {
1413 root_pixmap = new_root_pixmap; 1414 root_pixmap = new_root_pixmap;
1414 return true;
1415 }
1416
1417 return false;
1418} 1415}
1419# endif /* ENABLE_TRANSPARENCY */ 1416# endif /* ENABLE_TRANSPARENCY */
1420 1417
1421# ifndef HAVE_AFTERIMAGE 1418#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1422static 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);
1423# endif 1420# endif
1424 1421
1425bool 1422bool
1426bgPixmap_t::render () 1423bgPixmap_t::render ()
1427{ 1424{
1428 unsigned long background_flags = 0; 1425 unsigned long background_flags = 0;
1429 1426
1430 if (target == NULL) 1427 if (target == NULL)
1431 return false; 1428 return false;
1432
1433 TIMING_TEST_START (tp);
1434 1429
1435 invalidate (); 1430 invalidate ();
1436# ifdef ENABLE_TRANSPARENCY 1431# ifdef ENABLE_TRANSPARENCY
1437 if (flags & isTransparent) 1432 if (flags & isTransparent)
1438 { 1433 {
1439 /* we need to re-generate transparency pixmap in that case ! */ 1434 /* we need to re-generate transparency pixmap in that case ! */
1440 background_flags = make_transparency_pixmap (); 1435 background_flags = make_transparency_pixmap ();
1441 if (background_flags == 0) 1436 if (background_flags == 0)
1442 return false; 1437 return false;
1443 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1438 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1444 && pmap_depth == target->depth)
1445 flags = flags & ~isInvalid; 1439 flags = flags & ~isInvalid;
1446 } 1440 }
1447# endif 1441# endif
1448 1442
1449# ifdef BG_IMAGE_FROM_FILE 1443# ifdef BG_IMAGE_FROM_FILE
… …
1453 if (render_image (background_flags)) 1447 if (render_image (background_flags))
1454 flags = flags & ~isInvalid; 1448 flags = flags & ~isInvalid;
1455 } 1449 }
1456# endif 1450# endif
1457 1451
1452# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1458 XImage *result = NULL; 1453 XImage *result = NULL;
1459 1454
1460 if (background_flags && (flags & isInvalid)) 1455 if (background_flags && (flags & isInvalid))
1461 { 1456 {
1462 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1457 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1463 } 1458 }
1464 1459
1465 if (result) 1460 if (result)
1466 { 1461 {
1467# if !defined(HAVE_AFTERIMAGE) && !XFT
1468 /* our own client-side tinting */ 1462 /* our own client-side tinting */
1469 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1470 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1463 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472 { 1464 {
1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1465 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474 if (flags & tintSet) 1466 if (flags & tintSet)
1475 tint.get (c); 1467 tint.get (c);
1476 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);
1477 } 1469 }
1478# endif
1479 1470
1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1471 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481 1472
1482 if (gc) 1473 if (gc)
1483 { 1474 {
1484 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1485 {
1486 XFreePixmap (target->dpy, pixmap);
1487 pixmap = None;
1488 }
1489
1490 if (pixmap == None)
1491 {
1492 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1493 pmap_width = result->width;
1494 pmap_height = result->height;
1495 pmap_depth = target->depth;
1496 }
1497
1498 if (pmap_depth != result->depth)
1499 {
1500 /* Bad Match error will ensue ! stupid X !!!! */
1501 if (result->depth == 24 && pmap_depth == 32)
1502 result->depth = 32;
1503 else if (result->depth == 32 && pmap_depth == 24)
1504 result->depth = 24;
1505 else
1506 {
1507 /* TODO: implement image recoding */
1508 }
1509 }
1510
1511 if (pmap_depth == result->depth)
1512 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1475 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1513 1476
1514 XFreeGC (target->dpy, gc); 1477 XFreeGC (target->dpy, gc);
1515 flags = flags & ~isInvalid; 1478 flags = flags & ~isInvalid;
1516 } 1479 }
1517 1480
1518 XDestroyImage (result); 1481 XDestroyImage (result);
1519 } 1482 }
1483# endif
1520 1484
1521 if (flags & isInvalid) 1485 if (flags & isInvalid)
1522 { 1486 {
1523 if (pixmap != None) 1487 if (pixmap != None)
1524 { 1488 {
… …
1527 } 1491 }
1528 } 1492 }
1529 1493
1530 apply (); 1494 apply ();
1531 1495
1532 XSync (target->dpy, False);
1533 valid_since = ev::now (); 1496 valid_since = ev::now ();
1534 1497
1535 TIMING_TEST_PRINT_RESULT (tp);
1536
1537 return true; 1498 return true;
1538} 1499}
1539 1500
1540bool 1501void
1541bgPixmap_t::set_target (rxvt_term *new_target) 1502bgPixmap_t::set_target (rxvt_term *new_target)
1542{ 1503{
1543 if (new_target)
1544 if (target != new_target)
1545 {
1546 target = new_target; 1504 target = new_target;
1547# ifdef ENABLE_TRANSPARENCY 1505
1548 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 }
1549# endif 1520#endif
1550 return true;
1551 }
1552
1553 return false;
1554} 1521}
1555 1522
1556void 1523void
1557bgPixmap_t::apply () 1524bgPixmap_t::apply ()
1558{ 1525{
1559 if (target) 1526 if (target == NULL)
1560 { 1527 return;
1561 flags &= ~isVtOrigin;
1562 1528
1563 if (pixmap != None) 1529 if (pixmap != None)
1564 { 1530 {
1565 /* set target's background to pixmap */ 1531 /* set target's background to pixmap */
1566# ifdef ENABLE_TRANSPARENCY 1532# ifdef ENABLE_TRANSPARENCY
1567 if (flags & isTransparent) 1533 if (flags & isTransparent)
1568 { 1534 {
1569 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1535 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1570 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1536 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1571 1537
1572 if (target->scrollBar.win) 1538 if (target->scrollBar.win)
1573 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1539 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1574 } 1540 }
1575 else 1541 else
1576# endif 1542# endif
1577 { 1543 {
1578 flags |= isVtOrigin;
1579 /* force old pixmap dereference in case it was transparent before :*/ 1544 /* force old pixmap dereference in case it was transparent before :*/
1580 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1581 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1582 /* do we also need to set scrollbar's background here ? */
1583
1584 if (target->scrollBar.win)
1585 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1586 }
1587 }
1588 else
1589 {
1590 /* set target background to a pixel */
1591 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1545 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1592 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1546 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1593 /* do we also need to set scrollbar's background here ? */ 1547 /* do we also need to set scrollbar's background here ? */
1548
1594 if (target->scrollBar.win) 1549 if (target->scrollBar.win)
1595 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1550 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1596 } 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 }
1597 1562
1598 /* 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
1599 scr_touch or we get a great deal of flicker otherwise: */ 1564 scr_touch or we get a great deal of flicker otherwise: */
1600 XClearWindow (target->dpy, target->parent[0]); 1565 XClearWindow (target->dpy, target->parent[0]);
1601 1566
1602 if (target->scrollBar.state && target->scrollBar.win) 1567 if (target->scrollBar.state && target->scrollBar.win)
1603 { 1568 {
1604 target->scrollBar.state = STATE_IDLE; 1569 target->scrollBar.state = STATE_IDLE;
1605 target->scrollBar.show (0); 1570 target->scrollBar.show (0);
1606 } 1571 }
1607 1572
1608 target->want_refresh = 1; 1573 target->want_refresh = 1;
1609 flags |= hasChanged; 1574 flags |= hasChanged;
1610 }
1611} 1575}
1612 1576
1613#endif /* HAVE_BG_PIXMAP */ 1577#endif /* HAVE_BG_PIXMAP */
1614 1578
1615#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1579#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1616/* taken from aterm-0.4.2 */ 1580/* taken from aterm-0.4.2 */
1617 1581
1618typedef uint32_t RUINT32T;
1619
1620static void 1582static void
1621ShadeXImage(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)
1622{ 1584{
1623 int sh_r, sh_g, sh_b; 1585 int sh_r, sh_g, sh_b;
1624 RUINT32T mask_r, mask_g, mask_b; 1586 uint32_t mask_r, mask_g, mask_b;
1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1587 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1588 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1589 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1628 int i; 1590 int i;
1591 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1629 1592
1630 Visual *visual = term->visual;
1631
1632 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1593 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1633 1594
1634 /* for convenience */ 1595 /* for convenience */
1635 mask_r = visual->red_mask; 1596 mask_r = visual->red_mask;
1636 mask_g = visual->green_mask; 1597 mask_g = visual->green_mask;
1637 mask_b = visual->blue_mask; 1598 mask_b = visual->blue_mask;
1638 1599
1639 /* boring lookup table pre-initialization */ 1600 /* boring lookup table pre-initialization */
1640 switch (srcImage->bits_per_pixel) { 1601 switch (srcImage->depth)
1602 {
1641 case 15: 1603 case 15:
1642 if ((mask_r != 0x7c00) || 1604 if ((mask_r != 0x7c00) ||
1643 (mask_g != 0x03e0) || 1605 (mask_g != 0x03e0) ||
1644 (mask_b != 0x001f)) 1606 (mask_b != 0x001f))
1645 return; 1607 return;
1646 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1608 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1647 lookup_r = lookup; 1609 lookup_r = lookup;
1648 lookup_g = lookup+32; 1610 lookup_g = lookup+32;
1649 lookup_b = lookup+32+32; 1611 lookup_b = lookup+32+32;
1650 sh_r = 10; 1612 sh_r = 10;
1651 sh_g = 5; 1613 sh_g = 5;
1652 sh_b = 0; 1614 sh_b = 0;
1653 break; 1615 break;
1654 case 16: 1616 case 16:
1655 if ((mask_r != 0xf800) || 1617 if ((mask_r != 0xf800) ||
1656 (mask_g != 0x07e0) || 1618 (mask_g != 0x07e0) ||
1657 (mask_b != 0x001f)) 1619 (mask_b != 0x001f))
1658 return; 1620 return;
1659 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1621 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1660 lookup_r = lookup; 1622 lookup_r = lookup;
1661 lookup_g = lookup+32; 1623 lookup_g = lookup+32;
1662 lookup_b = lookup+32+64; 1624 lookup_b = lookup+32+64;
1663 sh_r = 11; 1625 sh_r = 11;
1664 sh_g = 5; 1626 sh_g = 5;
1665 sh_b = 0; 1627 sh_b = 0;
1666 break; 1628 break;
1667 case 24: 1629 case 24:
1668 if ((mask_r != 0xff0000) || 1630 if ((mask_r != 0xff0000) ||
1669 (mask_g != 0x00ff00) || 1631 (mask_g != 0x00ff00) ||
1670 (mask_b != 0x0000ff)) 1632 (mask_b != 0x0000ff))
1671 return; 1633 return;
1672 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1634 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1673 lookup_r = lookup; 1635 lookup_r = lookup;
1674 lookup_g = lookup+256; 1636 lookup_g = lookup+256;
1675 lookup_b = lookup+256+256; 1637 lookup_b = lookup+256+256;
1676 sh_r = 16; 1638 sh_r = 16;
1677 sh_g = 8; 1639 sh_g = 8;
1678 sh_b = 0; 1640 sh_b = 0;
1679 break; 1641 break;
1680 case 32: 1642 case 32:
1681 if ((mask_r != 0xff0000) || 1643 if ((mask_r != 0xff0000) ||
1682 (mask_g != 0x00ff00) || 1644 (mask_g != 0x00ff00) ||
1683 (mask_b != 0x0000ff)) 1645 (mask_b != 0x0000ff))
1684 return; 1646 return;
1685 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1647 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1686 lookup_r = lookup; 1648 lookup_r = lookup;
1687 lookup_g = lookup+256; 1649 lookup_g = lookup+256;
1688 lookup_b = lookup+256+256; 1650 lookup_b = lookup+256+256;
1689 sh_r = 16; 1651 sh_r = 16;
1690 sh_g = 8; 1652 sh_g = 8;
1691 sh_b = 0; 1653 sh_b = 0;
1692 break; 1654 break;
1693 default: 1655 default:
1694 return; /* we do not support this color depth */ 1656 return; /* we do not support this color depth */
1695 } 1657 }
1696 1658
1697 /* prepare limits for color transformation (each channel is handled separately) */ 1659 /* prepare limits for color transformation (each channel is handled separately) */
1698 if (shade > 100) { 1660 if (shade > 100)
1661 {
1699 shade = 200 - shade; 1662 shade = 200 - shade;
1700 1663
1701 lower_lim_r = 65535-rm; 1664 lower_lim_r = 65535-rm;
1702 lower_lim_g = 65535-gm; 1665 lower_lim_g = 65535-gm;
1703 lower_lim_b = 65535-bm; 1666 lower_lim_b = 65535-bm;
1704 1667
1705 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);
1706 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);
1707 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);
1708 1671
1709 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1672 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1673 }
1710 } else { 1674 else
1675 {
1711 1676
1712 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1677 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1713 1678
1714 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1679 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1715 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1680 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1716 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); 1681 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1717 } 1682 }
1718
1719 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1720 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1721 {
1722 unsigned int tmp;
1723
1724 tmp = lower_lim_r;
1725 lower_lim_r = lower_lim_b;
1726 lower_lim_b = tmp;
1727
1728 tmp = upper_lim_r;
1729 upper_lim_r = upper_lim_b;
1730 upper_lim_b = tmp;
1731 }
1732 1683
1733 /* fill our lookup tables */ 1684 /* fill our lookup tables */
1734 for (i = 0; i <= mask_r>>sh_r; i++) 1685 for (i = 0; i <= mask_r>>sh_r; i++)
1735 { 1686 {
1736 RUINT32T tmp; 1687 uint32_t tmp;
1737 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1688 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1738 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1689 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1739 lookup_r[i] = (tmp/65535)<<sh_r; 1690 lookup_r[i] = (tmp/65535)<<sh_r;
1740 } 1691 }
1741 for (i = 0; i <= mask_g>>sh_g; i++) 1692 for (i = 0; i <= mask_g>>sh_g; i++)
1742 { 1693 {
1743 RUINT32T tmp; 1694 uint32_t tmp;
1744 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1695 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1745 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1696 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1746 lookup_g[i] = (tmp/65535)<<sh_g; 1697 lookup_g[i] = (tmp/65535)<<sh_g;
1747 } 1698 }
1748 for (i = 0; i <= mask_b>>sh_b; i++) 1699 for (i = 0; i <= mask_b>>sh_b; i++)
1749 { 1700 {
1750 RUINT32T tmp; 1701 uint32_t tmp;
1751 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1702 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1752 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1703 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1753 lookup_b[i] = (tmp/65535)<<sh_b; 1704 lookup_b[i] = (tmp/65535)<<sh_b;
1754 } 1705 }
1755 1706
1756 /* apply table to input image (replacing colors by newly calculated ones) */ 1707 /* apply table to input image (replacing colors by newly calculated ones) */
1757 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)
1758 { 1711 {
1759 case 15:
1760 {
1761 unsigned short *p1, *pf, *p, *pl; 1712 uint32_t *p1, *pf, *p, *pl;
1762 p1 = (unsigned short *) srcImage->data; 1713 p1 = (uint32_t *) srcImage->data;
1763 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1714 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1715
1764 while (p1 < pf) 1716 while (p1 < pf)
1765 { 1717 {
1766 p = p1; 1718 p = p1;
1767 pl = p1 + srcImage->width; 1719 pl = p1 + srcImage->width;
1768 for (; p < pl; p++) 1720 for (; p < pl; p++)
1769 { 1721 {
1770 *p = lookup_r[(*p & 0x7c00)>>10] |
1771 lookup_g[(*p & 0x03e0)>> 5] |
1772 lookup_b[(*p & 0x001f)];
1773 }
1774 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1775 }
1776 break;
1777 }
1778 case 16:
1779 {
1780 unsigned short *p1, *pf, *p, *pl;
1781 p1 = (unsigned short *) srcImage->data;
1782 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1783 while (p1 < pf)
1784 {
1785 p = p1;
1786 pl = p1 + srcImage->width;
1787 for (; p < pl; p++)
1788 {
1789 *p = lookup_r[(*p & 0xf800)>>11] |
1790 lookup_g[(*p & 0x07e0)>> 5] |
1791 lookup_b[(*p & 0x001f)];
1792 }
1793 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1794 }
1795 break;
1796 }
1797 case 24:
1798 {
1799 unsigned char *p1, *pf, *p, *pl;
1800 p1 = (unsigned char *) srcImage->data;
1801 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1802 while (p1 < pf)
1803 {
1804 p = p1;
1805 pl = p1 + srcImage->width * 3;
1806 for (; p < pl; p += 3)
1807 {
1808 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1809 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1810 p[2] = lookup_r[(p[2] & 0x0000ff)];
1811 }
1812 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1813 }
1814 break;
1815 }
1816 case 32:
1817 {
1818 RUINT32T *p1, *pf, *p, *pl;
1819 p1 = (RUINT32T *) srcImage->data;
1820 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1821
1822 while (p1 < pf)
1823 {
1824 p = p1;
1825 pl = p1 + srcImage->width;
1826 for (; p < pl; p++)
1827 {
1828 *p = lookup_r[(*p & 0xff0000)>>16] | 1722 *p = lookup_r[(*p & 0xff0000) >> 16] |
1829 lookup_g[(*p & 0x00ff00)>> 8] | 1723 lookup_g[(*p & 0x00ff00) >> 8] |
1830 lookup_b[(*p & 0x0000ff)] | 1724 lookup_b[(*p & 0x0000ff)] |
1831 (*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);
1832 } 1740 }
1833 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1834 } 1741 }
1835 break;
1836 }
1837 }
1838 1742
1839 free (lookup); 1743 free (lookup);
1840} 1744}
1841#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