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

Diff Legend

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