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

Diff Legend

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