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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines