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.15 by sasha, Mon Nov 19 15:50:46 2007 UTC vs.
Revision 1.39 by sf-exg, Mon Jul 26 09:57:53 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C - former xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * 8 *
9 * 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
10 * 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
11 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
25#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
26 26
27#define DO_TIMING_TEST 0 27#define DO_TIMING_TEST 0
28 28
29#if DO_TIMING_TEST 29#if DO_TIMING_TEST
30# include <sys/time.h>
30#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
31 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv;\
32 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
33 34
34#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
35 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\ 36 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\
36 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 37 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\
86 */ 87 */
87 88
88#ifdef HAVE_BG_PIXMAP 89#ifdef HAVE_BG_PIXMAP
89bgPixmap_t::bgPixmap_t () 90bgPixmap_t::bgPixmap_t ()
90{ 91{
92 // this is basically redundant as bgPixmap_t is only used in
93 // zero_initialised-derived structs
91#ifdef HAVE_AFTERIMAGE 94#ifdef HAVE_AFTERIMAGE
92 original_asim = NULL; 95 original_asim = NULL;
93#endif 96#endif
94#ifdef BG_IMAGE_FROM_FILE 97#ifdef BG_IMAGE_FROM_FILE
95 h_scale = v_scale = 0; 98 h_scale = v_scale = 0;
96 h_align = v_align = 0; 99 h_align = v_align = 0;
97#endif 100#endif
98 flags = 0; 101 flags = 0;
99 pixmap = None; 102 pixmap = None;
103 valid_since = invalid_since = 0;
104 target = 0;
100} 105}
101 106
102void 107void
103bgPixmap_t::destroy () 108bgPixmap_t::destroy ()
104{ 109{
119 return true; 124 return true;
120# endif 125# endif
121 126
122# ifdef BG_IMAGE_FROM_FILE 127# ifdef BG_IMAGE_FROM_FILE
123# ifdef HAVE_AFTERIMAGE 128# ifdef HAVE_AFTERIMAGE
124 if (original_asim != NULL) 129 if (original_asim)
125# endif 130# endif
126 { 131 {
127 if (h_scale != 0 || v_scale != 0 132 if (h_scale != 0 || v_scale != 0
128 || h_align != 0 || v_align != 0) 133 || h_align != 0 || v_align != 0)
129 return true; 134 return true;
131# endif 136# endif
132 137
133 return false; 138 return false;
134} 139}
135 140
136bool 141bool
137bgPixmap_t::window_position_sensitive () 142bgPixmap_t::window_position_sensitive ()
138{ 143{
139# ifdef ENABLE_TRANSPARENCY 144# ifdef ENABLE_TRANSPARENCY
140 if (flags & isTransparent) 145 if (flags & isTransparent)
141 return true; 146 return true;
142# endif 147# endif
143 148
144# ifdef BG_IMAGE_FROM_FILE 149# ifdef BG_IMAGE_FROM_FILE
145# ifdef HAVE_AFTERIMAGE 150# ifdef HAVE_AFTERIMAGE
146 if (original_asim != NULL) 151 if (original_asim)
147# endif 152# endif
148 { 153 {
149 if (h_align == rootAlign || v_align == rootAlign) 154 if (h_align == rootAlign || v_align == rootAlign)
150 return true; 155 return true;
151 } 156 }
155}; 160};
156 161
157bool bgPixmap_t::need_client_side_rendering () 162bool bgPixmap_t::need_client_side_rendering ()
158{ 163{
159# ifdef HAVE_AFTERIMAGE 164# ifdef HAVE_AFTERIMAGE
160 if (original_asim != NULL) 165 if (original_asim)
161 return true; 166 return true;
162# endif 167# endif
163# ifdef ENABLE_TRANSPARENCY 168# ifdef ENABLE_TRANSPARENCY
164 if (flags & isTransparent) 169 if (flags & isTransparent)
165 { 170 {
254 int geom_flags = 0, changed = 0; 259 int geom_flags = 0, changed = 0;
255 int x = 0, y = 0; 260 int x = 0, y = 0;
256 unsigned int w = 0, h = 0; 261 unsigned int w = 0, h = 0;
257 unsigned int n; 262 unsigned int n;
258 unsigned long new_flags = (flags & (~geometryFlags)); 263 unsigned long new_flags = (flags & (~geometryFlags));
259 char *p; 264 const char *p;
260# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 265# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
261 266
262 if (geom == NULL) 267 if (geom == NULL)
263 return false; 268 return false;
264 269
265 char str[MAXLEN_GEOM]; 270 char str[MAXLEN_GEOM];
272 if (n < MAXLEN_GEOM) 277 if (n < MAXLEN_GEOM)
273 { 278 {
274 char *ops; 279 char *ops;
275 new_flags |= geometrySet; 280 new_flags |= geometrySet;
276 281
277 strncpy (str, geom, n); 282 memcpy (str, geom, n);
278 str[n] = '\0'; 283 str[n] = '\0';
279 if (str[0] == ':') 284 if (str[0] == ':')
280 ops = &str[0]; 285 ops = &str[0];
281 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 286 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
282 ops = &str[0]; 287 ops = &str[0];
302 y = x; 307 y = x;
303 geom_flags |= YValue; 308 geom_flags |= YValue;
304 } 309 }
305 310
306 if (flags & geometrySet) 311 if (flags & geometrySet)
312 {
307 {/* new geometry is an adjustment to the old one ! */ 313 /* new geometry is an adjustment to the old one ! */
308 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 314 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
309 { 315 {
310 if (w == 0 && h != 0) 316 if (w == 0 && h != 0)
311 { 317 {
312 w = h_scale; 318 w = h_scale;
328 } 334 }
329 } 335 }
330 else /* setting up geometry from scratch */ 336 else /* setting up geometry from scratch */
331 { 337 {
332 if (!(geom_flags & XValue)) 338 if (!(geom_flags & XValue))
339 {
333 {/* use default geometry - centered */ 340 /* use default geometry - centered */
334 x = y = defaultAlign; 341 x = y = defaultAlign;
335 } 342 }
336 else if (!(geom_flags & YValue)) 343 else if (!(geom_flags & YValue))
337 y = x; 344 y = x;
338 345
339 if ((geom_flags & (WidthValue|HeightValue)) == 0) 346 if ((geom_flags & (WidthValue|HeightValue)) == 0)
347 {
340 {/* use default geometry - scaled */ 348 /* use default geometry - scaled */
341 w = h = defaultScale; 349 w = h = defaultScale;
342 } 350 }
343 else if (geom_flags & WidthValue) 351 else if (geom_flags & WidthValue)
344 { 352 {
345 if (!(geom_flags & HeightValue)) 353 if (!(geom_flags & HeightValue))
348 else 356 else
349 w = h; 357 w = h;
350 } 358 }
351 } /* done parsing geometry string */ 359 } /* done parsing geometry string */
352 else if (!(flags & geometrySet)) 360 else if (!(flags & geometrySet))
361 {
353 { /* default geometry - scaled and centered */ 362 /* default geometry - scaled and centered */
354 x = y = defaultAlign; 363 x = y = defaultAlign;
355 w = h = defaultScale; 364 w = h = defaultScale;
356 } 365 }
357 366
358 if (!(flags & geometrySet)) 367 if (!(flags & geometrySet))
361 if (ops) 370 if (ops)
362 { 371 {
363 while (*ops) 372 while (*ops)
364 { 373 {
365 while (*ops == ':' || isspace(*ops)) ++ops; 374 while (*ops == ':' || isspace(*ops)) ++ops;
375
366# 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)
367 if (CHECK_GEOM_OPS("tile")) 377 if (CHECK_GEOM_OPS ("tile"))
368 { 378 {
369 w = h = noScale; 379 w = h = noScale;
370 geom_flags |= WidthValue|HeightValue; 380 geom_flags |= WidthValue|HeightValue;
371 } 381 }
372 else if (CHECK_GEOM_OPS("propscale")) 382 else if (CHECK_GEOM_OPS ("propscale"))
373 { 383 {
374 if (w == 0 && h == 0) 384 if (w == 0 && h == 0)
375 { 385 {
376 w = windowScale; 386 w = windowScale;
377 geom_flags |= WidthValue; 387 geom_flags |= WidthValue;
378 } 388 }
379 new_flags |= propScale; 389 new_flags |= propScale;
380 } 390 }
381 else if (CHECK_GEOM_OPS("hscale")) 391 else if (CHECK_GEOM_OPS ("hscale"))
382 { 392 {
383 if (w == 0)
384 w = windowScale; 393 if (w == 0) w = windowScale;
394
385 h = noScale; 395 h = noScale;
386 geom_flags |= WidthValue|HeightValue; 396 geom_flags |= WidthValue|HeightValue;
387 } 397 }
388 else if (CHECK_GEOM_OPS("vscale")) 398 else if (CHECK_GEOM_OPS ("vscale"))
389 { 399 {
390 if (h == 0)
391 h = windowScale; 400 if (h == 0) h = windowScale;
401
392 w = noScale; 402 w = noScale;
393 geom_flags |= WidthValue|HeightValue; 403 geom_flags |= WidthValue|HeightValue;
394 } 404 }
395 else if (CHECK_GEOM_OPS("scale")) 405 else if (CHECK_GEOM_OPS ("scale"))
396 { 406 {
397 if (h == 0)
398 h = windowScale; 407 if (h == 0) h = windowScale;
399 if (w == 0)
400 w = windowScale; 408 if (w == 0) w = windowScale;
409
401 geom_flags |= WidthValue|HeightValue; 410 geom_flags |= WidthValue|HeightValue;
402 } 411 }
403 else if (CHECK_GEOM_OPS("auto")) 412 else if (CHECK_GEOM_OPS ("auto"))
404 { 413 {
405 w = h = windowScale; 414 w = h = windowScale;
406 x = y = centerAlign; 415 x = y = centerAlign;
407 geom_flags |= WidthValue|HeightValue|XValue|YValue; 416 geom_flags |= WidthValue|HeightValue|XValue|YValue;
408 } 417 }
409 else if (CHECK_GEOM_OPS("root")) 418 else if (CHECK_GEOM_OPS ("root"))
410 { 419 {
411 w = h = noScale; 420 w = h = noScale;
412 x = y = rootAlign; 421 x = y = rootAlign;
413 geom_flags |= WidthValue|HeightValue|XValue|YValue; 422 geom_flags |= WidthValue|HeightValue|XValue|YValue;
414 } 423 }
415# undef CHECK_GEOM_OPS 424# undef CHECK_GEOM_OPS
425
416 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
417 } /* done parsing ops */ 427 } /* done parsing ops */
418 } 428 }
419 429
420 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 430 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
421 ++changed;
422 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 431 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
423 ++changed;
424 if (check_set_align_value (geom_flags, XValue, h_align, x)) 432 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
425 ++changed;
426 if (check_set_align_value (geom_flags, YValue, v_align, y)) 433 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
427 ++changed;
428 } 434 }
429 435
430 if (new_flags != flags) 436 if (new_flags != flags)
431 { 437 {
432 flags = new_flags; 438 flags = new_flags;
433 changed++; 439 changed++;
434 } 440 }
441
435//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 442//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
436// flags, h_scale, v_scale, h_align, v_align); 443// flags, h_scale, v_scale, h_align, v_align);
437 return (changed > 0); 444 return (changed > 0);
438} 445}
439 446
440# ifdef HAVE_AFTERIMAGE 447# ifdef HAVE_AFTERIMAGE
442bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 449bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)
443{ 450{
444 if (target == NULL) 451 if (target == NULL)
445 return false; 452 return false;
446 453
454 target->init_asv ();
455
456 ASImage *result = 0;
457
447 int target_width = (int)target->szHint.width; 458 int target_width = target->szHint.width;
448 int target_height = (int)target->szHint.height; 459 int target_height = target->szHint.height;
449 int new_pmap_width = target_width, new_pmap_height = target_height; 460 int new_pmap_width = target_width;
450 ASImage *result = NULL; 461 int new_pmap_height = target_height;
451 462
452 int x = 0; 463 int x = 0;
453 int y = 0; 464 int y = 0;
454 int w = h_scale * target_width / 100; 465 int w = h_scale * target_width / 100;
455 int h = v_scale * target_height / 100; 466 int h = v_scale * target_height / 100;
462 { 473 {
463 target->get_window_origin(x, y); 474 target->get_window_origin(x, y);
464 x = -x; 475 x = -x;
465 y = -y; 476 y = -y;
466 } 477 }
478
467 if (h_align != rootAlign) 479 if (h_align != rootAlign)
468 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
469 if (v_align != rootAlign) 482 if (v_align != rootAlign)
470 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);
471 } 484 }
472 485
473 if (original_asim == NULL 486 if (!original_asim
474 || x >= target_width 487 || x >= target_width
475 || y >= target_height 488 || y >= target_height
476 || (w > 0 && x + w <= 0) 489 || (w > 0 && x + w <= 0)
477 || (h > 0 && y + h <= 0)) 490 || (h > 0 && y + h <= 0))
478 { 491 {
479 if (background) 492 if (background)
480 { 493 {
481 new_pmap_width = background->width; 494 new_pmap_width = background->width;
482 new_pmap_height = background->height; 495 new_pmap_height = background->height;
483 result = background; 496 result = background;
497
484 if (background_tint != TINT_LEAVE_SAME) 498 if (background_tint != TINT_LEAVE_SAME)
485 { 499 {
486 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 500 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
487 target_width, target_height, background_tint, 501 target_width, target_height, background_tint,
488 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 502 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
489 if (tmp) 503 if (tmp)
490 result = tmp; 504 result = tmp;
491 } 505 }
494 new_pmap_width = new_pmap_height = 0; 508 new_pmap_width = new_pmap_height = 0;
495 } 509 }
496 else 510 else
497 { 511 {
498 result = original_asim; 512 result = original_asim;
513
499 if ((w > 0 && w != original_asim->width) 514 if ((w > 0 && w != original_asim->width)
500 || (h > 0 && h != original_asim->height)) 515 || (h > 0 && h != original_asim->height))
501 { 516 {
502 result = scale_asimage (target->asv, original_asim, 517 result = scale_asimage (target->asv, original_asim,
503 w > 0 ? w : original_asim->width, 518 w > 0 ? w : original_asim->width,
504 h > 0 ? h : original_asim->height, 519 h > 0 ? h : original_asim->height,
505 background ? ASA_ASImage : ASA_XImage, 520 background ? ASA_ASImage : ASA_XImage,
506 100, ASIMAGE_QUALITY_DEFAULT); 521 100, ASIMAGE_QUALITY_DEFAULT);
507 } 522 }
523
508 if (background == NULL) 524 if (background == NULL)
525 {
509 {/* if tiling - pixmap has to be sized exactly as the image, 526 /* if tiling - pixmap has to be sized exactly as the image,
510 but there is no need to make it bigger then the window! */ 527 but there is no need to make it bigger than the window! */
511 if (h_scale == 0) 528 if (h_scale == 0)
512 new_pmap_width = min (result->width, target_width); 529 new_pmap_width = min (result->width, target_width);
513 if (v_scale == 0) 530 if (v_scale == 0)
514 new_pmap_height = min (result->height, target_height); 531 new_pmap_height = min (result->height, target_height);
515 /* 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 */
516 if (h_scale == 0 || v_scale == 0) 533 if (h_scale == 0 || v_scale == 0)
517 { 534 {
518 ASImage *tmp = tile_asimage (target->asv, result, 535 ASImage *tmp = tile_asimage (target->asv, result,
519 (h_scale > 0) ? 0 : (int)result->width - x, 536 (h_scale > 0) ? 0 : (int)result->width - x,
520 (v_scale > 0) ? 0 : (int)result->height - y, 537 (v_scale > 0) ? 0 : (int)result->height - y,
521 new_pmap_width, 538 new_pmap_width,
522 new_pmap_height, 539 new_pmap_height,
523 TINT_LEAVE_SAME, ASA_XImage, 540 TINT_LEAVE_SAME, ASA_XImage,
524 100, ASIMAGE_QUALITY_DEFAULT); 541 100, ASIMAGE_QUALITY_DEFAULT);
525 if (tmp) 542 if (tmp)
526 { 543 {
527 if (result != original_asim) 544 if (result != original_asim)
528 destroy_asimage (&result); 545 destroy_asimage (&result);
546
529 result = tmp; 547 result = tmp;
530 } 548 }
531 } 549 }
532 } 550 }
533 else 551 else
552 {
534 {/* 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 */
535 ASImageLayer *layers = create_image_layers (2); 554 ASImageLayer *layers = create_image_layers (2);
536 ASImage *merged_im = NULL; 555 ASImage *merged_im = NULL;
537 556
538 layers[0].im = background; 557 layers[0].im = background;
539 layers[0].clip_width = target_width; 558 layers[0].clip_width = target_width;
540 layers[0].clip_height = target_height; 559 layers[0].clip_height = target_height;
541 layers[0].tint = background_tint; 560 layers[0].tint = background_tint;
542 layers[1].im = result; 561 layers[1].im = result;
562
543 if (w <= 0) 563 if (w <= 0)
564 {
544 {/* tile horizontally */ 565 /* tile horizontally */
545 while (x > 0) x -= (int)result->width; 566 while (x > 0) x -= (int)result->width;
546 layers[1].dst_x = x; 567 layers[1].dst_x = x;
547 layers[1].clip_width = result->width+target_width; 568 layers[1].clip_width = result->width+target_width;
548 } 569 }
549 else 570 else
571 {
550 {/* clip horizontally */ 572 /* clip horizontally */
551 layers[1].dst_x = x; 573 layers[1].dst_x = x;
552 layers[1].clip_width = result->width; 574 layers[1].clip_width = result->width;
553 } 575 }
576
554 if (h <= 0) 577 if (h <= 0)
555 { 578 {
556 while (y > 0) y -= (int)result->height; 579 while (y > 0) y -= (int)result->height;
557 layers[1].dst_y = y; 580 layers[1].dst_y = y;
558 layers[1].clip_height = result->height + target_height; 581 layers[1].clip_height = result->height + target_height;
560 else 583 else
561 { 584 {
562 layers[1].dst_y = y; 585 layers[1].dst_y = y;
563 layers[1].clip_height = result->height; 586 layers[1].clip_height = result->height;
564 } 587 }
588
565 if (target->rs[Rs_blendtype]) 589 if (target->rs[Rs_blendtype])
566 { 590 {
567 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 591 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
568 if (layers[1].merge_scanlines == NULL) 592 if (layers[1].merge_scanlines == NULL)
569 layers[1].merge_scanlines = alphablend_scanlines; 593 layers[1].merge_scanlines = alphablend_scanlines;
570 } 594 }
595
571 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,
572 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 597 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
598
573 if (tmp) 599 if (tmp)
574 { 600 {
575 if (result != original_asim) 601 if (result != original_asim)
576 destroy_asimage (&result); 602 destroy_asimage (&result);
603
577 result = tmp; 604 result = tmp;
578 } 605 }
606
579 free (layers); 607 free (layers);
580 } 608 }
581 } 609 }
582 TIMING_TEST_PRINT_RESULT (asim); 610 TIMING_TEST_PRINT_RESULT (asim);
583 611
612 640
613 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;
614 int dst_width = result->width, dst_height = result->height; 642 int dst_width = result->width, dst_height = result->height;
615 if (background == NULL) 643 if (background == NULL)
616 { 644 {
617 if (h_scale > 0)
618 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 );
619 if (v_scale > 0)
620 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);
621 647
622 if (dst_x > 0 || dst_y > 0 648 if (dst_x > 0 || dst_y > 0
623 || dst_x + dst_width < new_pmap_width 649 || dst_x + dst_width < new_pmap_width
624 || dst_y + dst_height < new_pmap_height) 650 || dst_y + dst_height < new_pmap_height)
625 {
626 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);
627 }
628 } 652 }
629 653
630 /* put result on pixmap */ 654 /* put result on pixmap */
631 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 655 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
632 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);
643# endif /* HAVE_AFTERIMAGE */ 667# endif /* HAVE_AFTERIMAGE */
644 668
645bool 669bool
646bgPixmap_t::set_file (const char *file) 670bgPixmap_t::set_file (const char *file)
647{ 671{
648 char *f;
649
650 assert (file != NULL); 672 assert (file);
651 673
652 if (*file != '\0') 674 if (*file)
653 { 675 {
654# ifdef HAVE_AFTERIMAGE 676# ifdef HAVE_AFTERIMAGE
655 if (target->asimman == NULL) 677 if (!target->asimman)
656 target->asimman = create_generic_imageman (target->rs[Rs_path]); 678 target->asimman = create_generic_imageman (target->rs[Rs_path]);
657 if ((f = strchr (file, ';')) == NULL) 679
658 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 680 if (const char *p = strchr (file, ';'))
659 else
660 { 681 {
661 size_t len = f - file; 682 size_t len = p - file;
662 f = (char *)malloc (len + 1); 683 char *f = (char *)malloc (len + 1);
663 strncpy (f, file, len); 684 memcpy (f, file, len);
664 f[len] = '\0'; 685 f[len] = '\0';
665 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 686 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
666 free (f); 687 free (f);
667 } 688 }
689 else
690 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
691
668 return (original_asim != NULL); 692 return original_asim;
669# endif 693# endif
670 } 694 }
695
671 return false; 696 return false;
672} 697}
673 698
674# endif /* BG_IMAGE_FROM_FILE */ 699# endif /* BG_IMAGE_FROM_FILE */
675 700
680 if (!(flags & isTransparent)) 705 if (!(flags & isTransparent))
681 { 706 {
682 flags |= isTransparent; 707 flags |= isTransparent;
683 return true; 708 return true;
684 } 709 }
710
685 return false; 711 return false;
686} 712}
687 713
688bool 714bool
689bgPixmap_t::set_blur_radius (const char *geom) 715bgPixmap_t::set_blur_radius (const char *geom)
770 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 796 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
771 tint = new_tint; 797 tint = new_tint;
772 flags = (flags & ~tintFlags) | new_flags | tintSet; 798 flags = (flags & ~tintFlags) | new_flags | tintSet;
773 return true; 799 return true;
774 } 800 }
801
775 return false; 802 return false;
776} 803}
777 804
778bool 805bool
779bgPixmap_t::unset_tint () 806bgPixmap_t::unset_tint ()
783 if (new_flags != (flags & tintFlags)) 810 if (new_flags != (flags & tintFlags))
784 { 811 {
785 flags = (flags&~tintFlags)|new_flags; 812 flags = (flags&~tintFlags)|new_flags;
786 return true; 813 return true;
787 } 814 }
815
788 return false; 816 return false;
789} 817}
790 818
791bool 819bool
792bgPixmap_t::set_shade (const char *shade_str) 820bgPixmap_t::set_shade (const char *shade_str)
793{ 821{
794 int new_shade = (shade_str) ? atoi (shade_str) : 0; 822 int new_shade = (shade_str) ? atoi (shade_str) : 0;
795 823
796 if (new_shade < 0 && new_shade > -100) 824 if (new_shade < 0 && new_shade > -100)
797 new_shade = 200 - (100 + new_shade); 825 new_shade = 200 - (100 + new_shade);
798 else if (new_shade == 100) 826 else if (new_shade == 100)
799 new_shade = 0; 827 new_shade = 0;
800 828
801 if (new_shade != shade) 829 if (new_shade != shade)
802 { 830 {
803 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);
804 shade = new_shade; 832 shade = new_shade;
805 flags = (flags & (~tintFlags | tintSet)) | new_flags; 833 flags = (flags & (~tintFlags | tintSet)) | new_flags;
806 return true; 834 return true;
807 } 835 }
836
808 return false; 837 return false;
809} 838}
810 839
811/* make_transparency_pixmap() 840/* make_transparency_pixmap()
812 * 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
819 unsigned long result = 0; 848 unsigned long result = 0;
820 849
821 if (target == NULL) 850 if (target == NULL)
822 return 0; 851 return 0;
823 852
824 /* root dimentions may change from call to call - but Display structure should 853 /* root dimensions may change from call to call - but Display structure should
825 * be always up-to-date, so let's use it : 854 * be always up-to-date, so let's use it :
826 */ 855 */
827 Window root = target->display->root; 856 Window root = target->display->root;
828 int screen = target->display->screen; 857 int screen = target->display->screen;
829 Display *dpy = target->dpy; 858 Display *dpy = target->dpy;
842 if (sx + window_width <= 0 || sy + window_height <= 0 871 if (sx + window_width <= 0 || sy + window_height <= 0
843 || sx >= root_width || sy >= root_height) 872 || sx >= root_width || sy >= root_height)
844 return 0; 873 return 0;
845 874
846 if (root_pixmap != None) 875 if (root_pixmap != None)
876 {
847 {/* 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 : */
848 int junk; 878 int junk;
849 unsigned int ujunk; 879 unsigned int ujunk;
850 /* root pixmap may be bad - allow a error */ 880 /* root pixmap may be bad - allow a error */
851 target->allowedxerror = -1; 881 target->allowedxerror = -1;
852 882
861 891
862 if (tiled_root_pmap == None) /* something really bad happened - abort */ 892 if (tiled_root_pmap == None) /* something really bad happened - abort */
863 return 0; 893 return 0;
864 894
865 if (root_pixmap == None) 895 if (root_pixmap == None)
896 {
866 { /* use tricks to obtain the root background image :*/ 897 /* use tricks to obtain the root background image :*/
867 /* we want to create Overrideredirect window overlapping out window 898 /* we want to create Overrideredirect window overlapping out window
868 with background type of Parent Relative and then grab it */ 899 with background type of Parent Relative and then grab it */
869 XSetWindowAttributes attr; 900 XSetWindowAttributes attr;
870 Window src; 901 Window src;
871 bool success = false; 902 bool success = false;
886 XGrabServer (dpy); 917 XGrabServer (dpy);
887 XMapRaised (dpy, src); 918 XMapRaised (dpy, src);
888 XSync (dpy, False); 919 XSync (dpy, False);
889 920
890 /* XSync should get window where it's properly exposed, 921 /* XSync should get window where it's properly exposed,
891 * 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 : */
892 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 923 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
893 ++ev_count; 924 ++ev_count;
894 925
895 if (ev_count > 0); 926 if (ev_count > 0);
927 {
896 { /* hooray! - we can grab the image! */ 928 /* hooray! - we can grab the image! */
897 gc = XCreateGC (dpy, root, 0, NULL); 929 gc = XCreateGC (dpy, root, 0, NULL);
898 if (gc) 930 if (gc)
899 { 931 {
900 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);
901 success = true; 933 success = true;
902 } 934 }
903 } 935 }
936
904 XDestroyWindow (dpy, src); 937 XDestroyWindow (dpy, src);
905 XUngrabServer (dpy); 938 XUngrabServer (dpy);
906 //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);
907 } 940 }
908 941
913 } 946 }
914 else 947 else
915 result |= transpPmapTiled; 948 result |= transpPmapTiled;
916 } 949 }
917 else 950 else
951 {
918 {/* strightforward pixmap copy */ 952 /* straightforward pixmap copy */
919 gcv.tile = root_pixmap; 953 gcv.tile = root_pixmap;
920 gcv.fill_style = FillTiled; 954 gcv.fill_style = FillTiled;
921 955
922 while (sx < 0) sx += (int)root_width; 956 while (sx < 0) sx += (int)root_width;
923 while (sy < 0) sy += (int)root_height; 957 while (sy < 0) sy += (int)root_height;
971 { 1005 {
972 c.r = (c.r * shade) / 100; 1006 c.r = (c.r * shade) / 100;
973 c.g = (c.g * shade) / 100; 1007 c.g = (c.g * shade) / 100;
974 c.b = (c.b * shade) / 100; 1008 c.b = (c.b * shade) / 100;
975 } 1009 }
976 else if( shade > 100 && shade < 200) 1010 else if (shade > 100 && shade < 200)
977 { 1011 {
978 c.r = (c.r * (200 - shade)) / 100; 1012 c.r = (c.r * (200 - shade)) / 100;
979 c.g = (c.g * (200 - shade)) / 100; 1013 c.g = (c.g * (200 - shade)) / 100;
980 c.b = (c.b * (200 - shade)) / 100; 1014 c.b = (c.b * (200 - shade)) / 100;
981 } 1015 }
1027 mask_c.blue = 0xffff - c.b; 1061 mask_c.blue = 0xffff - c.b;
1028 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1062 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1029 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);
1030 result |= transpPmapTinted; 1064 result |= transpPmapTinted;
1031 } 1065 }
1066
1032 XRenderFreePicture (dpy, mask_pic); 1067 XRenderFreePicture (dpy, mask_pic);
1033 XRenderFreePicture (dpy, overlay_pic); 1068 XRenderFreePicture (dpy, overlay_pic);
1034 XRenderFreePicture (dpy, back_pic); 1069 XRenderFreePicture (dpy, back_pic);
1035# if DO_TIMING_TEST 1070# if DO_TIMING_TEST
1036 XSync (dpy, False); 1071 XSync (dpy, False);
1058} 1093}
1059 1094
1060bool 1095bool
1061bgPixmap_t::set_root_pixmap () 1096bgPixmap_t::set_root_pixmap ()
1062{ 1097{
1063 Pixmap new_root_pixmap = None;
1064
1065 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1098 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1066 if (new_root_pixmap == None) 1099 if (new_root_pixmap == None)
1067 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1100 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1068 1101
1069 if (new_root_pixmap != root_pixmap) 1102 if (new_root_pixmap != root_pixmap)
1070 { 1103 {
1071 root_pixmap = new_root_pixmap; 1104 root_pixmap = new_root_pixmap;
1072 return true; 1105 return true;
1073 } 1106 }
1107
1074 return false; 1108 return false;
1075} 1109}
1076# endif /* ENABLE_TRANSPARENCY */ 1110# endif /* ENABLE_TRANSPARENCY */
1077 1111
1078# ifndef HAVE_AFTERIMAGE 1112# ifndef HAVE_AFTERIMAGE
1079static 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);
1080# endif 1114# endif
1081
1082 1115
1083bool 1116bool
1084bgPixmap_t::render () 1117bgPixmap_t::render ()
1085{ 1118{
1086 unsigned long background_flags = 0; 1119 unsigned long background_flags = 0;
1088 if (target == NULL) 1121 if (target == NULL)
1089 return false; 1122 return false;
1090 1123
1091 TIMING_TEST_START (tp); 1124 TIMING_TEST_START (tp);
1092 1125
1093 invalidate(); 1126 invalidate ();
1094# ifdef ENABLE_TRANSPARENCY 1127# ifdef ENABLE_TRANSPARENCY
1095 if (flags & isTransparent) 1128 if (flags & isTransparent)
1096 { 1129 {
1097 /* we need to re-generate transparency pixmap in that case ! */ 1130 /* we need to re-generate transparency pixmap in that case ! */
1098 background_flags = make_transparency_pixmap (); 1131 background_flags = make_transparency_pixmap ();
1107 XImage *result = NULL; 1140 XImage *result = NULL;
1108# ifdef HAVE_AFTERIMAGE 1141# ifdef HAVE_AFTERIMAGE
1109 if (original_asim 1142 if (original_asim
1110 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1143 || (background_flags & transpTransformations) != (flags & transpTransformations))
1111 { 1144 {
1145 target->init_asv ();
1146
1112 ASImage *background = NULL; 1147 ASImage *background = NULL;
1113 ARGB32 as_tint = TINT_LEAVE_SAME; 1148 ARGB32 as_tint = TINT_LEAVE_SAME;
1114 if (background_flags) 1149 if (background_flags)
1115 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);
1116 1151
1117# ifdef ENABLE_TRANSPARENCY 1152# ifdef ENABLE_TRANSPARENCY
1118 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1153 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1119 { 1154 {
1120 ShadingInfo as_shade; 1155 ShadingInfo as_shade;
1127 as_shade.tintColor.green = c.g; 1162 as_shade.tintColor.green = c.g;
1128 as_shade.tintColor.blue = c.b; 1163 as_shade.tintColor.blue = c.b;
1129 1164
1130 as_tint = shading2tint32 (&as_shade); 1165 as_tint = shading2tint32 (&as_shade);
1131 } 1166 }
1167
1132 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 1168 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1133 { 1169 {
1134 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,
1135 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, 1171 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1136 100, ASIMAGE_QUALITY_DEFAULT); 1172 100, ASIMAGE_QUALITY_DEFAULT);
1137 if (tmp) 1173 if (tmp)
1138 { 1174 {
1139 destroy_asimage (&background); 1175 destroy_asimage (&background);
1143# endif 1179# endif
1144 1180
1145 if (render_asim (background, as_tint)) 1181 if (render_asim (background, as_tint))
1146 flags = flags & ~isInvalid; 1182 flags = flags & ~isInvalid;
1147 if (background) 1183 if (background)
1148 destroy_asimage (&background); 1184 destroy_asimage (&background);
1149 } 1185 }
1150 else if (background_flags && pmap_depth != target->depth) 1186 else if (background_flags && pmap_depth != target->depth)
1187 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1188
1189# elif !XFT /* our own client-side tinting */
1190
1191 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1192 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1193
1194 if (background_flags && (flags & isInvalid))
1151 { 1195 {
1152 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);
1153 }
1154 1197
1155# elif !XFT /* our own client-side tinting */
1156
1157 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1158 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1159
1160 if (background_flags && (flags & isInvalid))
1161 {
1162 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1163 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1198 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1164 { 1199 {
1165 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1200 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1166 if (flags & tintSet) 1201 if (flags & tintSet)
1167 tint.get (c); 1202 tint.get (c);
1168 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1203 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1169 } 1204 }
1170 } 1205 }
1171# endif /* HAVE_AFTERIMAGE */ 1206# endif /* HAVE_AFTERIMAGE */
1172 1207
1173 if (result != NULL) 1208 if (result)
1174 { 1209 {
1175 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1210 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1211
1176 if (gc) 1212 if (gc)
1177 { 1213 {
1178 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1214 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1179 { 1215 {
1180 XFreePixmap (target->dpy, pixmap); 1216 XFreePixmap (target->dpy, pixmap);
1181 pixmap = None; 1217 pixmap = None;
1182 } 1218 }
1219
1183 if (pixmap == None) 1220 if (pixmap == None)
1184 { 1221 {
1185 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);
1186 pmap_width = result->width; 1223 pmap_width = result->width;
1187 pmap_height = result->height; 1224 pmap_height = result->height;
1188 pmap_depth = target->depth; 1225 pmap_depth = target->depth;
1189 } 1226 }
1227
1190 if (pmap_depth != result->depth) 1228 if (pmap_depth != result->depth)
1229 {
1191 { /* Bad Match error will ensue ! stupid X !!!! */ 1230 /* Bad Match error will ensue ! stupid X !!!! */
1192 if( result->depth == 24 && pmap_depth == 32) 1231 if (result->depth == 24 && pmap_depth == 32)
1193 result->depth = 32; 1232 result->depth = 32;
1194 else if( result->depth == 32 && pmap_depth == 24) 1233 else if (result->depth == 32 && pmap_depth == 24)
1195 result->depth = 24; 1234 result->depth = 24;
1196 else 1235 else
1197 { 1236 {
1198 /* TODO: implement image recoding */ 1237 /* TODO: implement image recoding */
1199 } 1238 }
1200 } 1239 }
1240
1201 if (pmap_depth == result->depth) 1241 if (pmap_depth == result->depth)
1202 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
1203 XFreeGC (target->dpy, gc); 1244 XFreeGC (target->dpy, gc);
1204 flags = flags & ~isInvalid; 1245 flags = flags & ~isInvalid;
1205 } 1246 }
1247
1206 XDestroyImage (result); 1248 XDestroyImage (result);
1207 } 1249 }
1208 1250
1209 if (flags & isInvalid) 1251 if (flags & isInvalid)
1210 { 1252 {
1214 pixmap = None; 1256 pixmap = None;
1215 } 1257 }
1216 } 1258 }
1217 1259
1218 apply (); 1260 apply ();
1261
1262 XSync (target->dpy, False);
1263 valid_since = ev::now ();
1219 1264
1220 TIMING_TEST_PRINT_RESULT (tp); 1265 TIMING_TEST_PRINT_RESULT (tp);
1221 1266
1222 return true; 1267 return true;
1223} 1268}
1232# ifdef ENABLE_TRANSPARENCY 1277# ifdef ENABLE_TRANSPARENCY
1233 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1278 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1234# endif 1279# endif
1235 return true; 1280 return true;
1236 } 1281 }
1282
1237 return false; 1283 return false;
1238} 1284}
1239 1285
1240void 1286void
1241bgPixmap_t::apply() 1287bgPixmap_t::apply ()
1242{ 1288{
1243 if (target) 1289 if (target)
1244 { 1290 {
1245 flags &= ~isVtOrigin; 1291 flags &= ~isVtOrigin;
1292
1246 if (pixmap != None) 1293 if (pixmap != None)
1294 {
1247 { /* set target's background to pixmap */ 1295 /* set target's background to pixmap */
1248# ifdef ENABLE_TRANSPARENCY 1296# ifdef ENABLE_TRANSPARENCY
1249 if (flags & isTransparent) 1297 if (flags & isTransparent)
1250 { 1298 {
1251 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1299 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1252 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1300 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1253# if HAVE_SCROLLBARS 1301
1254 if (target->scrollBar.win) 1302 if (target->scrollBar.win)
1255 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1303 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1256# endif
1257 } 1304 }
1258 else 1305 else
1259# endif 1306# endif
1260 { 1307 {
1261 flags |= isVtOrigin; 1308 flags |= isVtOrigin;
1262 /* force old pixmap dereference in case it was transparent before :*/ 1309 /* force old pixmap dereference in case it was transparent before :*/
1263 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1310 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1264 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1311 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1265 /* do we also need to set scrollbar's background here ? */ 1312 /* do we also need to set scrollbar's background here ? */
1266# if HAVE_SCROLLBARS 1313
1267 if (target->scrollBar.win) 1314 if (target->scrollBar.win)
1268 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1315 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1269# endif
1270 } 1316 }
1271 } 1317 }
1272 else 1318 else
1319 {
1273 { /* set target background to a pixel */ 1320 /* set target background to a pixel */
1274 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1321 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1275 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1322 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1276 /* do we also need to set scrollbar's background here ? */ 1323 /* do we also need to set scrollbar's background here ? */
1277# if HAVE_SCROLLBARS
1278 if (target->scrollBar.win) 1324 if (target->scrollBar.win)
1279 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1325 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1280# endif
1281 } 1326 }
1327
1282 /* 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
1283 scr_touch or we get a great deal of flicker otherwise: */ 1329 scr_touch or we get a great deal of flicker otherwise: */
1284 XClearWindow (target->dpy, target->parent[0]); 1330 XClearWindow (target->dpy, target->parent[0]);
1285 1331
1286# if HAVE_SCROLLBARS 1332 if (target->scrollBar.state && target->scrollBar.win)
1287 if (target->scrollBar.win)
1288 { 1333 {
1289 target->scrollBar.setIdle (); 1334 target->scrollBar.state = STATE_IDLE;
1290 target->scrollbar_show (0); 1335 target->scrollBar.show (0);
1291 } 1336 }
1292# endif
1293 1337
1294 target->want_refresh = 1; 1338 target->want_refresh = 1;
1295 flags |= hasChanged; 1339 flags |= hasChanged;
1296 } 1340 }
1297} 1341}
1302/* taken from aterm-0.4.2 */ 1346/* taken from aterm-0.4.2 */
1303 1347
1304typedef uint32_t RUINT32T; 1348typedef uint32_t RUINT32T;
1305 1349
1306static void 1350static void
1307ShadeXImage(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)
1308{ 1352{
1309 int sh_r, sh_g, sh_b; 1353 int sh_r, sh_g, sh_b;
1310 RUINT32T mask_r, mask_g, mask_b; 1354 RUINT32T mask_r, mask_g, mask_b;
1311 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1355 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1312 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