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

Diff Legend

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