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

Diff Legend

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