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.94 by sf-exg, Wed Oct 20 09:04:55 2010 UTC vs.
Revision 1.119 by sf-exg, Thu Nov 18 17:28:12 2010 UTC

… …
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 28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
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>
33#define TIMING_TEST_START(id) \ 41#define TIMING_TEST_START(id) \
… …
58 * 66 *
59 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 67 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
60 * W and H are percentages of the terminal window size. 68 * W and H are percentages of the terminal window size.
61 * X and Y are also percentages; e.g., +50+50 centers 69 * X and Y are also percentages; e.g., +50+50 centers
62 * the image in the window. 70 * the image in the window.
63 * WxH+X Assumes Y == X
64 * WxH Assumes Y == X == 50 (centers the image)
65 * W+X+Y Assumes H == W
66 * W+X Assumes H == W and Y == X
67 * W Assumes H == W and Y == X == 50
68 *
69 * Adjusting position only :
70 * =+X+Y Set position to X% by Y% (absolute).
71 * =+X Set position to X% by X%.
72 * +X+Y Adjust position horizontally X% and vertically Y%
73 * from current position (relative).
74 * +X Adjust position horizontally X% and vertically X%
75 * from current position.
76 *
77 * Adjusting scale only :
78 * Wx0 Multiply horizontal scaling factor by W%
79 * 0xH Multiply vertical scaling factor by H%
80 * 0x0 No scaling (show image at normal size).
81 * 71 *
82 * Pixmap Operations : (should be prepended by a colon) 72 * Pixmap Operations : (should be prepended by a colon)
83 * tile Tile image. Scaling/position modifiers above will affect 73 * tile Tile image. Scaling/position modifiers above will affect
84 * the tile size and origin. 74 * the tile size and origin.
85 * propscale When scaling, scale proportionally. That is, maintain the 75 * propscale When scaling, scale proportionally. That is, maintain the
… …
168 return true; 158 return true;
169 } 159 }
170# endif 160# endif
171 161
172 return false; 162 return false;
173}; 163}
174 164
175bool bgPixmap_t::need_client_side_rendering () 165bool bgPixmap_t::need_client_side_rendering ()
176{ 166{
177# ifdef HAVE_AFTERIMAGE 167# ifdef HAVE_AFTERIMAGE
178 if (original_asim) 168 if (original_asim)
… …
248 dst_size = target_size - dst_pos; 238 dst_size = target_size - dst_pos;
249 return src_pos; 239 return src_pos;
250} 240}
251 241
252bool 242bool
253bgPixmap_t::set_geometry (const char *geom) 243bgPixmap_t::set_geometry (const char *geom, bool update)
254{ 244{
245 bool changed = false;
255 int geom_flags = 0, changed = 0; 246 int geom_flags = 0;
256 int x = 0, y = 0; 247 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 248 unsigned int w = 0, h = 0;
258 unsigned int n; 249 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 250 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p; 251 const char *p;
… …
271 262
272 n = (p - geom); 263 n = (p - geom);
273 if (n < MAXLEN_GEOM) 264 if (n < MAXLEN_GEOM)
274 { 265 {
275 char *ops; 266 char *ops;
276 new_flags |= geometrySet;
277 267
278 memcpy (str, geom, n); 268 memcpy (str, geom, n);
279 str[n] = '\0'; 269 str[n] = '\0';
280 if (str[0] == ':') 270 if (str[0] == ':')
281 ops = &str[0]; 271 ops = &str[0];
… …
296 if (ops > str || ops == NULL) 286 if (ops > str || ops == NULL)
297 { 287 {
298 /* we have geometry string - let's handle it prior to applying ops */ 288 /* we have geometry string - let's handle it prior to applying ops */
299 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 289 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
300 290
301 if ((geom_flags & XValue) && !(geom_flags & YValue))
302 {
303 y = x;
304 geom_flags |= YValue;
305 }
306
307 if (flags & geometrySet)
308 {
309 /* new geometry is an adjustment to the old one ! */
310 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
311 {
312 if (w == 0 && h != 0)
313 {
314 w = h_scale;
315 h = (v_scale * h) / 100;
316 }
317 else if (h == 0 && w != 0)
318 {
319 w = (h_scale * w) / 100;
320 h = v_scale;
321 }
322 }
323 if (geom_flags & XValue)
324 {
325 if (str[0] != '=')
326 {
327 y += v_align;
328 x += h_align;
329 }
330 }
331 }
332 else /* setting up geometry from scratch */ 291 if (!update) /* setting up geometry from scratch */
333 { 292 {
334 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
335 { 294 {
336 /* use default geometry - centered */ 295 /* use default geometry - centered */
337 x = y = defaultAlign; 296 x = y = defaultAlign;
… …
351 } 310 }
352 else 311 else
353 w = h; 312 w = h;
354 } 313 }
355 } /* done parsing geometry string */ 314 } /* done parsing geometry string */
356 else if (!(flags & geometrySet)) 315 else if (!update)
357 { 316 {
358 /* default geometry - scaled and centered */ 317 /* default geometry - scaled and centered */
359 x = y = defaultAlign; 318 x = y = defaultAlign;
360 w = h = defaultScale; 319 w = h = defaultScale;
361 } 320 }
362 321
363 if (!(flags & geometrySet)) 322 if (!update)
364 geom_flags |= WidthValue|HeightValue|XValue|YValue; 323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
365 324
366 if (ops) 325 if (ops)
367 { 326 {
368 while (*ops) 327 while (*ops)
… …
416 375
417 while (*ops != ':' && *ops != '\0') ++ops; 376 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 377 } /* done parsing ops */
419 } 378 }
420 379
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 380 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; 381 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; 382 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; 383 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425 } 384 }
426 385
427 if (new_flags != flags) 386 if (new_flags != flags)
428 { 387 {
429 flags = new_flags; 388 flags = new_flags;
430 changed++; 389 changed = true;
431 } 390 }
432 391
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); 392 return changed;
436} 393}
437 394
438void 395void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 396bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
440{ 397{
… …
529 486
530 int x = 0; 487 int x = 0;
531 int y = 0; 488 int y = 0;
532 int w = 0; 489 int w = 0;
533 int h = 0; 490 int h = 0;
534
535 TIMING_TEST_START (asim);
536 491
537 if (original_asim) 492 if (original_asim)
538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 493 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
539 494
540 if (!original_asim 495 if (!original_asim
… …
657 } 612 }
658 613
659 free (layers); 614 free (layers);
660 } 615 }
661 } 616 }
662 TIMING_TEST_PRINT_RESULT (asim);
663 617
664 bool ret = false; 618 bool ret = false;
665 619
666 if (result) 620 if (result)
667 { 621 {
668 XGCValues gcv; 622 XGCValues gcv;
669 GC gc; 623 GC gc;
670 624
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 */ 625 /* create Pixmap */
683 if (pixmap == None) 626 if (pixmap == None
627 || pmap_width != new_pmap_width
628 || pmap_height != new_pmap_height
629 || pmap_depth != target->depth)
684 { 630 {
631 if (pixmap)
632 XFreePixmap (target->dpy, pixmap);
685 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 633 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
686 pmap_width = new_pmap_width; 634 pmap_width = new_pmap_width;
687 pmap_height = new_pmap_height; 635 pmap_height = new_pmap_height;
688 pmap_depth = target->depth; 636 pmap_depth = target->depth;
689 } 637 }
… …
713 661
714 if (result != background && result != original_asim) 662 if (result != background && result != original_asim)
715 destroy_asimage (&result); 663 destroy_asimage (&result);
716 664
717 XFreeGC (target->dpy, gc); 665 XFreeGC (target->dpy, gc);
718 TIMING_TEST_PRINT_RESULT (asim);
719 666
720 ret = true; 667 ret = true;
721 } 668 }
722 669
723 if (background) 670 if (background)
… …
735 return false; 682 return false;
736 683
737 if (!pixbuf) 684 if (!pixbuf)
738 return false; 685 return false;
739 686
740#if !XFT
741 if (background_flags) 687 if (background_flags
688 && !(flags & HAS_RENDER))
742 return false; 689 return false;
743#endif
744 690
745 GdkPixbuf *result; 691 GdkPixbuf *result;
746 692
747 int image_width = gdk_pixbuf_get_width (pixbuf); 693 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf); 694 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
799 new_pmap_width = min (image_width, target_width); 745 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height); 746 new_pmap_height = min (image_height, target_height);
801 } 747 }
802 } 748 }
803 749
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) 750 if (pixmap == None
751 || pmap_width != new_pmap_width
752 || pmap_height != new_pmap_height
753 || pmap_depth != target->depth)
816 { 754 {
755 if (pixmap)
756 XFreePixmap (target->dpy, pixmap);
817 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 757 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
818 pmap_width = new_pmap_width; 758 pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height; 759 pmap_height = new_pmap_height;
820 pmap_depth = target->depth; 760 pmap_depth = target->depth;
821 } 761 }
… …
862 dst_width, dst_height, 802 dst_width, dst_height,
863 XLIB_RGB_DITHER_NONE, 803 XLIB_RGB_DITHER_NONE,
864 0, 0); 804 0, 0);
865 } 805 }
866 806
867#if XFT 807#if XRENDER
868 if (background_flags) 808 if (background_flags)
869 { 809 {
870 Display *dpy = target->dpy; 810 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa; 811 XRenderPictureAttributes pa;
872 812
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 813 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 814 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875 815
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 816 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 817 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878 818
… …
915# endif /* HAVE_PIXBUF */ 855# endif /* HAVE_PIXBUF */
916 856
917bool 857bool
918bgPixmap_t::set_file (const char *file) 858bgPixmap_t::set_file (const char *file)
919{ 859{
920 assert (file); 860 if (!file || !*file)
861 return false;
921 862
922 if (*file)
923 {
924 if (const char *p = strchr (file, ';')) 863 if (const char *p = strchr (file, ';'))
925 { 864 {
926 size_t len = p - file; 865 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 866 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 867 memcpy (f, file, len);
929 f[len] = '\0'; 868 f[len] = '\0';
930 file = f; 869 file = f;
931 } 870 }
932 871
933# ifdef HAVE_AFTERIMAGE 872# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 873 if (!target->asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 874 target->asimman = create_generic_imageman (target->rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 875 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
937 if (image) 876 if (image)
938 { 877 {
939 if (original_asim) 878 if (original_asim)
940 safe_asimage_destroy (original_asim); 879 safe_asimage_destroy (original_asim);
941 original_asim = image; 880 original_asim = image;
942 have_image = true; 881 have_image = true;
943 return true; 882 return true;
944 } 883 }
945# endif 884# endif
946 885
947# ifdef HAVE_PIXBUF 886# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 887 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 888 if (image)
950 { 889 {
951 if (pixbuf) 890 if (pixbuf)
952 g_object_unref (pixbuf); 891 g_object_unref (pixbuf);
953 pixbuf = image; 892 pixbuf = image;
954 have_image = true; 893 have_image = true;
955 return true; 894 return true;
956 } 895 }
957# endif 896# endif
958 }
959 897
960 return false; 898 return false;
961} 899}
962 900
963# endif /* BG_IMAGE_FROM_FILE */ 901# endif /* BG_IMAGE_FROM_FILE */
… …
976} 914}
977 915
978bool 916bool
979bgPixmap_t::set_blur_radius (const char *geom) 917bgPixmap_t::set_blur_radius (const char *geom)
980{ 918{
981 int changed = 0; 919 bool changed = false;
982 unsigned int hr, vr; 920 unsigned int hr, vr;
983 int junk; 921 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 922 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 923
986 if (!(geom_flags & WidthValue)) 924 if (!(geom_flags & WidthValue))
… …
991 min_it (hr, 128); 929 min_it (hr, 128);
992 min_it (vr, 128); 930 min_it (vr, 128);
993 931
994 if (h_blurRadius != hr) 932 if (h_blurRadius != hr)
995 { 933 {
996 ++changed; 934 changed = true;
997 h_blurRadius = hr; 935 h_blurRadius = hr;
998 } 936 }
999 937
1000 if (v_blurRadius != vr) 938 if (v_blurRadius != vr)
1001 { 939 {
1002 ++changed; 940 changed = true;
1003 v_blurRadius = vr; 941 v_blurRadius = vr;
1004 } 942 }
1005 943
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 944 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 945 flags &= ~blurNeeded;
1008 else 946 else
1009 flags |= blurNeeded; 947 flags |= blurNeeded;
1010 948
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); 949 return changed;
1024} 950}
1025 951
1026static inline unsigned long 952static inline unsigned long
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 953compute_tint_shade_flags (rxvt_color *tint, int shade)
1028{ 954{
… …
1050 { 976 {
1051 flags |= bgPixmap_t::tintNeeded; 977 flags |= bgPixmap_t::tintNeeded;
1052 } 978 }
1053 } 979 }
1054 980
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; 981 return flags;
1068} 982}
1069 983
1070bool 984bool
1071bgPixmap_t::set_tint (rxvt_color &new_tint) 985bgPixmap_t::set_tint (rxvt_color &new_tint)
… …
1113 } 1027 }
1114 1028
1115 return false; 1029 return false;
1116} 1030}
1117 1031
1118#if XFT 1032#if XRENDER
1119static void 1033static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1034get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{ 1035{
1122 double sigma = radius / 2.0; 1036 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma; 1037 double scale = sqrt (2.0 * M_PI) * sigma;
… …
1140 1054
1141bool 1055bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1056bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{ 1057{
1144 bool ret = false; 1058 bool ret = false;
1145#if XFT 1059#if XRENDER
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1060 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double)); 1061 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1062 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149 1063
1150 Display *dpy = target->dpy; 1064 Display *dpy = target->dpy;
… …
1227 XFreeGC (dpy, gc); 1141 XFreeGC (dpy, gc);
1228 } 1142 }
1229 } 1143 }
1230 else 1144 else
1231 { 1145 {
1232# if XFT 1146# if XRENDER
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1147 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234 1148
1235 if (flags & tintSet) 1149 if (flags & tintSet)
1236 tint.get (c); 1150 tint.get (c);
1237 1151
… …
1267 1181
1268 if (mask_pic && overlay_pic && back_pic) 1182 if (mask_pic && overlay_pic && back_pic)
1269 { 1183 {
1270 XRenderColor mask_c; 1184 XRenderColor mask_c;
1271 1185
1272 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1186 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1273 mask_c.alpha = 0xffff; 1187 mask_c.alpha = 0xffff;
1274 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1188 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1275 1189
1276 mask_c.alpha = 0; 1190 mask_c.alpha = 0;
1277 mask_c.red = 0xffff - c.r; 1191 mask_c.red = 0xffff - c.r;
… …
1283 } 1197 }
1284 1198
1285 XRenderFreePicture (dpy, mask_pic); 1199 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic); 1200 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic); 1201 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST
1289 XSync (dpy, False);
1290# endif
1291# endif 1202# endif
1292 } 1203 }
1293 1204
1294 return ret; 1205 return ret;
1295} 1206}
1296 1207
1297/* make_transparency_pixmap() 1208/* make_transparency_pixmap()
1298 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1209 * 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 1210 * the tiled portion of the root pixmap that is supposed to be covered by
1300 * our window. 1211 * our window.
1301 */ 1212 */
1302unsigned long 1213unsigned long
1303bgPixmap_t::make_transparency_pixmap () 1214bgPixmap_t::make_transparency_pixmap ()
1304{ 1215{
… …
1308 return 0; 1219 return 0;
1309 1220
1310 /* root dimensions may change from call to call - but Display structure should 1221 /* root dimensions may change from call to call - but Display structure should
1311 * be always up-to-date, so let's use it : 1222 * be always up-to-date, so let's use it :
1312 */ 1223 */
1313 Window root = target->display->root;
1314 int screen = target->display->screen; 1224 int screen = target->display->screen;
1315 Display *dpy = target->dpy; 1225 Display *dpy = target->dpy;
1226 int root_depth = DefaultDepth (dpy, screen);
1316 int root_width = DisplayWidth (dpy, screen); 1227 int root_width = DisplayWidth (dpy, screen);
1317 int root_height = DisplayHeight (dpy, screen); 1228 int root_height = DisplayHeight (dpy, screen);
1318 unsigned int root_pmap_width, root_pmap_height; 1229 unsigned int root_pmap_width, root_pmap_height;
1319 int window_width = target->szHint.width; 1230 int window_width = target->szHint.width;
1320 int window_height = target->szHint.height; 1231 int window_height = target->szHint.height;
1321 int sx, sy; 1232 int sx, sy;
1322 XGCValues gcv; 1233 XGCValues gcv;
1323 GC gc; 1234 GC gc;
1324 1235
1325 TIMING_TEST_START (tp);
1326 target->get_window_origin (sx, sy); 1236 target->get_window_origin (sx, sy);
1327 1237
1328 /* check if we are outside of the visible part of the virtual screen : */ 1238 /* check if we are outside of the visible part of the virtual screen : */
1329 if (sx + window_width <= 0 || sy + window_height <= 0 1239 if (sx + window_width <= 0 || sy + window_height <= 0
1330 || sx >= root_width || sy >= root_height) 1240 || sx >= root_width || sy >= root_height)
1331 return 0; 1241 return 0;
1332 1242
1243 // validate root pixmap and get its size
1333 if (root_pixmap != None) 1244 if (root_pixmap != None)
1334 { 1245 {
1335 /* we want to validate the pixmap and get its size at the same time : */ 1246 Window wdummy;
1336 int junk; 1247 int idummy;
1337 unsigned int ujunk; 1248 unsigned int udummy;
1338 /* root pixmap may be bad - allow a error */ 1249
1339 target->allowedxerror = -1; 1250 target->allowedxerror = -1;
1340 1251
1341 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1252 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1342 root_pixmap = None; 1253 root_pixmap = None;
1343 1254
1344 target->allowedxerror = 0; 1255 target->allowedxerror = 0;
1256 }
1257
1258 Pixmap recoded_root_pmap = root_pixmap;
1259
1260 if (root_pixmap != None && root_depth != target->depth)
1261 {
1262#if XRENDER
1263 if (flags & HAS_RENDER)
1264 {
1265 XRenderPictureAttributes pa;
1266
1267 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1268 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1269
1270 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1271 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1272 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1273
1274 if (src && dst)
1275 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1276 else
1277 {
1278 XFreePixmap (dpy, recoded_root_pmap);
1279 root_pixmap = None;
1280 }
1281
1282 XRenderFreePicture (dpy, src);
1283 XRenderFreePicture (dpy, dst);
1284 }
1285 else
1286#endif
1287 root_pixmap = None;
1345 } 1288 }
1346 1289
1347 if (root_pixmap == None) 1290 if (root_pixmap == None)
1348 return 0; 1291 return 0;
1349 1292
1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1293 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1351 1294
1352 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1295 if (tiled_root_pmap == None) /* something really bad happened - abort */
1353 return 0; 1296 return 0;
1354 1297
1355 /* straightforward pixmap copy */ 1298 /* straightforward pixmap copy */
1356 gcv.tile = root_pixmap; 1299 gcv.tile = recoded_root_pmap;
1357 gcv.fill_style = FillTiled; 1300 gcv.fill_style = FillTiled;
1358 1301
1359 while (sx < 0) sx += (int)root_width; 1302 while (sx < 0) sx += (int)root_width;
1360 while (sy < 0) sy += (int)root_height; 1303 while (sy < 0) sy += (int)root_height;
1361 1304
1362 gcv.ts_x_origin = -sx; 1305 gcv.ts_x_origin = -sx;
1363 gcv.ts_y_origin = -sy; 1306 gcv.ts_y_origin = -sy;
1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1307 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1365 1308
1366 if (gc) 1309 if (gc)
1367 { 1310 {
1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1311 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1369 result |= transpPmapTiled; 1312 result |= transpPmapTiled;
1370 XFreeGC (dpy, gc); 1313 XFreeGC (dpy, gc);
1371 }
1372 TIMING_TEST_PRINT_RESULT (tp);
1373 1314
1374 if (tiled_root_pmap != None)
1375 {
1376 if (!need_client_side_rendering ()) 1315 if (!need_client_side_rendering ())
1377 { 1316 {
1378 if (flags & (blurNeeded | blurServerSide)) 1317 if ((flags & blurNeeded)
1318 && (flags & HAS_RENDER_CONV))
1379 { 1319 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1320 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1381 result |= transpPmapBlurred; 1321 result |= transpPmapBlurred;
1382 } 1322 }
1383 if (flags & (tintNeeded | tintServerSide)) 1323 if ((flags & tintNeeded)
1324 && (flags & (tintWholesome | HAS_RENDER)))
1384 { 1325 {
1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1326 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1386 result |= transpPmapTinted; 1327 result |= transpPmapTinted;
1387 } 1328 }
1388 } /* server side rendering completed */ 1329 } /* server side rendering completed */
1389 1330
1390 if (pixmap) 1331 if (pixmap)
1391 XFreePixmap (dpy, pixmap); 1332 XFreePixmap (dpy, pixmap);
1392 1333
1393 pixmap = tiled_root_pmap; 1334 pixmap = tiled_root_pmap;
1394 pmap_width = window_width; 1335 pmap_width = window_width;
1395 pmap_height = window_height; 1336 pmap_height = window_height;
1396 pmap_depth = root_depth; 1337 pmap_depth = target->depth;
1397 } 1338 }
1339 else
1340 XFreePixmap (dpy, tiled_root_pmap);
1398 1341
1399 TIMING_TEST_PRINT_RESULT (tp); 1342 if (recoded_root_pmap != root_pixmap)
1343 XFreePixmap (dpy, recoded_root_pmap);
1400 1344
1401 return result; 1345 return result;
1402} 1346}
1403 1347
1404bool 1348void
1405bgPixmap_t::set_root_pixmap () 1349bgPixmap_t::set_root_pixmap ()
1406{ 1350{
1407 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1351 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1408 if (new_root_pixmap == None) 1352 if (new_root_pixmap == None)
1409 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1353 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1410 1354
1411 if (new_root_pixmap != root_pixmap)
1412 {
1413 root_pixmap = new_root_pixmap; 1355 root_pixmap = new_root_pixmap;
1414 return true;
1415 }
1416
1417 return false;
1418} 1356}
1419# endif /* ENABLE_TRANSPARENCY */ 1357# endif /* ENABLE_TRANSPARENCY */
1420 1358
1421# ifndef HAVE_AFTERIMAGE 1359#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1422static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1360static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1423# endif 1361# endif
1424 1362
1425bool 1363bool
1426bgPixmap_t::render () 1364bgPixmap_t::render ()
1427{ 1365{
1428 unsigned long background_flags = 0; 1366 unsigned long background_flags = 0;
1429 1367
1430 if (target == NULL) 1368 if (target == NULL)
1431 return false; 1369 return false;
1432
1433 TIMING_TEST_START (tp);
1434 1370
1435 invalidate (); 1371 invalidate ();
1436# ifdef ENABLE_TRANSPARENCY 1372# ifdef ENABLE_TRANSPARENCY
1437 if (flags & isTransparent) 1373 if (flags & isTransparent)
1438 { 1374 {
1439 /* we need to re-generate transparency pixmap in that case ! */ 1375 /* we need to re-generate transparency pixmap in that case ! */
1440 background_flags = make_transparency_pixmap (); 1376 background_flags = make_transparency_pixmap ();
1441 if (background_flags == 0) 1377 if (background_flags == 0)
1442 return false; 1378 return false;
1443 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1379 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1444 && pmap_depth == target->depth)
1445 flags = flags & ~isInvalid; 1380 flags = flags & ~isInvalid;
1446 } 1381 }
1447# endif 1382# endif
1448 1383
1449# ifdef BG_IMAGE_FROM_FILE 1384# ifdef BG_IMAGE_FROM_FILE
… …
1453 if (render_image (background_flags)) 1388 if (render_image (background_flags))
1454 flags = flags & ~isInvalid; 1389 flags = flags & ~isInvalid;
1455 } 1390 }
1456# endif 1391# endif
1457 1392
1393# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1458 XImage *result = NULL; 1394 XImage *result = NULL;
1459 1395
1460 if (background_flags && (flags & isInvalid)) 1396 if (background_flags && (flags & isInvalid))
1461 { 1397 {
1462 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1398 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1463 } 1399 }
1464 1400
1465 if (result) 1401 if (result)
1466 { 1402 {
1467# if !defined(HAVE_AFTERIMAGE) && !XFT
1468 /* our own client-side tinting */ 1403 /* 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)) 1404 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472 { 1405 {
1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1406 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474 if (flags & tintSet) 1407 if (flags & tintSet)
1475 tint.get (c); 1408 tint.get (c);
1476 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1409 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1477 } 1410 }
1478# endif
1479 1411
1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1412 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481 1413
1482 if (gc) 1414 if (gc)
1483 { 1415 {
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); 1416 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1513 1417
1514 XFreeGC (target->dpy, gc); 1418 XFreeGC (target->dpy, gc);
1515 flags = flags & ~isInvalid; 1419 flags = flags & ~isInvalid;
1516 } 1420 }
1517 1421
1518 XDestroyImage (result); 1422 XDestroyImage (result);
1519 } 1423 }
1424# endif
1520 1425
1521 if (flags & isInvalid) 1426 if (flags & isInvalid)
1522 { 1427 {
1523 if (pixmap != None) 1428 if (pixmap != None)
1524 { 1429 {
… …
1527 } 1432 }
1528 } 1433 }
1529 1434
1530 apply (); 1435 apply ();
1531 1436
1532 XSync (target->dpy, False);
1533 valid_since = ev::now (); 1437 valid_since = ev::now ();
1534 1438
1535 TIMING_TEST_PRINT_RESULT (tp);
1536
1537 return true; 1439 return true;
1538} 1440}
1539 1441
1540bool 1442void
1541bgPixmap_t::set_target (rxvt_term *new_target) 1443bgPixmap_t::set_target (rxvt_term *new_target)
1542{ 1444{
1543 if (new_target)
1544 if (target != new_target)
1545 {
1546 target = new_target; 1445 target = new_target;
1547# ifdef ENABLE_TRANSPARENCY 1446
1548 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1447 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1448#if XRENDER
1449 int major, minor;
1450 if (XRenderQueryVersion (target->dpy, &major, &minor))
1451 flags |= HAS_RENDER;
1452 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1453 if (filters)
1454 {
1455 for (int i = 0; i < filters->nfilter; i++)
1456 if (!strcmp (filters->filter[i], FilterConvolution))
1457 flags |= HAS_RENDER_CONV;
1458
1459 XFree (filters);
1460 }
1549# endif 1461#endif
1550 return true;
1551 }
1552
1553 return false;
1554} 1462}
1555 1463
1556void 1464void
1557bgPixmap_t::apply () 1465bgPixmap_t::apply ()
1558{ 1466{
1559 if (target) 1467 if (target == NULL)
1560 { 1468 return;
1561 flags &= ~isVtOrigin;
1562 1469
1563 if (pixmap != None) 1470 if (pixmap != None)
1564 { 1471 {
1565 /* set target's background to pixmap */ 1472 /* set target's background to pixmap */
1566# ifdef ENABLE_TRANSPARENCY 1473# ifdef ENABLE_TRANSPARENCY
1567 if (flags & isTransparent) 1474 if (flags & isTransparent)
1568 { 1475 {
1569 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1476 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1570 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1477 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1571 1478
1572 if (target->scrollBar.win) 1479 if (target->scrollBar.win)
1573 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1480 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1574 } 1481 }
1575 else 1482 else
1576# endif 1483# endif
1577 { 1484 {
1578 flags |= isVtOrigin;
1579 /* force old pixmap dereference in case it was transparent before :*/ 1485 /* 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]); 1486 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1592 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1487 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1593 /* do we also need to set scrollbar's background here ? */ 1488 /* do we also need to set scrollbar's background here ? */
1489
1594 if (target->scrollBar.win) 1490 if (target->scrollBar.win)
1595 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1491 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1596 } 1492 }
1493 }
1494 else
1495 {
1496 /* set target background to a pixel */
1497 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1498 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1499 /* do we also need to set scrollbar's background here ? */
1500 if (target->scrollBar.win)
1501 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1502 }
1597 1503
1598 /* don't want Expose on the parent or vt. It is better to use 1504 /* 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: */ 1505 scr_touch or we get a great deal of flicker otherwise: */
1600 XClearWindow (target->dpy, target->parent[0]); 1506 XClearWindow (target->dpy, target->parent[0]);
1601 1507
1602 if (target->scrollBar.state && target->scrollBar.win) 1508 if (target->scrollBar.state && target->scrollBar.win)
1603 { 1509 {
1604 target->scrollBar.state = STATE_IDLE; 1510 target->scrollBar.state = STATE_IDLE;
1605 target->scrollBar.show (0); 1511 target->scrollBar.show (0);
1606 } 1512 }
1607 1513
1608 target->want_refresh = 1; 1514 target->want_refresh = 1;
1609 flags |= hasChanged; 1515 flags |= hasChanged;
1610 }
1611} 1516}
1612 1517
1613#endif /* HAVE_BG_PIXMAP */ 1518#endif /* HAVE_BG_PIXMAP */
1614 1519
1615#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1520#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1616/* taken from aterm-0.4.2 */ 1521/* taken from aterm-0.4.2 */
1617 1522
1618static void 1523static void
1619ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1524ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1620{ 1525{
1621 int sh_r, sh_g, sh_b; 1526 int sh_r, sh_g, sh_b;
1622 uint32_t mask_r, mask_g, mask_b; 1527 uint32_t mask_r, mask_g, mask_b;
1623 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1528 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1624 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1529 rgba low;
1625 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1530 rgba high;
1626 int i; 1531 int i;
1627 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1532 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1628 1533
1629 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1534 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1630 1535
… …
1695 /* prepare limits for color transformation (each channel is handled separately) */ 1600 /* prepare limits for color transformation (each channel is handled separately) */
1696 if (shade > 100) 1601 if (shade > 100)
1697 { 1602 {
1698 shade = 200 - shade; 1603 shade = 200 - shade;
1699 1604
1700 lower_lim_r = 65535-rm; 1605 high.r = (65535 - c.r) * shade / 100;
1701 lower_lim_g = 65535-gm; 1606 high.g = (65535 - c.g) * shade / 100;
1702 lower_lim_b = 65535-bm; 1607 high.b = (65535 - c.b) * shade / 100;
1703 1608
1704 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1609 low.r = 65535 - high.r;
1705 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1610 low.g = 65535 - high.g;
1706 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1611 low.b = 65535 - high.b;
1707
1708 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1709 } 1612 }
1710 else 1613 else
1711 { 1614 {
1615 high.r = c.r * shade / 100;
1616 high.g = c.g * shade / 100;
1617 high.b = c.b * shade / 100;
1712 1618
1713 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1619 low.r = low.g = low.b = 0;
1714
1715 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1716 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1717 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1718 } 1620 }
1719 1621
1720 /* fill our lookup tables */ 1622 /* fill our lookup tables */
1721 for (i = 0; i <= mask_r>>sh_r; i++) 1623 for (i = 0; i <= mask_r>>sh_r; i++)
1722 { 1624 {
1723 uint32_t tmp; 1625 uint32_t tmp;
1724 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1626 tmp = i * high.r;
1725 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1627 tmp += (mask_r>>sh_r) * low.r;
1726 lookup_r[i] = (tmp/65535)<<sh_r; 1628 lookup_r[i] = (tmp/65535)<<sh_r;
1727 } 1629 }
1728 for (i = 0; i <= mask_g>>sh_g; i++) 1630 for (i = 0; i <= mask_g>>sh_g; i++)
1729 { 1631 {
1730 uint32_t tmp; 1632 uint32_t tmp;
1731 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1633 tmp = i * high.g;
1732 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1634 tmp += (mask_g>>sh_g) * low.g;
1733 lookup_g[i] = (tmp/65535)<<sh_g; 1635 lookup_g[i] = (tmp/65535)<<sh_g;
1734 } 1636 }
1735 for (i = 0; i <= mask_b>>sh_b; i++) 1637 for (i = 0; i <= mask_b>>sh_b; i++)
1736 { 1638 {
1737 uint32_t tmp; 1639 uint32_t tmp;
1738 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1640 tmp = i * high.b;
1739 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1641 tmp += (mask_b>>sh_b) * low.b;
1740 lookup_b[i] = (tmp/65535)<<sh_b; 1642 lookup_b[i] = (tmp/65535)<<sh_b;
1741 } 1643 }
1742 1644
1743 /* apply table to input image (replacing colors by newly calculated ones) */ 1645 /* apply table to input image (replacing colors by newly calculated ones) */
1744 if (srcImage->bits_per_pixel == 32 1646 if (srcImage->bits_per_pixel == 32

Diff Legend

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