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.87 by sf-exg, Mon Oct 18 11:00:38 2010 UTC vs.
Revision 1.116 by sf-exg, Thu Nov 11 11:58:10 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>
… …
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 {
668 XGCValues gcv; 668 XGCValues gcv;
669 GC gc; 669 GC gc;
670 670
671 if (pixmap)
672 {
673 if (pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
676 {
677 XFreePixmap (target->dpy, pixmap);
678 pixmap = None;
679 }
680 }
681
682 /* create Pixmap */ 671 /* create Pixmap */
683 if (pixmap == None) 672 if (pixmap == None
673 || pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
684 { 676 {
677 if (pixmap)
678 XFreePixmap (target->dpy, pixmap);
685 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 679 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
686 pmap_width = new_pmap_width; 680 pmap_width = new_pmap_width;
687 pmap_height = new_pmap_height; 681 pmap_height = new_pmap_height;
688 pmap_depth = target->depth; 682 pmap_depth = target->depth;
689 } 683 }
… …
713 707
714 if (result != background && result != original_asim) 708 if (result != background && result != original_asim)
715 destroy_asimage (&result); 709 destroy_asimage (&result);
716 710
717 XFreeGC (target->dpy, gc); 711 XFreeGC (target->dpy, gc);
718 TIMING_TEST_PRINT_RESULT (asim);
719 712
720 ret = true; 713 ret = true;
721 } 714 }
722 715
723 if (background) 716 if (background)
… …
735 return false; 728 return false;
736 729
737 if (!pixbuf) 730 if (!pixbuf)
738 return false; 731 return false;
739 732
740#if !XFT
741 if (background_flags) 733 if (background_flags
734 && !(flags & HAS_RENDER))
742 return false; 735 return false;
743#endif
744 736
745 GdkPixbuf *result; 737 GdkPixbuf *result;
746 738
747 int image_width = gdk_pixbuf_get_width (pixbuf); 739 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf); 740 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
799 new_pmap_width = min (image_width, target_width); 791 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height); 792 new_pmap_height = min (image_height, target_height);
801 } 793 }
802 } 794 }
803 795
804 if (pixmap)
805 {
806 if (pmap_width != new_pmap_width
807 || pmap_height != new_pmap_height
808 || pmap_depth != target->depth)
809 {
810 XFreePixmap (target->dpy, pixmap);
811 pixmap = None;
812 }
813 }
814
815 if (pixmap == None) 796 if (pixmap == None
797 || pmap_width != new_pmap_width
798 || pmap_height != new_pmap_height
799 || pmap_depth != target->depth)
816 { 800 {
801 if (pixmap)
802 XFreePixmap (target->dpy, pixmap);
817 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 803 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
818 pmap_width = new_pmap_width; 804 pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height; 805 pmap_height = new_pmap_height;
820 pmap_depth = target->depth; 806 pmap_depth = target->depth;
821 } 807 }
… …
862 dst_width, dst_height, 848 dst_width, dst_height,
863 XLIB_RGB_DITHER_NONE, 849 XLIB_RGB_DITHER_NONE,
864 0, 0); 850 0, 0);
865 } 851 }
866 852
867#if XFT 853#if XRENDER
868 if (background_flags) 854 if (background_flags)
869 { 855 {
870 Display *dpy = target->dpy; 856 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa; 857 XRenderPictureAttributes pa;
872 858
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 859 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 860 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875 861
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 862 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 863 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878 864
… …
915# endif /* HAVE_PIXBUF */ 901# endif /* HAVE_PIXBUF */
916 902
917bool 903bool
918bgPixmap_t::set_file (const char *file) 904bgPixmap_t::set_file (const char *file)
919{ 905{
920 assert (file); 906 if (!file || !*file)
907 return false;
921 908
922 if (*file)
923 {
924 if (const char *p = strchr (file, ';')) 909 if (const char *p = strchr (file, ';'))
925 { 910 {
926 size_t len = p - file; 911 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 912 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 913 memcpy (f, file, len);
929 f[len] = '\0'; 914 f[len] = '\0';
930 file = f; 915 file = f;
931 } 916 }
932 917
933# ifdef HAVE_AFTERIMAGE 918# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 919 if (!target->asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 920 target->asimman = create_generic_imageman (target->rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 921 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image) 922 if (image)
938 { 923 {
939 if (original_asim) 924 if (original_asim)
940 safe_asimage_destroy (original_asim); 925 safe_asimage_destroy (original_asim);
941 original_asim = image; 926 original_asim = image;
942 have_image = true; 927 have_image = true;
943 return true; 928 return true;
944 } 929 }
945# endif 930# endif
946 931
947# ifdef HAVE_PIXBUF 932# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 933 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 934 if (image)
950 { 935 {
951 if (pixbuf) 936 if (pixbuf)
952 g_object_unref (pixbuf); 937 g_object_unref (pixbuf);
953 pixbuf = image; 938 pixbuf = image;
954 have_image = true; 939 have_image = true;
955 return true; 940 return true;
956 } 941 }
957# endif 942# endif
958 }
959 943
960 return false; 944 return false;
961} 945}
962 946
963# endif /* BG_IMAGE_FROM_FILE */ 947# endif /* BG_IMAGE_FROM_FILE */
… …
976} 960}
977 961
978bool 962bool
979bgPixmap_t::set_blur_radius (const char *geom) 963bgPixmap_t::set_blur_radius (const char *geom)
980{ 964{
981 int changed = 0; 965 bool changed = false;
982 unsigned int hr, vr; 966 unsigned int hr, vr;
983 int junk; 967 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 968 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 969
986 if (!(geom_flags & WidthValue)) 970 if (!(geom_flags & WidthValue))
… …
991 min_it (hr, 128); 975 min_it (hr, 128);
992 min_it (vr, 128); 976 min_it (vr, 128);
993 977
994 if (h_blurRadius != hr) 978 if (h_blurRadius != hr)
995 { 979 {
996 ++changed; 980 changed = true;
997 h_blurRadius = hr; 981 h_blurRadius = hr;
998 } 982 }
999 983
1000 if (v_blurRadius != vr) 984 if (v_blurRadius != vr)
1001 { 985 {
1002 ++changed; 986 changed = true;
1003 v_blurRadius = vr; 987 v_blurRadius = vr;
1004 } 988 }
1005 989
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 990 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 991 flags &= ~blurNeeded;
1008 else 992 else
1009 flags |= blurNeeded; 993 flags |= blurNeeded;
1010 994
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1022
1023 return (changed > 0); 995 return changed;
1024} 996}
1025 997
1026static inline unsigned long 998static inline unsigned long
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 999compute_tint_shade_flags (rxvt_color *tint, int shade)
1028{ 1000{
… …
1050 { 1022 {
1051 flags |= bgPixmap_t::tintNeeded; 1023 flags |= bgPixmap_t::tintNeeded;
1052 } 1024 }
1053 } 1025 }
1054 1026
1055 if (flags & bgPixmap_t::tintNeeded)
1056 {
1057 if (flags & bgPixmap_t::tintWholesome)
1058 flags |= bgPixmap_t::tintServerSide;
1059 else
1060 {
1061#if XFT
1062 flags |= bgPixmap_t::tintServerSide;
1063#endif
1064 }
1065 }
1066
1067 return flags; 1027 return flags;
1068} 1028}
1069 1029
1070bool 1030bool
1071bgPixmap_t::set_tint (rxvt_color &new_tint) 1031bgPixmap_t::set_tint (rxvt_color &new_tint)
… …
1113 } 1073 }
1114 1074
1115 return false; 1075 return false;
1116} 1076}
1117 1077
1118#if XFT 1078#if XRENDER
1119static void 1079static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1080get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{ 1081{
1122 double sigma = radius / 2.0; 1082 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma; 1083 double scale = sqrt (2.0 * M_PI) * sigma;
1124 double sum = 0.0; 1084 double sum = 0.0;
1125 1085
1126 for (int i = 0; i < width; i++) 1086 for (int i = 0; i < width; i++)
1127 { 1087 {
1128 double x = i - width / 2; 1088 double x = i - width / 2;
1129 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1089 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1130 sum += kernel[i]; 1090 sum += kernel[i];
1131 } 1091 }
1132 1092
1133 params[0] = XDoubleToFixed (width); 1093 params[0] = XDoubleToFixed (width);
1134 params[1] = XDoubleToFixed (1); 1094 params[1] = XDoubleToFixed (1);
1135 1095
1136 for (int i = 0; i < width; i++) 1096 for (int i = 0; i < width; i++)
1137 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1097 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138} 1098}
1139#endif 1099#endif
1140 1100
1141bool 1101bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1102bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{ 1103{
1144 bool ret = false; 1104 bool ret = false;
1145#if XFT 1105#if XRENDER
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1106 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double)); 1107 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1108 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149 1109
1150 Display *dpy = target->dpy; 1110 Display *dpy = target->dpy;
1151 XRenderPictureAttributes pa; 1111 XRenderPictureAttributes pa;
1152 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); 1112 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1153 1113
1154 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1114 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1155 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1115 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1156 1116
1157 if (kernel && params && src && dst) 1117 if (kernel && params && src && dst)
… …
1227 XFreeGC (dpy, gc); 1187 XFreeGC (dpy, gc);
1228 } 1188 }
1229 } 1189 }
1230 else 1190 else
1231 { 1191 {
1232# if XFT 1192# if XRENDER
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1193 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234 1194
1235 if (flags & tintSet) 1195 if (flags & tintSet)
1236 tint.get (c); 1196 tint.get (c);
1237 1197
… …
1267 1227
1268 if (mask_pic && overlay_pic && back_pic) 1228 if (mask_pic && overlay_pic && back_pic)
1269 { 1229 {
1270 XRenderColor mask_c; 1230 XRenderColor mask_c;
1271 1231
1272 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1232 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1273 mask_c.alpha = 0xffff; 1233 mask_c.alpha = 0xffff;
1274 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1234 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1275 1235
1276 mask_c.alpha = 0; 1236 mask_c.alpha = 0;
1277 mask_c.red = 0xffff - c.r; 1237 mask_c.red = 0xffff - c.r;
… …
1283 } 1243 }
1284 1244
1285 XRenderFreePicture (dpy, mask_pic); 1245 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic); 1246 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic); 1247 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST
1289 XSync (dpy, False);
1290# endif
1291# endif 1248# endif
1292 } 1249 }
1293 1250
1294 return ret; 1251 return ret;
1295} 1252}
1296 1253
1297/* make_transparency_pixmap() 1254/* make_transparency_pixmap()
1298 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1255 * Builds a pixmap of the same size as the terminal window that contains
1299 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1256 * the tiled portion of the root pixmap that is supposed to be covered by
1300 * our window. 1257 * our window.
1301 */ 1258 */
1302unsigned long 1259unsigned long
1303bgPixmap_t::make_transparency_pixmap () 1260bgPixmap_t::make_transparency_pixmap ()
1304{ 1261{
… …
1308 return 0; 1265 return 0;
1309 1266
1310 /* root dimensions may change from call to call - but Display structure should 1267 /* root dimensions may change from call to call - but Display structure should
1311 * be always up-to-date, so let's use it : 1268 * be always up-to-date, so let's use it :
1312 */ 1269 */
1313 Window root = target->display->root;
1314 int screen = target->display->screen; 1270 int screen = target->display->screen;
1315 Display *dpy = target->dpy; 1271 Display *dpy = target->dpy;
1272 int root_depth = DefaultDepth (dpy, screen);
1316 int root_width = DisplayWidth (dpy, screen); 1273 int root_width = DisplayWidth (dpy, screen);
1317 int root_height = DisplayHeight (dpy, screen); 1274 int root_height = DisplayHeight (dpy, screen);
1318 unsigned int root_pmap_width, root_pmap_height; 1275 unsigned int root_pmap_width, root_pmap_height;
1319 int window_width = target->szHint.width; 1276 int window_width = target->szHint.width;
1320 int window_height = target->szHint.height; 1277 int window_height = target->szHint.height;
1321 int sx, sy; 1278 int sx, sy;
1322 XGCValues gcv; 1279 XGCValues gcv;
1323 GC gc; 1280 GC gc;
1324 1281
1325 TIMING_TEST_START (tp);
1326 target->get_window_origin (sx, sy); 1282 target->get_window_origin (sx, sy);
1327 1283
1328 /* check if we are outside of the visible part of the virtual screen : */ 1284 /* check if we are outside of the visible part of the virtual screen : */
1329 if (sx + window_width <= 0 || sy + window_height <= 0 1285 if (sx + window_width <= 0 || sy + window_height <= 0
1330 || sx >= root_width || sy >= root_height) 1286 || sx >= root_width || sy >= root_height)
1331 return 0; 1287 return 0;
1332 1288
1289 // validate root pixmap and get its size
1333 if (root_pixmap != None) 1290 if (root_pixmap != None)
1334 { 1291 {
1335 /* we want to validate the pixmap and get its size at the same time : */ 1292 Window wdummy;
1336 int junk; 1293 int idummy;
1337 unsigned int ujunk; 1294 unsigned int udummy;
1338 /* root pixmap may be bad - allow a error */ 1295
1339 target->allowedxerror = -1; 1296 target->allowedxerror = -1;
1340 1297
1341 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1298 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1342 root_pixmap = None; 1299 root_pixmap = None;
1343 1300
1344 target->allowedxerror = 0; 1301 target->allowedxerror = 0;
1302 }
1303
1304 Pixmap recoded_root_pmap = root_pixmap;
1305
1306 if (root_pixmap != None && root_depth != target->depth)
1307 {
1308#if XRENDER
1309 if (flags & HAS_RENDER)
1310 {
1311 XRenderPictureAttributes pa;
1312
1313 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1314 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1315
1316 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1317 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1318 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1319
1320 if (src && dst)
1321 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1322 else
1323 {
1324 XFreePixmap (dpy, recoded_root_pmap);
1325 root_pixmap = None;
1326 }
1327
1328 XRenderFreePicture (dpy, src);
1329 XRenderFreePicture (dpy, dst);
1330 }
1331 else
1332#endif
1333 root_pixmap = None;
1345 } 1334 }
1346 1335
1347 if (root_pixmap == None) 1336 if (root_pixmap == None)
1348 return 0; 1337 return 0;
1349 1338
1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1339 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1351 1340
1352 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1341 if (tiled_root_pmap == None) /* something really bad happened - abort */
1353 return 0; 1342 return 0;
1354 1343
1355 /* straightforward pixmap copy */ 1344 /* straightforward pixmap copy */
1356 gcv.tile = root_pixmap; 1345 gcv.tile = recoded_root_pmap;
1357 gcv.fill_style = FillTiled; 1346 gcv.fill_style = FillTiled;
1358 1347
1359 while (sx < 0) sx += (int)root_width; 1348 while (sx < 0) sx += (int)root_width;
1360 while (sy < 0) sy += (int)root_height; 1349 while (sy < 0) sy += (int)root_height;
1361 1350
1362 gcv.ts_x_origin = -sx; 1351 gcv.ts_x_origin = -sx;
1363 gcv.ts_y_origin = -sy; 1352 gcv.ts_y_origin = -sy;
1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1353 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1365 1354
1366 if (gc) 1355 if (gc)
1367 { 1356 {
1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1357 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1369 result |= transpPmapTiled; 1358 result |= transpPmapTiled;
1370 XFreeGC (dpy, gc); 1359 XFreeGC (dpy, gc);
1371 }
1372 TIMING_TEST_PRINT_RESULT (tp);
1373 1360
1374 if (tiled_root_pmap != None)
1375 {
1376 if (!need_client_side_rendering ()) 1361 if (!need_client_side_rendering ())
1377 { 1362 {
1378 if (flags & (blurNeeded | blurServerSide)) 1363 if ((flags & blurNeeded)
1364 && (flags & HAS_RENDER_CONV))
1379 { 1365 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1366 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1381 result |= transpPmapBlurred; 1367 result |= transpPmapBlurred;
1382 } 1368 }
1383 if (flags & (tintNeeded | tintServerSide)) 1369 if ((flags & tintNeeded)
1370 && (flags & (tintWholesome | HAS_RENDER)))
1384 { 1371 {
1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1372 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1386 result |= transpPmapTinted; 1373 result |= transpPmapTinted;
1387 } 1374 }
1388 } /* server side rendering completed */ 1375 } /* server side rendering completed */
1389 1376
1390 if (pixmap) 1377 if (pixmap)
1391 XFreePixmap (dpy, pixmap); 1378 XFreePixmap (dpy, pixmap);
1392 1379
1393 pixmap = tiled_root_pmap; 1380 pixmap = tiled_root_pmap;
1394 pmap_width = window_width; 1381 pmap_width = window_width;
1395 pmap_height = window_height; 1382 pmap_height = window_height;
1396 pmap_depth = root_depth; 1383 pmap_depth = target->depth;
1397 } 1384 }
1385 else
1386 XFreePixmap (dpy, tiled_root_pmap);
1398 1387
1399 TIMING_TEST_PRINT_RESULT (tp); 1388 if (recoded_root_pmap != root_pixmap)
1389 XFreePixmap (dpy, recoded_root_pmap);
1400 1390
1401 return result; 1391 return result;
1402} 1392}
1403 1393
1404bool 1394void
1405bgPixmap_t::set_root_pixmap () 1395bgPixmap_t::set_root_pixmap ()
1406{ 1396{
1407 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1397 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1408 if (new_root_pixmap == None) 1398 if (new_root_pixmap == None)
1409 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1399 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1410 1400
1411 if (new_root_pixmap != root_pixmap)
1412 {
1413 root_pixmap = new_root_pixmap; 1401 root_pixmap = new_root_pixmap;
1414 return true;
1415 }
1416
1417 return false;
1418} 1402}
1419# endif /* ENABLE_TRANSPARENCY */ 1403# endif /* ENABLE_TRANSPARENCY */
1420 1404
1421# ifndef HAVE_AFTERIMAGE 1405#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1422static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1406static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1423# endif 1407# endif
1424 1408
1425bool 1409bool
1426bgPixmap_t::render () 1410bgPixmap_t::render ()
1427{ 1411{
1428 unsigned long background_flags = 0; 1412 unsigned long background_flags = 0;
1429 1413
1430 if (target == NULL) 1414 if (target == NULL)
1431 return false; 1415 return false;
1432
1433 TIMING_TEST_START (tp);
1434 1416
1435 invalidate (); 1417 invalidate ();
1436# ifdef ENABLE_TRANSPARENCY 1418# ifdef ENABLE_TRANSPARENCY
1437 if (flags & isTransparent) 1419 if (flags & isTransparent)
1438 { 1420 {
1439 /* we need to re-generate transparency pixmap in that case ! */ 1421 /* we need to re-generate transparency pixmap in that case ! */
1440 background_flags = make_transparency_pixmap (); 1422 background_flags = make_transparency_pixmap ();
1441 if (background_flags == 0) 1423 if (background_flags == 0)
1442 return false; 1424 return false;
1443 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1425 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1444 && pmap_depth == target->depth)
1445 flags = flags & ~isInvalid; 1426 flags = flags & ~isInvalid;
1446 } 1427 }
1447# endif 1428# endif
1448 1429
1449# ifdef BG_IMAGE_FROM_FILE 1430# ifdef BG_IMAGE_FROM_FILE
… …
1453 if (render_image (background_flags)) 1434 if (render_image (background_flags))
1454 flags = flags & ~isInvalid; 1435 flags = flags & ~isInvalid;
1455 } 1436 }
1456# endif 1437# endif
1457 1438
1439# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1458 XImage *result = NULL; 1440 XImage *result = NULL;
1459 1441
1460 if (background_flags && (flags & isInvalid)) 1442 if (background_flags && (flags & isInvalid))
1461 { 1443 {
1462 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1444 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1463 } 1445 }
1464 1446
1465 if (result) 1447 if (result)
1466 { 1448 {
1467# if !defined(HAVE_AFTERIMAGE) && !XFT
1468 /* our own client-side tinting */ 1449 /* 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)) 1450 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472 { 1451 {
1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1452 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474 if (flags & tintSet) 1453 if (flags & tintSet)
1475 tint.get (c); 1454 tint.get (c);
1476 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1455 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1477 } 1456 }
1478# endif
1479 1457
1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481 1459
1482 if (gc) 1460 if (gc)
1483 { 1461 {
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); 1462 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1513 1463
1514 XFreeGC (target->dpy, gc); 1464 XFreeGC (target->dpy, gc);
1515 flags = flags & ~isInvalid; 1465 flags = flags & ~isInvalid;
1516 } 1466 }
1517 1467
1518 XDestroyImage (result); 1468 XDestroyImage (result);
1519 } 1469 }
1470# endif
1520 1471
1521 if (flags & isInvalid) 1472 if (flags & isInvalid)
1522 { 1473 {
1523 if (pixmap != None) 1474 if (pixmap != None)
1524 { 1475 {
… …
1527 } 1478 }
1528 } 1479 }
1529 1480
1530 apply (); 1481 apply ();
1531 1482
1532 XSync (target->dpy, False);
1533 valid_since = ev::now (); 1483 valid_since = ev::now ();
1534 1484
1535 TIMING_TEST_PRINT_RESULT (tp);
1536
1537 return true; 1485 return true;
1538} 1486}
1539 1487
1540bool 1488void
1541bgPixmap_t::set_target (rxvt_term *new_target) 1489bgPixmap_t::set_target (rxvt_term *new_target)
1542{ 1490{
1543 if (new_target)
1544 if (target != new_target)
1545 {
1546 target = new_target; 1491 target = new_target;
1547# ifdef ENABLE_TRANSPARENCY 1492
1548 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1493 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1494#if XRENDER
1495 int major, minor;
1496 if (XRenderQueryVersion (target->dpy, &major, &minor))
1497 flags |= HAS_RENDER;
1498 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1499 if (filters)
1500 {
1501 for (int i = 0; i < filters->nfilter; i++)
1502 if (!strcmp (filters->filter[i], FilterConvolution))
1503 flags |= HAS_RENDER_CONV;
1504
1505 XFree (filters);
1506 }
1549# endif 1507#endif
1550 return true;
1551 }
1552
1553 return false;
1554} 1508}
1555 1509
1556void 1510void
1557bgPixmap_t::apply () 1511bgPixmap_t::apply ()
1558{ 1512{
1559 if (target) 1513 if (target == NULL)
1560 { 1514 return;
1561 flags &= ~isVtOrigin;
1562 1515
1563 if (pixmap != None) 1516 if (pixmap != None)
1564 { 1517 {
1565 /* set target's background to pixmap */ 1518 /* set target's background to pixmap */
1566# ifdef ENABLE_TRANSPARENCY 1519# ifdef ENABLE_TRANSPARENCY
1567 if (flags & isTransparent) 1520 if (flags & isTransparent)
1568 { 1521 {
1569 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1522 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1570 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1523 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1571 1524
1572 if (target->scrollBar.win) 1525 if (target->scrollBar.win)
1573 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1526 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1574 } 1527 }
1575 else 1528 else
1576# endif 1529# endif
1577 { 1530 {
1578 flags |= isVtOrigin;
1579 /* force old pixmap dereference in case it was transparent before :*/ 1531 /* 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]); 1532 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1592 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1533 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1593 /* do we also need to set scrollbar's background here ? */ 1534 /* do we also need to set scrollbar's background here ? */
1535
1594 if (target->scrollBar.win) 1536 if (target->scrollBar.win)
1595 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1537 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1596 } 1538 }
1539 }
1540 else
1541 {
1542 /* set target background to a pixel */
1543 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1544 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1545 /* do we also need to set scrollbar's background here ? */
1546 if (target->scrollBar.win)
1547 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1548 }
1597 1549
1598 /* don't want Expose on the parent or vt. It is better to use 1550 /* don't want Expose on the parent or vt. It is better to use
1599 scr_touch or we get a great deal of flicker otherwise: */ 1551 scr_touch or we get a great deal of flicker otherwise: */
1600 XClearWindow (target->dpy, target->parent[0]); 1552 XClearWindow (target->dpy, target->parent[0]);
1601 1553
1602 if (target->scrollBar.state && target->scrollBar.win) 1554 if (target->scrollBar.state && target->scrollBar.win)
1603 { 1555 {
1604 target->scrollBar.state = STATE_IDLE; 1556 target->scrollBar.state = STATE_IDLE;
1605 target->scrollBar.show (0); 1557 target->scrollBar.show (0);
1606 } 1558 }
1607 1559
1608 target->want_refresh = 1; 1560 target->want_refresh = 1;
1609 flags |= hasChanged; 1561 flags |= hasChanged;
1610 }
1611} 1562}
1612 1563
1613#endif /* HAVE_BG_PIXMAP */ 1564#endif /* HAVE_BG_PIXMAP */
1614 1565
1615#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1566#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1616/* taken from aterm-0.4.2 */ 1567/* taken from aterm-0.4.2 */
1617 1568
1618typedef uint32_t RUINT32T;
1619
1620static void 1569static void
1621ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1570ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1622{ 1571{
1623 int sh_r, sh_g, sh_b; 1572 int sh_r, sh_g, sh_b;
1624 RUINT32T mask_r, mask_g, mask_b; 1573 uint32_t mask_r, mask_g, mask_b;
1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1574 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1575 rgba low;
1627 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1576 rgba high;
1628 int i; 1577 int i;
1629 1578 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1630 Visual *visual = term->visual;
1631 1579
1632 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1580 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1633 1581
1634 /* for convenience */ 1582 /* for convenience */
1635 mask_r = visual->red_mask; 1583 mask_r = visual->red_mask;
1636 mask_g = visual->green_mask; 1584 mask_g = visual->green_mask;
1637 mask_b = visual->blue_mask; 1585 mask_b = visual->blue_mask;
1638 1586
1639 /* boring lookup table pre-initialization */ 1587 /* boring lookup table pre-initialization */
1640 switch (srcImage->bits_per_pixel) 1588 switch (srcImage->depth)
1641 { 1589 {
1642 case 15: 1590 case 15:
1643 if ((mask_r != 0x7c00) || 1591 if ((mask_r != 0x7c00) ||
1644 (mask_g != 0x03e0) || 1592 (mask_g != 0x03e0) ||
1645 (mask_b != 0x001f)) 1593 (mask_b != 0x001f))
1646 return; 1594 return;
1647 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1595 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1648 lookup_r = lookup; 1596 lookup_r = lookup;
1649 lookup_g = lookup+32; 1597 lookup_g = lookup+32;
1650 lookup_b = lookup+32+32; 1598 lookup_b = lookup+32+32;
1651 sh_r = 10; 1599 sh_r = 10;
1652 sh_g = 5; 1600 sh_g = 5;
… …
1655 case 16: 1603 case 16:
1656 if ((mask_r != 0xf800) || 1604 if ((mask_r != 0xf800) ||
1657 (mask_g != 0x07e0) || 1605 (mask_g != 0x07e0) ||
1658 (mask_b != 0x001f)) 1606 (mask_b != 0x001f))
1659 return; 1607 return;
1660 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1608 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1661 lookup_r = lookup; 1609 lookup_r = lookup;
1662 lookup_g = lookup+32; 1610 lookup_g = lookup+32;
1663 lookup_b = lookup+32+64; 1611 lookup_b = lookup+32+64;
1664 sh_r = 11; 1612 sh_r = 11;
1665 sh_g = 5; 1613 sh_g = 5;
… …
1668 case 24: 1616 case 24:
1669 if ((mask_r != 0xff0000) || 1617 if ((mask_r != 0xff0000) ||
1670 (mask_g != 0x00ff00) || 1618 (mask_g != 0x00ff00) ||
1671 (mask_b != 0x0000ff)) 1619 (mask_b != 0x0000ff))
1672 return; 1620 return;
1673 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1621 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1674 lookup_r = lookup; 1622 lookup_r = lookup;
1675 lookup_g = lookup+256; 1623 lookup_g = lookup+256;
1676 lookup_b = lookup+256+256; 1624 lookup_b = lookup+256+256;
1677 sh_r = 16; 1625 sh_r = 16;
1678 sh_g = 8; 1626 sh_g = 8;
… …
1681 case 32: 1629 case 32:
1682 if ((mask_r != 0xff0000) || 1630 if ((mask_r != 0xff0000) ||
1683 (mask_g != 0x00ff00) || 1631 (mask_g != 0x00ff00) ||
1684 (mask_b != 0x0000ff)) 1632 (mask_b != 0x0000ff))
1685 return; 1633 return;
1686 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1634 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1687 lookup_r = lookup; 1635 lookup_r = lookup;
1688 lookup_g = lookup+256; 1636 lookup_g = lookup+256;
1689 lookup_b = lookup+256+256; 1637 lookup_b = lookup+256+256;
1690 sh_r = 16; 1638 sh_r = 16;
1691 sh_g = 8; 1639 sh_g = 8;
… …
1698 /* prepare limits for color transformation (each channel is handled separately) */ 1646 /* prepare limits for color transformation (each channel is handled separately) */
1699 if (shade > 100) 1647 if (shade > 100)
1700 { 1648 {
1701 shade = 200 - shade; 1649 shade = 200 - shade;
1702 1650
1703 lower_lim_r = 65535-rm; 1651 high.r = (65535 - c.r) * shade / 100;
1704 lower_lim_g = 65535-gm; 1652 high.g = (65535 - c.g) * shade / 100;
1705 lower_lim_b = 65535-bm; 1653 high.b = (65535 - c.b) * shade / 100;
1706 1654
1707 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1655 low.r = 65535 - high.r;
1708 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1656 low.g = 65535 - high.g;
1709 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1657 low.b = 65535 - high.b;
1710
1711 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1712 } 1658 }
1713 else 1659 else
1714 { 1660 {
1661 high.r = c.r * shade / 100;
1662 high.g = c.g * shade / 100;
1663 high.b = c.b * shade / 100;
1715 1664
1716 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1665 low.r = low.g = low.b = 0;
1717
1718 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1719 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1720 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1721 }
1722
1723 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1724 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000))
1725 {
1726 unsigned int tmp;
1727
1728 tmp = lower_lim_r;
1729 lower_lim_r = lower_lim_b;
1730 lower_lim_b = tmp;
1731
1732 tmp = upper_lim_r;
1733 upper_lim_r = upper_lim_b;
1734 upper_lim_b = tmp;
1735 } 1666 }
1736 1667
1737 /* fill our lookup tables */ 1668 /* fill our lookup tables */
1738 for (i = 0; i <= mask_r>>sh_r; i++) 1669 for (i = 0; i <= mask_r>>sh_r; i++)
1739 { 1670 {
1740 RUINT32T tmp; 1671 uint32_t tmp;
1741 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1672 tmp = i * high.r;
1742 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1673 tmp += (mask_r>>sh_r) * low.r;
1743 lookup_r[i] = (tmp/65535)<<sh_r; 1674 lookup_r[i] = (tmp/65535)<<sh_r;
1744 } 1675 }
1745 for (i = 0; i <= mask_g>>sh_g; i++) 1676 for (i = 0; i <= mask_g>>sh_g; i++)
1746 { 1677 {
1747 RUINT32T tmp; 1678 uint32_t tmp;
1748 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1679 tmp = i * high.g;
1749 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1680 tmp += (mask_g>>sh_g) * low.g;
1750 lookup_g[i] = (tmp/65535)<<sh_g; 1681 lookup_g[i] = (tmp/65535)<<sh_g;
1751 } 1682 }
1752 for (i = 0; i <= mask_b>>sh_b; i++) 1683 for (i = 0; i <= mask_b>>sh_b; i++)
1753 { 1684 {
1754 RUINT32T tmp; 1685 uint32_t tmp;
1755 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1686 tmp = i * high.b;
1756 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1687 tmp += (mask_b>>sh_b) * low.b;
1757 lookup_b[i] = (tmp/65535)<<sh_b; 1688 lookup_b[i] = (tmp/65535)<<sh_b;
1758 } 1689 }
1759 1690
1760 /* apply table to input image (replacing colors by newly calculated ones) */ 1691 /* apply table to input image (replacing colors by newly calculated ones) */
1761 switch (srcImage->bits_per_pixel) 1692 if (srcImage->bits_per_pixel == 32
1693 && (srcImage->depth == 24 || srcImage->depth == 32)
1694 && srcImage->byte_order == host_byte_order)
1762 { 1695 {
1763 case 15: 1696 uint32_t *p1, *pf, *p, *pl;
1764 {
1765 unsigned short *p1, *pf, *p, *pl;
1766 p1 = (unsigned short *) srcImage->data; 1697 p1 = (uint32_t *) srcImage->data;
1767 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1698 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1699
1768 while (p1 < pf) 1700 while (p1 < pf)
1769 { 1701 {
1770 p = p1; 1702 p = p1;
1771 pl = p1 + srcImage->width; 1703 pl = p1 + srcImage->width;
1772 for (; p < pl; p++) 1704 for (; p < pl; p++)
1773 {
1774 *p = lookup_r[(*p & 0x7c00)>>10] |
1775 lookup_g[(*p & 0x03e0)>> 5] |
1776 lookup_b[(*p & 0x001f)];
1777 }
1778 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1779 } 1705 {
1780 break;
1781 }
1782 case 16:
1783 {
1784 unsigned short *p1, *pf, *p, *pl;
1785 p1 = (unsigned short *) srcImage->data;
1786 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1787 while (p1 < pf)
1788 {
1789 p = p1;
1790 pl = p1 + srcImage->width;
1791 for (; p < pl; p++)
1792 {
1793 *p = lookup_r[(*p & 0xf800)>>11] |
1794 lookup_g[(*p & 0x07e0)>> 5] |
1795 lookup_b[(*p & 0x001f)];
1796 }
1797 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1798 }
1799 break;
1800 }
1801 case 24:
1802 {
1803 unsigned char *p1, *pf, *p, *pl;
1804 p1 = (unsigned char *) srcImage->data;
1805 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1806 while (p1 < pf)
1807 {
1808 p = p1;
1809 pl = p1 + srcImage->width * 3;
1810 for (; p < pl; p += 3)
1811 {
1812 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1813 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1814 p[2] = lookup_r[(p[2] & 0x0000ff)];
1815 }
1816 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1817 }
1818 break;
1819 }
1820 case 32:
1821 {
1822 RUINT32T *p1, *pf, *p, *pl;
1823 p1 = (RUINT32T *) srcImage->data;
1824 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1825
1826 while (p1 < pf)
1827 {
1828 p = p1;
1829 pl = p1 + srcImage->width;
1830 for (; p < pl; p++)
1831 {
1832 *p = lookup_r[(*p & 0xff0000)>>16] | 1706 *p = lookup_r[(*p & 0xff0000) >> 16] |
1833 lookup_g[(*p & 0x00ff00)>> 8] | 1707 lookup_g[(*p & 0x00ff00) >> 8] |
1834 lookup_b[(*p & 0x0000ff)] | 1708 lookup_b[(*p & 0x0000ff)] |
1835 (*p & ~0xffffff); 1709 (*p & 0xff000000);
1836 } 1710 }
1837 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); 1711 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1712 }
1713 }
1714 else
1715 {
1716 for (int y = 0; y < srcImage->height; y++)
1717 for (int x = 0; x < srcImage->width; x++)
1718 {
1719 unsigned long pixel = XGetPixel (srcImage, x, y);
1720 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1721 lookup_g[(pixel & mask_g) >> sh_g] |
1722 lookup_b[(pixel & mask_b) >> sh_b];
1723 XPutPixel (srcImage, x, y, pixel);
1838 } 1724 }
1839 break;
1840 }
1841 } 1725 }
1842 1726
1843 free (lookup); 1727 free (lookup);
1844} 1728}
1845#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1729#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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