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.78 by sf-exg, Wed Oct 13 10:27:22 2010 UTC

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

Diff Legend

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