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

Diff Legend

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