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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines