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

Diff Legend

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