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.74 by sf-exg, Sun Oct 10 21:56:09 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 (!w) w = image_width;
464 if (!h) h = image_height;
465
466 if (flags & rootAlign)
467 {
468 target->get_window_origin (x, y);
469 x = -x;
470 y = -y;
471 }
472 else
473 {
474 x = make_align_position (h_align, target_width, w);
475 y = make_align_position (v_align, target_height, h);
476 }
477
478 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0
480 || h_align != 0 || v_align != 0
481 || w > target_width || h > target_height)
482 flags |= sizeSensitive;
442} 483}
443 484
444# ifdef HAVE_AFTERIMAGE 485# ifdef HAVE_AFTERIMAGE
445bool 486bool
446bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 487bgPixmap_t::render_image (unsigned long background_flags)
447{ 488{
448 if (target == NULL) 489 if (target == NULL)
449 return false; 490 return false;
450 491
492 target->init_asv ();
493
494 ASImage *background = NULL;
495 ARGB32 background_tint = TINT_LEAVE_SAME;
496
497# ifdef ENABLE_TRANSPARENCY
498 if (background_flags)
499 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
500
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 {
503 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade;
505
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet)
508 tint.get (c);
509 as_shade.tintColor.red = c.r;
510 as_shade.tintColor.green = c.g;
511 as_shade.tintColor.blue = c.b;
512
513 background_tint = shading2tint32 (&as_shade);
514 }
515
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
517 {
518 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
519 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
520 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp)
522 {
523 destroy_asimage (&background);
524 background = tmp;
525 }
526 }
527# endif
528
529 ASImage *result = 0;
530
451 int target_width = (int)target->szHint.width; 531 int target_width = target->szHint.width;
452 int target_height = (int)target->szHint.height; 532 int target_height = target->szHint.height;
453 int new_pmap_width = target_width, new_pmap_height = target_height; 533 int new_pmap_width = target_width;
454 ASImage *result = NULL; 534 int new_pmap_height = target_height;
455 535
456 int x = 0; 536 int x = 0;
457 int y = 0; 537 int y = 0;
458 int w = h_scale * target_width / 100; 538 int w = 0;
459 int h = v_scale * target_height / 100; 539 int h = 0;
460 540
461 TIMING_TEST_START (asim); 541 TIMING_TEST_START (asim);
462 542
463 if (original_asim) 543 if (original_asim)
464 { 544 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 545
477 if (original_asim == NULL 546 if (!original_asim
547 || (!(flags & rootAlign)
478 || x >= target_width 548 && (x >= target_width
479 || y >= target_height 549 || y >= target_height
480 || (w > 0 && x + w <= 0) 550 || (x + w <= 0)
481 || (h > 0 && y + h <= 0)) 551 || (y + h <= 0))))
482 { 552 {
483 if (background) 553 if (background)
484 { 554 {
485 new_pmap_width = background->width; 555 new_pmap_width = background->width;
486 new_pmap_height = background->height; 556 new_pmap_height = background->height;
487 result = background; 557 result = background;
558
488 if (background_tint != TINT_LEAVE_SAME) 559 if (background_tint != TINT_LEAVE_SAME)
489 { 560 {
490 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 561 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
491 target_width, target_height, background_tint, 562 target_width, target_height, background_tint,
492 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 563 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
493 if (tmp) 564 if (tmp)
494 result = tmp; 565 result = tmp;
495 } 566 }
… …
498 new_pmap_width = new_pmap_height = 0; 569 new_pmap_width = new_pmap_height = 0;
499 } 570 }
500 else 571 else
501 { 572 {
502 result = original_asim; 573 result = original_asim;
574
503 if ((w > 0 && w != original_asim->width) 575 if ((w != original_asim->width)
504 || (h > 0 && h != original_asim->height)) 576 || (h != original_asim->height))
505 { 577 {
506 result = scale_asimage (target->asv, original_asim, 578 result = scale_asimage (target->asv, original_asim,
507 w > 0 ? w : original_asim->width, 579 w, h,
508 h > 0 ? h : original_asim->height,
509 background ? ASA_ASImage : ASA_XImage, 580 background ? ASA_ASImage : ASA_XImage,
510 100, ASIMAGE_QUALITY_DEFAULT); 581 100, ASIMAGE_QUALITY_DEFAULT);
511 } 582 }
583
512 if (background == NULL) 584 if (background == NULL)
513 { 585 {
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) 586 if (h_scale == 0 || v_scale == 0)
522 { 587 {
588 /* if tiling - pixmap has to be sized exactly as the image,
589 but there is no need to make it bigger than the window! */
590 new_pmap_width = min (result->width, target_width);
591 new_pmap_height = min (result->height, target_height);
592
593 /* we also need to tile our image in both directions */
523 ASImage *tmp = tile_asimage (target->asv, result, 594 ASImage *tmp = tile_asimage (target->asv, result,
524 (h_scale > 0) ? 0 : (int)result->width - x, 595 (int)result->width - x,
525 (v_scale > 0) ? 0 : (int)result->height - y, 596 (int)result->height - y,
526 new_pmap_width, 597 new_pmap_width,
527 new_pmap_height, 598 new_pmap_height,
528 TINT_LEAVE_SAME, ASA_XImage, 599 TINT_LEAVE_SAME, ASA_XImage,
529 100, ASIMAGE_QUALITY_DEFAULT); 600 100, ASIMAGE_QUALITY_DEFAULT);
530 if (tmp) 601 if (tmp)
531 { 602 {
532 if (result != original_asim) 603 if (result != original_asim)
533 destroy_asimage (&result); 604 destroy_asimage (&result);
605
534 result = tmp; 606 result = tmp;
535 } 607 }
536 } 608 }
537 } 609 }
538 else 610 else
539 { 611 {
540 /* if blending background and image - pixmap has to be sized same as target window */ 612 /* if blending background and image - pixmap has to be sized same as target window */
541 ASImageLayer *layers = create_image_layers (2); 613 ASImageLayer *layers = create_image_layers (2);
542 ASImage *merged_im = NULL;
543 614
544 layers[0].im = background; 615 layers[0].im = background;
545 layers[0].clip_width = target_width; 616 layers[0].clip_width = target_width;
546 layers[0].clip_height = target_height; 617 layers[0].clip_height = target_height;
547 layers[0].tint = background_tint; 618 layers[0].tint = background_tint;
548 layers[1].im = result; 619 layers[1].im = result;
549 if (w <= 0) 620
621 if (h_scale == 0 || v_scale == 0)
550 { 622 {
551 /* tile horizontally */ 623 /* tile horizontally */
552 while (x > 0) x -= (int)result->width; 624 while (x > 0) x -= (int)result->width;
553 layers[1].dst_x = x; 625 layers[1].dst_x = x;
554 layers[1].clip_width = result->width+target_width; 626 layers[1].clip_width = result->width+target_width;
… …
557 { 629 {
558 /* clip horizontally */ 630 /* clip horizontally */
559 layers[1].dst_x = x; 631 layers[1].dst_x = x;
560 layers[1].clip_width = result->width; 632 layers[1].clip_width = result->width;
561 } 633 }
562 if (h <= 0) 634
635 if (h_scale == 0 || v_scale == 0)
563 { 636 {
564 while (y > 0) y -= (int)result->height; 637 while (y > 0) y -= (int)result->height;
565 layers[1].dst_y = y; 638 layers[1].dst_y = y;
566 layers[1].clip_height = result->height + target_height; 639 layers[1].clip_height = result->height + target_height;
567 } 640 }
568 else 641 else
569 { 642 {
570 layers[1].dst_y = y; 643 layers[1].dst_y = y;
571 layers[1].clip_height = result->height; 644 layers[1].clip_height = result->height;
572 } 645 }
646
573 if (target->rs[Rs_blendtype]) 647 if (target->rs[Rs_blendtype])
574 { 648 {
575 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 649 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
576 if (layers[1].merge_scanlines == NULL) 650 if (layers[1].merge_scanlines == NULL)
577 layers[1].merge_scanlines = alphablend_scanlines; 651 layers[1].merge_scanlines = alphablend_scanlines;
578 } 652 }
653
579 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 654 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
580 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 655 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
656
581 if (tmp) 657 if (tmp)
582 { 658 {
583 if (result != original_asim) 659 if (result != original_asim)
584 destroy_asimage (&result); 660 destroy_asimage (&result);
661
585 result = tmp; 662 result = tmp;
586 } 663 }
664
587 free (layers); 665 free (layers);
588 } 666 }
589 } 667 }
590 TIMING_TEST_PRINT_RESULT (asim); 668 TIMING_TEST_PRINT_RESULT (asim);
591 669
592 if (pixmap) 670 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 671
604 if (result) 672 if (result)
605 { 673 {
606 XGCValues gcv; 674 XGCValues gcv;
607 GC gc; 675 GC gc;
676
677 if (pixmap)
678 {
679 if (pmap_width != new_pmap_width
680 || pmap_height != new_pmap_height
681 || pmap_depth != target->depth)
682 {
683 XFreePixmap (target->dpy, pixmap);
684 pixmap = None;
685 }
686 }
608 687
609 /* create Pixmap */ 688 /* create Pixmap */
610 if (pixmap == None) 689 if (pixmap == None)
611 { 690 {
612 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 691 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
613 pmap_width = new_pmap_width; 692 pmap_width = new_pmap_width;
614 pmap_height = new_pmap_height; 693 pmap_height = new_pmap_height;
615 pmap_depth = target->depth; 694 pmap_depth = target->depth;
616 } 695 }
617 /* fill with background color ( if result's not completely overlapping it)*/ 696 /* fill with background color (if result's not completely overlapping it) */
618 gcv.foreground = target->pix_colors[Color_bg]; 697 gcv.foreground = target->pix_colors[Color_bg];
619 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 698 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
620 699
621 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 700 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
622 int dst_width = result->width, dst_height = result->height; 701 int dst_width = result->width, dst_height = result->height;
623 if (background == NULL) 702 if (background == NULL)
624 { 703 {
625 if (h_scale > 0) 704 if (!(h_scale == 0 || v_scale == 0))
705 {
626 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 706 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); 707 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
708 }
629 709
630 if (dst_x > 0 || dst_y > 0 710 if (dst_x > 0 || dst_y > 0
631 || dst_x + dst_width < new_pmap_width 711 || dst_x + dst_width < new_pmap_width
632 || dst_y + dst_height < new_pmap_height) 712 || dst_y + dst_height < new_pmap_height)
633 {
634 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 713 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
635 }
636 } 714 }
637 715
638 /* put result on pixmap */ 716 /* put result on pixmap */
639 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 717 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); 718 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) 720 if (result != background && result != original_asim)
643 destroy_asimage (&result); 721 destroy_asimage (&result);
644 722
645 XFreeGC (target->dpy, gc); 723 XFreeGC (target->dpy, gc);
646 TIMING_TEST_PRINT_RESULT (asim); 724 TIMING_TEST_PRINT_RESULT (asim);
647 }
648 725
726 ret = true;
727 }
728
729 if (background)
730 destroy_asimage (&background);
731
649 return true; 732 return ret;
650} 733}
651# endif /* HAVE_AFTERIMAGE */ 734# endif /* HAVE_AFTERIMAGE */
735
736# ifdef HAVE_PIXBUF
737bool
738bgPixmap_t::render_image (unsigned long background_flags)
739{
740 if (target == NULL)
741 return false;
742
743 if (!pixbuf)
744 return false;
745
746 // TODO: add alpha blending
747 if (background_flags)
748 return false;
749
750 GdkPixbuf *result;
751
752 int image_width = gdk_pixbuf_get_width (pixbuf);
753 int image_height = gdk_pixbuf_get_height (pixbuf);
754
755 int target_width = target->szHint.width;
756 int target_height = target->szHint.height;
757 int new_pmap_width = target_width;
758 int new_pmap_height = target_height;
759
760 int x = 0;
761 int y = 0;
762 int w = 0;
763 int h = 0;
764
765 get_image_geometry (image_width, image_height, w, h, x, y);
766
767 if (!(flags & rootAlign)
768 && (x >= target_width
769 || y >= target_height
770 || (x + w <= 0)
771 || (y + h <= 0)))
772 return false;
773
774 result = pixbuf;
775
776 if ((w != image_width)
777 || (h != image_height))
778 {
779 result = gdk_pixbuf_scale_simple (pixbuf,
780 w, h,
781 GDK_INTERP_BILINEAR);
782 }
783
784 bool ret = false;
785
786 if (result)
787 {
788 XGCValues gcv;
789 GC gc;
790
791 image_width = gdk_pixbuf_get_width (result);
792 image_height = gdk_pixbuf_get_height (result);
793
794 if (h_scale == 0 || v_scale == 0)
795 {
796 new_pmap_width = min (image_width, target_width);
797 new_pmap_height = min (image_height, target_height);
798 }
799
800 if (pixmap)
801 {
802 if (pmap_width != new_pmap_width
803 || pmap_height != new_pmap_height
804 || pmap_depth != target->depth)
805 {
806 XFreePixmap (target->dpy, pixmap);
807 pixmap = None;
808 }
809 }
810
811 if (pixmap == None)
812 {
813 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
814 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height;
816 pmap_depth = target->depth;
817 }
818
819 gcv.foreground = target->pix_colors[Color_bg];
820 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
821
822 if (h_scale == 0 || v_scale == 0)
823 {
824 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
825 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
826 0, 0,
827 0, 0,
828 image_width, image_height,
829 XLIB_RGB_DITHER_NONE,
830 0, 0);
831
832 gcv.tile = tile;
833 gcv.fill_style = FillTiled;
834 gcv.ts_x_origin = x;
835 gcv.ts_y_origin = y;
836 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
837
838 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
839 XFreePixmap (target->dpy, tile);
840 }
841 else
842 {
843 int src_x, src_y, dst_x, dst_y;
844 int dst_width, dst_height;
845
846 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
847 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
848
849 if (dst_x > 0 || dst_y > 0
850 || dst_x + dst_width < new_pmap_width
851 || dst_y + dst_height < new_pmap_height)
852 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
853
854 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
855 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
856 src_x, src_y,
857 dst_x, dst_y,
858 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE,
860 0, 0);
861 }
862
863 if (result != pixbuf)
864 g_object_unref (result);
865
866 XFreeGC (target->dpy, gc);
867
868 ret = true;
869 }
870
871 return ret;
872}
873# endif /* HAVE_PIXBUF */
652 874
653bool 875bool
654bgPixmap_t::set_file (const char *file) 876bgPixmap_t::set_file (const char *file)
655{ 877{
656 char *f;
657
658 assert (file != NULL); 878 assert (file);
659 879
660 if (*file != '\0') 880 if (*file)
661 { 881 {
882 if (const char *p = strchr (file, ';'))
883 {
884 size_t len = p - file;
885 char *f = rxvt_temp_buf<char> (len + 1);
886 memcpy (f, file, len);
887 f[len] = '\0';
888 file = f;
889 }
890
662# ifdef HAVE_AFTERIMAGE 891# ifdef HAVE_AFTERIMAGE
663 if (target->asimman == NULL) 892 if (!target->asimman)
664 target->asimman = create_generic_imageman (target->rs[Rs_path]); 893 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); 894 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
667 else 895 if (original_asim)
668 { 896 have_image = true;
669 size_t len = f - file; 897 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 898# endif
899
900# ifdef HAVE_PIXBUF
901 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
902 if (pixbuf)
903 have_image = true;
904 return have_image;
905# endif
678 } 906 }
907
679 return false; 908 return false;
680} 909}
681 910
682# endif /* BG_IMAGE_FROM_FILE */ 911# endif /* BG_IMAGE_FROM_FILE */
683 912
… …
688 if (!(flags & isTransparent)) 917 if (!(flags & isTransparent))
689 { 918 {
690 flags |= isTransparent; 919 flags |= isTransparent;
691 return true; 920 return true;
692 } 921 }
922
693 return false; 923 return false;
694} 924}
695 925
696bool 926bool
697bgPixmap_t::set_blur_radius (const char *geom) 927bgPixmap_t::set_blur_radius (const char *geom)
… …
699 int changed = 0; 929 int changed = 0;
700 unsigned int hr, vr; 930 unsigned int hr, vr;
701 int junk; 931 int junk;
702 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 932 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
703 933
704 if (!(geom_flags&WidthValue)) 934 if (!(geom_flags & WidthValue))
705 hr = 1; 935 hr = 1;
706 if (!(geom_flags&HeightValue)) 936 if (!(geom_flags & HeightValue))
707 vr = hr; 937 vr = hr;
708 938
709 if (h_blurRadius != hr) 939 if (h_blurRadius != hr)
710 { 940 {
711 ++changed; 941 ++changed;
… …
721 if (v_blurRadius == 0 && h_blurRadius == 0) 951 if (v_blurRadius == 0 && h_blurRadius == 0)
722 flags &= ~blurNeeded; 952 flags &= ~blurNeeded;
723 else 953 else
724 flags |= blurNeeded; 954 flags |= blurNeeded;
725 955
726 return (changed>0); 956 return (changed > 0);
727} 957}
728 958
729static inline unsigned long 959static inline unsigned long
730compute_tint_shade_flags (rxvt_color *tint, int shade) 960compute_tint_shade_flags (rxvt_color *tint, int shade)
731{ 961{
… …
748 flags |= bgPixmap_t::tintNeeded; 978 flags |= bgPixmap_t::tintNeeded;
749 else if (tint) 979 else if (tint)
750 { 980 {
751 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 981 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
752 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 982 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
753 { 983 {
754 flags |= bgPixmap_t::tintNeeded; 984 flags |= bgPixmap_t::tintNeeded;
755 } 985 }
756 } 986 }
757 987
758 if (flags & bgPixmap_t::tintNeeded) 988 if (flags & bgPixmap_t::tintNeeded)
759 { 989 {
760 if (flags & bgPixmap_t::tintWholesome) 990 if (flags & bgPixmap_t::tintWholesome)
… …
771} 1001}
772 1002
773bool 1003bool
774bgPixmap_t::set_tint (rxvt_color &new_tint) 1004bgPixmap_t::set_tint (rxvt_color &new_tint)
775{ 1005{
776 if (tint != new_tint) 1006 if (!(flags & tintSet) || tint != new_tint)
777 { 1007 {
778 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1008 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
779 tint = new_tint; 1009 tint = new_tint;
780 flags = (flags & ~tintFlags) | new_flags | tintSet; 1010 flags = (flags & ~tintFlags) | new_flags | tintSet;
781 return true; 1011 return true;
782 } 1012 }
1013
783 return false; 1014 return false;
784} 1015}
785 1016
786bool 1017bool
787bgPixmap_t::unset_tint () 1018bgPixmap_t::unset_tint ()
788{ 1019{
789 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1020 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
790 1021
791 if (new_flags != (flags & tintFlags)) 1022 if (new_flags != (flags & tintFlags))
792 { 1023 {
793 flags = (flags&~tintFlags)|new_flags; 1024 flags = (flags & ~tintFlags) | new_flags;
794 return true; 1025 return true;
795 } 1026 }
1027
796 return false; 1028 return false;
797} 1029}
798 1030
799bool 1031bool
800bgPixmap_t::set_shade (const char *shade_str) 1032bgPixmap_t::set_shade (const char *shade_str)
801{ 1033{
802 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1034 int new_shade = (shade_str) ? atoi (shade_str) : 0;
803 1035
804 if (new_shade < 0 && new_shade > -100) 1036 if (new_shade < 0 && new_shade > -100)
805 new_shade = 200 - (100 + new_shade); 1037 new_shade = 200 - (100 + new_shade);
806 else if (new_shade == 100) 1038 else if (new_shade == 100)
807 new_shade = 0; 1039 new_shade = 0;
808 1040
809 if (new_shade != shade) 1041 if (new_shade != shade)
810 { 1042 {
811 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1043 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
812 shade = new_shade; 1044 shade = new_shade;
813 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1045 flags = (flags & (~tintFlags | tintSet)) | new_flags;
814 return true; 1046 return true;
815 } 1047 }
1048
816 return false; 1049 return false;
1050}
1051
1052bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap, Window root, int width, int height)
1054{
1055 Display *dpy = target->dpy;
1056 bool ret = false;
1057
1058 if (flags & tintWholesome)
1059 {
1060 XGCValues gcv;
1061 GC gc;
1062
1063 /* In this case we can tint image server-side getting significant
1064 * performance improvements, as we eliminate XImage transfer
1065 */
1066 gcv.foreground = Pixel (tint);
1067 gcv.function = GXand;
1068 gcv.fill_style = FillSolid;
1069 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1070 if (gc)
1071 {
1072 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1073 ret = true;
1074 XFreeGC (dpy, gc);
1075 }
1076 }
1077 else
1078 {
1079# if XFT
1080 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1081
1082 if (flags & tintSet)
1083 tint.get (c);
1084
1085 if (shade > 0 && shade < 100)
1086 {
1087 c.r = (c.r * shade) / 100;
1088 c.g = (c.g * shade) / 100;
1089 c.b = (c.b * shade) / 100;
1090 }
1091 else if (shade > 100 && shade < 200)
1092 {
1093 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1094 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1095 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1096 }
1097
1098 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1099 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1100 XRenderPictureAttributes pa;
1101
1102 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa);
1103
1104 pa.repeat = True;
1105
1106 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1107 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1108 XFreePixmap (dpy, overlay_pmap);
1109
1110 pa.component_alpha = True;
1111 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1112 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1113 XFreePixmap (dpy, mask_pmap);
1114
1115 if (mask_pic && overlay_pic && back_pic)
1116 {
1117 XRenderColor mask_c;
1118
1119 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1120 mask_c.alpha = 0xffff;
1121 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1122
1123 mask_c.alpha = 0;
1124 mask_c.red = 0xffff - c.r;
1125 mask_c.green = 0xffff - c.g;
1126 mask_c.blue = 0xffff - c.b;
1127 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1128 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1129 ret = true;
1130 }
1131
1132 XRenderFreePicture (dpy, mask_pic);
1133 XRenderFreePicture (dpy, overlay_pic);
1134 XRenderFreePicture (dpy, back_pic);
1135# if DO_TIMING_TEST
1136 XSync (dpy, False);
1137# endif
1138# endif
1139 }
1140
1141 return ret;
817} 1142}
818 1143
819/* make_transparency_pixmap() 1144/* make_transparency_pixmap()
820 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1145 * 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 1146 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
827 unsigned long result = 0; 1152 unsigned long result = 0;
828 1153
829 if (target == NULL) 1154 if (target == NULL)
830 return 0; 1155 return 0;
831 1156
832 /* root dimentions may change from call to call - but Display structure should 1157 /* root dimensions may change from call to call - but Display structure should
833 * be always up-to-date, so let's use it : 1158 * be always up-to-date, so let's use it :
834 */ 1159 */
835 Window root = target->display->root; 1160 Window root = target->display->root;
836 int screen = target->display->screen; 1161 int screen = target->display->screen;
837 Display *dpy = target->dpy; 1162 Display *dpy = target->dpy;
… …
882 1207
883 attr.background_pixmap = ParentRelative; 1208 attr.background_pixmap = ParentRelative;
884 attr.backing_store = Always; 1209 attr.backing_store = Always;
885 attr.event_mask = ExposureMask; 1210 attr.event_mask = ExposureMask;
886 attr.override_redirect = True; 1211 attr.override_redirect = True;
887 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1212 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
888 CopyFromParent, CopyFromParent, CopyFromParent, 1213 CopyFromParent, CopyFromParent, CopyFromParent,
889 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1214 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
890 &attr); 1215 &attr);
891 1216
892 if (src != None) 1217 if (src != None)
… …
896 XGrabServer (dpy); 1221 XGrabServer (dpy);
897 XMapRaised (dpy, src); 1222 XMapRaised (dpy, src);
898 XSync (dpy, False); 1223 XSync (dpy, False);
899 1224
900 /* XSync should get window where it's properly exposed, 1225 /* 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 : */ 1226 * but to be on the safe side - let's check for the actual event to arrive : */
902 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 1227 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
903 ++ev_count; 1228 ++ev_count;
904 1229
905 if (ev_count > 0); 1230 if (ev_count > 0);
906 { 1231 {
… …
910 { 1235 {
911 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 1236 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
912 success = true; 1237 success = true;
913 } 1238 }
914 } 1239 }
1240
915 XDestroyWindow (dpy, src); 1241 XDestroyWindow (dpy, src);
916 XUngrabServer (dpy); 1242 XUngrabServer (dpy);
917 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1243 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
918 } 1244 }
919 1245
920 if (!success) 1246 if (!success)
921 { 1247 {
922 XFreePixmap (dpy, tiled_root_pmap); 1248 XFreePixmap (dpy, tiled_root_pmap);
923 tiled_root_pmap = None; 1249 tiled_root_pmap = None;
924 } 1250 }
925 else 1251 else
926 result |= transpPmapTiled; 1252 result |= transpPmapTiled;
927 } 1253 }
928 else 1254 else
929 { 1255 {
930 /* strightforward pixmap copy */ 1256 /* straightforward pixmap copy */
931 gcv.tile = root_pixmap; 1257 gcv.tile = root_pixmap;
932 gcv.fill_style = FillTiled; 1258 gcv.fill_style = FillTiled;
933 1259
934 while (sx < 0) sx += (int)root_width; 1260 while (sx < 0) sx += (int)root_width;
935 while (sy < 0) sy += (int)root_height; 1261 while (sy < 0) sy += (int)root_height;
… …
950 { 1276 {
951 if (!need_client_side_rendering ()) 1277 if (!need_client_side_rendering ())
952 { 1278 {
953 if ((flags & tintNeeded)) 1279 if ((flags & tintNeeded))
954 { 1280 {
955 if (flags & tintWholesome) 1281 if (tint_pixmap (tiled_root_pmap, root, window_width, window_height))
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; 1282 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 } 1283 }
1053 } /* server side rendering completed */ 1284 } /* server side rendering completed */
1054 1285
1055 if (pixmap) 1286 if (pixmap)
1056 XFreePixmap (dpy, pixmap); 1287 XFreePixmap (dpy, pixmap);
1057 1288
… …
1070} 1301}
1071 1302
1072bool 1303bool
1073bgPixmap_t::set_root_pixmap () 1304bgPixmap_t::set_root_pixmap ()
1074{ 1305{
1075 Pixmap new_root_pixmap = None;
1076
1077 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1306 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1078 if (new_root_pixmap == None) 1307 if (new_root_pixmap == None)
1079 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1308 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1080 1309
1081 if (new_root_pixmap != root_pixmap) 1310 if (new_root_pixmap != root_pixmap)
1082 { 1311 {
1083 root_pixmap = new_root_pixmap; 1312 root_pixmap = new_root_pixmap;
1084 return true; 1313 return true;
1085 } 1314 }
1315
1086 return false; 1316 return false;
1087} 1317}
1088# endif /* ENABLE_TRANSPARENCY */ 1318# endif /* ENABLE_TRANSPARENCY */
1089 1319
1090# ifndef HAVE_AFTERIMAGE 1320# ifndef HAVE_AFTERIMAGE
1091static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1321static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1092# endif 1322# endif
1093
1094 1323
1095bool 1324bool
1096bgPixmap_t::render () 1325bgPixmap_t::render ()
1097{ 1326{
1098 unsigned long background_flags = 0; 1327 unsigned long background_flags = 0;
… …
1100 if (target == NULL) 1329 if (target == NULL)
1101 return false; 1330 return false;
1102 1331
1103 TIMING_TEST_START (tp); 1332 TIMING_TEST_START (tp);
1104 1333
1105 invalidate(); 1334 invalidate ();
1106# ifdef ENABLE_TRANSPARENCY 1335# ifdef ENABLE_TRANSPARENCY
1107 if (flags & isTransparent) 1336 if (flags & isTransparent)
1108 { 1337 {
1109 /* we need to re-generate transparency pixmap in that case ! */ 1338 /* we need to re-generate transparency pixmap in that case ! */
1110 background_flags = make_transparency_pixmap (); 1339 background_flags = make_transparency_pixmap ();
1111 if (background_flags == 0) 1340 if (background_flags == 0)
1112 return false; 1341 return false;
1113 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1342 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1114 && pmap_depth == target->depth) 1343 && pmap_depth == target->depth)
1115 flags = flags & ~isInvalid; 1344 flags = flags & ~isInvalid;
1116 } 1345 }
1117# endif 1346# endif
1118 1347
1348# ifdef BG_IMAGE_FROM_FILE
1349 if (have_image
1350 || (background_flags & transpTransformations) != (flags & transpTransformations))
1351 {
1352 if (render_image (background_flags))
1353 flags = flags & ~isInvalid;
1354 }
1355# endif
1356
1119 XImage *result = NULL; 1357 XImage *result = NULL;
1120# ifdef HAVE_AFTERIMAGE 1358
1121 if (original_asim 1359 if (background_flags && (flags & isInvalid))
1122 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1360 {
1361 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1123 { 1362 }
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 1363
1129# ifdef ENABLE_TRANSPARENCY 1364 if (result)
1365 {
1366# if !defined(HAVE_AFTERIMAGE) && !XFT
1367 /* our own client-side tinting */
1368 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1369 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1130 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1370 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 { 1371 {
1177 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1372 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1178 if (flags & tintSet) 1373 if (flags & tintSet)
1179 tint.get (c); 1374 tint.get (c);
1180 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1375 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1181 } 1376 }
1182 } 1377# endif
1183# endif /* HAVE_AFTERIMAGE */
1184 1378
1185 if (result != NULL)
1186 {
1187 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1379 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1380
1188 if (gc) 1381 if (gc)
1189 { 1382 {
1190 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1383 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1191 { 1384 {
1192 XFreePixmap (target->dpy, pixmap); 1385 XFreePixmap (target->dpy, pixmap);
1193 pixmap = None; 1386 pixmap = None;
1194 } 1387 }
1388
1195 if (pixmap == None) 1389 if (pixmap == None)
1196 { 1390 {
1197 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); 1391 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1198 pmap_width = result->width; 1392 pmap_width = result->width;
1199 pmap_height = result->height; 1393 pmap_height = result->height;
1200 pmap_depth = target->depth; 1394 pmap_depth = target->depth;
1201 } 1395 }
1396
1202 if (pmap_depth != result->depth) 1397 if (pmap_depth != result->depth)
1203 { 1398 {
1204 /* Bad Match error will ensue ! stupid X !!!! */ 1399 /* Bad Match error will ensue ! stupid X !!!! */
1205 if( result->depth == 24 && pmap_depth == 32) 1400 if (result->depth == 24 && pmap_depth == 32)
1206 result->depth = 32; 1401 result->depth = 32;
1207 else if( result->depth == 32 && pmap_depth == 24) 1402 else if (result->depth == 32 && pmap_depth == 24)
1208 result->depth = 24; 1403 result->depth = 24;
1209 else 1404 else
1210 { 1405 {
1211 /* TODO: implement image recoding */ 1406 /* TODO: implement image recoding */
1212 } 1407 }
1213 } 1408 }
1409
1214 if (pmap_depth == result->depth) 1410 if (pmap_depth == result->depth)
1215 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1411 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1412
1216 XFreeGC (target->dpy, gc); 1413 XFreeGC (target->dpy, gc);
1217 flags = flags & ~isInvalid; 1414 flags = flags & ~isInvalid;
1218 } 1415 }
1416
1219 XDestroyImage (result); 1417 XDestroyImage (result);
1220 } 1418 }
1221 1419
1222 if (flags & isInvalid) 1420 if (flags & isInvalid)
1223 { 1421 {
1224 if (pixmap != None) 1422 if (pixmap != None)
… …
1227 pixmap = None; 1425 pixmap = None;
1228 } 1426 }
1229 } 1427 }
1230 1428
1231 apply (); 1429 apply ();
1430
1431 XSync (target->dpy, False);
1432 valid_since = ev::now ();
1232 1433
1233 TIMING_TEST_PRINT_RESULT (tp); 1434 TIMING_TEST_PRINT_RESULT (tp);
1234 1435
1235 return true; 1436 return true;
1236} 1437}
… …
1245# ifdef ENABLE_TRANSPARENCY 1446# ifdef ENABLE_TRANSPARENCY
1246 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1447 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1247# endif 1448# endif
1248 return true; 1449 return true;
1249 } 1450 }
1451
1250 return false; 1452 return false;
1251} 1453}
1252 1454
1253void 1455void
1254bgPixmap_t::apply() 1456bgPixmap_t::apply ()
1255{ 1457{
1256 if (target) 1458 if (target)
1257 { 1459 {
1258 flags &= ~isVtOrigin; 1460 flags &= ~isVtOrigin;
1461
1259 if (pixmap != None) 1462 if (pixmap != None)
1260 { 1463 {
1261 /* set target's background to pixmap */ 1464 /* set target's background to pixmap */
1262# ifdef ENABLE_TRANSPARENCY 1465# ifdef ENABLE_TRANSPARENCY
1263 if (flags & isTransparent) 1466 if (flags & isTransparent)
1264 { 1467 {
1265 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1468 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1266 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1469 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1267# if HAVE_SCROLLBARS 1470
1268 if (target->scrollBar.win) 1471 if (target->scrollBar.win)
1269 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1472 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1270# endif
1271 } 1473 }
1272 else 1474 else
1273# endif 1475# endif
1274 { 1476 {
1275 flags |= isVtOrigin; 1477 flags |= isVtOrigin;
1276 /* force old pixmap dereference in case it was transparent before :*/ 1478 /* force old pixmap dereference in case it was transparent before :*/
1277 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1479 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1278 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1480 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1279 /* do we also need to set scrollbar's background here ? */ 1481 /* do we also need to set scrollbar's background here ? */
1280# if HAVE_SCROLLBARS 1482
1281 if (target->scrollBar.win) 1483 if (target->scrollBar.win)
1282 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1484 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1283# endif
1284 } 1485 }
1285 } 1486 }
1286 else 1487 else
1287 { 1488 {
1288 /* set target background to a pixel */ 1489 /* set target background to a pixel */
1289 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1490 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1290 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1491 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1291 /* do we also need to set scrollbar's background here ? */ 1492 /* do we also need to set scrollbar's background here ? */
1292# if HAVE_SCROLLBARS
1293 if (target->scrollBar.win) 1493 if (target->scrollBar.win)
1294 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1494 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1295# endif
1296 } 1495 }
1496
1297 /* don't want Expose on the parent or vt. It is better to use 1497 /* 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: */ 1498 scr_touch or we get a great deal of flicker otherwise: */
1299 XClearWindow (target->dpy, target->parent[0]); 1499 XClearWindow (target->dpy, target->parent[0]);
1300 1500
1301# if HAVE_SCROLLBARS 1501 if (target->scrollBar.state && target->scrollBar.win)
1302 if (target->scrollBar.win)
1303 { 1502 {
1304 target->scrollBar.setIdle (); 1503 target->scrollBar.state = STATE_IDLE;
1305 target->scrollbar_show (0); 1504 target->scrollBar.show (0);
1306 } 1505 }
1307# endif
1308 1506
1309 target->want_refresh = 1; 1507 target->want_refresh = 1;
1310 flags |= hasChanged; 1508 flags |= hasChanged;
1311 } 1509 }
1312} 1510}
… …
1317/* taken from aterm-0.4.2 */ 1515/* taken from aterm-0.4.2 */
1318 1516
1319typedef uint32_t RUINT32T; 1517typedef uint32_t RUINT32T;
1320 1518
1321static void 1519static void
1322ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1520ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1323{ 1521{
1324 int sh_r, sh_g, sh_b; 1522 int sh_r, sh_g, sh_b;
1325 RUINT32T mask_r, mask_g, mask_b; 1523 RUINT32T mask_r, mask_g, mask_b;
1326 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1524 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1327 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1525 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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