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