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.22 by sasha, Fri Jan 4 21:25:57 2008 UTC vs.
Revision 1.75 by sf-exg, Sun Oct 10 21:58:00 2010 UTC

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

Diff Legend

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