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.31 by root, Tue Nov 4 13:20:40 2008 UTC vs.
Revision 1.85 by sf-exg, Mon Oct 18 08:19:03 2010 UTC

3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
19 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
23 24
25#include <cmath>
24#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
26 28
27#define DO_TIMING_TEST 0 29#define DO_TIMING_TEST 0
28 30
29#if DO_TIMING_TEST 31#if DO_TIMING_TEST
30# include <sys/time.h> 32# include <sys/time.h>
31#define TIMING_TEST_START(id) \ 33#define TIMING_TEST_START(id) \
32 struct timeval timing_test_##id##_stv;\ 34 struct timeval timing_test_##id##_stv; \
33 gettimeofday (&timing_test_##id##_stv, NULL); 35 gettimeofday (&timing_test_##id##_stv, NULL);
34 36
35#define TIMING_TEST_PRINT_RESULT(id) \ 37#define TIMING_TEST_PRINT_RESULT(id) \
36 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\ 38 do { \
39 struct timeval tv; \
40 gettimeofday (&tv, NULL); \
41 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
37 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 42 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
38 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0) 43 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
44 } while (0)
39 45
40#else 46#else
41#define TIMING_TEST_START(id) do{}while (0) 47#define TIMING_TEST_START(id) do {} while (0)
42#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 48#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
43#endif 49#endif
44 50
45/* 51/*
46 * Pixmap geometry string interpretation : 52 * Pixmap geometry string interpretation :
47 * Each geometry string contains zero or one scale/position 53 * Each geometry string contains zero or one scale/position
48 * adjustment and may optionally be followed by a colon and one or more 54 * adjustment and may optionally be followed by a colon and one or more
49 * colon-delimited pixmap operations. 55 * colon-delimited pixmap operations.
50 * The following table shows the valid geometry strings and their 56 * The following table shows the valid geometry strings and their
51 * affects on the background image : 57 * effects on the background image :
52 * 58 *
53 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 59 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
54 * W and H are percentages of the terminal window size. 60 * W and H are percentages of the terminal window size.
55 * X and Y are also percentages; e.g., +50+50 centers 61 * X and Y are also percentages; e.g., +50+50 centers
56 * the image in the window. 62 * the image in the window.
57 * WxH+X Assumes Y == X 63 * WxH+X Assumes Y == X
58 * WxH Assumes Y == X == 50 (centers the image) 64 * WxH Assumes Y == X == 50 (centers the image)
59 * W+X+Y Assumes H == W 65 * W+X+Y Assumes H == W
60 * W+X Assumes H == W and Y == X 66 * W+X Assumes H == W and Y == X
61 * W Assumes H == W and Y == X == 50 67 * W Assumes H == W and Y == X == 50
62 * 68 *
63 * Adjusting position only : 69 * Adjusting position only :
64 * =+X+Y Set position to X% by Y% (absolute). 70 * =+X+Y Set position to X% by Y% (absolute).
65 * =+X Set position to X% by X%. 71 * =+X Set position to X% by X%.
66 * +X+Y Adjust position horizontally X% and vertically Y% 72 * +X+Y Adjust position horizontally X% and vertically Y%
67 * from current position (relative). 73 * from current position (relative).
68 * +X Adjust position horizontally X% and vertically X% 74 * +X Adjust position horizontally X% and vertically X%
69 * from current position. 75 * from current position.
70 * 76 *
71 * Adjusting scale only : 77 * Adjusting scale only :
72 * Wx0 Multiply horizontal scaling factor by W% 78 * Wx0 Multiply horizontal scaling factor by W%
73 * 0xH Multiply vertical scaling factor by H% 79 * 0xH Multiply vertical scaling factor by H%
74 * 0x0 No scaling (show image at normal size). 80 * 0x0 No scaling (show image at normal size).
75 * 81 *
76 * Pixmap Operations : (should be prepended by a colon) 82 * Pixmap Operations : (should be prepended by a colon)
77 * tile Tile image. Scaling/position modifiers above will affect 83 * tile Tile image. Scaling/position modifiers above will affect
78 * the tile size and origin. 84 * the tile size and origin.
79 * propscale When scaling, scale proportionally. That is, maintain the 85 * propscale When scaling, scale proportionally. That is, maintain the
80 * proper aspect ratio for the image. Any portion of the 86 * proper aspect ratio for the image. Any portion of the
81 * background not covered by the image is filled with the 87 * background not covered by the image is filled with the
82 * current background color. 88 * current background color.
83 * hscale Scale horizontally, tile vertically ? 89 * hscale Scale horizontally, tile vertically ?
84 * vscale Tile horizontally, scale vertically ? 90 * vscale Tile horizontally, scale vertically ?
92 // this is basically redundant as bgPixmap_t is only used in 98 // this is basically redundant as bgPixmap_t is only used in
93 // zero_initialised-derived structs 99 // zero_initialised-derived structs
94#ifdef HAVE_AFTERIMAGE 100#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL; 101 original_asim = NULL;
96#endif 102#endif
103#ifdef HAVE_PIXBUF
104 pixbuf = NULL;
105#endif
97#ifdef BG_IMAGE_FROM_FILE 106#ifdef BG_IMAGE_FROM_FILE
107 have_image = false;
98 h_scale = v_scale = 0; 108 h_scale = v_scale = 0;
99 h_align = v_align = 0; 109 h_align = v_align = 0;
110#endif
111#ifdef ENABLE_TRANSPARENCY
112 shade = 100;
100#endif 113#endif
101 flags = 0; 114 flags = 0;
102 pixmap = None; 115 pixmap = None;
103 valid_since = invalid_since = 0; 116 valid_since = invalid_since = 0;
104 target = 0; 117 target = 0;
110#ifdef HAVE_AFTERIMAGE 123#ifdef HAVE_AFTERIMAGE
111 if (original_asim) 124 if (original_asim)
112 safe_asimage_destroy (original_asim); 125 safe_asimage_destroy (original_asim);
113#endif 126#endif
114 127
128#ifdef HAVE_PIXBUF
129 if (pixbuf)
130 g_object_unref (pixbuf);
131#endif
132
115 if (pixmap && target) 133 if (pixmap && target)
116 XFreePixmap (target->dpy, pixmap); 134 XFreePixmap (target->dpy, pixmap);
117} 135}
118 136
119bool 137bool
123 if (flags & isTransparent) 141 if (flags & isTransparent)
124 return true; 142 return true;
125# endif 143# endif
126 144
127# ifdef BG_IMAGE_FROM_FILE 145# ifdef BG_IMAGE_FROM_FILE
128# ifdef HAVE_AFTERIMAGE 146 if (have_image)
129 if (original_asim)
130# endif
131 { 147 {
132 if (h_scale != 0 || v_scale != 0 148 if (flags & sizeSensitive)
133 || h_align != 0 || v_align != 0)
134 return true; 149 return true;
135 } 150 }
136# endif 151# endif
137 152
138 return false; 153 return false;
139} 154}
140 155
141bool 156bool
142bgPixmap_t::window_position_sensitive () 157bgPixmap_t::window_position_sensitive ()
143{ 158{
144# ifdef ENABLE_TRANSPARENCY 159# ifdef ENABLE_TRANSPARENCY
145 if (flags & isTransparent) 160 if (flags & isTransparent)
146 return true; 161 return true;
147# endif 162# endif
148 163
149# ifdef BG_IMAGE_FROM_FILE 164# ifdef BG_IMAGE_FROM_FILE
150# ifdef HAVE_AFTERIMAGE 165 if (have_image)
151 if (original_asim)
152# endif
153 { 166 {
154 if (h_align == rootAlign || v_align == rootAlign) 167 if (flags & rootAlign)
155 return true; 168 return true;
156 } 169 }
157# endif 170# endif
158 171
159 return false; 172 return false;
163{ 176{
164# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
165 if (original_asim) 178 if (original_asim)
166 return true; 179 return true;
167# endif 180# endif
168# ifdef ENABLE_TRANSPARENCY
169 if (flags & isTransparent)
170 {
171# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
172 if ((flags & blurNeeded) && !(flags & blurServerSide))
173 return true;
174# endif
175 if ((flags & tintNeeded) && !(flags & tintServerSide))
176 return true;
177 }
178# endif
179 return false; 181 return false;
180} 182}
181 183
182# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
183static inline bool 185static inline bool
199static inline bool 201static inline bool
200check_set_align_value (int geom_flags, int flag, int &align, int new_value) 202check_set_align_value (int geom_flags, int flag, int &align, int new_value)
201{ 203{
202 if (geom_flags & flag) 204 if (geom_flags & flag)
203 { 205 {
204 if (new_value != bgPixmap_t::rootAlign)
205 {
206 if (new_value < -100) 206 if (new_value < -100)
207 new_value = -100; 207 new_value = -100;
208 else if (new_value > 200) 208 else if (new_value > 200)
209 new_value = 200; 209 new_value = 200;
210 }
211 if (new_value != align) 210 if (new_value != align)
212 { 211 {
213 align = new_value; 212 align = new_value;
214 return true; 213 return true;
215 } 214 }
219 218
220static inline int 219static inline int
221make_align_position (int align, int window_size, int image_size) 220make_align_position (int align, int window_size, int image_size)
222{ 221{
223 int diff = window_size - image_size; 222 int diff = window_size - image_size;
224 int smaller = MIN (image_size,window_size); 223 int smaller = min (image_size, window_size);
225 224
226 if (align >= 0 && align <= 50) 225 if (align >= 0 && align <= 100)
227 return diff * align / 100; 226 return diff * align / 100;
228 else if (align > 50 && align <= 100)
229 return window_size - image_size - diff * (100 - align) / 100;
230 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200 )
231 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
232 else if (align > -100 && align < 0) 229 else if (align >= -100 && align < 0)
233 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
234 return 0; 231 return 0;
235} 232}
236 233
237static inline int 234static inline int
238make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 235make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
239{ 236{
240 int src_pos = 0; 237 int src_pos = 0;
241 dst_pos = 0; 238 dst_pos = pos;
242 dst_size = size; 239 dst_size = size;
243 if (pos < 0 && size > target_size) 240 if (pos < 0)
244 { 241 {
245 src_pos = -pos; 242 src_pos = -pos;
243 dst_pos = 0;
246 dst_size += pos; 244 dst_size += pos;
247 } 245 }
248 else if (pos > 0)
249 dst_pos = pos;
250 246
251 if (dst_pos + dst_size > target_size) 247 if (dst_pos + dst_size > target_size)
252 dst_size = target_size - dst_pos; 248 dst_size = target_size - dst_pos;
253 return src_pos; 249 return src_pos;
254} 250}
259 int geom_flags = 0, changed = 0; 255 int geom_flags = 0, changed = 0;
260 int x = 0, y = 0; 256 int x = 0, y = 0;
261 unsigned int w = 0, h = 0; 257 unsigned int w = 0, h = 0;
262 unsigned int n; 258 unsigned int n;
263 unsigned long new_flags = (flags & (~geometryFlags)); 259 unsigned long new_flags = (flags & (~geometryFlags));
264 char *p; 260 const char *p;
265# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 261# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
266 262
267 if (geom == NULL) 263 if (geom == NULL)
268 return false; 264 return false;
269 265
379 w = h = noScale; 375 w = h = noScale;
380 geom_flags |= WidthValue|HeightValue; 376 geom_flags |= WidthValue|HeightValue;
381 } 377 }
382 else if (CHECK_GEOM_OPS ("propscale")) 378 else if (CHECK_GEOM_OPS ("propscale"))
383 { 379 {
384 if (w == 0 && h == 0)
385 {
386 w = windowScale;
387 geom_flags |= WidthValue;
388 }
389 new_flags |= propScale; 380 new_flags |= propScale;
390 } 381 }
391 else if (CHECK_GEOM_OPS ("hscale")) 382 else if (CHECK_GEOM_OPS ("hscale"))
392 { 383 {
393 if (w == 0) w = windowScale; 384 if (w == 0) w = windowScale;
415 x = y = centerAlign; 406 x = y = centerAlign;
416 geom_flags |= WidthValue|HeightValue|XValue|YValue; 407 geom_flags |= WidthValue|HeightValue|XValue|YValue;
417 } 408 }
418 else if (CHECK_GEOM_OPS ("root")) 409 else if (CHECK_GEOM_OPS ("root"))
419 { 410 {
411 new_flags |= rootAlign;
420 w = h = noScale; 412 w = h = noScale;
421 x = y = rootAlign;
422 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue;
423 } 414 }
424# undef CHECK_GEOM_OPS 415# undef CHECK_GEOM_OPS
425 416
426 while (*ops != ':' && *ops != '\0') ++ops; 417 while (*ops != ':' && *ops != '\0') ++ops;
427 } /* done parsing ops */ 418 } /* done parsing ops */
437 { 428 {
438 flags = new_flags; 429 flags = new_flags;
439 changed++; 430 changed++;
440 } 431 }
441 432
442//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 433 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
443// flags, h_scale, v_scale, h_align, v_align); 434 // flags, h_scale, v_scale, h_align, v_align);
444 return (changed > 0); 435 return (changed > 0);
436}
437
438void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
440{
441 int target_width = target->szHint.width;
442 int target_height = target->szHint.height;
443
444 if (flags & propScale)
445 {
446 float scale = (float)target_width / image_width;
447 min_it (scale, (float)target_height / image_height);
448 w = image_width * scale + 0.5;
449 h = image_height * scale + 0.5;
450 }
451 else
452 {
453 w = h_scale * target_width / 100;
454 h = v_scale * target_height / 100;
455 }
456
457 if (!w) w = image_width;
458 if (!h) h = image_height;
459
460 if (flags & rootAlign)
461 {
462 target->get_window_origin (x, y);
463 x = -x;
464 y = -y;
465 }
466 else
467 {
468 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h);
470 }
471
472 flags &= ~sizeSensitive;
473 if ((flags & propScale) || h_scale || v_scale
474 || (!(flags & rootAlign) && (h_align || v_align))
475 || w > target_width || h > target_height)
476 flags |= sizeSensitive;
445} 477}
446 478
447# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
448bool 480bool
449bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 481bgPixmap_t::render_image (unsigned long background_flags)
450{ 482{
451 if (target == NULL) 483 if (target == NULL)
452 return false; 484 return false;
453 485
454 target->init_asv (); 486 target->init_asv ();
487
488 ASImage *background = NULL;
489 ARGB32 background_tint = TINT_LEAVE_SAME;
490
491# ifdef ENABLE_TRANSPARENCY
492 if (background_flags)
493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
494
495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
496 {
497 ShadingInfo as_shade;
498 as_shade.shading = shade;
499
500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
501 if (flags & tintSet)
502 tint.get (c);
503 as_shade.tintColor.red = c.r;
504 as_shade.tintColor.green = c.g;
505 as_shade.tintColor.blue = c.b;
506
507 background_tint = shading2tint32 (&as_shade);
508 }
509
510 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
511 {
512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
514 100, ASIMAGE_QUALITY_DEFAULT);
515 if (tmp)
516 {
517 destroy_asimage (&background);
518 background = tmp;
519 }
520 }
521# endif
455 522
456 ASImage *result = 0; 523 ASImage *result = 0;
457 524
458 int target_width = target->szHint.width; 525 int target_width = target->szHint.width;
459 int target_height = target->szHint.height; 526 int target_height = target->szHint.height;
460 int new_pmap_width = target_width; 527 int new_pmap_width = target_width;
461 int new_pmap_height = target_height; 528 int new_pmap_height = target_height;
462 529
463 int x = 0; 530 int x = 0;
464 int y = 0; 531 int y = 0;
465 int w = h_scale * target_width / 100; 532 int w = 0;
466 int h = v_scale * target_height / 100; 533 int h = 0;
467 534
468 TIMING_TEST_START (asim); 535 TIMING_TEST_START (asim);
469 536
470 if (original_asim) 537 if (original_asim)
471 { 538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
472 if (h_align == rootAlign || v_align == rootAlign)
473 {
474 target->get_window_origin(x, y);
475 x = -x;
476 y = -y;
477 }
478
479 if (h_align != rootAlign)
480 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
481
482 if (v_align != rootAlign)
483 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
484 }
485 539
486 if (!original_asim 540 if (!original_asim
541 || (!(flags & rootAlign)
487 || x >= target_width 542 && (x >= target_width
488 || y >= target_height 543 || y >= target_height
489 || (w > 0 && x + w <= 0) 544 || (x + w <= 0)
490 || (h > 0 && y + h <= 0)) 545 || (y + h <= 0))))
491 { 546 {
492 if (background) 547 if (background)
493 { 548 {
494 new_pmap_width = background->width; 549 new_pmap_width = background->width;
495 new_pmap_height = background->height; 550 new_pmap_height = background->height;
496 result = background; 551 result = background;
497 552
498 if (background_tint != TINT_LEAVE_SAME) 553 if (background_tint != TINT_LEAVE_SAME)
499 { 554 {
500 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 555 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
501 target_width, target_height, background_tint, 556 target_width, target_height, background_tint,
502 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 557 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
503 if (tmp) 558 if (tmp)
504 result = tmp; 559 result = tmp;
505 } 560 }
509 } 564 }
510 else 565 else
511 { 566 {
512 result = original_asim; 567 result = original_asim;
513 568
514 if ((w > 0 && w != original_asim->width) 569 if ((w != original_asim->width)
515 || (h > 0 && h != original_asim->height)) 570 || (h != original_asim->height))
516 { 571 {
517 result = scale_asimage (target->asv, original_asim, 572 result = scale_asimage (target->asv, original_asim,
518 w > 0 ? w : original_asim->width, 573 w, h,
519 h > 0 ? h : original_asim->height,
520 background ? ASA_ASImage : ASA_XImage, 574 background ? ASA_ASImage : ASA_XImage,
521 100, ASIMAGE_QUALITY_DEFAULT); 575 100, ASIMAGE_QUALITY_DEFAULT);
522 } 576 }
523 577
524 if (background == NULL) 578 if (background == NULL)
525 { 579 {
526 /* if tiling - pixmap has to be sized exactly as the image,
527 but there is no need to make it bigger than the window! */
528 if (h_scale == 0)
529 new_pmap_width = min (result->width, target_width);
530 if (v_scale == 0)
531 new_pmap_height = min (result->height, target_height);
532 /* we also need to tile our image in one or both directions */
533 if (h_scale == 0 || v_scale == 0) 580 if (h_scale == 0 || v_scale == 0)
534 { 581 {
582 /* if tiling - pixmap has to be sized exactly as the image,
583 but there is no need to make it bigger than the window! */
584 new_pmap_width = min (result->width, target_width);
585 new_pmap_height = min (result->height, target_height);
586
587 /* we also need to tile our image in both directions */
535 ASImage *tmp = tile_asimage (target->asv, result, 588 ASImage *tmp = tile_asimage (target->asv, result,
536 (h_scale > 0) ? 0 : (int)result->width - x, 589 (int)result->width - x,
537 (v_scale > 0) ? 0 : (int)result->height - y, 590 (int)result->height - y,
538 new_pmap_width, 591 new_pmap_width,
539 new_pmap_height, 592 new_pmap_height,
540 TINT_LEAVE_SAME, ASA_XImage, 593 TINT_LEAVE_SAME, ASA_XImage,
541 100, ASIMAGE_QUALITY_DEFAULT); 594 100, ASIMAGE_QUALITY_DEFAULT);
542 if (tmp) 595 if (tmp)
543 { 596 {
550 } 603 }
551 else 604 else
552 { 605 {
553 /* if blending background and image - pixmap has to be sized same as target window */ 606 /* if blending background and image - pixmap has to be sized same as target window */
554 ASImageLayer *layers = create_image_layers (2); 607 ASImageLayer *layers = create_image_layers (2);
555 ASImage *merged_im = NULL;
556 608
557 layers[0].im = background; 609 layers[0].im = background;
558 layers[0].clip_width = target_width; 610 layers[0].clip_width = target_width;
559 layers[0].clip_height = target_height; 611 layers[0].clip_height = target_height;
560 layers[0].tint = background_tint; 612 layers[0].tint = background_tint;
561 layers[1].im = result; 613 layers[1].im = result;
562 614
563 if (w <= 0) 615 if (h_scale == 0 || v_scale == 0)
564 { 616 {
565 /* tile horizontally */ 617 /* tile horizontally */
566 while (x > 0) x -= (int)result->width; 618 while (x > 0) x -= (int)result->width;
567 layers[1].dst_x = x; 619 layers[1].dst_x = x;
568 layers[1].clip_width = result->width+target_width; 620 layers[1].clip_width = result->width+target_width;
572 /* clip horizontally */ 624 /* clip horizontally */
573 layers[1].dst_x = x; 625 layers[1].dst_x = x;
574 layers[1].clip_width = result->width; 626 layers[1].clip_width = result->width;
575 } 627 }
576 628
577 if (h <= 0) 629 if (h_scale == 0 || v_scale == 0)
578 { 630 {
579 while (y > 0) y -= (int)result->height; 631 while (y > 0) y -= (int)result->height;
580 layers[1].dst_y = y; 632 layers[1].dst_y = y;
581 layers[1].clip_height = result->height + target_height; 633 layers[1].clip_height = result->height + target_height;
582 } 634 }
607 free (layers); 659 free (layers);
608 } 660 }
609 } 661 }
610 TIMING_TEST_PRINT_RESULT (asim); 662 TIMING_TEST_PRINT_RESULT (asim);
611 663
612 if (pixmap) 664 bool ret = false;
613 {
614 if (result == NULL
615 || pmap_width != new_pmap_width
616 || pmap_height != new_pmap_height
617 || pmap_depth != target->depth)
618 {
619 XFreePixmap (target->dpy, pixmap);
620 pixmap = None;
621 }
622 }
623 665
624 if (result) 666 if (result)
625 { 667 {
626 XGCValues gcv; 668 XGCValues gcv;
627 GC gc; 669 GC gc;
670
671 if (pixmap)
672 {
673 if (pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
676 {
677 XFreePixmap (target->dpy, pixmap);
678 pixmap = None;
679 }
680 }
628 681
629 /* create Pixmap */ 682 /* create Pixmap */
630 if (pixmap == None) 683 if (pixmap == None)
631 { 684 {
632 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 685 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
633 pmap_width = new_pmap_width; 686 pmap_width = new_pmap_width;
634 pmap_height = new_pmap_height; 687 pmap_height = new_pmap_height;
635 pmap_depth = target->depth; 688 pmap_depth = target->depth;
636 } 689 }
637 /* fill with background color ( if result's not completely overlapping it)*/ 690 /* fill with background color (if result's not completely overlapping it) */
638 gcv.foreground = target->pix_colors[Color_bg]; 691 gcv.foreground = target->pix_colors[Color_bg];
639 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 692 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
640 693
641 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 694 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
642 int dst_width = result->width, dst_height = result->height; 695 int dst_width = result->width, dst_height = result->height;
643 if (background == NULL) 696 if (background == NULL)
644 { 697 {
698 if (!(h_scale == 0 || v_scale == 0))
699 {
645 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 700 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
646 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 701 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
702 }
647 703
648 if (dst_x > 0 || dst_y > 0 704 if (dst_x > 0 || dst_y > 0
649 || dst_x + dst_width < new_pmap_width 705 || dst_x + dst_width < new_pmap_width
650 || dst_y + dst_height < new_pmap_height) 706 || dst_y + dst_height < new_pmap_height)
651 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 707 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
658 if (result != background && result != original_asim) 714 if (result != background && result != original_asim)
659 destroy_asimage (&result); 715 destroy_asimage (&result);
660 716
661 XFreeGC (target->dpy, gc); 717 XFreeGC (target->dpy, gc);
662 TIMING_TEST_PRINT_RESULT (asim); 718 TIMING_TEST_PRINT_RESULT (asim);
663 }
664 719
720 ret = true;
721 }
722
723 if (background)
724 destroy_asimage (&background);
725
665 return true; 726 return ret;
666} 727}
667# endif /* HAVE_AFTERIMAGE */ 728# endif /* HAVE_AFTERIMAGE */
729
730# ifdef HAVE_PIXBUF
731bool
732bgPixmap_t::render_image (unsigned long background_flags)
733{
734 if (target == NULL)
735 return false;
736
737 if (!pixbuf)
738 return false;
739
740#if !XFT
741 if (background_flags)
742 return false;
743#endif
744
745 GdkPixbuf *result;
746
747 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf);
749
750 int target_width = target->szHint.width;
751 int target_height = target->szHint.height;
752 int new_pmap_width = target_width;
753 int new_pmap_height = target_height;
754
755 int x = 0;
756 int y = 0;
757 int w = 0;
758 int h = 0;
759
760 get_image_geometry (image_width, image_height, w, h, x, y);
761
762 if (!(flags & rootAlign)
763 && (x >= target_width
764 || y >= target_height
765 || (x + w <= 0)
766 || (y + h <= 0)))
767 return false;
768
769 result = pixbuf;
770
771 if ((w != image_width)
772 || (h != image_height))
773 {
774 result = gdk_pixbuf_scale_simple (pixbuf,
775 w, h,
776 GDK_INTERP_BILINEAR);
777 }
778
779 bool ret = false;
780
781 if (result)
782 {
783 XGCValues gcv;
784 GC gc;
785 Pixmap root_pmap;
786
787 image_width = gdk_pixbuf_get_width (result);
788 image_height = gdk_pixbuf_get_height (result);
789
790 if (background_flags)
791 {
792 root_pmap = pixmap;
793 pixmap = None;
794 }
795 else
796 {
797 if (h_scale == 0 || v_scale == 0)
798 {
799 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height);
801 }
802 }
803
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)
816 {
817 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
818 pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height;
820 pmap_depth = target->depth;
821 }
822
823 gcv.foreground = target->pix_colors[Color_bg];
824 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
825
826 if (h_scale == 0 || v_scale == 0)
827 {
828 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
829 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
830 0, 0,
831 0, 0,
832 image_width, image_height,
833 XLIB_RGB_DITHER_NONE,
834 0, 0);
835
836 gcv.tile = tile;
837 gcv.fill_style = FillTiled;
838 gcv.ts_x_origin = x;
839 gcv.ts_y_origin = y;
840 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
841
842 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
843 XFreePixmap (target->dpy, tile);
844 }
845 else
846 {
847 int src_x, src_y, dst_x, dst_y;
848 int dst_width, dst_height;
849
850 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
851 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
852
853 if (dst_x > 0 || dst_y > 0
854 || dst_x + dst_width < new_pmap_width
855 || dst_y + dst_height < new_pmap_height)
856 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
857
858 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
859 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
860 src_x, src_y,
861 dst_x, dst_y,
862 dst_width, dst_height,
863 XLIB_RGB_DITHER_NONE,
864 0, 0);
865 }
866
867#if XFT
868 if (background_flags)
869 {
870 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa;
872
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878
879 pa.repeat = True;
880 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
881 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
882 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
883 XFreePixmap (dpy, mask_pmap);
884
885 if (src && dst && mask)
886 {
887 XRenderColor mask_c;
888
889 mask_c.alpha = 0x8000;
890 mask_c.red = 0;
891 mask_c.green = 0;
892 mask_c.blue = 0;
893 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
894 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
895 }
896
897 XRenderFreePicture (dpy, src);
898 XRenderFreePicture (dpy, dst);
899 XRenderFreePicture (dpy, mask);
900
901 XFreePixmap (dpy, root_pmap);
902 }
903#endif
904
905 if (result != pixbuf)
906 g_object_unref (result);
907
908 XFreeGC (target->dpy, gc);
909
910 ret = true;
911 }
912
913 return ret;
914}
915# endif /* HAVE_PIXBUF */
668 916
669bool 917bool
670bgPixmap_t::set_file (const char *file) 918bgPixmap_t::set_file (const char *file)
671{ 919{
672 assert (file); 920 assert (file);
673 921
674 if (*file) 922 if (*file)
675 { 923 {
924 if (const char *p = strchr (file, ';'))
925 {
926 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len);
929 f[len] = '\0';
930 file = f;
931 }
932
676# ifdef HAVE_AFTERIMAGE 933# ifdef HAVE_AFTERIMAGE
677 if (!target->asimman) 934 if (!target->asimman)
678 target->asimman = create_generic_imageman (target->rs[Rs_path]); 935 target->asimman = create_generic_imageman (target->rs[Rs_path]);
679
680 if (char *f = strchr (file, ';'))
681 {
682 size_t len = f - file;
683 f = (char *)malloc (len + 1);
684 memcpy (f, file, len);
685 f[len] = '\0';
686 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
687 free (f); 937 if (image)
688 } 938 {
689 else 939 if (original_asim)
690 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 940 safe_asimage_destroy (original_asim);
941 original_asim = image;
942 have_image = true;
943 return true;
944 }
945# endif
691 946
692 return original_asim; 947# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image)
950 {
951 if (pixbuf)
952 g_object_unref (pixbuf);
953 pixbuf = image;
954 have_image = true;
955 return true;
956 }
693# endif 957# endif
694 } 958 }
695 959
696 return false; 960 return false;
697} 961}
717 int changed = 0; 981 int changed = 0;
718 unsigned int hr, vr; 982 unsigned int hr, vr;
719 int junk; 983 int junk;
720 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
721 985
722 if (!(geom_flags&WidthValue)) 986 if (!(geom_flags & WidthValue))
723 hr = 1; 987 hr = 1;
724 if (!(geom_flags&HeightValue)) 988 if (!(geom_flags & HeightValue))
725 vr = hr; 989 vr = hr;
990
991 min_it (hr, 128);
992 min_it (vr, 128);
726 993
727 if (h_blurRadius != hr) 994 if (h_blurRadius != hr)
728 { 995 {
729 ++changed; 996 ++changed;
730 h_blurRadius = hr; 997 h_blurRadius = hr;
739 if (v_blurRadius == 0 && h_blurRadius == 0) 1006 if (v_blurRadius == 0 && h_blurRadius == 0)
740 flags &= ~blurNeeded; 1007 flags &= ~blurNeeded;
741 else 1008 else
742 flags |= blurNeeded; 1009 flags |= blurNeeded;
743 1010
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
744 return (changed>0); 1023 return (changed > 0);
745} 1024}
746 1025
747static inline unsigned long 1026static inline unsigned long
748compute_tint_shade_flags (rxvt_color *tint, int shade) 1027compute_tint_shade_flags (rxvt_color *tint, int shade)
749{ 1028{
750 unsigned long flags = 0; 1029 unsigned long flags = 0;
751 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1030 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
752 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1031 bool has_shade = shade != 100;
753 1032
754 if (tint) 1033 if (tint)
755 { 1034 {
756 tint->get (c); 1035 tint->get (c);
757# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
766 flags |= bgPixmap_t::tintNeeded; 1045 flags |= bgPixmap_t::tintNeeded;
767 else if (tint) 1046 else if (tint)
768 { 1047 {
769 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 1048 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
770 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 1049 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
771 { 1050 {
772 flags |= bgPixmap_t::tintNeeded; 1051 flags |= bgPixmap_t::tintNeeded;
773 } 1052 }
774 } 1053 }
775 1054
776 if (flags & bgPixmap_t::tintNeeded) 1055 if (flags & bgPixmap_t::tintNeeded)
777 { 1056 {
778 if (flags & bgPixmap_t::tintWholesome) 1057 if (flags & bgPixmap_t::tintWholesome)
789} 1068}
790 1069
791bool 1070bool
792bgPixmap_t::set_tint (rxvt_color &new_tint) 1071bgPixmap_t::set_tint (rxvt_color &new_tint)
793{ 1072{
794 if (tint != new_tint) 1073 if (!(flags & tintSet) || tint != new_tint)
795 { 1074 {
796 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1075 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
797 tint = new_tint; 1076 tint = new_tint;
798 flags = (flags & ~tintFlags) | new_flags | tintSet; 1077 flags = (flags & ~tintFlags) | new_flags | tintSet;
799 return true; 1078 return true;
807{ 1086{
808 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1087 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
809 1088
810 if (new_flags != (flags & tintFlags)) 1089 if (new_flags != (flags & tintFlags))
811 { 1090 {
812 flags = (flags&~tintFlags)|new_flags; 1091 flags = (flags & ~tintFlags) | new_flags;
813 return true; 1092 return true;
814 } 1093 }
815 1094
816 return false; 1095 return false;
817} 1096}
818 1097
819bool 1098bool
820bgPixmap_t::set_shade (const char *shade_str) 1099bgPixmap_t::set_shade (const char *shade_str)
821{ 1100{
822 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1101 int new_shade = (shade_str) ? atoi (shade_str) : 100;
823 1102
824 if (new_shade < 0 && new_shade > -100) 1103 clamp_it (new_shade, -100, 200);
1104 if (new_shade < 0)
825 new_shade = 200 - (100 + new_shade); 1105 new_shade = 200 - (100 + new_shade);
826 else if (new_shade == 100)
827 new_shade = 0;
828 1106
829 if (new_shade != shade) 1107 if (new_shade != shade)
830 { 1108 {
831 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1109 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
832 shade = new_shade; 1110 shade = new_shade;
833 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1111 flags = (flags & (~tintFlags | tintSet)) | new_flags;
834 return true; 1112 return true;
835 } 1113 }
836 1114
837 return false; 1115 return false;
1116}
1117
1118#if XFT
1119static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{
1122 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma;
1124 double sum = 0.0;
1125
1126 for (int i = 0; i < width; i++)
1127 {
1128 double x = i - width / 2;
1129 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1130 sum += kernel[i];
1131 }
1132
1133 params[0] = XDoubleToFixed (width);
1134 params[1] = XDoubleToFixed (1);
1135
1136 for (int i = 0; i < width; i++)
1137 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138}
1139#endif
1140
1141bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{
1144 bool ret = false;
1145#if XFT
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149
1150 Display *dpy = target->dpy;
1151 XRenderPictureAttributes pa;
1152 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual);
1153
1154 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1155 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1156
1157 if (kernel && params && src && dst)
1158 {
1159 if (h_blurRadius)
1160 {
1161 size = h_blurRadius * 2 + 1;
1162 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1163
1164 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1165 XRenderComposite (dpy,
1166 PictOpSrc,
1167 src,
1168 None,
1169 dst,
1170 0, 0,
1171 0, 0,
1172 0, 0,
1173 width, height);
1174 }
1175
1176 if (v_blurRadius)
1177 {
1178 size = v_blurRadius * 2 + 1;
1179 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1180 swap (params[0], params[1]);
1181
1182 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1183 XRenderComposite (dpy,
1184 PictOpSrc,
1185 src,
1186 None,
1187 dst,
1188 0, 0,
1189 0, 0,
1190 0, 0,
1191 width, height);
1192 }
1193
1194 ret = true;
1195 }
1196
1197 free (kernel);
1198 free (params);
1199 XRenderFreePicture (dpy, src);
1200 XRenderFreePicture (dpy, dst);
1201#endif
1202 return ret;
1203}
1204
1205bool
1206bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1207{
1208 Display *dpy = target->dpy;
1209 bool ret = false;
1210
1211 if (flags & tintWholesome)
1212 {
1213 XGCValues gcv;
1214 GC gc;
1215
1216 /* In this case we can tint image server-side getting significant
1217 * performance improvements, as we eliminate XImage transfer
1218 */
1219 gcv.foreground = Pixel (tint);
1220 gcv.function = GXand;
1221 gcv.fill_style = FillSolid;
1222 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1223 if (gc)
1224 {
1225 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1226 ret = true;
1227 XFreeGC (dpy, gc);
1228 }
1229 }
1230 else
1231 {
1232# if XFT
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234
1235 if (flags & tintSet)
1236 tint.get (c);
1237
1238 if (shade <= 100)
1239 {
1240 c.r = (c.r * shade) / 100;
1241 c.g = (c.g * shade) / 100;
1242 c.b = (c.b * shade) / 100;
1243 }
1244 else
1245 {
1246 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1247 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1248 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1249 }
1250
1251 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1252 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1253 XRenderPictureAttributes pa;
1254
1255 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1256
1257 pa.repeat = True;
1258
1259 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1260 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1261 XFreePixmap (dpy, overlay_pmap);
1262
1263 pa.component_alpha = True;
1264 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1265 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1266 XFreePixmap (dpy, mask_pmap);
1267
1268 if (mask_pic && overlay_pic && back_pic)
1269 {
1270 XRenderColor mask_c;
1271
1272 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1273 mask_c.alpha = 0xffff;
1274 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1275
1276 mask_c.alpha = 0;
1277 mask_c.red = 0xffff - c.r;
1278 mask_c.green = 0xffff - c.g;
1279 mask_c.blue = 0xffff - c.b;
1280 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1281 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1282 ret = true;
1283 }
1284
1285 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST
1289 XSync (dpy, False);
1290# endif
1291# endif
1292 }
1293
1294 return ret;
838} 1295}
839 1296
840/* make_transparency_pixmap() 1297/* make_transparency_pixmap()
841 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1298 * Builds a pixmap sized the same as terminal window, with depth same as the root window
842 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1299 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
848 unsigned long result = 0; 1305 unsigned long result = 0;
849 1306
850 if (target == NULL) 1307 if (target == NULL)
851 return 0; 1308 return 0;
852 1309
853 /* root dimentions may change from call to call - but Display structure should 1310 /* root dimensions may change from call to call - but Display structure should
854 * be always up-to-date, so let's use it : 1311 * be always up-to-date, so let's use it :
855 */ 1312 */
856 Window root = target->display->root; 1313 Window root = target->display->root;
857 int screen = target->display->screen; 1314 int screen = target->display->screen;
858 Display *dpy = target->dpy; 1315 Display *dpy = target->dpy;
861 unsigned int root_pmap_width, root_pmap_height; 1318 unsigned int root_pmap_width, root_pmap_height;
862 int window_width = target->szHint.width; 1319 int window_width = target->szHint.width;
863 int window_height = target->szHint.height; 1320 int window_height = target->szHint.height;
864 int sx, sy; 1321 int sx, sy;
865 XGCValues gcv; 1322 XGCValues gcv;
1323 GC gc;
866 1324
867 TIMING_TEST_START (tp); 1325 TIMING_TEST_START (tp);
868 target->get_window_origin (sx, sy); 1326 target->get_window_origin (sx, sy);
869 1327
870 /* check if we are outside of the visible part of the virtual screen : */ 1328 /* check if we are outside of the visible part of the virtual screen : */
872 || sx >= root_width || sy >= root_height) 1330 || sx >= root_width || sy >= root_height)
873 return 0; 1331 return 0;
874 1332
875 if (root_pixmap != None) 1333 if (root_pixmap != None)
876 { 1334 {
877 /* we want to validate the pixmap and get it's size at the same time : */ 1335 /* we want to validate the pixmap and get its size at the same time : */
878 int junk; 1336 int junk;
879 unsigned int ujunk; 1337 unsigned int ujunk;
880 /* root pixmap may be bad - allow a error */ 1338 /* root pixmap may be bad - allow a error */
881 target->allowedxerror = -1; 1339 target->allowedxerror = -1;
882 1340
884 root_pixmap = None; 1342 root_pixmap = None;
885 1343
886 target->allowedxerror = 0; 1344 target->allowedxerror = 0;
887 } 1345 }
888 1346
1347 if (root_pixmap == None)
1348 return 0;
1349
889 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
890 GC gc = NULL;
891 1351
892 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1352 if (tiled_root_pmap == None) /* something really bad happened - abort */
893 return 0; 1353 return 0;
894 1354
895 if (root_pixmap == None)
896 {
897 /* use tricks to obtain the root background image :*/
898 /* we want to create Overrideredirect window overlapping out window
899 with background type of Parent Relative and then grab it */
900 XSetWindowAttributes attr;
901 Window src;
902 bool success = false;
903
904 attr.background_pixmap = ParentRelative;
905 attr.backing_store = Always;
906 attr.event_mask = ExposureMask;
907 attr.override_redirect = True;
908 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
909 CopyFromParent, CopyFromParent, CopyFromParent,
910 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
911 &attr);
912
913 if (src != None)
914 {
915 XEvent event;
916 int ev_count = 0;
917 XGrabServer (dpy);
918 XMapRaised (dpy, src);
919 XSync (dpy, False);
920
921 /* XSync should get window where it's properly exposed,
922 * but to be on the safe side - let's check for the actual event to arrive : */
923 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
924 ++ev_count;
925
926 if (ev_count > 0);
927 {
928 /* hooray! - we can grab the image! */
929 gc = XCreateGC (dpy, root, 0, NULL);
930 if (gc)
931 {
932 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
933 success = true;
934 }
935 }
936
937 XDestroyWindow (dpy, src);
938 XUngrabServer (dpy);
939 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
940 }
941
942 if (!success)
943 {
944 XFreePixmap (dpy, tiled_root_pmap);
945 tiled_root_pmap = None;
946 }
947 else
948 result |= transpPmapTiled;
949 }
950 else
951 {
952 /* strightforward pixmap copy */ 1355 /* straightforward pixmap copy */
953 gcv.tile = root_pixmap; 1356 gcv.tile = root_pixmap;
954 gcv.fill_style = FillTiled; 1357 gcv.fill_style = FillTiled;
955 1358
956 while (sx < 0) sx += (int)root_width; 1359 while (sx < 0) sx += (int)root_width;
957 while (sy < 0) sy += (int)root_height; 1360 while (sy < 0) sy += (int)root_height;
958 1361
959 gcv.ts_x_origin = -sx; 1362 gcv.ts_x_origin = -sx;
960 gcv.ts_y_origin = -sy; 1363 gcv.ts_y_origin = -sy;
961 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
962 1365
963 if (gc) 1366 if (gc)
964 { 1367 {
965 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
966 result |= transpPmapTiled; 1369 result |= transpPmapTiled;
967 } 1370 XFreeGC (dpy, gc);
968 } 1371 }
969 TIMING_TEST_PRINT_RESULT (tp); 1372 TIMING_TEST_PRINT_RESULT (tp);
970 1373
971 if (tiled_root_pmap != None) 1374 if (tiled_root_pmap != None)
972 { 1375 {
973 if (!need_client_side_rendering ()) 1376 if (!need_client_side_rendering ())
974 { 1377 {
975 if ((flags & tintNeeded)) 1378 if (flags & (blurNeeded | blurServerSide))
976 {
977 if (flags & tintWholesome)
978 { 1379 {
979 /* In this case we can tint image server-side getting significant 1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
980 * performance improvements, as we eliminate XImage transfer
981 */
982 gcv.foreground = Pixel (tint);
983 gcv.function = GXand;
984 gcv.fill_style = FillSolid;
985 if (gc)
986 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
987 else
988 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
989 if (gc)
990 {
991 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
992 result |= transpPmapTinted; 1381 result |= transpPmapBlurred;
993 }
994 }
995 else
996 {
997# if XFT
998 Picture back_pic = 0;
999 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1000
1001 if (flags & tintSet)
1002 tint.get (c);
1003
1004 if (shade > 0 && shade < 100)
1005 {
1006 c.r = (c.r * shade) / 100;
1007 c.g = (c.g * shade) / 100;
1008 c.b = (c.b * shade) / 100;
1009 }
1010 else if (shade > 100 && shade < 200)
1011 {
1012 c.r = (c.r * (200 - shade)) / 100;
1013 c.g = (c.g * (200 - shade)) / 100;
1014 c.b = (c.b * (200 - shade)) / 100;
1015 }
1016
1017 XRenderPictFormat pf;
1018 pf.type = PictTypeDirect;
1019 pf.depth = 32;
1020 pf.direct.redMask = 0xff;
1021 pf.direct.greenMask = 0xff;
1022 pf.direct.blueMask = 0xff;
1023 pf.direct.alphaMask = 0xff;
1024
1025 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1026 (PictFormatType|
1027 PictFormatDepth|
1028 PictFormatRedMask|
1029 PictFormatGreenMask|
1030 PictFormatBlueMask|
1031 PictFormatAlphaMask),
1032 &pf,
1033 0);
1034 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1035 XRenderPictureAttributes pa ;
1036
1037 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1038
1039 pa.repeat = True;
1040
1041 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1042 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1043 XFreePixmap (dpy, overlay_pmap);
1044
1045 pa.component_alpha = True;
1046 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1047 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1048 XFreePixmap (dpy, mask_pmap);
1049
1050 if (mask_pic && overlay_pic && back_pic)
1051 {
1052 XRenderColor mask_c;
1053
1054 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1055 mask_c.alpha = 0xffff;
1056 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1057
1058 mask_c.alpha = 0;
1059 mask_c.red = 0xffff - c.r;
1060 mask_c.green = 0xffff - c.g;
1061 mask_c.blue = 0xffff - c.b;
1062 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1063 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1064 result |= transpPmapTinted;
1065 }
1066
1067 XRenderFreePicture (dpy, mask_pic);
1068 XRenderFreePicture (dpy, overlay_pic);
1069 XRenderFreePicture (dpy, back_pic);
1070# if DO_TIMING_TEST
1071 XSync (dpy, False);
1072# endif
1073# endif
1074 }
1075 } 1382 }
1383 if (flags & (tintNeeded | tintServerSide))
1384 {
1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
1386 result |= transpPmapTinted;
1387 }
1076 } /* server side rendering completed */ 1388 } /* server side rendering completed */
1077 1389
1078 if (pixmap) 1390 if (pixmap)
1079 XFreePixmap (dpy, pixmap); 1391 XFreePixmap (dpy, pixmap);
1080 1392
1082 pmap_width = window_width; 1394 pmap_width = window_width;
1083 pmap_height = window_height; 1395 pmap_height = window_height;
1084 pmap_depth = root_depth; 1396 pmap_depth = root_depth;
1085 } 1397 }
1086 1398
1087 if (gc)
1088 XFreeGC (dpy, gc);
1089
1090 TIMING_TEST_PRINT_RESULT (tp); 1399 TIMING_TEST_PRINT_RESULT (tp);
1091 1400
1092 return result; 1401 return result;
1093} 1402}
1094 1403
1108 return false; 1417 return false;
1109} 1418}
1110# endif /* ENABLE_TRANSPARENCY */ 1419# endif /* ENABLE_TRANSPARENCY */
1111 1420
1112# ifndef HAVE_AFTERIMAGE 1421# ifndef HAVE_AFTERIMAGE
1113static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1422static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1114# endif 1423# endif
1115 1424
1116bool 1425bool
1117bgPixmap_t::render () 1426bgPixmap_t::render ()
1118{ 1427{
1119 unsigned long background_flags = 0; 1428 unsigned long background_flags = 0;
1120 1429
1121 if (target == NULL) 1430 if (target == NULL)
1122 return false; 1431 return false;
1123
1124 target->init_asv ();
1125 1432
1126 TIMING_TEST_START (tp); 1433 TIMING_TEST_START (tp);
1127 1434
1128 invalidate (); 1435 invalidate ();
1129# ifdef ENABLE_TRANSPARENCY 1436# ifdef ENABLE_TRANSPARENCY
1132 /* we need to re-generate transparency pixmap in that case ! */ 1439 /* we need to re-generate transparency pixmap in that case ! */
1133 background_flags = make_transparency_pixmap (); 1440 background_flags = make_transparency_pixmap ();
1134 if (background_flags == 0) 1441 if (background_flags == 0)
1135 return false; 1442 return false;
1136 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1443 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1137 && pmap_depth == target->depth) 1444 && pmap_depth == target->depth)
1138 flags = flags & ~isInvalid; 1445 flags = flags & ~isInvalid;
1139 } 1446 }
1140# endif 1447# endif
1141 1448
1449# ifdef BG_IMAGE_FROM_FILE
1450 if (have_image
1451 || (background_flags & transpTransformations) != (flags & transpTransformations))
1452 {
1453 if (render_image (background_flags))
1454 flags = flags & ~isInvalid;
1455 }
1456# endif
1457
1142 XImage *result = NULL; 1458 XImage *result = NULL;
1143# ifdef HAVE_AFTERIMAGE 1459
1144 if (original_asim 1460 if (background_flags && (flags & isInvalid))
1145 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1461 {
1462 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1146 { 1463 }
1147 ASImage *background = NULL;
1148 ARGB32 as_tint = TINT_LEAVE_SAME;
1149 if (background_flags)
1150 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1151 1464
1152# ifdef ENABLE_TRANSPARENCY 1465 if (result)
1466 {
1467# if !defined(HAVE_AFTERIMAGE) && !XFT
1468 /* 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 !!! */
1153 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1154 {
1155 ShadingInfo as_shade;
1156 as_shade.shading = (shade == 0) ? 100 : shade;
1157
1158 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1159 if (flags & tintSet)
1160 tint.get (c);
1161 as_shade.tintColor.red = c.r;
1162 as_shade.tintColor.green = c.g;
1163 as_shade.tintColor.blue = c.b;
1164
1165 as_tint = shading2tint32 (&as_shade);
1166 }
1167
1168 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1169 {
1170 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1171 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1172 100, ASIMAGE_QUALITY_DEFAULT);
1173 if (tmp)
1174 {
1175 destroy_asimage (&background);
1176 background = tmp;
1177 }
1178 }
1179# endif
1180
1181 if (render_asim (background, as_tint))
1182 flags = flags & ~isInvalid;
1183 if (background)
1184 destroy_asimage (&background);
1185 }
1186 else if (background_flags && pmap_depth != target->depth)
1187 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1188
1189# elif !XFT /* our own client-side tinting */
1190
1191 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1192 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1193
1194 if (background_flags && (flags & isInvalid))
1195 {
1196 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1197
1198 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1199 { 1472 {
1200 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1201 if (flags & tintSet) 1474 if (flags & tintSet)
1202 tint.get (c); 1475 tint.get (c);
1203 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1476 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1204 } 1477 }
1205 } 1478# endif
1206# endif /* HAVE_AFTERIMAGE */
1207 1479
1208 if (result)
1209 {
1210 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1211 1481
1212 if (gc) 1482 if (gc)
1213 { 1483 {
1214 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1484 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1243 1513
1244 XFreeGC (target->dpy, gc); 1514 XFreeGC (target->dpy, gc);
1245 flags = flags & ~isInvalid; 1515 flags = flags & ~isInvalid;
1246 } 1516 }
1247 1517
1248 XDestroyImage (result); 1518 XDestroyImage (result);
1249 } 1519 }
1250 1520
1251 if (flags & isInvalid) 1521 if (flags & isInvalid)
1252 { 1522 {
1253 if (pixmap != None) 1523 if (pixmap != None)
1327 1597
1328 /* don't want Expose on the parent or vt. It is better to use 1598 /* don't want Expose on the parent or vt. It is better to use
1329 scr_touch or we get a great deal of flicker otherwise: */ 1599 scr_touch or we get a great deal of flicker otherwise: */
1330 XClearWindow (target->dpy, target->parent[0]); 1600 XClearWindow (target->dpy, target->parent[0]);
1331 1601
1332 if (target->scrollBar.win) 1602 if (target->scrollBar.state && target->scrollBar.win)
1333 { 1603 {
1334 target->scrollBar.state = STATE_IDLE; 1604 target->scrollBar.state = STATE_IDLE;
1335 target->scrollBar.show (0); 1605 target->scrollBar.show (0);
1336 } 1606 }
1337 1607
1346/* taken from aterm-0.4.2 */ 1616/* taken from aterm-0.4.2 */
1347 1617
1348typedef uint32_t RUINT32T; 1618typedef uint32_t RUINT32T;
1349 1619
1350static void 1620static void
1351ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1621ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1352{ 1622{
1353 int sh_r, sh_g, sh_b; 1623 int sh_r, sh_g, sh_b;
1354 RUINT32T mask_r, mask_g, mask_b; 1624 RUINT32T mask_r, mask_g, mask_b;
1355 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1625 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1356 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1626 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1358 int i; 1628 int i;
1359 1629
1360 Visual *visual = term->visual; 1630 Visual *visual = term->visual;
1361 1631
1362 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1632 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1363
1364 if (shade == 0)
1365 shade = 100;
1366 1633
1367 /* for convenience */ 1634 /* for convenience */
1368 mask_r = visual->red_mask; 1635 mask_r = visual->red_mask;
1369 mask_g = visual->green_mask; 1636 mask_g = visual->green_mask;
1370 mask_b = visual->blue_mask; 1637 mask_b = visual->blue_mask;
1426 default: 1693 default:
1427 return; /* we do not support this color depth */ 1694 return; /* we do not support this color depth */
1428 } 1695 }
1429 1696
1430 /* prepare limits for color transformation (each channel is handled separately) */ 1697 /* prepare limits for color transformation (each channel is handled separately) */
1431 if (shade < 0) { 1698 if (shade > 100) {
1432 shade = -shade; 1699 shade = 200 - shade;
1433 if (shade < 0) shade = 0;
1434 if (shade > 100) shade = 100;
1435 1700
1436 lower_lim_r = 65535-rm; 1701 lower_lim_r = 65535-rm;
1437 lower_lim_g = 65535-gm; 1702 lower_lim_g = 65535-gm;
1438 lower_lim_b = 65535-bm; 1703 lower_lim_b = 65535-bm;
1439 1704
1441 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1706 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1442 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1707 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1443 1708
1444 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1709 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1445 } else { 1710 } else {
1446 if (shade < 0) shade = 0;
1447 if (shade > 100) shade = 100;
1448 1711
1449 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1712 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1450 1713
1451 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1714 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1452 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1715 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines