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.1 by sasha, Wed Sep 12 20:29:24 2007 UTC vs.
Revision 1.53 by sf-exg, Wed Sep 1 13:18:55 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines