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.18 by ayin, Tue Dec 11 17:42:04 2007 UTC vs.
Revision 1.73 by sf-exg, Sat Oct 9 14:58:15 2010 UTC

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

Diff Legend

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