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.27 by ayin, Sun Jan 27 22:48:33 2008 UTC vs.
Revision 1.83 by sf-exg, Thu Oct 14 17:39:42 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C - former xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 9 *
9 * This program is free software; you can redistribute it and/or modify 10 * 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 11 * 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 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
… …
19 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
23 24
25#include <cmath>
24#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
26 28
27#define DO_TIMING_TEST 0 29#define DO_TIMING_TEST 0
28 30
29#if DO_TIMING_TEST 31#if DO_TIMING_TEST
30# include <sys/time.h> 32# include <sys/time.h>
31#define TIMING_TEST_START(id) \ 33#define TIMING_TEST_START(id) \
32 struct timeval timing_test_##id##_stv;\ 34 struct timeval timing_test_##id##_stv; \
33 gettimeofday (&timing_test_##id##_stv, NULL); 35 gettimeofday (&timing_test_##id##_stv, NULL);
34 36
35#define TIMING_TEST_PRINT_RESULT(id) \ 37#define TIMING_TEST_PRINT_RESULT(id) \
36 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\ 38 do { \
39 struct timeval tv; \
40 gettimeofday (&tv, NULL); \
41 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
37 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 42 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) 43 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
44 } while (0)
39 45
40#else 46#else
41#define TIMING_TEST_START(id) do{}while (0) 47#define TIMING_TEST_START(id) do {} while (0)
42#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 48#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
43#endif 49#endif
44 50
45/* 51/*
46 * Pixmap geometry string interpretation : 52 * Pixmap geometry string interpretation :
47 * Each geometry string contains zero or one scale/position 53 * Each geometry string contains zero or one scale/position
48 * adjustment and may optionally be followed by a colon and one or more 54 * adjustment and may optionally be followed by a colon and one or more
49 * colon-delimited pixmap operations. 55 * colon-delimited pixmap operations.
50 * The following table shows the valid geometry strings and their 56 * The following table shows the valid geometry strings and their
51 * affects on the background image : 57 * effects on the background image :
52 * 58 *
53 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 59 * 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. 60 * W and H are percentages of the terminal window size.
55 * X and Y are also percentages; e.g., +50+50 centers 61 * X and Y are also percentages; e.g., +50+50 centers
56 * the image in the window. 62 * the image in the window.
57 * WxH+X Assumes Y == X 63 * WxH+X Assumes Y == X
58 * WxH Assumes Y == X == 50 (centers the image) 64 * WxH Assumes Y == X == 50 (centers the image)
59 * W+X+Y Assumes H == W 65 * W+X+Y Assumes H == W
60 * W+X Assumes H == W and Y == X 66 * W+X Assumes H == W and Y == X
61 * W Assumes H == W and Y == X == 50 67 * W Assumes H == W and Y == X == 50
62 * 68 *
63 * Adjusting position only : 69 * Adjusting position only :
64 * =+X+Y Set position to X% by Y% (absolute). 70 * =+X+Y Set position to X% by Y% (absolute).
65 * =+X Set position to X% by X%. 71 * =+X Set position to X% by X%.
66 * +X+Y Adjust position horizontally X% and vertically Y% 72 * +X+Y Adjust position horizontally X% and vertically Y%
67 * from current position (relative). 73 * from current position (relative).
68 * +X Adjust position horizontally X% and vertically X% 74 * +X Adjust position horizontally X% and vertically X%
69 * from current position. 75 * from current position.
70 * 76 *
71 * Adjusting scale only : 77 * Adjusting scale only :
72 * Wx0 Multiply horizontal scaling factor by W% 78 * Wx0 Multiply horizontal scaling factor by W%
73 * 0xH Multiply vertical scaling factor by H% 79 * 0xH Multiply vertical scaling factor by H%
74 * 0x0 No scaling (show image at normal size). 80 * 0x0 No scaling (show image at normal size).
75 * 81 *
76 * Pixmap Operations : (should be prepended by a colon) 82 * Pixmap Operations : (should be prepended by a colon)
77 * tile Tile image. Scaling/position modifiers above will affect 83 * tile Tile image. Scaling/position modifiers above will affect
78 * the tile size and origin. 84 * the tile size and origin.
79 * propscale When scaling, scale proportionally. That is, maintain the 85 * propscale When scaling, scale proportionally. That is, maintain the
80 * proper aspect ratio for the image. Any portion of the 86 * proper aspect ratio for the image. Any portion of the
81 * background not covered by the image is filled with the 87 * background not covered by the image is filled with the
82 * current background color. 88 * current background color.
83 * hscale Scale horizontally, tile vertically ? 89 * hscale Scale horizontally, tile vertically ?
84 * vscale Tile horizontally, scale vertically ? 90 * vscale Tile horizontally, scale vertically ?
… …
92 // this is basically redundant as bgPixmap_t is only used in 98 // this is basically redundant as bgPixmap_t is only used in
93 // zero_initialised-derived structs 99 // zero_initialised-derived structs
94#ifdef HAVE_AFTERIMAGE 100#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL; 101 original_asim = NULL;
96#endif 102#endif
103#ifdef HAVE_PIXBUF
104 pixbuf = NULL;
105#endif
97#ifdef BG_IMAGE_FROM_FILE 106#ifdef BG_IMAGE_FROM_FILE
107 have_image = false;
98 h_scale = v_scale = 0; 108 h_scale = v_scale = 0;
99 h_align = v_align = 0; 109 h_align = v_align = 0;
110#endif
111#ifdef ENABLE_TRANSPARENCY
112 shade = 100;
100#endif 113#endif
101 flags = 0; 114 flags = 0;
102 pixmap = None; 115 pixmap = None;
103 valid_since = invalid_since = 0; 116 valid_since = invalid_since = 0;
104 target = 0; 117 target = 0;
… …
110#ifdef HAVE_AFTERIMAGE 123#ifdef HAVE_AFTERIMAGE
111 if (original_asim) 124 if (original_asim)
112 safe_asimage_destroy (original_asim); 125 safe_asimage_destroy (original_asim);
113#endif 126#endif
114 127
128#ifdef HAVE_PIXBUF
129 if (pixbuf)
130 g_object_unref (pixbuf);
131#endif
132
115 if (pixmap && target) 133 if (pixmap && target)
116 XFreePixmap (target->dpy, pixmap); 134 XFreePixmap (target->dpy, pixmap);
117} 135}
118 136
119bool 137bool
… …
123 if (flags & isTransparent) 141 if (flags & isTransparent)
124 return true; 142 return true;
125# endif 143# endif
126 144
127# ifdef BG_IMAGE_FROM_FILE 145# ifdef BG_IMAGE_FROM_FILE
128# ifdef HAVE_AFTERIMAGE 146 if (have_image)
129 if (original_asim)
130# endif
131 { 147 {
132 if (h_scale != 0 || v_scale != 0 148 if (flags & sizeSensitive)
133 || h_align != 0 || v_align != 0)
134 return true; 149 return true;
135 } 150 }
136# endif 151# endif
137 152
138 return false; 153 return false;
139} 154}
140 155
141bool 156bool
142bgPixmap_t::window_position_sensitive () 157bgPixmap_t::window_position_sensitive ()
143{ 158{
144# ifdef ENABLE_TRANSPARENCY 159# ifdef ENABLE_TRANSPARENCY
145 if (flags & isTransparent) 160 if (flags & isTransparent)
146 return true; 161 return true;
147# endif 162# endif
148 163
149# ifdef BG_IMAGE_FROM_FILE 164# ifdef BG_IMAGE_FROM_FILE
150# ifdef HAVE_AFTERIMAGE 165 if (have_image)
151 if (original_asim)
152# endif
153 { 166 {
154 if (h_align == rootAlign || v_align == rootAlign) 167 if (flags & rootAlign)
155 return true; 168 return true;
156 } 169 }
157# endif 170# endif
158 171
159 return false; 172 return false;
… …
163{ 176{
164# ifdef HAVE_AFTERIMAGE 177# ifdef HAVE_AFTERIMAGE
165 if (original_asim) 178 if (original_asim)
166 return true; 179 return true;
167# endif 180# endif
168# ifdef ENABLE_TRANSPARENCY
169 if (flags & isTransparent)
170 {
171# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
172 if ((flags & blurNeeded) && !(flags & blurServerSide))
173 return true;
174# endif
175 if ((flags & tintNeeded) && !(flags & tintServerSide))
176 return true;
177 }
178# endif
179 return false; 181 return false;
180} 182}
181 183
182# ifdef BG_IMAGE_FROM_FILE 184# ifdef BG_IMAGE_FROM_FILE
183static inline bool 185static inline bool
… …
199static inline bool 201static inline bool
200check_set_align_value (int geom_flags, int flag, int &align, int new_value) 202check_set_align_value (int geom_flags, int flag, int &align, int new_value)
201{ 203{
202 if (geom_flags & flag) 204 if (geom_flags & flag)
203 { 205 {
204 if (new_value != bgPixmap_t::rootAlign)
205 {
206 if (new_value < -100) 206 if (new_value < -100)
207 new_value = -100; 207 new_value = -100;
208 else if (new_value > 200) 208 else if (new_value > 200)
209 new_value = 200; 209 new_value = 200;
210 }
211 if (new_value != align) 210 if (new_value != align)
212 { 211 {
213 align = new_value; 212 align = new_value;
214 return true; 213 return true;
215 } 214 }
… …
219 218
220static inline int 219static inline int
221make_align_position (int align, int window_size, int image_size) 220make_align_position (int align, int window_size, int image_size)
222{ 221{
223 int diff = window_size - image_size; 222 int diff = window_size - image_size;
224 int smaller = MIN (image_size,window_size); 223 int smaller = min (image_size, window_size);
225 224
226 if (align >= 0 && align <= 50) 225 if (align >= 0 && align <= 100)
227 return diff * align / 100; 226 return diff * align / 100;
228 else if (align > 50 && align <= 100)
229 return window_size - image_size - diff * (100 - align) / 100;
230 else if (align > 100 && align <= 200 ) 227 else if (align > 100 && align <= 200 )
231 return ((align - 100) * smaller / 100) + window_size - smaller; 228 return ((align - 100) * smaller / 100) + window_size - smaller;
232 else if (align > -100 && align < 0) 229 else if (align >= -100 && align < 0)
233 return ((align + 100) * smaller / 100) - image_size; 230 return ((align + 100) * smaller / 100) - image_size;
234 return 0; 231 return 0;
235} 232}
236 233
237static inline int 234static inline int
238make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 235make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
239{ 236{
240 int src_pos = 0; 237 int src_pos = 0;
241 dst_pos = 0; 238 dst_pos = pos;
242 dst_size = size; 239 dst_size = size;
243 if (pos < 0 && size > target_size) 240 if (pos < 0)
244 { 241 {
245 src_pos = -pos; 242 src_pos = -pos;
243 dst_pos = 0;
246 dst_size += pos; 244 dst_size += pos;
247 } 245 }
248 else if (pos > 0)
249 dst_pos = pos;
250 246
251 if (dst_pos + dst_size > target_size) 247 if (dst_pos + dst_size > target_size)
252 dst_size = target_size - dst_pos; 248 dst_size = target_size - dst_pos;
253 return src_pos; 249 return src_pos;
254} 250}
… …
259 int geom_flags = 0, changed = 0; 255 int geom_flags = 0, changed = 0;
260 int x = 0, y = 0; 256 int x = 0, y = 0;
261 unsigned int w = 0, h = 0; 257 unsigned int w = 0, h = 0;
262 unsigned int n; 258 unsigned int n;
263 unsigned long new_flags = (flags & (~geometryFlags)); 259 unsigned long new_flags = (flags & (~geometryFlags));
264 char *p; 260 const char *p;
265# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 261# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
266 262
267 if (geom == NULL) 263 if (geom == NULL)
268 return false; 264 return false;
269 265
… …
379 w = h = noScale; 375 w = h = noScale;
380 geom_flags |= WidthValue|HeightValue; 376 geom_flags |= WidthValue|HeightValue;
381 } 377 }
382 else if (CHECK_GEOM_OPS ("propscale")) 378 else if (CHECK_GEOM_OPS ("propscale"))
383 { 379 {
384 if (w == 0 && h == 0)
385 {
386 w = windowScale;
387 geom_flags |= WidthValue;
388 }
389 new_flags |= propScale; 380 new_flags |= propScale;
390 } 381 }
391 else if (CHECK_GEOM_OPS ("hscale")) 382 else if (CHECK_GEOM_OPS ("hscale"))
392 { 383 {
393 if (w == 0) w = windowScale; 384 if (w == 0) w = windowScale;
… …
415 x = y = centerAlign; 406 x = y = centerAlign;
416 geom_flags |= WidthValue|HeightValue|XValue|YValue; 407 geom_flags |= WidthValue|HeightValue|XValue|YValue;
417 } 408 }
418 else if (CHECK_GEOM_OPS ("root")) 409 else if (CHECK_GEOM_OPS ("root"))
419 { 410 {
411 new_flags |= rootAlign;
420 w = h = noScale; 412 w = h = noScale;
421 x = y = rootAlign;
422 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue;
423 } 414 }
424# undef CHECK_GEOM_OPS 415# undef CHECK_GEOM_OPS
425 416
426 while (*ops != ':' && *ops != '\0') ++ops; 417 while (*ops != ':' && *ops != '\0') ++ops;
427 } /* done parsing ops */ 418 } /* done parsing ops */
… …
437 { 428 {
438 flags = new_flags; 429 flags = new_flags;
439 changed++; 430 changed++;
440 } 431 }
441 432
442//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 433 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
443// flags, h_scale, v_scale, h_align, v_align); 434 // flags, h_scale, v_scale, h_align, v_align);
444 return (changed > 0); 435 return (changed > 0);
436}
437
438void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
440{
441 int target_width = target->szHint.width;
442 int target_height = target->szHint.height;
443
444 if (flags & propScale)
445 {
446 float scale = (float)target_width / image_width;
447 min_it (scale, (float)target_height / image_height);
448 w = image_width * scale + 0.5;
449 h = image_height * scale + 0.5;
450 }
451 else
452 {
453 w = h_scale * target_width / 100;
454 h = v_scale * target_height / 100;
455 }
456
457 if (!w) w = image_width;
458 if (!h) h = image_height;
459
460 if (flags & rootAlign)
461 {
462 target->get_window_origin (x, y);
463 x = -x;
464 y = -y;
465 }
466 else
467 {
468 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h);
470 }
471
472 flags &= ~sizeSensitive;
473 if (h_scale != 0 || v_scale != 0
474 || h_align != 0 || v_align != 0
475 || w > target_width || h > target_height)
476 flags |= sizeSensitive;
445} 477}
446 478
447# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
448bool 480bool
449bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 481bgPixmap_t::render_image (unsigned long background_flags)
450{ 482{
451 if (target == NULL) 483 if (target == NULL)
452 return false; 484 return false;
453 485
486 target->init_asv ();
487
488 ASImage *background = NULL;
489 ARGB32 background_tint = TINT_LEAVE_SAME;
490
491# ifdef ENABLE_TRANSPARENCY
492 if (background_flags)
493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
494
495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
496 {
497 ShadingInfo as_shade;
498 as_shade.shading = shade;
499
500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
501 if (flags & tintSet)
502 tint.get (c);
503 as_shade.tintColor.red = c.r;
504 as_shade.tintColor.green = c.g;
505 as_shade.tintColor.blue = c.b;
506
507 background_tint = shading2tint32 (&as_shade);
508 }
509
510 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
511 {
512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
514 100, ASIMAGE_QUALITY_DEFAULT);
515 if (tmp)
516 {
517 destroy_asimage (&background);
518 background = tmp;
519 }
520 }
521# endif
522
523 ASImage *result = 0;
524
454 int target_width = (int)target->szHint.width; 525 int target_width = target->szHint.width;
455 int target_height = (int)target->szHint.height; 526 int target_height = target->szHint.height;
456 int new_pmap_width = target_width, new_pmap_height = target_height; 527 int new_pmap_width = target_width;
457 ASImage *result = NULL; 528 int new_pmap_height = target_height;
458 529
459 int x = 0; 530 int x = 0;
460 int y = 0; 531 int y = 0;
461 int w = h_scale * target_width / 100; 532 int w = 0;
462 int h = v_scale * target_height / 100; 533 int h = 0;
463 534
464 TIMING_TEST_START (asim); 535 TIMING_TEST_START (asim);
465 536
466 if (original_asim) 537 if (original_asim)
467 { 538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
468 if (h_align == rootAlign || v_align == rootAlign)
469 {
470 target->get_window_origin(x, y);
471 x = -x;
472 y = -y;
473 }
474
475 if (h_align != rootAlign)
476 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
477
478 if (v_align != rootAlign)
479 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
480 }
481 539
482 if (!original_asim 540 if (!original_asim
541 || (!(flags & rootAlign)
483 || x >= target_width 542 && (x >= target_width
484 || y >= target_height 543 || y >= target_height
485 || (w > 0 && x + w <= 0) 544 || (x + w <= 0)
486 || (h > 0 && y + h <= 0)) 545 || (y + h <= 0))))
487 { 546 {
488 if (background) 547 if (background)
489 { 548 {
490 new_pmap_width = background->width; 549 new_pmap_width = background->width;
491 new_pmap_height = background->height; 550 new_pmap_height = background->height;
492 result = background; 551 result = background;
493 552
494 if (background_tint != TINT_LEAVE_SAME) 553 if (background_tint != TINT_LEAVE_SAME)
495 { 554 {
496 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 555 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
497 target_width, target_height, background_tint, 556 target_width, target_height, background_tint,
498 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 557 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
499 if (tmp) 558 if (tmp)
500 result = tmp; 559 result = tmp;
501 } 560 }
… …
505 } 564 }
506 else 565 else
507 { 566 {
508 result = original_asim; 567 result = original_asim;
509 568
510 if ((w > 0 && w != original_asim->width) 569 if ((w != original_asim->width)
511 || (h > 0 && h != original_asim->height)) 570 || (h != original_asim->height))
512 { 571 {
513 result = scale_asimage (target->asv, original_asim, 572 result = scale_asimage (target->asv, original_asim,
514 w > 0 ? w : original_asim->width, 573 w, h,
515 h > 0 ? h : original_asim->height,
516 background ? ASA_ASImage : ASA_XImage, 574 background ? ASA_ASImage : ASA_XImage,
517 100, ASIMAGE_QUALITY_DEFAULT); 575 100, ASIMAGE_QUALITY_DEFAULT);
518 } 576 }
519 577
520 if (background == NULL) 578 if (background == NULL)
521 { 579 {
522 /* if tiling - pixmap has to be sized exactly as the image,
523 but there is no need to make it bigger than the window! */
524 if (h_scale == 0)
525 new_pmap_width = min (result->width, target_width);
526 if (v_scale == 0)
527 new_pmap_height = min (result->height, target_height);
528 /* we also need to tile our image in one or both directions */
529 if (h_scale == 0 || v_scale == 0) 580 if (h_scale == 0 || v_scale == 0)
530 { 581 {
582 /* if tiling - pixmap has to be sized exactly as the image,
583 but there is no need to make it bigger than the window! */
584 new_pmap_width = min (result->width, target_width);
585 new_pmap_height = min (result->height, target_height);
586
587 /* we also need to tile our image in both directions */
531 ASImage *tmp = tile_asimage (target->asv, result, 588 ASImage *tmp = tile_asimage (target->asv, result,
532 (h_scale > 0) ? 0 : (int)result->width - x, 589 (int)result->width - x,
533 (v_scale > 0) ? 0 : (int)result->height - y, 590 (int)result->height - y,
534 new_pmap_width, 591 new_pmap_width,
535 new_pmap_height, 592 new_pmap_height,
536 TINT_LEAVE_SAME, ASA_XImage, 593 TINT_LEAVE_SAME, ASA_XImage,
537 100, ASIMAGE_QUALITY_DEFAULT); 594 100, ASIMAGE_QUALITY_DEFAULT);
538 if (tmp) 595 if (tmp)
539 { 596 {
… …
546 } 603 }
547 else 604 else
548 { 605 {
549 /* if blending background and image - pixmap has to be sized same as target window */ 606 /* if blending background and image - pixmap has to be sized same as target window */
550 ASImageLayer *layers = create_image_layers (2); 607 ASImageLayer *layers = create_image_layers (2);
551 ASImage *merged_im = NULL;
552 608
553 layers[0].im = background; 609 layers[0].im = background;
554 layers[0].clip_width = target_width; 610 layers[0].clip_width = target_width;
555 layers[0].clip_height = target_height; 611 layers[0].clip_height = target_height;
556 layers[0].tint = background_tint; 612 layers[0].tint = background_tint;
557 layers[1].im = result; 613 layers[1].im = result;
558 614
559 if (w <= 0) 615 if (h_scale == 0 || v_scale == 0)
560 { 616 {
561 /* tile horizontally */ 617 /* tile horizontally */
562 while (x > 0) x -= (int)result->width; 618 while (x > 0) x -= (int)result->width;
563 layers[1].dst_x = x; 619 layers[1].dst_x = x;
564 layers[1].clip_width = result->width+target_width; 620 layers[1].clip_width = result->width+target_width;
… …
568 /* clip horizontally */ 624 /* clip horizontally */
569 layers[1].dst_x = x; 625 layers[1].dst_x = x;
570 layers[1].clip_width = result->width; 626 layers[1].clip_width = result->width;
571 } 627 }
572 628
573 if (h <= 0) 629 if (h_scale == 0 || v_scale == 0)
574 { 630 {
575 while (y > 0) y -= (int)result->height; 631 while (y > 0) y -= (int)result->height;
576 layers[1].dst_y = y; 632 layers[1].dst_y = y;
577 layers[1].clip_height = result->height + target_height; 633 layers[1].clip_height = result->height + target_height;
578 } 634 }
… …
603 free (layers); 659 free (layers);
604 } 660 }
605 } 661 }
606 TIMING_TEST_PRINT_RESULT (asim); 662 TIMING_TEST_PRINT_RESULT (asim);
607 663
608 if (pixmap) 664 bool ret = false;
609 {
610 if (result == NULL
611 || pmap_width != new_pmap_width
612 || pmap_height != new_pmap_height
613 || pmap_depth != target->depth)
614 {
615 XFreePixmap (target->dpy, pixmap);
616 pixmap = None;
617 }
618 }
619 665
620 if (result) 666 if (result)
621 { 667 {
622 XGCValues gcv; 668 XGCValues gcv;
623 GC gc; 669 GC gc;
670
671 if (pixmap)
672 {
673 if (pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
676 {
677 XFreePixmap (target->dpy, pixmap);
678 pixmap = None;
679 }
680 }
624 681
625 /* create Pixmap */ 682 /* create Pixmap */
626 if (pixmap == None) 683 if (pixmap == None)
627 { 684 {
628 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 685 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
629 pmap_width = new_pmap_width; 686 pmap_width = new_pmap_width;
630 pmap_height = new_pmap_height; 687 pmap_height = new_pmap_height;
631 pmap_depth = target->depth; 688 pmap_depth = target->depth;
632 } 689 }
633 /* fill with background color ( if result's not completely overlapping it)*/ 690 /* fill with background color (if result's not completely overlapping it) */
634 gcv.foreground = target->pix_colors[Color_bg]; 691 gcv.foreground = target->pix_colors[Color_bg];
635 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 692 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
636 693
637 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 694 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
638 int dst_width = result->width, dst_height = result->height; 695 int dst_width = result->width, dst_height = result->height;
639 if (background == NULL) 696 if (background == NULL)
640 { 697 {
698 if (!(h_scale == 0 || v_scale == 0))
699 {
641 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 700 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
642 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 701 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
702 }
643 703
644 if (dst_x > 0 || dst_y > 0 704 if (dst_x > 0 || dst_y > 0
645 || dst_x + dst_width < new_pmap_width 705 || dst_x + dst_width < new_pmap_width
646 || dst_y + dst_height < new_pmap_height) 706 || dst_y + dst_height < new_pmap_height)
647 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 707 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
… …
654 if (result != background && result != original_asim) 714 if (result != background && result != original_asim)
655 destroy_asimage (&result); 715 destroy_asimage (&result);
656 716
657 XFreeGC (target->dpy, gc); 717 XFreeGC (target->dpy, gc);
658 TIMING_TEST_PRINT_RESULT (asim); 718 TIMING_TEST_PRINT_RESULT (asim);
659 }
660 719
720 ret = true;
721 }
722
723 if (background)
724 destroy_asimage (&background);
725
661 return true; 726 return ret;
662} 727}
663# endif /* HAVE_AFTERIMAGE */ 728# endif /* HAVE_AFTERIMAGE */
729
730# ifdef HAVE_PIXBUF
731bool
732bgPixmap_t::render_image (unsigned long background_flags)
733{
734 if (target == NULL)
735 return false;
736
737 if (!pixbuf)
738 return false;
739
740#if !XFT
741 if (background_flags)
742 return false;
743#endif
744
745 GdkPixbuf *result;
746
747 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf);
749
750 int target_width = target->szHint.width;
751 int target_height = target->szHint.height;
752 int new_pmap_width = target_width;
753 int new_pmap_height = target_height;
754
755 int x = 0;
756 int y = 0;
757 int w = 0;
758 int h = 0;
759
760 get_image_geometry (image_width, image_height, w, h, x, y);
761
762 if (!(flags & rootAlign)
763 && (x >= target_width
764 || y >= target_height
765 || (x + w <= 0)
766 || (y + h <= 0)))
767 return false;
768
769 result = pixbuf;
770
771 if ((w != image_width)
772 || (h != image_height))
773 {
774 result = gdk_pixbuf_scale_simple (pixbuf,
775 w, h,
776 GDK_INTERP_BILINEAR);
777 }
778
779 bool ret = false;
780
781 if (result)
782 {
783 XGCValues gcv;
784 GC gc;
785 Pixmap root_pmap;
786
787 image_width = gdk_pixbuf_get_width (result);
788 image_height = gdk_pixbuf_get_height (result);
789
790 if (background_flags)
791 {
792 root_pmap = pixmap;
793 pixmap = None;
794 }
795 else
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
804 if (pixmap)
805 {
806 if (pmap_width != new_pmap_width
807 || pmap_height != new_pmap_height
808 || pmap_depth != target->depth)
809 {
810 XFreePixmap (target->dpy, pixmap);
811 pixmap = None;
812 }
813 }
814
815 if (pixmap == None)
816 {
817 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
818 pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height;
820 pmap_depth = target->depth;
821 }
822
823 gcv.foreground = target->pix_colors[Color_bg];
824 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
825
826 if (h_scale == 0 || v_scale == 0)
827 {
828 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
829 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
830 0, 0,
831 0, 0,
832 image_width, image_height,
833 XLIB_RGB_DITHER_NONE,
834 0, 0);
835
836 gcv.tile = tile;
837 gcv.fill_style = FillTiled;
838 gcv.ts_x_origin = x;
839 gcv.ts_y_origin = y;
840 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
841
842 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
843 XFreePixmap (target->dpy, tile);
844 }
845 else
846 {
847 int src_x, src_y, dst_x, dst_y;
848 int dst_width, dst_height;
849
850 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
851 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
852
853 if (dst_x > 0 || dst_y > 0
854 || dst_x + dst_width < new_pmap_width
855 || dst_y + dst_height < new_pmap_height)
856 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
857
858 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
859 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
860 src_x, src_y,
861 dst_x, dst_y,
862 dst_width, dst_height,
863 XLIB_RGB_DITHER_NONE,
864 0, 0);
865 }
866
867#if XFT
868 if (background_flags)
869 {
870 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa;
872
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen));
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
878
879 pa.repeat = True;
880 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
881 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
882 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
883 XFreePixmap (dpy, mask_pmap);
884
885 if (src && dst && mask)
886 {
887 XRenderColor mask_c;
888
889 mask_c.alpha = 0x8000;
890 mask_c.red = 0;
891 mask_c.green = 0;
892 mask_c.blue = 0;
893 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
894 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
895 }
896
897 XRenderFreePicture (dpy, src);
898 XRenderFreePicture (dpy, dst);
899 XRenderFreePicture (dpy, mask);
900
901 XFreePixmap (dpy, root_pmap);
902 }
903#endif
904
905 if (result != pixbuf)
906 g_object_unref (result);
907
908 XFreeGC (target->dpy, gc);
909
910 ret = true;
911 }
912
913 return ret;
914}
915# endif /* HAVE_PIXBUF */
664 916
665bool 917bool
666bgPixmap_t::set_file (const char *file) 918bgPixmap_t::set_file (const char *file)
667{ 919{
668 char *f;
669
670 assert (file); 920 assert (file);
671 921
672 if (*file) 922 if (*file)
673 { 923 {
674# ifdef HAVE_AFTERIMAGE 924 if (const char *p = strchr (file, ';'))
675 if (target->asimman == NULL)
676 target->asimman = create_generic_imageman (target->rs[Rs_path]);
677
678 if ((f = strchr (file, ';')) == NULL)
679 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
680 else
681 { 925 {
682 size_t len = f - file; 926 size_t len = p - file;
683 f = (char *)malloc (len + 1); 927 char *f = rxvt_temp_buf<char> (len + 1);
684 memcpy (f, file, len); 928 memcpy (f, file, len);
685 f[len] = '\0'; 929 f[len] = '\0';
930 file = f;
931 }
932
933# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]);
686 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
687 free (f); 937 if (image)
688 } 938 {
939 if (original_asim)
940 safe_asimage_destroy (original_asim);
941 original_asim = image;
942 have_image = true;
943 return true;
944 }
945# endif
689 946
690 return original_asim; 947# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image)
950 {
951 if (pixbuf)
952 g_object_unref (pixbuf);
953 pixbuf = image;
954 have_image = true;
955 return true;
956 }
691# endif 957# endif
692 } 958 }
693 959
694 return false; 960 return false;
695} 961}
… …
715 int changed = 0; 981 int changed = 0;
716 unsigned int hr, vr; 982 unsigned int hr, vr;
717 int junk; 983 int junk;
718 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
719 985
720 if (!(geom_flags&WidthValue)) 986 if (!(geom_flags & WidthValue))
721 hr = 1; 987 hr = 1;
722 if (!(geom_flags&HeightValue)) 988 if (!(geom_flags & HeightValue))
723 vr = hr; 989 vr = hr;
990
991 min_it (hr, 128);
992 min_it (vr, 128);
724 993
725 if (h_blurRadius != hr) 994 if (h_blurRadius != hr)
726 { 995 {
727 ++changed; 996 ++changed;
728 h_blurRadius = hr; 997 h_blurRadius = hr;
… …
737 if (v_blurRadius == 0 && h_blurRadius == 0) 1006 if (v_blurRadius == 0 && h_blurRadius == 0)
738 flags &= ~blurNeeded; 1007 flags &= ~blurNeeded;
739 else 1008 else
740 flags |= blurNeeded; 1009 flags |= blurNeeded;
741 1010
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1022
742 return (changed>0); 1023 return (changed > 0);
743} 1024}
744 1025
745static inline unsigned long 1026static inline unsigned long
746compute_tint_shade_flags (rxvt_color *tint, int shade) 1027compute_tint_shade_flags (rxvt_color *tint, int shade)
747{ 1028{
748 unsigned long flags = 0; 1029 unsigned long flags = 0;
749 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1030 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
750 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 1031 bool has_shade = shade != 100;
751 1032
752 if (tint) 1033 if (tint)
753 { 1034 {
754 tint->get (c); 1035 tint->get (c);
755# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
764 flags |= bgPixmap_t::tintNeeded; 1045 flags |= bgPixmap_t::tintNeeded;
765 else if (tint) 1046 else if (tint)
766 { 1047 {
767 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 1048 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
768 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 1049 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
769 { 1050 {
770 flags |= bgPixmap_t::tintNeeded; 1051 flags |= bgPixmap_t::tintNeeded;
771 } 1052 }
772 } 1053 }
773 1054
774 if (flags & bgPixmap_t::tintNeeded) 1055 if (flags & bgPixmap_t::tintNeeded)
775 { 1056 {
776 if (flags & bgPixmap_t::tintWholesome) 1057 if (flags & bgPixmap_t::tintWholesome)
… …
787} 1068}
788 1069
789bool 1070bool
790bgPixmap_t::set_tint (rxvt_color &new_tint) 1071bgPixmap_t::set_tint (rxvt_color &new_tint)
791{ 1072{
792 if (tint != new_tint) 1073 if (!(flags & tintSet) || tint != new_tint)
793 { 1074 {
794 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1075 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
795 tint = new_tint; 1076 tint = new_tint;
796 flags = (flags & ~tintFlags) | new_flags | tintSet; 1077 flags = (flags & ~tintFlags) | new_flags | tintSet;
797 return true; 1078 return true;
… …
805{ 1086{
806 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1087 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
807 1088
808 if (new_flags != (flags & tintFlags)) 1089 if (new_flags != (flags & tintFlags))
809 { 1090 {
810 flags = (flags&~tintFlags)|new_flags; 1091 flags = (flags & ~tintFlags) | new_flags;
811 return true; 1092 return true;
812 } 1093 }
813 1094
814 return false; 1095 return false;
815} 1096}
816 1097
817bool 1098bool
818bgPixmap_t::set_shade (const char *shade_str) 1099bgPixmap_t::set_shade (const char *shade_str)
819{ 1100{
820 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1101 int new_shade = (shade_str) ? atoi (shade_str) : 100;
821 1102
822 if (new_shade < 0 && new_shade > -100) 1103 clamp_it (new_shade, -100, 200);
1104 if (new_shade < 0)
823 new_shade = 200 - (100 + new_shade); 1105 new_shade = 200 - (100 + new_shade);
824 else if (new_shade == 100)
825 new_shade = 0;
826 1106
827 if (new_shade != shade) 1107 if (new_shade != shade)
828 { 1108 {
829 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1109 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
830 shade = new_shade; 1110 shade = new_shade;
831 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1111 flags = (flags & (~tintFlags | tintSet)) | new_flags;
832 return true; 1112 return true;
833 } 1113 }
834 1114
835 return false; 1115 return false;
1116}
1117
1118static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{
1121 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0;
1124
1125 for (int i = 0; i < width; i++)
1126 {
1127 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i];
1130 }
1131
1132 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1);
1134
1135 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137}
1138
1139bool
1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1141{
1142 bool ret = false;
1143#if XFT
1144 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1145 double *kernel = (double *)malloc (size * sizeof (double));
1146 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1147
1148 Display *dpy = target->dpy;
1149 XRenderPictureAttributes pa;
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual);
1151
1152 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1153 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154
1155 if (kernel && params && src && dst)
1156 {
1157 if (h_blurRadius)
1158 {
1159 size = h_blurRadius * 2 + 1;
1160 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1161
1162 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1163 XRenderComposite (dpy,
1164 PictOpSrc,
1165 src,
1166 None,
1167 dst,
1168 0, 0,
1169 0, 0,
1170 0, 0,
1171 width, height);
1172 }
1173
1174 if (v_blurRadius)
1175 {
1176 size = v_blurRadius * 2 + 1;
1177 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1178 swap (params[0], params[1]);
1179
1180 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1181 XRenderComposite (dpy,
1182 PictOpSrc,
1183 src,
1184 None,
1185 dst,
1186 0, 0,
1187 0, 0,
1188 0, 0,
1189 width, height);
1190 }
1191
1192 ret = true;
1193 }
1194
1195 free (kernel);
1196 free (params);
1197 XRenderFreePicture (dpy, src);
1198 XRenderFreePicture (dpy, dst);
1199#endif
1200 return ret;
1201}
1202
1203bool
1204bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1205{
1206 Display *dpy = target->dpy;
1207 bool ret = false;
1208
1209 if (flags & tintWholesome)
1210 {
1211 XGCValues gcv;
1212 GC gc;
1213
1214 /* In this case we can tint image server-side getting significant
1215 * performance improvements, as we eliminate XImage transfer
1216 */
1217 gcv.foreground = Pixel (tint);
1218 gcv.function = GXand;
1219 gcv.fill_style = FillSolid;
1220 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1221 if (gc)
1222 {
1223 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1224 ret = true;
1225 XFreeGC (dpy, gc);
1226 }
1227 }
1228 else
1229 {
1230# if XFT
1231 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1232
1233 if (flags & tintSet)
1234 tint.get (c);
1235
1236 if (shade <= 100)
1237 {
1238 c.r = (c.r * shade) / 100;
1239 c.g = (c.g * shade) / 100;
1240 c.b = (c.b * shade) / 100;
1241 }
1242 else
1243 {
1244 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1245 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1246 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1247 }
1248
1249 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1250 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1251 XRenderPictureAttributes pa;
1252
1253 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1254
1255 pa.repeat = True;
1256
1257 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1258 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1259 XFreePixmap (dpy, overlay_pmap);
1260
1261 pa.component_alpha = True;
1262 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1263 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1264 XFreePixmap (dpy, mask_pmap);
1265
1266 if (mask_pic && overlay_pic && back_pic)
1267 {
1268 XRenderColor mask_c;
1269
1270 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1271 mask_c.alpha = 0xffff;
1272 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1273
1274 mask_c.alpha = 0;
1275 mask_c.red = 0xffff - c.r;
1276 mask_c.green = 0xffff - c.g;
1277 mask_c.blue = 0xffff - c.b;
1278 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1279 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1280 ret = true;
1281 }
1282
1283 XRenderFreePicture (dpy, mask_pic);
1284 XRenderFreePicture (dpy, overlay_pic);
1285 XRenderFreePicture (dpy, back_pic);
1286# if DO_TIMING_TEST
1287 XSync (dpy, False);
1288# endif
1289# endif
1290 }
1291
1292 return ret;
836} 1293}
837 1294
838/* make_transparency_pixmap() 1295/* make_transparency_pixmap()
839 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1296 * Builds a pixmap sized the same as terminal window, with depth same as the root window
840 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1297 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
846 unsigned long result = 0; 1303 unsigned long result = 0;
847 1304
848 if (target == NULL) 1305 if (target == NULL)
849 return 0; 1306 return 0;
850 1307
851 /* root dimentions may change from call to call - but Display structure should 1308 /* root dimensions may change from call to call - but Display structure should
852 * be always up-to-date, so let's use it : 1309 * be always up-to-date, so let's use it :
853 */ 1310 */
854 Window root = target->display->root; 1311 Window root = target->display->root;
855 int screen = target->display->screen; 1312 int screen = target->display->screen;
856 Display *dpy = target->dpy; 1313 Display *dpy = target->dpy;
… …
859 unsigned int root_pmap_width, root_pmap_height; 1316 unsigned int root_pmap_width, root_pmap_height;
860 int window_width = target->szHint.width; 1317 int window_width = target->szHint.width;
861 int window_height = target->szHint.height; 1318 int window_height = target->szHint.height;
862 int sx, sy; 1319 int sx, sy;
863 XGCValues gcv; 1320 XGCValues gcv;
1321 GC gc;
864 1322
865 TIMING_TEST_START (tp); 1323 TIMING_TEST_START (tp);
866 target->get_window_origin (sx, sy); 1324 target->get_window_origin (sx, sy);
867 1325
868 /* check if we are outside of the visible part of the virtual screen : */ 1326 /* check if we are outside of the visible part of the virtual screen : */
… …
870 || sx >= root_width || sy >= root_height) 1328 || sx >= root_width || sy >= root_height)
871 return 0; 1329 return 0;
872 1330
873 if (root_pixmap != None) 1331 if (root_pixmap != None)
874 { 1332 {
875 /* we want to validate the pixmap and get it's size at the same time : */ 1333 /* we want to validate the pixmap and get its size at the same time : */
876 int junk; 1334 int junk;
877 unsigned int ujunk; 1335 unsigned int ujunk;
878 /* root pixmap may be bad - allow a error */ 1336 /* root pixmap may be bad - allow a error */
879 target->allowedxerror = -1; 1337 target->allowedxerror = -1;
880 1338
… …
882 root_pixmap = None; 1340 root_pixmap = None;
883 1341
884 target->allowedxerror = 0; 1342 target->allowedxerror = 0;
885 } 1343 }
886 1344
1345 if (root_pixmap == None)
1346 return 0;
1347
887 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1348 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
888 GC gc = NULL;
889 1349
890 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1350 if (tiled_root_pmap == None) /* something really bad happened - abort */
891 return 0; 1351 return 0;
892 1352
893 if (root_pixmap == None)
894 {
895 /* use tricks to obtain the root background image :*/
896 /* we want to create Overrideredirect window overlapping out window
897 with background type of Parent Relative and then grab it */
898 XSetWindowAttributes attr;
899 Window src;
900 bool success = false;
901
902 attr.background_pixmap = ParentRelative;
903 attr.backing_store = Always;
904 attr.event_mask = ExposureMask;
905 attr.override_redirect = True;
906 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
907 CopyFromParent, CopyFromParent, CopyFromParent,
908 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
909 &attr);
910
911 if (src != None)
912 {
913 XEvent event;
914 int ev_count = 0;
915 XGrabServer (dpy);
916 XMapRaised (dpy, src);
917 XSync (dpy, False);
918
919 /* XSync should get window where it's properly exposed,
920 * but to be on the safe side - let's check for the actual event to arrive : */
921 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
922 ++ev_count;
923
924 if (ev_count > 0);
925 {
926 /* hooray! - we can grab the image! */
927 gc = XCreateGC (dpy, root, 0, NULL);
928 if (gc)
929 {
930 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
931 success = true;
932 }
933 }
934
935 XDestroyWindow (dpy, src);
936 XUngrabServer (dpy);
937 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
938 }
939
940 if (!success)
941 {
942 XFreePixmap (dpy, tiled_root_pmap);
943 tiled_root_pmap = None;
944 }
945 else
946 result |= transpPmapTiled;
947 }
948 else
949 {
950 /* strightforward pixmap copy */ 1353 /* straightforward pixmap copy */
951 gcv.tile = root_pixmap; 1354 gcv.tile = root_pixmap;
952 gcv.fill_style = FillTiled; 1355 gcv.fill_style = FillTiled;
953 1356
954 while (sx < 0) sx += (int)root_width; 1357 while (sx < 0) sx += (int)root_width;
955 while (sy < 0) sy += (int)root_height; 1358 while (sy < 0) sy += (int)root_height;
956 1359
957 gcv.ts_x_origin = -sx; 1360 gcv.ts_x_origin = -sx;
958 gcv.ts_y_origin = -sy; 1361 gcv.ts_y_origin = -sy;
959 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1362 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
960 1363
961 if (gc) 1364 if (gc)
962 { 1365 {
963 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1366 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
964 result |= transpPmapTiled; 1367 result |= transpPmapTiled;
965 } 1368 XFreeGC (dpy, gc);
966 } 1369 }
967 TIMING_TEST_PRINT_RESULT (tp); 1370 TIMING_TEST_PRINT_RESULT (tp);
968 1371
969 if (tiled_root_pmap != None) 1372 if (tiled_root_pmap != None)
970 { 1373 {
971 if (!need_client_side_rendering ()) 1374 if (!need_client_side_rendering ())
972 { 1375 {
973 if ((flags & tintNeeded)) 1376 if (flags & (blurNeeded | blurServerSide))
974 {
975 if (flags & tintWholesome)
976 { 1377 {
977 /* In this case we can tint image server-side getting significant 1378 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
978 * performance improvements, as we eliminate XImage transfer
979 */
980 gcv.foreground = Pixel (tint);
981 gcv.function = GXand;
982 gcv.fill_style = FillSolid;
983 if (gc)
984 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
985 else
986 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
987 if (gc)
988 {
989 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
990 result |= transpPmapTinted; 1379 result |= transpPmapBlurred;
991 }
992 }
993 else
994 {
995# if XFT
996 Picture back_pic = 0;
997 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
998
999 if (flags & tintSet)
1000 tint.get (c);
1001
1002 if (shade > 0 && shade < 100)
1003 {
1004 c.r = (c.r * shade) / 100;
1005 c.g = (c.g * shade) / 100;
1006 c.b = (c.b * shade) / 100;
1007 }
1008 else if (shade > 100 && shade < 200)
1009 {
1010 c.r = (c.r * (200 - shade)) / 100;
1011 c.g = (c.g * (200 - shade)) / 100;
1012 c.b = (c.b * (200 - shade)) / 100;
1013 }
1014
1015 XRenderPictFormat pf;
1016 pf.type = PictTypeDirect;
1017 pf.depth = 32;
1018 pf.direct.redMask = 0xff;
1019 pf.direct.greenMask = 0xff;
1020 pf.direct.blueMask = 0xff;
1021 pf.direct.alphaMask = 0xff;
1022
1023 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1024 (PictFormatType|
1025 PictFormatDepth|
1026 PictFormatRedMask|
1027 PictFormatGreenMask|
1028 PictFormatBlueMask|
1029 PictFormatAlphaMask),
1030 &pf,
1031 0);
1032 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1033 XRenderPictureAttributes pa ;
1034
1035 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1036
1037 pa.repeat = True;
1038
1039 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1040 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1041 XFreePixmap (dpy, overlay_pmap);
1042
1043 pa.component_alpha = True;
1044 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1045 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1046 XFreePixmap (dpy, mask_pmap);
1047
1048 if (mask_pic && overlay_pic && back_pic)
1049 {
1050 XRenderColor mask_c;
1051
1052 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1053 mask_c.alpha = 0xffff;
1054 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1055
1056 mask_c.alpha = 0;
1057 mask_c.red = 0xffff - c.r;
1058 mask_c.green = 0xffff - c.g;
1059 mask_c.blue = 0xffff - c.b;
1060 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1061 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1062 result |= transpPmapTinted;
1063 }
1064
1065 XRenderFreePicture (dpy, mask_pic);
1066 XRenderFreePicture (dpy, overlay_pic);
1067 XRenderFreePicture (dpy, back_pic);
1068# if DO_TIMING_TEST
1069 XSync (dpy, False);
1070# endif
1071# endif
1072 }
1073 } 1380 }
1381 if (flags & (tintNeeded | tintServerSide))
1382 {
1383 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
1384 result |= transpPmapTinted;
1385 }
1074 } /* server side rendering completed */ 1386 } /* server side rendering completed */
1075 1387
1076 if (pixmap) 1388 if (pixmap)
1077 XFreePixmap (dpy, pixmap); 1389 XFreePixmap (dpy, pixmap);
1078 1390
… …
1080 pmap_width = window_width; 1392 pmap_width = window_width;
1081 pmap_height = window_height; 1393 pmap_height = window_height;
1082 pmap_depth = root_depth; 1394 pmap_depth = root_depth;
1083 } 1395 }
1084 1396
1085 if (gc)
1086 XFreeGC (dpy, gc);
1087
1088 TIMING_TEST_PRINT_RESULT (tp); 1397 TIMING_TEST_PRINT_RESULT (tp);
1089 1398
1090 return result; 1399 return result;
1091} 1400}
1092 1401
… …
1106 return false; 1415 return false;
1107} 1416}
1108# endif /* ENABLE_TRANSPARENCY */ 1417# endif /* ENABLE_TRANSPARENCY */
1109 1418
1110# ifndef HAVE_AFTERIMAGE 1419# ifndef HAVE_AFTERIMAGE
1111static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1420static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1112# endif 1421# endif
1113 1422
1114bool 1423bool
1115bgPixmap_t::render () 1424bgPixmap_t::render ()
1116{ 1425{
… …
1119 if (target == NULL) 1428 if (target == NULL)
1120 return false; 1429 return false;
1121 1430
1122 TIMING_TEST_START (tp); 1431 TIMING_TEST_START (tp);
1123 1432
1124 invalidate(); 1433 invalidate ();
1125# ifdef ENABLE_TRANSPARENCY 1434# ifdef ENABLE_TRANSPARENCY
1126 if (flags & isTransparent) 1435 if (flags & isTransparent)
1127 { 1436 {
1128 /* we need to re-generate transparency pixmap in that case ! */ 1437 /* we need to re-generate transparency pixmap in that case ! */
1129 background_flags = make_transparency_pixmap (); 1438 background_flags = make_transparency_pixmap ();
1130 if (background_flags == 0) 1439 if (background_flags == 0)
1131 return false; 1440 return false;
1132 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1441 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1133 && pmap_depth == target->depth) 1442 && pmap_depth == target->depth)
1134 flags = flags & ~isInvalid; 1443 flags = flags & ~isInvalid;
1135 } 1444 }
1136# endif 1445# endif
1137 1446
1447# ifdef BG_IMAGE_FROM_FILE
1448 if (have_image
1449 || (background_flags & transpTransformations) != (flags & transpTransformations))
1450 {
1451 if (render_image (background_flags))
1452 flags = flags & ~isInvalid;
1453 }
1454# endif
1455
1138 XImage *result = NULL; 1456 XImage *result = NULL;
1139# ifdef HAVE_AFTERIMAGE 1457
1140 if (original_asim 1458 if (background_flags && (flags & isInvalid))
1141 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1459 {
1460 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1142 { 1461 }
1143 ASImage *background = NULL;
1144 ARGB32 as_tint = TINT_LEAVE_SAME;
1145 if (background_flags)
1146 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1147 1462
1148# ifdef ENABLE_TRANSPARENCY 1463 if (result)
1464 {
1465# if !defined(HAVE_AFTERIMAGE) && !XFT
1466 /* our own client-side tinting */
1467 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1468 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1149 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1469 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1150 {
1151 ShadingInfo as_shade;
1152 as_shade.shading = (shade == 0) ? 100 : shade;
1153
1154 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1155 if (flags & tintSet)
1156 tint.get (c);
1157 as_shade.tintColor.red = c.r;
1158 as_shade.tintColor.green = c.g;
1159 as_shade.tintColor.blue = c.b;
1160
1161 as_tint = shading2tint32 (&as_shade);
1162 }
1163 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1164 {
1165 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1166 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1167 100, ASIMAGE_QUALITY_DEFAULT);
1168 if (tmp)
1169 {
1170 destroy_asimage (&background);
1171 background = tmp;
1172 }
1173 }
1174# endif
1175
1176 if (render_asim (background, as_tint))
1177 flags = flags & ~isInvalid;
1178 if (background)
1179 destroy_asimage (&background);
1180 }
1181 else if (background_flags && pmap_depth != target->depth)
1182 {
1183 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1184 }
1185
1186# elif !XFT /* our own client-side tinting */
1187
1188 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1189 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1190
1191 if (background_flags && (flags & isInvalid))
1192 {
1193 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1194 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1195 { 1470 {
1196 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1471 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1197 if (flags & tintSet) 1472 if (flags & tintSet)
1198 tint.get (c); 1473 tint.get (c);
1199 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1474 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1200 } 1475 }
1201 } 1476# endif
1202# endif /* HAVE_AFTERIMAGE */
1203 1477
1204 if (result)
1205 {
1206 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1478 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1207 1479
1208 if (gc) 1480 if (gc)
1209 { 1481 {
1210 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1482 if (/*pmap_depth != target->depth &&*/ pixmap != None)
… …
1239 1511
1240 XFreeGC (target->dpy, gc); 1512 XFreeGC (target->dpy, gc);
1241 flags = flags & ~isInvalid; 1513 flags = flags & ~isInvalid;
1242 } 1514 }
1243 1515
1244 XDestroyImage (result); 1516 XDestroyImage (result);
1245 } 1517 }
1246 1518
1247 if (flags & isInvalid) 1519 if (flags & isInvalid)
1248 { 1520 {
1249 if (pixmap != None) 1521 if (pixmap != None)
… …
1273# ifdef ENABLE_TRANSPARENCY 1545# ifdef ENABLE_TRANSPARENCY
1274 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1546 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1275# endif 1547# endif
1276 return true; 1548 return true;
1277 } 1549 }
1550
1278 return false; 1551 return false;
1279} 1552}
1280 1553
1281void 1554void
1282bgPixmap_t::apply () 1555bgPixmap_t::apply ()
1283{ 1556{
1284 if (target) 1557 if (target)
1285 { 1558 {
1286 flags &= ~isVtOrigin; 1559 flags &= ~isVtOrigin;
1560
1287 if (pixmap != None) 1561 if (pixmap != None)
1288 { 1562 {
1289 /* set target's background to pixmap */ 1563 /* set target's background to pixmap */
1290# ifdef ENABLE_TRANSPARENCY 1564# ifdef ENABLE_TRANSPARENCY
1291 if (flags & isTransparent) 1565 if (flags & isTransparent)
1292 { 1566 {
1293 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1567 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1294 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1568 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1569
1295 if (target->scrollBar.win) 1570 if (target->scrollBar.win)
1296 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1571 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1297 } 1572 }
1298 else 1573 else
1299# endif 1574# endif
… …
1301 flags |= isVtOrigin; 1576 flags |= isVtOrigin;
1302 /* force old pixmap dereference in case it was transparent before :*/ 1577 /* force old pixmap dereference in case it was transparent before :*/
1303 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1578 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1304 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1579 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1305 /* do we also need to set scrollbar's background here ? */ 1580 /* do we also need to set scrollbar's background here ? */
1581
1306 if (target->scrollBar.win) 1582 if (target->scrollBar.win)
1307 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1583 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1308 } 1584 }
1309 } 1585 }
1310 else 1586 else
1311 { 1587 {
1312 /* set target background to a pixel */ 1588 /* set target background to a pixel */
1313 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1589 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1314 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1590 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1315 /* do we also need to set scrollbar's background here ? */ 1591 /* do we also need to set scrollbar's background here ? */
1316 if (target->scrollBar.win) 1592 if (target->scrollBar.win)
1317 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1593 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1318 } 1594 }
1595
1319 /* don't want Expose on the parent or vt. It is better to use 1596 /* don't want Expose on the parent or vt. It is better to use
1320 scr_touch or we get a great deal of flicker otherwise: */ 1597 scr_touch or we get a great deal of flicker otherwise: */
1321 XClearWindow (target->dpy, target->parent[0]); 1598 XClearWindow (target->dpy, target->parent[0]);
1322 1599
1323 if (target->scrollBar.win) 1600 if (target->scrollBar.state && target->scrollBar.win)
1324 { 1601 {
1325 target->scrollBar.setIdle (); 1602 target->scrollBar.state = STATE_IDLE;
1326 target->scrollbar_show (0); 1603 target->scrollBar.show (0);
1327 } 1604 }
1328 1605
1329 target->want_refresh = 1; 1606 target->want_refresh = 1;
1330 flags |= hasChanged; 1607 flags |= hasChanged;
1331 } 1608 }
… …
1337/* taken from aterm-0.4.2 */ 1614/* taken from aterm-0.4.2 */
1338 1615
1339typedef uint32_t RUINT32T; 1616typedef uint32_t RUINT32T;
1340 1617
1341static void 1618static void
1342ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1619ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1343{ 1620{
1344 int sh_r, sh_g, sh_b; 1621 int sh_r, sh_g, sh_b;
1345 RUINT32T mask_r, mask_g, mask_b; 1622 RUINT32T mask_r, mask_g, mask_b;
1346 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1623 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1347 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1624 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
… …
1349 int i; 1626 int i;
1350 1627
1351 Visual *visual = term->visual; 1628 Visual *visual = term->visual;
1352 1629
1353 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1354
1355 if (shade == 0)
1356 shade = 100;
1357 1631
1358 /* for convenience */ 1632 /* for convenience */
1359 mask_r = visual->red_mask; 1633 mask_r = visual->red_mask;
1360 mask_g = visual->green_mask; 1634 mask_g = visual->green_mask;
1361 mask_b = visual->blue_mask; 1635 mask_b = visual->blue_mask;
… …
1417 default: 1691 default:
1418 return; /* we do not support this color depth */ 1692 return; /* we do not support this color depth */
1419 } 1693 }
1420 1694
1421 /* prepare limits for color transformation (each channel is handled separately) */ 1695 /* prepare limits for color transformation (each channel is handled separately) */
1422 if (shade < 0) { 1696 if (shade > 100) {
1423 shade = -shade; 1697 shade = 200 - shade;
1424 if (shade < 0) shade = 0;
1425 if (shade > 100) shade = 100;
1426 1698
1427 lower_lim_r = 65535-rm; 1699 lower_lim_r = 65535-rm;
1428 lower_lim_g = 65535-gm; 1700 lower_lim_g = 65535-gm;
1429 lower_lim_b = 65535-bm; 1701 lower_lim_b = 65535-bm;
1430 1702
… …
1432 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1704 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1433 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1705 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1434 1706
1435 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1707 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1436 } else { 1708 } else {
1437 if (shade < 0) shade = 0;
1438 if (shade > 100) shade = 100;
1439 1709
1440 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1710 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1441 1711
1442 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1712 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1443 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1713 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);

Diff Legend

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