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.103 by sf-exg, Sun Oct 31 11:15:29 2010 UTC vs.
Revision 1.125 by sf-exg, Tue Nov 23 18:31:13 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
… …
113#endif 103#endif
114 flags = 0; 104 flags = 0;
115 pixmap = None; 105 pixmap = None;
116 valid_since = invalid_since = 0; 106 valid_since = invalid_since = 0;
117 target = 0; 107 target = 0;
108 target_x = target_y = 0;
118} 109}
119 110
120void 111void
121bgPixmap_t::destroy () 112bgPixmap_t::destroy ()
122{ 113{
… …
133 if (pixmap && target) 124 if (pixmap && target)
134 XFreePixmap (target->dpy, pixmap); 125 XFreePixmap (target->dpy, pixmap);
135} 126}
136 127
137bool 128bool
129bgPixmap_t::set_position (int x, int y)
130{
131
132 if (target_x != x
133 || target_y != y)
134 {
135 target_x = x;
136 target_y = y;
137 return true;
138 }
139 return false;
140}
141
142bool
138bgPixmap_t::window_size_sensitive () 143bgPixmap_t::window_size_sensitive ()
139{ 144{
140# ifdef ENABLE_TRANSPARENCY 145# ifdef ENABLE_TRANSPARENCY
141 if (flags & isTransparent) 146 if (flags & isTransparent)
142 return true; 147 return true;
… …
168 return true; 173 return true;
169 } 174 }
170# endif 175# endif
171 176
172 return false; 177 return false;
173}; 178}
174 179
175bool bgPixmap_t::need_client_side_rendering () 180bool bgPixmap_t::need_client_side_rendering ()
176{ 181{
177# ifdef HAVE_AFTERIMAGE 182# ifdef HAVE_AFTERIMAGE
178 if (original_asim) 183 if (original_asim)
… …
248 dst_size = target_size - dst_pos; 253 dst_size = target_size - dst_pos;
249 return src_pos; 254 return src_pos;
250} 255}
251 256
252bool 257bool
253bgPixmap_t::set_geometry (const char *geom) 258bgPixmap_t::set_geometry (const char *geom, bool update)
254{ 259{
260 bool changed = false;
255 int geom_flags = 0, changed = 0; 261 int geom_flags = 0;
256 int x = 0, y = 0; 262 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 263 unsigned int w = 0, h = 0;
258 unsigned int n; 264 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 265 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p; 266 const char *ops;
261# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 268
263 if (geom == NULL) 269 if (geom == NULL)
264 return false; 270 return false;
265 271
266 char str[MAXLEN_GEOM]; 272 char str[MAXLEN_GEOM];
267 273
268 while (isspace(*geom)) ++geom;
269 if ((p = strchr (geom, ';')) == NULL)
270 p = strchr (geom, '\0'); 274 ops = strchr (geom, ':');
271 275 if (ops == NULL)
276 n = strlen (geom);
277 else
272 n = (p - geom); 278 n = ops - geom;
279
273 if (n < MAXLEN_GEOM) 280 if (n >= MAXLEN_GEOM)
274 { 281 return false;
275 char *ops;
276 new_flags |= geometrySet;
277 282
278 memcpy (str, geom, n); 283 memcpy (str, geom, n);
279 str[n] = '\0'; 284 str[n] = '\0';
280 if (str[0] == ':') 285 rxvt_strtrim (str);
281 ops = &str[0];
282 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283 ops = &str[0];
284 else
285 {
286 char *tmp;
287 ops = strchr (str, ':');
288 if (ops != NULL)
289 {
290 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
291 *(++tmp) = '\0';
292 if (ops == tmp) ++ops;
293 }
294 }
295 286
296 if (ops > str || ops == NULL) 287 if (str[0])
297 { 288 {
298 /* we have geometry string - let's handle it prior to applying ops */ 289 /* we have geometry string - let's handle it prior to applying ops */
299 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 290 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
300
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 */
333 {
334 if (!(geom_flags & XValue))
335 {
336 /* use default geometry - centered */
337 x = y = defaultAlign;
338 }
339 else if (!(geom_flags & YValue))
340 y = x;
341
342 if ((geom_flags & (WidthValue|HeightValue)) == 0)
343 {
344 /* use default geometry - scaled */
345 w = h = defaultScale;
346 }
347 else if (geom_flags & WidthValue)
348 {
349 if (!(geom_flags & HeightValue))
350 h = w;
351 }
352 else
353 w = h;
354 }
355 } /* done parsing geometry string */ 291 } /* done parsing geometry string */
356 else if (!(flags & geometrySet)) 292
357 { 293 if (!update)
358 /* default geometry - scaled and centered */ 294 {
295 if (!(geom_flags & XValue))
359 x = y = defaultAlign; 296 x = y = defaultAlign;
297 else if (!(geom_flags & YValue))
298 y = x;
299
300 if (!(geom_flags & (WidthValue|HeightValue)))
360 w = h = defaultScale; 301 w = h = defaultScale;
361 } 302 else if (!(geom_flags & HeightValue))
303 h = w;
304 else if (!(geom_flags & WidthValue))
305 w = h;
362 306
363 if (!(flags & geometrySet))
364 geom_flags |= WidthValue|HeightValue|XValue|YValue; 307 geom_flags |= WidthValue|HeightValue|XValue|YValue;
308 }
365 309
366 if (ops) 310 if (ops)
367 { 311 {
368 while (*ops) 312 while (*ops)
369 { 313 {
370 while (*ops == ':' || isspace(*ops)) ++ops; 314 while (*ops == ':' || isspace(*ops)) ++ops;
371 315
372# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 316# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
373 if (CHECK_GEOM_OPS ("tile")) 317 if (CHECK_GEOM_OPS ("tile"))
374 { 318 {
375 w = h = noScale; 319 w = h = noScale;
376 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
377 } 321 }
378 else if (CHECK_GEOM_OPS ("propscale")) 322 else if (CHECK_GEOM_OPS ("propscale"))
379 { 323 {
380 new_flags |= propScale; 324 new_flags |= propScale;
381 } 325 }
382 else if (CHECK_GEOM_OPS ("hscale")) 326 else if (CHECK_GEOM_OPS ("hscale"))
383 { 327 {
384 if (w == 0) w = windowScale; 328 if (w == 0) w = windowScale;
385 329
386 h = noScale; 330 h = noScale;
387 geom_flags |= WidthValue|HeightValue; 331 geom_flags |= WidthValue|HeightValue;
388 } 332 }
389 else if (CHECK_GEOM_OPS ("vscale")) 333 else if (CHECK_GEOM_OPS ("vscale"))
390 { 334 {
391 if (h == 0) h = windowScale; 335 if (h == 0) h = windowScale;
392 336
393 w = noScale; 337 w = noScale;
394 geom_flags |= WidthValue|HeightValue; 338 geom_flags |= WidthValue|HeightValue;
395 } 339 }
396 else if (CHECK_GEOM_OPS ("scale")) 340 else if (CHECK_GEOM_OPS ("scale"))
397 { 341 {
398 if (h == 0) h = windowScale; 342 if (h == 0) h = windowScale;
399 if (w == 0) w = windowScale; 343 if (w == 0) w = windowScale;
400 344
401 geom_flags |= WidthValue|HeightValue; 345 geom_flags |= WidthValue|HeightValue;
402 } 346 }
403 else if (CHECK_GEOM_OPS ("auto")) 347 else if (CHECK_GEOM_OPS ("auto"))
404 { 348 {
405 w = h = windowScale; 349 w = h = windowScale;
406 x = y = centerAlign; 350 x = y = centerAlign;
407 geom_flags |= WidthValue|HeightValue|XValue|YValue; 351 geom_flags |= WidthValue|HeightValue|XValue|YValue;
408 } 352 }
409 else if (CHECK_GEOM_OPS ("root")) 353 else if (CHECK_GEOM_OPS ("root"))
410 { 354 {
411 new_flags |= rootAlign; 355 new_flags |= rootAlign;
412 w = h = noScale; 356 w = h = noScale;
413 geom_flags |= WidthValue|HeightValue; 357 geom_flags |= WidthValue|HeightValue;
414 } 358 }
415# undef CHECK_GEOM_OPS 359# undef CHECK_GEOM_OPS
416 360
417 while (*ops != ':' && *ops != '\0') ++ops; 361 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 362 } /* done parsing ops */
419 } 363 }
420 364
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 365 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; 366 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; 367 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; 368 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425 }
426 369
427 if (new_flags != flags) 370 if (new_flags != flags)
428 { 371 {
429 flags = new_flags; 372 flags = new_flags;
430 changed++; 373 changed = true;
431 } 374 }
432 375
433 return (changed > 0); 376 return changed;
434} 377}
435 378
436void 379void
437bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 380bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
438{ 381{
… …
455 if (!w) w = image_width; 398 if (!w) w = image_width;
456 if (!h) h = image_height; 399 if (!h) h = image_height;
457 400
458 if (flags & rootAlign) 401 if (flags & rootAlign)
459 { 402 {
460 target->get_window_origin (x, y);
461 x = -x; 403 x = -target_x;
462 y = -y; 404 y = -target_y;
463 } 405 }
464 else 406 else
465 { 407 {
466 x = make_align_position (h_align, target_width, w); 408 x = make_align_position (h_align, target_width, w);
467 y = make_align_position (v_align, target_height, h); 409 y = make_align_position (v_align, target_height, h);
… …
661 if (result) 603 if (result)
662 { 604 {
663 XGCValues gcv; 605 XGCValues gcv;
664 GC gc; 606 GC gc;
665 607
666 if (pixmap)
667 {
668 if (pmap_width != new_pmap_width
669 || pmap_height != new_pmap_height
670 || pmap_depth != target->depth)
671 {
672 XFreePixmap (target->dpy, pixmap);
673 pixmap = None;
674 }
675 }
676
677 /* create Pixmap */ 608 /* create Pixmap */
678 if (pixmap == None) 609 if (pixmap == None
610 || pmap_width != new_pmap_width
611 || pmap_height != new_pmap_height
612 || pmap_depth != target->depth)
679 { 613 {
614 if (pixmap)
615 XFreePixmap (target->dpy, pixmap);
680 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 616 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
681 pmap_width = new_pmap_width; 617 pmap_width = new_pmap_width;
682 pmap_height = new_pmap_height; 618 pmap_height = new_pmap_height;
683 pmap_depth = target->depth; 619 pmap_depth = target->depth;
684 } 620 }
… …
729 return false; 665 return false;
730 666
731 if (!pixbuf) 667 if (!pixbuf)
732 return false; 668 return false;
733 669
734#if !XRENDER
735 if (background_flags) 670 if (background_flags
671 && !(flags & HAS_RENDER))
736 return false; 672 return false;
737#endif
738 673
739 GdkPixbuf *result; 674 GdkPixbuf *result;
740 675
741 int image_width = gdk_pixbuf_get_width (pixbuf); 676 int image_width = gdk_pixbuf_get_width (pixbuf);
742 int image_height = gdk_pixbuf_get_height (pixbuf); 677 int image_height = gdk_pixbuf_get_height (pixbuf);
… …
793 new_pmap_width = min (image_width, target_width); 728 new_pmap_width = min (image_width, target_width);
794 new_pmap_height = min (image_height, target_height); 729 new_pmap_height = min (image_height, target_height);
795 } 730 }
796 } 731 }
797 732
798 if (pixmap)
799 {
800 if (pmap_width != new_pmap_width
801 || pmap_height != new_pmap_height
802 || pmap_depth != target->depth)
803 {
804 XFreePixmap (target->dpy, pixmap);
805 pixmap = None;
806 }
807 }
808
809 if (pixmap == None) 733 if (pixmap == None
734 || pmap_width != new_pmap_width
735 || pmap_height != new_pmap_height
736 || pmap_depth != target->depth)
810 { 737 {
738 if (pixmap)
739 XFreePixmap (target->dpy, pixmap);
811 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 740 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
812 pmap_width = new_pmap_width; 741 pmap_width = new_pmap_width;
813 pmap_height = new_pmap_height; 742 pmap_height = new_pmap_height;
814 pmap_depth = target->depth; 743 pmap_depth = target->depth;
815 } 744 }
… …
909# endif /* HAVE_PIXBUF */ 838# endif /* HAVE_PIXBUF */
910 839
911bool 840bool
912bgPixmap_t::set_file (const char *file) 841bgPixmap_t::set_file (const char *file)
913{ 842{
914 assert (file); 843 if (!file || !*file)
844 return false;
915 845
916 if (*file)
917 {
918 if (const char *p = strchr (file, ';')) 846 if (const char *p = strchr (file, ';'))
919 { 847 {
920 size_t len = p - file; 848 size_t len = p - file;
921 char *f = rxvt_temp_buf<char> (len + 1); 849 char *f = rxvt_temp_buf<char> (len + 1);
922 memcpy (f, file, len); 850 memcpy (f, file, len);
923 f[len] = '\0'; 851 f[len] = '\0';
924 file = f; 852 file = f;
925 } 853 }
926 854
927# ifdef HAVE_AFTERIMAGE 855# ifdef HAVE_AFTERIMAGE
928 if (!target->asimman) 856 if (!target->asimman)
929 target->asimman = create_generic_imageman (target->rs[Rs_path]); 857 target->asimman = create_generic_imageman (target->rs[Rs_path]);
930 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 858 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
931 if (image) 859 if (image)
932 { 860 {
933 if (original_asim) 861 if (original_asim)
934 safe_asimage_destroy (original_asim); 862 safe_asimage_destroy (original_asim);
935 original_asim = image; 863 original_asim = image;
936 have_image = true; 864 have_image = true;
937 return true; 865 return true;
938 } 866 }
939# endif 867# endif
940 868
941# ifdef HAVE_PIXBUF 869# ifdef HAVE_PIXBUF
942 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 870 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
943 if (image) 871 if (image)
944 { 872 {
945 if (pixbuf) 873 if (pixbuf)
946 g_object_unref (pixbuf); 874 g_object_unref (pixbuf);
947 pixbuf = image; 875 pixbuf = image;
948 have_image = true; 876 have_image = true;
949 return true; 877 return true;
950 } 878 }
951# endif 879# endif
952 }
953 880
954 return false; 881 return false;
955} 882}
956 883
957# endif /* BG_IMAGE_FROM_FILE */ 884# endif /* BG_IMAGE_FROM_FILE */
… …
970} 897}
971 898
972bool 899bool
973bgPixmap_t::set_blur_radius (const char *geom) 900bgPixmap_t::set_blur_radius (const char *geom)
974{ 901{
975 int changed = 0; 902 bool changed = false;
976 unsigned int hr, vr; 903 unsigned int hr, vr;
977 int junk; 904 int junk;
978 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 905 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
979 906
980 if (!(geom_flags & WidthValue)) 907 if (!(geom_flags & WidthValue))
… …
985 min_it (hr, 128); 912 min_it (hr, 128);
986 min_it (vr, 128); 913 min_it (vr, 128);
987 914
988 if (h_blurRadius != hr) 915 if (h_blurRadius != hr)
989 { 916 {
990 ++changed; 917 changed = true;
991 h_blurRadius = hr; 918 h_blurRadius = hr;
992 } 919 }
993 920
994 if (v_blurRadius != vr) 921 if (v_blurRadius != vr)
995 { 922 {
996 ++changed; 923 changed = true;
997 v_blurRadius = vr; 924 v_blurRadius = vr;
998 } 925 }
999 926
1000 if (v_blurRadius == 0 && h_blurRadius == 0) 927 if (v_blurRadius == 0 && h_blurRadius == 0)
1001 flags &= ~blurNeeded; 928 flags &= ~blurNeeded;
1002 else 929 else
1003 flags |= blurNeeded; 930 flags |= blurNeeded;
1004 931
1005#if XRENDER
1006 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1007 if (filters)
1008 {
1009 for (int i = 0; i < filters->nfilter; i++)
1010 if (!strcmp (filters->filter[i], FilterConvolution))
1011 flags |= bgPixmap_t::blurServerSide;
1012
1013 XFree (filters);
1014 }
1015#endif
1016
1017 return (changed > 0); 932 return changed;
1018} 933}
1019 934
1020static inline unsigned long 935static inline unsigned long
1021compute_tint_shade_flags (rxvt_color *tint, int shade) 936compute_tint_shade_flags (rxvt_color *tint, int shade)
1022{ 937{
… …
1025 bool has_shade = shade != 100; 940 bool has_shade = shade != 100;
1026 941
1027 if (tint) 942 if (tint)
1028 { 943 {
1029 tint->get (c); 944 tint->get (c);
1030# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 945# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x00ff || (cmp) >= 0xff00)
946 if (!has_shade
1031 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 947 && IS_COMPONENT_WHOLESOME (c.r)
1032 && IS_COMPONENT_WHOLESOME (c.g) 948 && IS_COMPONENT_WHOLESOME (c.g)
1033 && IS_COMPONENT_WHOLESOME (c.b)) 949 && IS_COMPONENT_WHOLESOME (c.b))
1034 flags |= bgPixmap_t::tintWholesome; 950 flags |= bgPixmap_t::tintWholesome;
1035# undef IS_COMPONENT_WHOLESOME 951# undef IS_COMPONENT_WHOLESOME
1036 } 952 }
1037 953
1038 if (has_shade) 954 if (has_shade || tint)
1039 flags |= bgPixmap_t::tintNeeded; 955 flags |= bgPixmap_t::tintNeeded;
1040 else if (tint)
1041 {
1042 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1043 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1044 {
1045 flags |= bgPixmap_t::tintNeeded;
1046 }
1047 }
1048
1049 if (flags & bgPixmap_t::tintNeeded)
1050 {
1051 if (flags & bgPixmap_t::tintWholesome)
1052 flags |= bgPixmap_t::tintServerSide;
1053 else
1054 {
1055#if XRENDER
1056 flags |= bgPixmap_t::tintServerSide;
1057#endif
1058 }
1059 }
1060 956
1061 return flags; 957 return flags;
1062} 958}
1063 959
1064bool 960bool
… …
1235 c.g = (c.g * shade) / 100; 1131 c.g = (c.g * shade) / 100;
1236 c.b = (c.b * shade) / 100; 1132 c.b = (c.b * shade) / 100;
1237 } 1133 }
1238 else 1134 else
1239 { 1135 {
1240 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1136 c.r = (c.r * (200 - shade)) / 100;
1241 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1137 c.g = (c.g * (200 - shade)) / 100;
1242 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1138 c.b = (c.b * (200 - shade)) / 100;
1243 } 1139 }
1244 1140
1245 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1141 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1246 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1142 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1247 XRenderPictureAttributes pa; 1143 XRenderPictureAttributes pa;
… …
1261 1157
1262 if (mask_pic && overlay_pic && back_pic) 1158 if (mask_pic && overlay_pic && back_pic)
1263 { 1159 {
1264 XRenderColor mask_c; 1160 XRenderColor mask_c;
1265 1161
1266 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1162 mask_c.red = mask_c.green = mask_c.blue = 0;
1267 mask_c.alpha = 0xffff; 1163 mask_c.alpha = 0xffff;
1268 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1164 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1269 1165
1270 mask_c.alpha = 0; 1166 mask_c.alpha = 0;
1271 mask_c.red = 0xffff - c.r; 1167 mask_c.red = 0xffff - c.r;
1272 mask_c.green = 0xffff - c.g; 1168 mask_c.green = 0xffff - c.g;
1273 mask_c.blue = 0xffff - c.b; 1169 mask_c.blue = 0xffff - c.b;
1274 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1170 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1275 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1171 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1172
1173 if (shade > 100)
1174 {
1175 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1176 mask_c.alpha = 0;
1177 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1178
1179 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1180 }
1181
1276 ret = true; 1182 ret = true;
1277 } 1183 }
1278 1184
1279 XRenderFreePicture (dpy, mask_pic); 1185 XRenderFreePicture (dpy, mask_pic);
1280 XRenderFreePicture (dpy, overlay_pic); 1186 XRenderFreePicture (dpy, overlay_pic);
… …
1311 int window_height = target->szHint.height; 1217 int window_height = target->szHint.height;
1312 int sx, sy; 1218 int sx, sy;
1313 XGCValues gcv; 1219 XGCValues gcv;
1314 GC gc; 1220 GC gc;
1315 1221
1316 target->get_window_origin (sx, sy); 1222 sx = target_x;
1223 sy = target_y;
1317 1224
1318 /* check if we are outside of the visible part of the virtual screen : */ 1225 /* check if we are outside of the visible part of the virtual screen : */
1319 if (sx + window_width <= 0 || sy + window_height <= 0 1226 if (sx + window_width <= 0 || sy + window_height <= 0
1320 || sx >= root_width || sy >= root_height) 1227 || sx >= root_width || sy >= root_height)
1321 return 0; 1228 return 0;
… …
1338 Pixmap recoded_root_pmap = root_pixmap; 1245 Pixmap recoded_root_pmap = root_pixmap;
1339 1246
1340 if (root_pixmap != None && root_depth != target->depth) 1247 if (root_pixmap != None && root_depth != target->depth)
1341 { 1248 {
1342#if XRENDER 1249#if XRENDER
1250 if (flags & HAS_RENDER)
1251 {
1343 XRenderPictureAttributes pa; 1252 XRenderPictureAttributes pa;
1344 1253
1345 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1254 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1346 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1255 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1347 1256
1348 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth); 1257 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1349 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 1258 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1350 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1259 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1351 1260
1352 if (src && dst) 1261 if (src && dst)
1353 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1262 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1263 else
1264 {
1265 XFreePixmap (dpy, recoded_root_pmap);
1266 root_pixmap = None;
1267 }
1268
1269 XRenderFreePicture (dpy, src);
1270 XRenderFreePicture (dpy, dst);
1271 }
1354 else 1272 else
1355 root_pixmap = None; 1273#endif
1356
1357 XRenderFreePicture (dpy, src);
1358 XRenderFreePicture (dpy, dst);
1359#else
1360 root_pixmap = None; 1274 root_pixmap = None;
1361#endif
1362 } 1275 }
1363 1276
1364 if (root_pixmap == None) 1277 if (root_pixmap == None)
1365 return 0; 1278 return 0;
1366 1279
… …
1368 1281
1369 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1282 if (tiled_root_pmap == None) /* something really bad happened - abort */
1370 return 0; 1283 return 0;
1371 1284
1372 /* straightforward pixmap copy */ 1285 /* straightforward pixmap copy */
1286 while (sx < 0) sx += (int)root_width;
1287 while (sy < 0) sy += (int)root_height;
1288
1373 gcv.tile = recoded_root_pmap; 1289 gcv.tile = recoded_root_pmap;
1374 gcv.fill_style = FillTiled; 1290 gcv.fill_style = FillTiled;
1375
1376 while (sx < 0) sx += (int)root_width;
1377 while (sy < 0) sy += (int)root_height;
1378
1379 gcv.ts_x_origin = -sx; 1291 gcv.ts_x_origin = -sx;
1380 gcv.ts_y_origin = -sy; 1292 gcv.ts_y_origin = -sy;
1381 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1293 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1382 1294
1383 if (gc) 1295 if (gc)
1384 { 1296 {
1385 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1297 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1386 result |= transpPmapTiled; 1298 result |= transpPmapTiled;
1387 XFreeGC (dpy, gc); 1299 XFreeGC (dpy, gc);
1388 }
1389 1300
1390 if (tiled_root_pmap != None)
1391 {
1392 if (!need_client_side_rendering ()) 1301 if (!need_client_side_rendering ())
1393 { 1302 {
1394 if (flags & (blurNeeded | blurServerSide)) 1303 if ((flags & blurNeeded)
1304 && (flags & HAS_RENDER_CONV))
1395 { 1305 {
1396 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1306 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1397 result |= transpPmapBlurred; 1307 result |= transpPmapBlurred;
1398 } 1308 }
1399 if (flags & (tintNeeded | tintServerSide)) 1309 if ((flags & tintNeeded)
1310 && (flags & (tintWholesome | HAS_RENDER)))
1400 { 1311 {
1401 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height)) 1312 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1402 result |= transpPmapTinted; 1313 result |= transpPmapTinted;
1403 } 1314 }
1404 } /* server side rendering completed */ 1315 } /* server side rendering completed */
… …
1409 pixmap = tiled_root_pmap; 1320 pixmap = tiled_root_pmap;
1410 pmap_width = window_width; 1321 pmap_width = window_width;
1411 pmap_height = window_height; 1322 pmap_height = window_height;
1412 pmap_depth = target->depth; 1323 pmap_depth = target->depth;
1413 } 1324 }
1325 else
1326 XFreePixmap (dpy, tiled_root_pmap);
1414 1327
1415 if (recoded_root_pmap != root_pixmap) 1328 if (recoded_root_pmap != root_pixmap)
1416 XFreePixmap (dpy, recoded_root_pmap); 1329 XFreePixmap (dpy, recoded_root_pmap);
1417 1330
1418 return result; 1331 return result;
… …
1427 1340
1428 root_pixmap = new_root_pixmap; 1341 root_pixmap = new_root_pixmap;
1429} 1342}
1430# endif /* ENABLE_TRANSPARENCY */ 1343# endif /* ENABLE_TRANSPARENCY */
1431 1344
1432# ifndef HAVE_AFTERIMAGE 1345#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1433static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1346static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1434# endif 1347# endif
1435 1348
1436bool 1349bool
1437bgPixmap_t::render () 1350bgPixmap_t::render ()
1438{ 1351{
… …
1448 /* we need to re-generate transparency pixmap in that case ! */ 1361 /* we need to re-generate transparency pixmap in that case ! */
1449 background_flags = make_transparency_pixmap (); 1362 background_flags = make_transparency_pixmap ();
1450 if (background_flags == 0) 1363 if (background_flags == 0)
1451 return false; 1364 return false;
1452 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1365 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1453 flags = flags & ~isInvalid; 1366 flags &= ~isInvalid;
1454 } 1367 }
1455# endif 1368# endif
1456 1369
1457# ifdef BG_IMAGE_FROM_FILE 1370# ifdef BG_IMAGE_FROM_FILE
1458 if (have_image 1371 if (have_image
1459 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1372 || (background_flags & transpTransformations) != (flags & transpTransformations))
1460 { 1373 {
1461 if (render_image (background_flags)) 1374 if (render_image (background_flags))
1462 flags = flags & ~isInvalid; 1375 flags &= ~isInvalid;
1463 } 1376 }
1464# endif 1377# endif
1465 1378
1379# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1466 XImage *result = NULL; 1380 XImage *result = NULL;
1467 1381
1468 if (background_flags && (flags & isInvalid)) 1382 if (background_flags && (flags & isInvalid))
1469 { 1383 {
1470 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1384 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1471 } 1385 }
1472 1386
1473 if (result) 1387 if (result)
1474 { 1388 {
1475# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1476 /* our own client-side tinting */ 1389 /* our own client-side tinting */
1477 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1390 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1478 { 1391 {
1479 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1392 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1480 if (flags & tintSet) 1393 if (flags & tintSet)
1481 tint.get (c); 1394 tint.get (c);
1482 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1395 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1483 } 1396 }
1484# endif
1485 1397
1486 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1398 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1487 1399
1488 if (gc) 1400 if (gc)
1489 { 1401 {
1490 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1402 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1491 1403
1492 XFreeGC (target->dpy, gc); 1404 XFreeGC (target->dpy, gc);
1493 flags = flags & ~isInvalid; 1405 flags &= ~isInvalid;
1494 } 1406 }
1495 1407
1496 XDestroyImage (result); 1408 XDestroyImage (result);
1497 } 1409 }
1410# endif
1498 1411
1499 if (flags & isInvalid) 1412 if (flags & isInvalid)
1500 { 1413 {
1501 if (pixmap != None) 1414 if (pixmap != None)
1502 { 1415 {
… …
1510 valid_since = ev::now (); 1423 valid_since = ev::now ();
1511 1424
1512 return true; 1425 return true;
1513} 1426}
1514 1427
1515bool 1428void
1516bgPixmap_t::set_target (rxvt_term *new_target) 1429bgPixmap_t::set_target (rxvt_term *new_target)
1517{ 1430{
1518 if (new_target)
1519 if (target != new_target)
1520 {
1521 target = new_target; 1431 target = new_target;
1522 return true; 1432
1433 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1434#if XRENDER
1435 int major, minor;
1436 if (XRenderQueryVersion (target->dpy, &major, &minor))
1437 flags |= HAS_RENDER;
1438 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1439 if (filters)
1440 {
1441 for (int i = 0; i < filters->nfilter; i++)
1442 if (!strcmp (filters->filter[i], FilterConvolution))
1443 flags |= HAS_RENDER_CONV;
1444
1445 XFree (filters);
1523 } 1446 }
1524 1447#endif
1525 return false;
1526} 1448}
1527 1449
1528void 1450void
1529bgPixmap_t::apply () 1451bgPixmap_t::apply ()
1530{ 1452{
1531 if (target) 1453 if (target == NULL)
1532 { 1454 return;
1455
1533 if (pixmap != None) 1456 if (pixmap != None)
1534 { 1457 {
1535 /* set target's background to pixmap */ 1458 /* set target's background to pixmap */
1536# ifdef ENABLE_TRANSPARENCY 1459# ifdef ENABLE_TRANSPARENCY
1537 if (flags & isTransparent) 1460 if (flags & isTransparent)
1538 { 1461 {
1539 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1462 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1540 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1463 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1541 1464
1542 if (target->scrollBar.win) 1465 if (target->scrollBar.win)
1543 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1466 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1544 } 1467 }
1545 else 1468 else
1546# endif 1469# endif
1547 { 1470 {
1548 /* force old pixmap dereference in case it was transparent before :*/ 1471 /* force old pixmap dereference in case it was transparent before :*/
1549 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1550 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1551 /* do we also need to set scrollbar's background here ? */
1552
1553 if (target->scrollBar.win)
1554 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1555 }
1556 }
1557 else
1558 {
1559 /* set target background to a pixel */
1560 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1472 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1561 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1473 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1562 /* do we also need to set scrollbar's background here ? */ 1474 /* do we also need to set scrollbar's background here ? */
1475
1563 if (target->scrollBar.win) 1476 if (target->scrollBar.win)
1564 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1477 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1565 } 1478 }
1479 }
1480 else
1481 {
1482 /* set target background to a pixel */
1483 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1484 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1485 /* do we also need to set scrollbar's background here ? */
1486 if (target->scrollBar.win)
1487 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1488 }
1566 1489
1567 /* don't want Expose on the parent or vt. It is better to use 1490 /* don't want Expose on the parent or vt. It is better to use
1568 scr_touch or we get a great deal of flicker otherwise: */ 1491 scr_touch or we get a great deal of flicker otherwise: */
1569 XClearWindow (target->dpy, target->parent[0]); 1492 XClearWindow (target->dpy, target->parent[0]);
1570 1493
1571 if (target->scrollBar.state && target->scrollBar.win) 1494 if (target->scrollBar.state && target->scrollBar.win)
1572 { 1495 {
1573 target->scrollBar.state = STATE_IDLE; 1496 target->scrollBar.state = STATE_IDLE;
1574 target->scrollBar.show (0); 1497 target->scrollBar.show (0);
1575 } 1498 }
1576 1499
1577 target->want_refresh = 1; 1500 target->want_refresh = 1;
1578 flags |= hasChanged; 1501 flags |= hasChanged;
1579 }
1580} 1502}
1581 1503
1582#endif /* HAVE_BG_PIXMAP */ 1504#endif /* HAVE_BG_PIXMAP */
1583 1505
1584#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER 1506#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1585/* taken from aterm-0.4.2 */ 1507/* taken from aterm-0.4.2 */
1586 1508
1587static void 1509static void
1588ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1510ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1589{ 1511{
1590 int sh_r, sh_g, sh_b; 1512 int sh_r, sh_g, sh_b;
1591 uint32_t mask_r, mask_g, mask_b; 1513 uint32_t mask_r, mask_g, mask_b;
1592 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1514 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1593 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1515 rgba low;
1594 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1516 rgba high;
1595 int i; 1517 int i;
1596 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1518 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1597 1519
1598 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1520 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1599 1521
… …
1664 /* prepare limits for color transformation (each channel is handled separately) */ 1586 /* prepare limits for color transformation (each channel is handled separately) */
1665 if (shade > 100) 1587 if (shade > 100)
1666 { 1588 {
1667 shade = 200 - shade; 1589 shade = 200 - shade;
1668 1590
1669 lower_lim_r = 65535-rm; 1591 high.r = c.r * shade / 100;
1670 lower_lim_g = 65535-gm; 1592 high.g = c.g * shade / 100;
1671 lower_lim_b = 65535-bm; 1593 high.b = c.b * shade / 100;
1672 1594
1673 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1595 low.r = 65535 * (100 - shade) / 100;
1674 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1596 low.g = 65535 * (100 - shade) / 100;
1675 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1597 low.b = 65535 * (100 - shade) / 100;
1676
1677 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1678 } 1598 }
1679 else 1599 else
1680 { 1600 {
1601 high.r = c.r * shade / 100;
1602 high.g = c.g * shade / 100;
1603 high.b = c.b * shade / 100;
1681 1604
1682 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1605 low.r = low.g = low.b = 0;
1683
1684 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1685 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1686 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1687 } 1606 }
1688 1607
1689 /* fill our lookup tables */ 1608 /* fill our lookup tables */
1690 for (i = 0; i <= mask_r>>sh_r; i++) 1609 for (i = 0; i <= mask_r>>sh_r; i++)
1691 { 1610 {
1692 uint32_t tmp; 1611 uint32_t tmp;
1693 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1612 tmp = i * high.r;
1694 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1613 tmp += (mask_r>>sh_r) * low.r;
1695 lookup_r[i] = (tmp/65535)<<sh_r; 1614 lookup_r[i] = (tmp/65535)<<sh_r;
1696 } 1615 }
1697 for (i = 0; i <= mask_g>>sh_g; i++) 1616 for (i = 0; i <= mask_g>>sh_g; i++)
1698 { 1617 {
1699 uint32_t tmp; 1618 uint32_t tmp;
1700 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1619 tmp = i * high.g;
1701 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1620 tmp += (mask_g>>sh_g) * low.g;
1702 lookup_g[i] = (tmp/65535)<<sh_g; 1621 lookup_g[i] = (tmp/65535)<<sh_g;
1703 } 1622 }
1704 for (i = 0; i <= mask_b>>sh_b; i++) 1623 for (i = 0; i <= mask_b>>sh_b; i++)
1705 { 1624 {
1706 uint32_t tmp; 1625 uint32_t tmp;
1707 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1626 tmp = i * high.b;
1708 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1627 tmp += (mask_b>>sh_b) * low.b;
1709 lookup_b[i] = (tmp/65535)<<sh_b; 1628 lookup_b[i] = (tmp/65535)<<sh_b;
1710 } 1629 }
1711 1630
1712 /* apply table to input image (replacing colors by newly calculated ones) */ 1631 /* apply table to input image (replacing colors by newly calculated ones) */
1713 if (srcImage->bits_per_pixel == 32 1632 if (srcImage->bits_per_pixel == 32

Diff Legend

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