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.17 by ayin, Wed Dec 5 08:46:27 2007 UTC vs.
Revision 1.42 by sf-exg, Sun Aug 29 13:24:30 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 { \
37 struct timeval tv; \
38 gettimeofday (&tv, NULL); \
39 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
36 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__, \
37 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)
38 43
39#else 44#else
40#define TIMING_TEST_START(id) do{}while (0) 45#define TIMING_TEST_START(id) do {} while (0)
41#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 46#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
42#endif 47#endif
43 48
44/* 49/*
45 * Pixmap geometry string interpretation : 50 * Pixmap geometry string interpretation :
46 * Each geometry string contains zero or one scale/position 51 * Each geometry string contains zero or one scale/position
47 * 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
48 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
49 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
50 * affects on the background image : 55 * effects on the background image :
51 * 56 *
52 * 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%.
53 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
54 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
55 * the image in the window. 60 * the image in the window.
86 */ 91 */
87 92
88#ifdef HAVE_BG_PIXMAP 93#ifdef HAVE_BG_PIXMAP
89bgPixmap_t::bgPixmap_t () 94bgPixmap_t::bgPixmap_t ()
90{ 95{
96 // this is basically redundant as bgPixmap_t is only used in
97 // zero_initialised-derived structs
91#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
92 original_asim = NULL; 99 original_asim = NULL;
93#endif 100#endif
94#ifdef BG_IMAGE_FROM_FILE 101#ifdef BG_IMAGE_FROM_FILE
95 h_scale = v_scale = 0; 102 h_scale = v_scale = 0;
96 h_align = v_align = 0; 103 h_align = v_align = 0;
97#endif 104#endif
98 flags = 0; 105 flags = 0;
99 pixmap = None; 106 pixmap = None;
107 valid_since = invalid_since = 0;
108 target = 0;
100} 109}
101 110
102void 111void
103bgPixmap_t::destroy () 112bgPixmap_t::destroy ()
104{ 113{
119 return true; 128 return true;
120# endif 129# endif
121 130
122# ifdef BG_IMAGE_FROM_FILE 131# ifdef BG_IMAGE_FROM_FILE
123# ifdef HAVE_AFTERIMAGE 132# ifdef HAVE_AFTERIMAGE
124 if (original_asim != NULL) 133 if (original_asim)
125# endif 134# endif
126 { 135 {
127 if (h_scale != 0 || v_scale != 0 136 if (h_scale != 0 || v_scale != 0
128 || h_align != 0 || v_align != 0) 137 || h_align != 0 || v_align != 0)
129 return true; 138 return true;
131# endif 140# endif
132 141
133 return false; 142 return false;
134} 143}
135 144
136bool 145bool
137bgPixmap_t::window_position_sensitive () 146bgPixmap_t::window_position_sensitive ()
138{ 147{
139# ifdef ENABLE_TRANSPARENCY 148# ifdef ENABLE_TRANSPARENCY
140 if (flags & isTransparent) 149 if (flags & isTransparent)
141 return true; 150 return true;
142# endif 151# endif
143 152
144# ifdef BG_IMAGE_FROM_FILE 153# ifdef BG_IMAGE_FROM_FILE
145# ifdef HAVE_AFTERIMAGE 154# ifdef HAVE_AFTERIMAGE
146 if (original_asim != NULL) 155 if (original_asim)
147# endif 156# endif
148 { 157 {
149 if (h_align == rootAlign || v_align == rootAlign) 158 if (h_align == rootAlign || v_align == rootAlign)
150 return true; 159 return true;
151 } 160 }
155}; 164};
156 165
157bool bgPixmap_t::need_client_side_rendering () 166bool bgPixmap_t::need_client_side_rendering ()
158{ 167{
159# ifdef HAVE_AFTERIMAGE 168# ifdef HAVE_AFTERIMAGE
160 if (original_asim != NULL) 169 if (original_asim)
161 return true; 170 return true;
162# endif 171# endif
163# ifdef ENABLE_TRANSPARENCY 172# ifdef ENABLE_TRANSPARENCY
164 if (flags & isTransparent) 173 if (flags & isTransparent)
165 { 174 {
254 int geom_flags = 0, changed = 0; 263 int geom_flags = 0, changed = 0;
255 int x = 0, y = 0; 264 int x = 0, y = 0;
256 unsigned int w = 0, h = 0; 265 unsigned int w = 0, h = 0;
257 unsigned int n; 266 unsigned int n;
258 unsigned long new_flags = (flags & (~geometryFlags)); 267 unsigned long new_flags = (flags & (~geometryFlags));
259 char *p; 268 const char *p;
260# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 269# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
261 270
262 if (geom == NULL) 271 if (geom == NULL)
263 return false; 272 return false;
264 273
265 char str[MAXLEN_GEOM]; 274 char str[MAXLEN_GEOM];
272 if (n < MAXLEN_GEOM) 281 if (n < MAXLEN_GEOM)
273 { 282 {
274 char *ops; 283 char *ops;
275 new_flags |= geometrySet; 284 new_flags |= geometrySet;
276 285
277 strncpy (str, geom, n); 286 memcpy (str, geom, n);
278 str[n] = '\0'; 287 str[n] = '\0';
279 if (str[0] == ':') 288 if (str[0] == ':')
280 ops = &str[0]; 289 ops = &str[0];
281 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 290 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
282 ops = &str[0]; 291 ops = &str[0];
365 if (ops) 374 if (ops)
366 { 375 {
367 while (*ops) 376 while (*ops)
368 { 377 {
369 while (*ops == ':' || isspace(*ops)) ++ops; 378 while (*ops == ':' || isspace(*ops)) ++ops;
379
370# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 380# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
371 if (CHECK_GEOM_OPS("tile")) 381 if (CHECK_GEOM_OPS ("tile"))
372 { 382 {
373 w = h = noScale; 383 w = h = noScale;
374 geom_flags |= WidthValue|HeightValue; 384 geom_flags |= WidthValue|HeightValue;
375 } 385 }
376 else if (CHECK_GEOM_OPS("propscale")) 386 else if (CHECK_GEOM_OPS ("propscale"))
377 { 387 {
378 if (w == 0 && h == 0) 388 if (w == 0 && h == 0)
379 { 389 {
380 w = windowScale; 390 w = windowScale;
381 geom_flags |= WidthValue; 391 geom_flags |= WidthValue;
382 } 392 }
383 new_flags |= propScale; 393 new_flags |= propScale;
384 } 394 }
385 else if (CHECK_GEOM_OPS("hscale")) 395 else if (CHECK_GEOM_OPS ("hscale"))
386 { 396 {
387 if (w == 0)
388 w = windowScale; 397 if (w == 0) w = windowScale;
398
389 h = noScale; 399 h = noScale;
390 geom_flags |= WidthValue|HeightValue; 400 geom_flags |= WidthValue|HeightValue;
391 } 401 }
392 else if (CHECK_GEOM_OPS("vscale")) 402 else if (CHECK_GEOM_OPS ("vscale"))
393 { 403 {
394 if (h == 0)
395 h = windowScale; 404 if (h == 0) h = windowScale;
405
396 w = noScale; 406 w = noScale;
397 geom_flags |= WidthValue|HeightValue; 407 geom_flags |= WidthValue|HeightValue;
398 } 408 }
399 else if (CHECK_GEOM_OPS("scale")) 409 else if (CHECK_GEOM_OPS ("scale"))
400 { 410 {
401 if (h == 0)
402 h = windowScale; 411 if (h == 0) h = windowScale;
403 if (w == 0)
404 w = windowScale; 412 if (w == 0) w = windowScale;
413
405 geom_flags |= WidthValue|HeightValue; 414 geom_flags |= WidthValue|HeightValue;
406 } 415 }
407 else if (CHECK_GEOM_OPS("auto")) 416 else if (CHECK_GEOM_OPS ("auto"))
408 { 417 {
409 w = h = windowScale; 418 w = h = windowScale;
410 x = y = centerAlign; 419 x = y = centerAlign;
411 geom_flags |= WidthValue|HeightValue|XValue|YValue; 420 geom_flags |= WidthValue|HeightValue|XValue|YValue;
412 } 421 }
413 else if (CHECK_GEOM_OPS("root")) 422 else if (CHECK_GEOM_OPS ("root"))
414 { 423 {
415 w = h = noScale; 424 w = h = noScale;
416 x = y = rootAlign; 425 x = y = rootAlign;
417 geom_flags |= WidthValue|HeightValue|XValue|YValue; 426 geom_flags |= WidthValue|HeightValue|XValue|YValue;
418 } 427 }
419# undef CHECK_GEOM_OPS 428# undef CHECK_GEOM_OPS
429
420 while (*ops != ':' && *ops != '\0') ++ops; 430 while (*ops != ':' && *ops != '\0') ++ops;
421 } /* done parsing ops */ 431 } /* done parsing ops */
422 } 432 }
423 433
424 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 434 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
425 ++changed;
426 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 435 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
427 ++changed;
428 if (check_set_align_value (geom_flags, XValue, h_align, x)) 436 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
429 ++changed;
430 if (check_set_align_value (geom_flags, YValue, v_align, y)) 437 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
431 ++changed;
432 } 438 }
433 439
434 if (new_flags != flags) 440 if (new_flags != flags)
435 { 441 {
436 flags = new_flags; 442 flags = new_flags;
437 changed++; 443 changed++;
438 } 444 }
445
439//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 446//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
440// flags, h_scale, v_scale, h_align, v_align); 447// flags, h_scale, v_scale, h_align, v_align);
441 return (changed > 0); 448 return (changed > 0);
442} 449}
443 450
444# ifdef HAVE_AFTERIMAGE 451# ifdef HAVE_AFTERIMAGE
446bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 453bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)
447{ 454{
448 if (target == NULL) 455 if (target == NULL)
449 return false; 456 return false;
450 457
458 target->init_asv ();
459
460 ASImage *result = 0;
461
451 int target_width = (int)target->szHint.width; 462 int target_width = target->szHint.width;
452 int target_height = (int)target->szHint.height; 463 int target_height = target->szHint.height;
453 int new_pmap_width = target_width, new_pmap_height = target_height; 464 int new_pmap_width = target_width;
454 ASImage *result = NULL; 465 int new_pmap_height = target_height;
455 466
456 int x = 0; 467 int x = 0;
457 int y = 0; 468 int y = 0;
458 int w = h_scale * target_width / 100; 469 int w = h_scale * target_width / 100;
459 int h = v_scale * target_height / 100; 470 int h = v_scale * target_height / 100;
466 { 477 {
467 target->get_window_origin(x, y); 478 target->get_window_origin(x, y);
468 x = -x; 479 x = -x;
469 y = -y; 480 y = -y;
470 } 481 }
482
471 if (h_align != rootAlign) 483 if (h_align != rootAlign)
472 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); 484 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
485
473 if (v_align != rootAlign) 486 if (v_align != rootAlign)
474 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); 487 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
475 } 488 }
476 489
477 if (original_asim == NULL 490 if (!original_asim
478 || x >= target_width 491 || x >= target_width
479 || y >= target_height 492 || y >= target_height
480 || (w > 0 && x + w <= 0) 493 || (w > 0 && x + w <= 0)
481 || (h > 0 && y + h <= 0)) 494 || (h > 0 && y + h <= 0))
482 { 495 {
483 if (background) 496 if (background)
484 { 497 {
485 new_pmap_width = background->width; 498 new_pmap_width = background->width;
486 new_pmap_height = background->height; 499 new_pmap_height = background->height;
487 result = background; 500 result = background;
501
488 if (background_tint != TINT_LEAVE_SAME) 502 if (background_tint != TINT_LEAVE_SAME)
489 { 503 {
490 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 504 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
491 target_width, target_height, background_tint, 505 target_width, target_height, background_tint,
492 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 506 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
493 if (tmp) 507 if (tmp)
494 result = tmp; 508 result = tmp;
495 } 509 }
498 new_pmap_width = new_pmap_height = 0; 512 new_pmap_width = new_pmap_height = 0;
499 } 513 }
500 else 514 else
501 { 515 {
502 result = original_asim; 516 result = original_asim;
517
503 if ((w > 0 && w != original_asim->width) 518 if ((w > 0 && w != original_asim->width)
504 || (h > 0 && h != original_asim->height)) 519 || (h > 0 && h != original_asim->height))
505 { 520 {
506 result = scale_asimage (target->asv, original_asim, 521 result = scale_asimage (target->asv, original_asim,
507 w > 0 ? w : original_asim->width, 522 w > 0 ? w : original_asim->width,
508 h > 0 ? h : original_asim->height, 523 h > 0 ? h : original_asim->height,
509 background ? ASA_ASImage : ASA_XImage, 524 background ? ASA_ASImage : ASA_XImage,
510 100, ASIMAGE_QUALITY_DEFAULT); 525 100, ASIMAGE_QUALITY_DEFAULT);
511 } 526 }
527
512 if (background == NULL) 528 if (background == NULL)
513 { 529 {
514 /* if tiling - pixmap has to be sized exactly as the image, 530 /* if tiling - pixmap has to be sized exactly as the image,
515 but there is no need to make it bigger then the window! */ 531 but there is no need to make it bigger than the window! */
516 if (h_scale == 0) 532 if (h_scale == 0)
517 new_pmap_width = min (result->width, target_width); 533 new_pmap_width = min (result->width, target_width);
518 if (v_scale == 0) 534 if (v_scale == 0)
519 new_pmap_height = min (result->height, target_height); 535 new_pmap_height = min (result->height, target_height);
520 /* we also need to tile our image in one or both directions */ 536 /* we also need to tile our image in one or both directions */
521 if (h_scale == 0 || v_scale == 0) 537 if (h_scale == 0 || v_scale == 0)
522 { 538 {
523 ASImage *tmp = tile_asimage (target->asv, result, 539 ASImage *tmp = tile_asimage (target->asv, result,
524 (h_scale > 0) ? 0 : (int)result->width - x, 540 (h_scale > 0) ? 0 : (int)result->width - x,
525 (v_scale > 0) ? 0 : (int)result->height - y, 541 (v_scale > 0) ? 0 : (int)result->height - y,
526 new_pmap_width, 542 new_pmap_width,
527 new_pmap_height, 543 new_pmap_height,
528 TINT_LEAVE_SAME, ASA_XImage, 544 TINT_LEAVE_SAME, ASA_XImage,
529 100, ASIMAGE_QUALITY_DEFAULT); 545 100, ASIMAGE_QUALITY_DEFAULT);
530 if (tmp) 546 if (tmp)
531 { 547 {
532 if (result != original_asim) 548 if (result != original_asim)
533 destroy_asimage (&result); 549 destroy_asimage (&result);
550
534 result = tmp; 551 result = tmp;
535 } 552 }
536 } 553 }
537 } 554 }
538 else 555 else
539 { 556 {
540 /* if blending background and image - pixmap has to be sized same as target window */ 557 /* if blending background and image - pixmap has to be sized same as target window */
541 ASImageLayer *layers = create_image_layers (2); 558 ASImageLayer *layers = create_image_layers (2);
542 ASImage *merged_im = NULL;
543 559
544 layers[0].im = background; 560 layers[0].im = background;
545 layers[0].clip_width = target_width; 561 layers[0].clip_width = target_width;
546 layers[0].clip_height = target_height; 562 layers[0].clip_height = target_height;
547 layers[0].tint = background_tint; 563 layers[0].tint = background_tint;
548 layers[1].im = result; 564 layers[1].im = result;
565
549 if (w <= 0) 566 if (w <= 0)
550 { 567 {
551 /* tile horizontally */ 568 /* tile horizontally */
552 while (x > 0) x -= (int)result->width; 569 while (x > 0) x -= (int)result->width;
553 layers[1].dst_x = x; 570 layers[1].dst_x = x;
557 { 574 {
558 /* clip horizontally */ 575 /* clip horizontally */
559 layers[1].dst_x = x; 576 layers[1].dst_x = x;
560 layers[1].clip_width = result->width; 577 layers[1].clip_width = result->width;
561 } 578 }
579
562 if (h <= 0) 580 if (h <= 0)
563 { 581 {
564 while (y > 0) y -= (int)result->height; 582 while (y > 0) y -= (int)result->height;
565 layers[1].dst_y = y; 583 layers[1].dst_y = y;
566 layers[1].clip_height = result->height + target_height; 584 layers[1].clip_height = result->height + target_height;
568 else 586 else
569 { 587 {
570 layers[1].dst_y = y; 588 layers[1].dst_y = y;
571 layers[1].clip_height = result->height; 589 layers[1].clip_height = result->height;
572 } 590 }
591
573 if (target->rs[Rs_blendtype]) 592 if (target->rs[Rs_blendtype])
574 { 593 {
575 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 594 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
576 if (layers[1].merge_scanlines == NULL) 595 if (layers[1].merge_scanlines == NULL)
577 layers[1].merge_scanlines = alphablend_scanlines; 596 layers[1].merge_scanlines = alphablend_scanlines;
578 } 597 }
598
579 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 599 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
580 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 600 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
601
581 if (tmp) 602 if (tmp)
582 { 603 {
583 if (result != original_asim) 604 if (result != original_asim)
584 destroy_asimage (&result); 605 destroy_asimage (&result);
606
585 result = tmp; 607 result = tmp;
586 } 608 }
609
587 free (layers); 610 free (layers);
588 } 611 }
589 } 612 }
590 TIMING_TEST_PRINT_RESULT (asim); 613 TIMING_TEST_PRINT_RESULT (asim);
591 614
620 643
621 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 644 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
622 int dst_width = result->width, dst_height = result->height; 645 int dst_width = result->width, dst_height = result->height;
623 if (background == NULL) 646 if (background == NULL)
624 { 647 {
625 if (h_scale > 0)
626 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 648 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
627 if (v_scale > 0)
628 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 649 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
629 650
630 if (dst_x > 0 || dst_y > 0 651 if (dst_x > 0 || dst_y > 0
631 || dst_x + dst_width < new_pmap_width 652 || dst_x + dst_width < new_pmap_width
632 || dst_y + dst_height < new_pmap_height) 653 || dst_y + dst_height < new_pmap_height)
633 {
634 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 654 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
635 }
636 } 655 }
637 656
638 /* put result on pixmap */ 657 /* put result on pixmap */
639 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 658 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
640 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 659 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
651# endif /* HAVE_AFTERIMAGE */ 670# endif /* HAVE_AFTERIMAGE */
652 671
653bool 672bool
654bgPixmap_t::set_file (const char *file) 673bgPixmap_t::set_file (const char *file)
655{ 674{
656 char *f;
657
658 assert (file != NULL); 675 assert (file);
659 676
660 if (*file != '\0') 677 if (*file)
661 { 678 {
662# ifdef HAVE_AFTERIMAGE 679# ifdef HAVE_AFTERIMAGE
663 if (target->asimman == NULL) 680 if (!target->asimman)
664 target->asimman = create_generic_imageman (target->rs[Rs_path]); 681 target->asimman = create_generic_imageman (target->rs[Rs_path]);
665 if ((f = strchr (file, ';')) == NULL) 682
666 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 683 if (const char *p = strchr (file, ';'))
667 else
668 { 684 {
669 size_t len = f - file; 685 size_t len = p - file;
670 f = (char *)malloc (len + 1); 686 char *f = (char *)malloc (len + 1);
671 strncpy (f, file, len); 687 memcpy (f, file, len);
672 f[len] = '\0'; 688 f[len] = '\0';
673 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 689 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
674 free (f); 690 free (f);
675 } 691 }
692 else
693 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
694
676 return (original_asim != NULL); 695 return original_asim;
677# endif 696# endif
678 } 697 }
698
679 return false; 699 return false;
680} 700}
681 701
682# endif /* BG_IMAGE_FROM_FILE */ 702# endif /* BG_IMAGE_FROM_FILE */
683 703
688 if (!(flags & isTransparent)) 708 if (!(flags & isTransparent))
689 { 709 {
690 flags |= isTransparent; 710 flags |= isTransparent;
691 return true; 711 return true;
692 } 712 }
713
693 return false; 714 return false;
694} 715}
695 716
696bool 717bool
697bgPixmap_t::set_blur_radius (const char *geom) 718bgPixmap_t::set_blur_radius (const char *geom)
778 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 799 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
779 tint = new_tint; 800 tint = new_tint;
780 flags = (flags & ~tintFlags) | new_flags | tintSet; 801 flags = (flags & ~tintFlags) | new_flags | tintSet;
781 return true; 802 return true;
782 } 803 }
804
783 return false; 805 return false;
784} 806}
785 807
786bool 808bool
787bgPixmap_t::unset_tint () 809bgPixmap_t::unset_tint ()
791 if (new_flags != (flags & tintFlags)) 813 if (new_flags != (flags & tintFlags))
792 { 814 {
793 flags = (flags&~tintFlags)|new_flags; 815 flags = (flags&~tintFlags)|new_flags;
794 return true; 816 return true;
795 } 817 }
818
796 return false; 819 return false;
797} 820}
798 821
799bool 822bool
800bgPixmap_t::set_shade (const char *shade_str) 823bgPixmap_t::set_shade (const char *shade_str)
801{ 824{
802 int new_shade = (shade_str) ? atoi (shade_str) : 0; 825 int new_shade = (shade_str) ? atoi (shade_str) : 0;
803 826
804 if (new_shade < 0 && new_shade > -100) 827 if (new_shade < 0 && new_shade > -100)
805 new_shade = 200 - (100 + new_shade); 828 new_shade = 200 - (100 + new_shade);
806 else if (new_shade == 100) 829 else if (new_shade == 100)
807 new_shade = 0; 830 new_shade = 0;
808 831
809 if (new_shade != shade) 832 if (new_shade != shade)
810 { 833 {
811 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 834 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
812 shade = new_shade; 835 shade = new_shade;
813 flags = (flags & (~tintFlags | tintSet)) | new_flags; 836 flags = (flags & (~tintFlags | tintSet)) | new_flags;
814 return true; 837 return true;
815 } 838 }
839
816 return false; 840 return false;
817} 841}
818 842
819/* make_transparency_pixmap() 843/* make_transparency_pixmap()
820 * Builds a pixmap sized the same as terminal window, with depth same as the root window 844 * Builds a pixmap sized the same as terminal window, with depth same as the root window
827 unsigned long result = 0; 851 unsigned long result = 0;
828 852
829 if (target == NULL) 853 if (target == NULL)
830 return 0; 854 return 0;
831 855
832 /* root dimentions may change from call to call - but Display structure should 856 /* root dimensions may change from call to call - but Display structure should
833 * be always up-to-date, so let's use it : 857 * be always up-to-date, so let's use it :
834 */ 858 */
835 Window root = target->display->root; 859 Window root = target->display->root;
836 int screen = target->display->screen; 860 int screen = target->display->screen;
837 Display *dpy = target->dpy; 861 Display *dpy = target->dpy;
896 XGrabServer (dpy); 920 XGrabServer (dpy);
897 XMapRaised (dpy, src); 921 XMapRaised (dpy, src);
898 XSync (dpy, False); 922 XSync (dpy, False);
899 923
900 /* XSync should get window where it's properly exposed, 924 /* XSync should get window where it's properly exposed,
901 * but to be on the safe side - let's check for the actuall event to arrive : */ 925 * but to be on the safe side - let's check for the actual event to arrive : */
902 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 926 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
903 ++ev_count; 927 ++ev_count;
904 928
905 if (ev_count > 0); 929 if (ev_count > 0);
906 { 930 {
910 { 934 {
911 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 935 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
912 success = true; 936 success = true;
913 } 937 }
914 } 938 }
939
915 XDestroyWindow (dpy, src); 940 XDestroyWindow (dpy, src);
916 XUngrabServer (dpy); 941 XUngrabServer (dpy);
917 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 942 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
918 } 943 }
919 944
925 else 950 else
926 result |= transpPmapTiled; 951 result |= transpPmapTiled;
927 } 952 }
928 else 953 else
929 { 954 {
930 /* strightforward pixmap copy */ 955 /* straightforward pixmap copy */
931 gcv.tile = root_pixmap; 956 gcv.tile = root_pixmap;
932 gcv.fill_style = FillTiled; 957 gcv.fill_style = FillTiled;
933 958
934 while (sx < 0) sx += (int)root_width; 959 while (sx < 0) sx += (int)root_width;
935 while (sy < 0) sy += (int)root_height; 960 while (sy < 0) sy += (int)root_height;
983 { 1008 {
984 c.r = (c.r * shade) / 100; 1009 c.r = (c.r * shade) / 100;
985 c.g = (c.g * shade) / 100; 1010 c.g = (c.g * shade) / 100;
986 c.b = (c.b * shade) / 100; 1011 c.b = (c.b * shade) / 100;
987 } 1012 }
988 else if( shade > 100 && shade < 200) 1013 else if (shade > 100 && shade < 200)
989 { 1014 {
990 c.r = (c.r * (200 - shade)) / 100; 1015 c.r = (c.r * (200 - shade)) / 100;
991 c.g = (c.g * (200 - shade)) / 100; 1016 c.g = (c.g * (200 - shade)) / 100;
992 c.b = (c.b * (200 - shade)) / 100; 1017 c.b = (c.b * (200 - shade)) / 100;
993 } 1018 }
1039 mask_c.blue = 0xffff - c.b; 1064 mask_c.blue = 0xffff - c.b;
1040 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1065 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1041 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); 1066 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1042 result |= transpPmapTinted; 1067 result |= transpPmapTinted;
1043 } 1068 }
1069
1044 XRenderFreePicture (dpy, mask_pic); 1070 XRenderFreePicture (dpy, mask_pic);
1045 XRenderFreePicture (dpy, overlay_pic); 1071 XRenderFreePicture (dpy, overlay_pic);
1046 XRenderFreePicture (dpy, back_pic); 1072 XRenderFreePicture (dpy, back_pic);
1047# if DO_TIMING_TEST 1073# if DO_TIMING_TEST
1048 XSync (dpy, False); 1074 XSync (dpy, False);
1070} 1096}
1071 1097
1072bool 1098bool
1073bgPixmap_t::set_root_pixmap () 1099bgPixmap_t::set_root_pixmap ()
1074{ 1100{
1075 Pixmap new_root_pixmap = None;
1076
1077 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1101 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1078 if (new_root_pixmap == None) 1102 if (new_root_pixmap == None)
1079 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1103 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1080 1104
1081 if (new_root_pixmap != root_pixmap) 1105 if (new_root_pixmap != root_pixmap)
1082 { 1106 {
1083 root_pixmap = new_root_pixmap; 1107 root_pixmap = new_root_pixmap;
1084 return true; 1108 return true;
1085 } 1109 }
1110
1086 return false; 1111 return false;
1087} 1112}
1088# endif /* ENABLE_TRANSPARENCY */ 1113# endif /* ENABLE_TRANSPARENCY */
1089 1114
1090# ifndef HAVE_AFTERIMAGE 1115# ifndef HAVE_AFTERIMAGE
1091static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1116static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1092# endif 1117# endif
1093
1094 1118
1095bool 1119bool
1096bgPixmap_t::render () 1120bgPixmap_t::render ()
1097{ 1121{
1098 unsigned long background_flags = 0; 1122 unsigned long background_flags = 0;
1100 if (target == NULL) 1124 if (target == NULL)
1101 return false; 1125 return false;
1102 1126
1103 TIMING_TEST_START (tp); 1127 TIMING_TEST_START (tp);
1104 1128
1105 invalidate(); 1129 invalidate ();
1106# ifdef ENABLE_TRANSPARENCY 1130# ifdef ENABLE_TRANSPARENCY
1107 if (flags & isTransparent) 1131 if (flags & isTransparent)
1108 { 1132 {
1109 /* we need to re-generate transparency pixmap in that case ! */ 1133 /* we need to re-generate transparency pixmap in that case ! */
1110 background_flags = make_transparency_pixmap (); 1134 background_flags = make_transparency_pixmap ();
1119 XImage *result = NULL; 1143 XImage *result = NULL;
1120# ifdef HAVE_AFTERIMAGE 1144# ifdef HAVE_AFTERIMAGE
1121 if (original_asim 1145 if (original_asim
1122 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1146 || (background_flags & transpTransformations) != (flags & transpTransformations))
1123 { 1147 {
1148 target->init_asv ();
1149
1124 ASImage *background = NULL; 1150 ASImage *background = NULL;
1125 ARGB32 as_tint = TINT_LEAVE_SAME; 1151 ARGB32 as_tint = TINT_LEAVE_SAME;
1126 if (background_flags) 1152 if (background_flags)
1127 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 1153 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1128 1154
1129# ifdef ENABLE_TRANSPARENCY 1155# ifdef ENABLE_TRANSPARENCY
1130 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1156 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1131 { 1157 {
1132 ShadingInfo as_shade; 1158 ShadingInfo as_shade;
1139 as_shade.tintColor.green = c.g; 1165 as_shade.tintColor.green = c.g;
1140 as_shade.tintColor.blue = c.b; 1166 as_shade.tintColor.blue = c.b;
1141 1167
1142 as_tint = shading2tint32 (&as_shade); 1168 as_tint = shading2tint32 (&as_shade);
1143 } 1169 }
1170
1144 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 1171 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1145 { 1172 {
1146 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 1173 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1147 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, 1174 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1148 100, ASIMAGE_QUALITY_DEFAULT); 1175 100, ASIMAGE_QUALITY_DEFAULT);
1149 if (tmp) 1176 if (tmp)
1150 { 1177 {
1151 destroy_asimage (&background); 1178 destroy_asimage (&background);
1155# endif 1182# endif
1156 1183
1157 if (render_asim (background, as_tint)) 1184 if (render_asim (background, as_tint))
1158 flags = flags & ~isInvalid; 1185 flags = flags & ~isInvalid;
1159 if (background) 1186 if (background)
1160 destroy_asimage (&background); 1187 destroy_asimage (&background);
1161 } 1188 }
1162 else if (background_flags && pmap_depth != target->depth) 1189 else if (background_flags && pmap_depth != target->depth)
1190 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1191
1192# elif !XFT /* our own client-side tinting */
1193
1194 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1195 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1196
1197 if (background_flags && (flags & isInvalid))
1163 { 1198 {
1164 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1199 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1165 }
1166 1200
1167# elif !XFT /* our own client-side tinting */
1168
1169 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1170 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1171
1172 if (background_flags && (flags & isInvalid))
1173 {
1174 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1175 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1201 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1176 { 1202 {
1177 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1203 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1178 if (flags & tintSet) 1204 if (flags & tintSet)
1179 tint.get (c); 1205 tint.get (c);
1180 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1206 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1181 } 1207 }
1182 } 1208 }
1183# endif /* HAVE_AFTERIMAGE */ 1209# endif /* HAVE_AFTERIMAGE */
1184 1210
1185 if (result != NULL) 1211 if (result)
1186 { 1212 {
1187 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1213 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1214
1188 if (gc) 1215 if (gc)
1189 { 1216 {
1190 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1217 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1191 { 1218 {
1192 XFreePixmap (target->dpy, pixmap); 1219 XFreePixmap (target->dpy, pixmap);
1193 pixmap = None; 1220 pixmap = None;
1194 } 1221 }
1222
1195 if (pixmap == None) 1223 if (pixmap == None)
1196 { 1224 {
1197 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); 1225 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1198 pmap_width = result->width; 1226 pmap_width = result->width;
1199 pmap_height = result->height; 1227 pmap_height = result->height;
1200 pmap_depth = target->depth; 1228 pmap_depth = target->depth;
1201 } 1229 }
1230
1202 if (pmap_depth != result->depth) 1231 if (pmap_depth != result->depth)
1203 { 1232 {
1204 /* Bad Match error will ensue ! stupid X !!!! */ 1233 /* Bad Match error will ensue ! stupid X !!!! */
1205 if( result->depth == 24 && pmap_depth == 32) 1234 if (result->depth == 24 && pmap_depth == 32)
1206 result->depth = 32; 1235 result->depth = 32;
1207 else if( result->depth == 32 && pmap_depth == 24) 1236 else if (result->depth == 32 && pmap_depth == 24)
1208 result->depth = 24; 1237 result->depth = 24;
1209 else 1238 else
1210 { 1239 {
1211 /* TODO: implement image recoding */ 1240 /* TODO: implement image recoding */
1212 } 1241 }
1213 } 1242 }
1243
1214 if (pmap_depth == result->depth) 1244 if (pmap_depth == result->depth)
1215 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1245 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1246
1216 XFreeGC (target->dpy, gc); 1247 XFreeGC (target->dpy, gc);
1217 flags = flags & ~isInvalid; 1248 flags = flags & ~isInvalid;
1218 } 1249 }
1250
1219 XDestroyImage (result); 1251 XDestroyImage (result);
1220 } 1252 }
1221 1253
1222 if (flags & isInvalid) 1254 if (flags & isInvalid)
1223 { 1255 {
1227 pixmap = None; 1259 pixmap = None;
1228 } 1260 }
1229 } 1261 }
1230 1262
1231 apply (); 1263 apply ();
1264
1265 XSync (target->dpy, False);
1266 valid_since = ev::now ();
1232 1267
1233 TIMING_TEST_PRINT_RESULT (tp); 1268 TIMING_TEST_PRINT_RESULT (tp);
1234 1269
1235 return true; 1270 return true;
1236} 1271}
1245# ifdef ENABLE_TRANSPARENCY 1280# ifdef ENABLE_TRANSPARENCY
1246 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1281 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1247# endif 1282# endif
1248 return true; 1283 return true;
1249 } 1284 }
1285
1250 return false; 1286 return false;
1251} 1287}
1252 1288
1253void 1289void
1254bgPixmap_t::apply() 1290bgPixmap_t::apply ()
1255{ 1291{
1256 if (target) 1292 if (target)
1257 { 1293 {
1258 flags &= ~isVtOrigin; 1294 flags &= ~isVtOrigin;
1295
1259 if (pixmap != None) 1296 if (pixmap != None)
1260 { 1297 {
1261 /* set target's background to pixmap */ 1298 /* set target's background to pixmap */
1262# ifdef ENABLE_TRANSPARENCY 1299# ifdef ENABLE_TRANSPARENCY
1263 if (flags & isTransparent) 1300 if (flags & isTransparent)
1264 { 1301 {
1265 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1302 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1266 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1303 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1267# if HAVE_SCROLLBARS 1304
1268 if (target->scrollBar.win) 1305 if (target->scrollBar.win)
1269 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1306 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1270# endif
1271 } 1307 }
1272 else 1308 else
1273# endif 1309# endif
1274 { 1310 {
1275 flags |= isVtOrigin; 1311 flags |= isVtOrigin;
1276 /* force old pixmap dereference in case it was transparent before :*/ 1312 /* force old pixmap dereference in case it was transparent before :*/
1277 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1313 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1278 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1314 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1279 /* do we also need to set scrollbar's background here ? */ 1315 /* do we also need to set scrollbar's background here ? */
1280# if HAVE_SCROLLBARS 1316
1281 if (target->scrollBar.win) 1317 if (target->scrollBar.win)
1282 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1318 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1283# endif
1284 } 1319 }
1285 } 1320 }
1286 else 1321 else
1287 { 1322 {
1288 /* set target background to a pixel */ 1323 /* set target background to a pixel */
1289 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1324 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1290 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1325 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1291 /* do we also need to set scrollbar's background here ? */ 1326 /* do we also need to set scrollbar's background here ? */
1292# if HAVE_SCROLLBARS
1293 if (target->scrollBar.win) 1327 if (target->scrollBar.win)
1294 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1328 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1295# endif
1296 } 1329 }
1330
1297 /* don't want Expose on the parent or vt. It is better to use 1331 /* don't want Expose on the parent or vt. It is better to use
1298 scr_touch or we get a great deal of flicker otherwise: */ 1332 scr_touch or we get a great deal of flicker otherwise: */
1299 XClearWindow (target->dpy, target->parent[0]); 1333 XClearWindow (target->dpy, target->parent[0]);
1300 1334
1301# if HAVE_SCROLLBARS 1335 if (target->scrollBar.state && target->scrollBar.win)
1302 if (target->scrollBar.win)
1303 { 1336 {
1304 target->scrollBar.setIdle (); 1337 target->scrollBar.state = STATE_IDLE;
1305 target->scrollbar_show (0); 1338 target->scrollBar.show (0);
1306 } 1339 }
1307# endif
1308 1340
1309 target->want_refresh = 1; 1341 target->want_refresh = 1;
1310 flags |= hasChanged; 1342 flags |= hasChanged;
1311 } 1343 }
1312} 1344}
1317/* taken from aterm-0.4.2 */ 1349/* taken from aterm-0.4.2 */
1318 1350
1319typedef uint32_t RUINT32T; 1351typedef uint32_t RUINT32T;
1320 1352
1321static void 1353static void
1322ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1354ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1323{ 1355{
1324 int sh_r, sh_g, sh_b; 1356 int sh_r, sh_g, sh_b;
1325 RUINT32T mask_r, mask_g, mask_b; 1357 RUINT32T mask_r, mask_g, mask_b;
1326 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1358 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1327 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1359 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines