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.101 by sf-exg, Sun Oct 31 08:28:04 2010 UTC vs.
Revision 1.124 by sf-exg, Tue Nov 23 16:37:36 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 }
… …
862 if (background_flags) 791 if (background_flags)
863 { 792 {
864 Display *dpy = target->dpy; 793 Display *dpy = target->dpy;
865 XRenderPictureAttributes pa; 794 XRenderPictureAttributes pa;
866 795
867 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 796 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
868 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 797 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
869 798
870 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 799 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
871 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 800 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
872 801
… …
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->display->root);
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
… …
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 = shade > 100 ? 0xffff : 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;
… …
1299 return 0; 1195 return 0;
1300 1196
1301 /* root dimensions may change from call to call - but Display structure should 1197 /* root dimensions may change from call to call - but Display structure should
1302 * be always up-to-date, so let's use it : 1198 * be always up-to-date, so let's use it :
1303 */ 1199 */
1304 Window root = target->display->root;
1305 int screen = target->display->screen; 1200 int screen = target->display->screen;
1306 Display *dpy = target->dpy; 1201 Display *dpy = target->dpy;
1202 int root_depth = DefaultDepth (dpy, screen);
1307 int root_width = DisplayWidth (dpy, screen); 1203 int root_width = DisplayWidth (dpy, screen);
1308 int root_height = DisplayHeight (dpy, screen); 1204 int root_height = DisplayHeight (dpy, screen);
1205 unsigned int root_pmap_width, root_pmap_height;
1309 int window_width = target->szHint.width; 1206 int window_width = target->szHint.width;
1310 int window_height = target->szHint.height; 1207 int window_height = target->szHint.height;
1311 int sx, sy; 1208 int sx, sy;
1312 XGCValues gcv; 1209 XGCValues gcv;
1313 GC gc; 1210 GC gc;
1314 1211
1315 target->get_window_origin (sx, sy); 1212 sx = target_x;
1213 sy = target_y;
1316 1214
1317 /* check if we are outside of the visible part of the virtual screen : */ 1215 /* check if we are outside of the visible part of the virtual screen : */
1318 if (sx + window_width <= 0 || sy + window_height <= 0 1216 if (sx + window_width <= 0 || sy + window_height <= 0
1319 || sx >= root_width || sy >= root_height) 1217 || sx >= root_width || sy >= root_height)
1320 return 0; 1218 return 0;
1321 1219
1220 // validate root pixmap and get its size
1221 if (root_pixmap != None)
1222 {
1223 Window wdummy;
1224 int idummy;
1225 unsigned int udummy;
1226
1227 target->allowedxerror = -1;
1228
1229 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1230 root_pixmap = None;
1231
1232 target->allowedxerror = 0;
1233 }
1234
1235 Pixmap recoded_root_pmap = root_pixmap;
1236
1237 if (root_pixmap != None && root_depth != target->depth)
1238 {
1239#if XRENDER
1240 if (flags & HAS_RENDER)
1241 {
1242 XRenderPictureAttributes pa;
1243
1244 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1245 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1246
1247 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1248 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1249 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1250
1251 if (src && dst)
1252 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1253 else
1254 {
1255 XFreePixmap (dpy, recoded_root_pmap);
1256 root_pixmap = None;
1257 }
1258
1259 XRenderFreePicture (dpy, src);
1260 XRenderFreePicture (dpy, dst);
1261 }
1262 else
1263#endif
1264 root_pixmap = None;
1265 }
1266
1322 if (root_pixmap == None) 1267 if (root_pixmap == None)
1323 return 0; 1268 return 0;
1324 1269
1325 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1270 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1326 1271
1327 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1272 if (tiled_root_pmap == None) /* something really bad happened - abort */
1328 return 0; 1273 return 0;
1329 1274
1330 /* straightforward pixmap copy */ 1275 /* straightforward pixmap copy */
1331 gcv.tile = root_pixmap;
1332 gcv.fill_style = FillTiled;
1333
1334 while (sx < 0) sx += (int)root_width; 1276 while (sx < 0) sx += (int)root_width;
1335 while (sy < 0) sy += (int)root_height; 1277 while (sy < 0) sy += (int)root_height;
1336 1278
1279 gcv.tile = recoded_root_pmap;
1280 gcv.fill_style = FillTiled;
1337 gcv.ts_x_origin = -sx; 1281 gcv.ts_x_origin = -sx;
1338 gcv.ts_y_origin = -sy; 1282 gcv.ts_y_origin = -sy;
1339 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1283 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1340 1284
1341 if (gc) 1285 if (gc)
1342 { 1286 {
1343 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1287 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1344 result |= transpPmapTiled; 1288 result |= transpPmapTiled;
1345 XFreeGC (dpy, gc); 1289 XFreeGC (dpy, gc);
1346 }
1347 1290
1348 if (tiled_root_pmap != None)
1349 {
1350 if (!need_client_side_rendering ()) 1291 if (!need_client_side_rendering ())
1351 { 1292 {
1352 if (flags & (blurNeeded | blurServerSide)) 1293 if ((flags & blurNeeded)
1294 && (flags & HAS_RENDER_CONV))
1353 { 1295 {
1354 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1296 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1355 result |= transpPmapBlurred; 1297 result |= transpPmapBlurred;
1356 } 1298 }
1357 if (flags & (tintNeeded | tintServerSide)) 1299 if ((flags & tintNeeded)
1300 && (flags & (tintWholesome | HAS_RENDER)))
1358 { 1301 {
1359 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height)) 1302 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1360 result |= transpPmapTinted; 1303 result |= transpPmapTinted;
1361 } 1304 }
1362 } /* server side rendering completed */ 1305 } /* server side rendering completed */
1363 1306
1364 if (pixmap) 1307 if (pixmap)
1365 XFreePixmap (dpy, pixmap); 1308 XFreePixmap (dpy, pixmap);
1366 1309
1367 pixmap = tiled_root_pmap; 1310 pixmap = tiled_root_pmap;
1368 pmap_width = window_width; 1311 pmap_width = window_width;
1369 pmap_height = window_height; 1312 pmap_height = window_height;
1370 pmap_depth = root_depth; 1313 pmap_depth = target->depth;
1371 } 1314 }
1315 else
1316 XFreePixmap (dpy, tiled_root_pmap);
1317
1318 if (recoded_root_pmap != root_pixmap)
1319 XFreePixmap (dpy, recoded_root_pmap);
1372 1320
1373 return result; 1321 return result;
1374} 1322}
1375 1323
1376void 1324void
… …
1379 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1327 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1380 if (new_root_pixmap == None) 1328 if (new_root_pixmap == None)
1381 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1329 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1382 1330
1383 root_pixmap = new_root_pixmap; 1331 root_pixmap = new_root_pixmap;
1384
1385 // validate root pixmap
1386 if (root_pixmap != None)
1387 {
1388 unsigned int width, height;
1389 Window wdummy;
1390 int idummy;
1391 unsigned int udummy;
1392
1393 target->allowedxerror = -1;
1394
1395 if (!XGetGeometry (target->dpy, root_pixmap, &wdummy, &idummy, &idummy, &width, &height, &udummy, &udummy))
1396 root_pixmap = None;
1397
1398 target->allowedxerror = 0;
1399 }
1400} 1332}
1401# endif /* ENABLE_TRANSPARENCY */ 1333# endif /* ENABLE_TRANSPARENCY */
1402 1334
1403# ifndef HAVE_AFTERIMAGE 1335#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1404static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm); 1336static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1405# endif 1337# endif
1406 1338
1407bool 1339bool
1408bgPixmap_t::render () 1340bgPixmap_t::render ()
1409{ 1341{
… …
1418 { 1350 {
1419 /* we need to re-generate transparency pixmap in that case ! */ 1351 /* we need to re-generate transparency pixmap in that case ! */
1420 background_flags = make_transparency_pixmap (); 1352 background_flags = make_transparency_pixmap ();
1421 if (background_flags == 0) 1353 if (background_flags == 0)
1422 return false; 1354 return false;
1423 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1355 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1424 && pmap_depth == target->depth)
1425 flags = flags & ~isInvalid; 1356 flags &= ~isInvalid;
1426 } 1357 }
1427# endif 1358# endif
1428 1359
1429# ifdef BG_IMAGE_FROM_FILE 1360# ifdef BG_IMAGE_FROM_FILE
1430 if (have_image 1361 if (have_image
1431 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1362 || (background_flags & transpTransformations) != (flags & transpTransformations))
1432 { 1363 {
1433 if (render_image (background_flags)) 1364 if (render_image (background_flags))
1434 flags = flags & ~isInvalid; 1365 flags &= ~isInvalid;
1435 } 1366 }
1436# endif 1367# endif
1437 1368
1369# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1438 XImage *result = NULL; 1370 XImage *result = NULL;
1439 1371
1440 if (background_flags && (flags & isInvalid)) 1372 if (background_flags && (flags & isInvalid))
1441 { 1373 {
1442 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1374 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1443 } 1375 }
1444 1376
1445 if (result) 1377 if (result)
1446 { 1378 {
1447# if !defined(HAVE_AFTERIMAGE) && !XRENDER
1448 /* our own client-side tinting */ 1379 /* our own client-side tinting */
1449 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1380 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1450 { 1381 {
1451 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1382 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1452 if (flags & tintSet) 1383 if (flags & tintSet)
1453 tint.get (c); 1384 tint.get (c);
1454 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b); 1385 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1455 } 1386 }
1456# endif
1457 1387
1458 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1388 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1459 1389
1460 if (gc) 1390 if (gc)
1461 { 1391 {
1462 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1463 {
1464 XFreePixmap (target->dpy, pixmap);
1465 pixmap = None;
1466 }
1467
1468 if (pixmap == None)
1469 {
1470 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1471 pmap_width = result->width;
1472 pmap_height = result->height;
1473 pmap_depth = target->depth;
1474 }
1475
1476 if (pmap_depth != result->depth)
1477 {
1478 /* Bad Match error will ensue ! stupid X !!!! */
1479 if (result->depth == 24 && pmap_depth == 32)
1480 result->depth = 32;
1481 else if (result->depth == 32 && pmap_depth == 24)
1482 result->depth = 24;
1483 else
1484 {
1485 /* TODO: implement image recoding */
1486 }
1487 }
1488
1489 if (pmap_depth == result->depth)
1490 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1392 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1491 1393
1492 XFreeGC (target->dpy, gc); 1394 XFreeGC (target->dpy, gc);
1493 flags = flags & ~isInvalid; 1395 flags &= ~isInvalid;
1494 } 1396 }
1495 1397
1496 XDestroyImage (result); 1398 XDestroyImage (result);
1497 } 1399 }
1400# endif
1498 1401
1499 if (flags & isInvalid) 1402 if (flags & isInvalid)
1500 { 1403 {
1501 if (pixmap != None) 1404 if (pixmap != None)
1502 { 1405 {
… …
1510 valid_since = ev::now (); 1413 valid_since = ev::now ();
1511 1414
1512 return true; 1415 return true;
1513} 1416}
1514 1417
1515bool 1418void
1516bgPixmap_t::set_target (rxvt_term *new_target) 1419bgPixmap_t::set_target (rxvt_term *new_target)
1517{ 1420{
1518 if (new_target)
1519 if (target != new_target)
1520 {
1521 target = new_target; 1421 target = new_target;
1522# ifdef ENABLE_TRANSPARENCY 1422
1523 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1423 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1424#if XRENDER
1425 int major, minor;
1426 if (XRenderQueryVersion (target->dpy, &major, &minor))
1427 flags |= HAS_RENDER;
1428 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1429 if (filters)
1430 {
1431 for (int i = 0; i < filters->nfilter; i++)
1432 if (!strcmp (filters->filter[i], FilterConvolution))
1433 flags |= HAS_RENDER_CONV;
1434
1435 XFree (filters);
1436 }
1524# endif 1437#endif
1525 return true;
1526 }
1527
1528 return false;
1529} 1438}
1530 1439
1531void 1440void
1532bgPixmap_t::apply () 1441bgPixmap_t::apply ()
1533{ 1442{
1534 if (target) 1443 if (target == NULL)
1535 { 1444 return;
1445
1536 if (pixmap != None) 1446 if (pixmap != None)
1537 { 1447 {
1538 /* set target's background to pixmap */ 1448 /* set target's background to pixmap */
1539# ifdef ENABLE_TRANSPARENCY 1449# ifdef ENABLE_TRANSPARENCY
1540 if (flags & isTransparent) 1450 if (flags & isTransparent)
1541 { 1451 {
1542 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1452 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1543 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1453 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1544 1454
1545 if (target->scrollBar.win) 1455 if (target->scrollBar.win)
1546 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1456 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1547 } 1457 }
1548 else 1458 else
1549# endif 1459# endif
1550 { 1460 {
1551 /* force old pixmap dereference in case it was transparent before :*/ 1461 /* force old pixmap dereference in case it was transparent before :*/
1552 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1553 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1554 /* do we also need to set scrollbar's background here ? */
1555
1556 if (target->scrollBar.win)
1557 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1558 }
1559 }
1560 else
1561 {
1562 /* set target background to a pixel */
1563 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1462 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1564 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1463 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1565 /* do we also need to set scrollbar's background here ? */ 1464 /* do we also need to set scrollbar's background here ? */
1465
1566 if (target->scrollBar.win) 1466 if (target->scrollBar.win)
1567 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1467 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1568 } 1468 }
1469 }
1470 else
1471 {
1472 /* set target background to a pixel */
1473 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1474 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1475 /* do we also need to set scrollbar's background here ? */
1476 if (target->scrollBar.win)
1477 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1478 }
1569 1479
1570 /* don't want Expose on the parent or vt. It is better to use 1480 /* don't want Expose on the parent or vt. It is better to use
1571 scr_touch or we get a great deal of flicker otherwise: */ 1481 scr_touch or we get a great deal of flicker otherwise: */
1572 XClearWindow (target->dpy, target->parent[0]); 1482 XClearWindow (target->dpy, target->parent[0]);
1573 1483
1574 if (target->scrollBar.state && target->scrollBar.win) 1484 if (target->scrollBar.state && target->scrollBar.win)
1575 { 1485 {
1576 target->scrollBar.state = STATE_IDLE; 1486 target->scrollBar.state = STATE_IDLE;
1577 target->scrollBar.show (0); 1487 target->scrollBar.show (0);
1578 } 1488 }
1579 1489
1580 target->want_refresh = 1; 1490 target->want_refresh = 1;
1581 flags |= hasChanged; 1491 flags |= hasChanged;
1582 }
1583} 1492}
1584 1493
1585#endif /* HAVE_BG_PIXMAP */ 1494#endif /* HAVE_BG_PIXMAP */
1586 1495
1587#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XRENDER 1496#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1588/* taken from aterm-0.4.2 */ 1497/* taken from aterm-0.4.2 */
1589 1498
1590static void 1499static void
1591ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1500ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1592{ 1501{
1593 int sh_r, sh_g, sh_b; 1502 int sh_r, sh_g, sh_b;
1594 uint32_t mask_r, mask_g, mask_b; 1503 uint32_t mask_r, mask_g, mask_b;
1595 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1504 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1596 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1505 rgba low;
1597 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1506 rgba high;
1598 int i; 1507 int i;
1599 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1508 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1600 1509
1601 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1510 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1602 1511
… …
1667 /* prepare limits for color transformation (each channel is handled separately) */ 1576 /* prepare limits for color transformation (each channel is handled separately) */
1668 if (shade > 100) 1577 if (shade > 100)
1669 { 1578 {
1670 shade = 200 - shade; 1579 shade = 200 - shade;
1671 1580
1672 lower_lim_r = 65535-rm; 1581 high.r = (65535 - c.r) * shade / 100;
1673 lower_lim_g = 65535-gm; 1582 high.g = (65535 - c.g) * shade / 100;
1674 lower_lim_b = 65535-bm; 1583 high.b = (65535 - c.b) * shade / 100;
1675 1584
1676 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100); 1585 low.r = 65535 - high.r;
1677 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100); 1586 low.g = 65535 - high.g;
1678 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100); 1587 low.b = 65535 - high.b;
1679
1680 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1681 } 1588 }
1682 else 1589 else
1683 { 1590 {
1591 high.r = c.r * shade / 100;
1592 high.g = c.g * shade / 100;
1593 high.b = c.b * shade / 100;
1684 1594
1685 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1595 low.r = low.g = low.b = 0;
1686
1687 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1688 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1689 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1690 } 1596 }
1691 1597
1692 /* fill our lookup tables */ 1598 /* fill our lookup tables */
1693 for (i = 0; i <= mask_r>>sh_r; i++) 1599 for (i = 0; i <= mask_r>>sh_r; i++)
1694 { 1600 {
1695 uint32_t tmp; 1601 uint32_t tmp;
1696 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r)); 1602 tmp = i * high.r;
1697 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r); 1603 tmp += (mask_r>>sh_r) * low.r;
1698 lookup_r[i] = (tmp/65535)<<sh_r; 1604 lookup_r[i] = (tmp/65535)<<sh_r;
1699 } 1605 }
1700 for (i = 0; i <= mask_g>>sh_g; i++) 1606 for (i = 0; i <= mask_g>>sh_g; i++)
1701 { 1607 {
1702 uint32_t tmp; 1608 uint32_t tmp;
1703 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g)); 1609 tmp = i * high.g;
1704 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g); 1610 tmp += (mask_g>>sh_g) * low.g;
1705 lookup_g[i] = (tmp/65535)<<sh_g; 1611 lookup_g[i] = (tmp/65535)<<sh_g;
1706 } 1612 }
1707 for (i = 0; i <= mask_b>>sh_b; i++) 1613 for (i = 0; i <= mask_b>>sh_b; i++)
1708 { 1614 {
1709 uint32_t tmp; 1615 uint32_t tmp;
1710 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b)); 1616 tmp = i * high.b;
1711 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b); 1617 tmp += (mask_b>>sh_b) * low.b;
1712 lookup_b[i] = (tmp/65535)<<sh_b; 1618 lookup_b[i] = (tmp/65535)<<sh_b;
1713 } 1619 }
1714 1620
1715 /* apply table to input image (replacing colors by newly calculated ones) */ 1621 /* apply table to input image (replacing colors by newly calculated ones) */
1716 if (srcImage->bits_per_pixel == 32 1622 if (srcImage->bits_per_pixel == 32

Diff Legend

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