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.23 by ayin, Sat Jan 5 13:52:23 2008 UTC vs.
Revision 1.45 by sf-exg, Sun Aug 29 16:10:42 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;
101 valid_since = invalid_since = 0; 107 valid_since = invalid_since = 0;
108 target = 0;
102} 109}
103 110
104void 111void
105bgPixmap_t::destroy () 112bgPixmap_t::destroy ()
106{ 113{
… …
121 return true; 128 return true;
122# endif 129# endif
123 130
124# ifdef BG_IMAGE_FROM_FILE 131# ifdef BG_IMAGE_FROM_FILE
125# ifdef HAVE_AFTERIMAGE 132# ifdef HAVE_AFTERIMAGE
126 if (original_asim != NULL) 133 if (original_asim)
127# endif 134# endif
128 { 135 {
129 if (h_scale != 0 || v_scale != 0 136 if (h_scale != 0 || v_scale != 0
130 || h_align != 0 || v_align != 0) 137 || h_align != 0 || v_align != 0)
131 return true; 138 return true;
… …
133# endif 140# endif
134 141
135 return false; 142 return false;
136} 143}
137 144
138bool 145bool
139bgPixmap_t::window_position_sensitive () 146bgPixmap_t::window_position_sensitive ()
140{ 147{
141# ifdef ENABLE_TRANSPARENCY 148# ifdef ENABLE_TRANSPARENCY
142 if (flags & isTransparent) 149 if (flags & isTransparent)
143 return true; 150 return true;
144# endif 151# endif
145 152
146# ifdef BG_IMAGE_FROM_FILE 153# ifdef BG_IMAGE_FROM_FILE
147# ifdef HAVE_AFTERIMAGE 154# ifdef HAVE_AFTERIMAGE
148 if (original_asim != NULL) 155 if (original_asim)
149# endif 156# endif
150 { 157 {
151 if (h_align == rootAlign || v_align == rootAlign) 158 if (h_align == rootAlign || v_align == rootAlign)
152 return true; 159 return true;
153 } 160 }
… …
157}; 164};
158 165
159bool bgPixmap_t::need_client_side_rendering () 166bool bgPixmap_t::need_client_side_rendering ()
160{ 167{
161# ifdef HAVE_AFTERIMAGE 168# ifdef HAVE_AFTERIMAGE
162 if (original_asim != NULL) 169 if (original_asim)
163 return true; 170 return true;
164# endif 171# endif
165# ifdef ENABLE_TRANSPARENCY 172# ifdef ENABLE_TRANSPARENCY
166 if (flags & isTransparent) 173 if (flags & isTransparent)
167 { 174 {
… …
256 int geom_flags = 0, changed = 0; 263 int geom_flags = 0, changed = 0;
257 int x = 0, y = 0; 264 int x = 0, y = 0;
258 unsigned int w = 0, h = 0; 265 unsigned int w = 0, h = 0;
259 unsigned int n; 266 unsigned int n;
260 unsigned long new_flags = (flags & (~geometryFlags)); 267 unsigned long new_flags = (flags & (~geometryFlags));
261 char *p; 268 const char *p;
262# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 269# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
263 270
264 if (geom == NULL) 271 if (geom == NULL)
265 return false; 272 return false;
266 273
… …
274 if (n < MAXLEN_GEOM) 281 if (n < MAXLEN_GEOM)
275 { 282 {
276 char *ops; 283 char *ops;
277 new_flags |= geometrySet; 284 new_flags |= geometrySet;
278 285
279 strncpy (str, geom, n); 286 memcpy (str, geom, n);
280 str[n] = '\0'; 287 str[n] = '\0';
281 if (str[0] == ':') 288 if (str[0] == ':')
282 ops = &str[0]; 289 ops = &str[0];
283 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 290 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
284 ops = &str[0]; 291 ops = &str[0];
… …
367 if (ops) 374 if (ops)
368 { 375 {
369 while (*ops) 376 while (*ops)
370 { 377 {
371 while (*ops == ':' || isspace(*ops)) ++ops; 378 while (*ops == ':' || isspace(*ops)) ++ops;
379
372# 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)
373 if (CHECK_GEOM_OPS("tile")) 381 if (CHECK_GEOM_OPS ("tile"))
374 { 382 {
375 w = h = noScale; 383 w = h = noScale;
376 geom_flags |= WidthValue|HeightValue; 384 geom_flags |= WidthValue|HeightValue;
377 } 385 }
378 else if (CHECK_GEOM_OPS("propscale")) 386 else if (CHECK_GEOM_OPS ("propscale"))
379 { 387 {
380 if (w == 0 && h == 0) 388 if (w == 0 && h == 0)
381 { 389 {
382 w = windowScale; 390 w = windowScale;
383 geom_flags |= WidthValue; 391 geom_flags |= WidthValue;
384 } 392 }
385 new_flags |= propScale; 393 new_flags |= propScale;
386 } 394 }
387 else if (CHECK_GEOM_OPS("hscale")) 395 else if (CHECK_GEOM_OPS ("hscale"))
388 { 396 {
389 if (w == 0)
390 w = windowScale; 397 if (w == 0) w = windowScale;
398
391 h = noScale; 399 h = noScale;
392 geom_flags |= WidthValue|HeightValue; 400 geom_flags |= WidthValue|HeightValue;
393 } 401 }
394 else if (CHECK_GEOM_OPS("vscale")) 402 else if (CHECK_GEOM_OPS ("vscale"))
395 { 403 {
396 if (h == 0)
397 h = windowScale; 404 if (h == 0) h = windowScale;
405
398 w = noScale; 406 w = noScale;
399 geom_flags |= WidthValue|HeightValue; 407 geom_flags |= WidthValue|HeightValue;
400 } 408 }
401 else if (CHECK_GEOM_OPS("scale")) 409 else if (CHECK_GEOM_OPS ("scale"))
402 { 410 {
403 if (h == 0)
404 h = windowScale; 411 if (h == 0) h = windowScale;
405 if (w == 0)
406 w = windowScale; 412 if (w == 0) w = windowScale;
413
407 geom_flags |= WidthValue|HeightValue; 414 geom_flags |= WidthValue|HeightValue;
408 } 415 }
409 else if (CHECK_GEOM_OPS("auto")) 416 else if (CHECK_GEOM_OPS ("auto"))
410 { 417 {
411 w = h = windowScale; 418 w = h = windowScale;
412 x = y = centerAlign; 419 x = y = centerAlign;
413 geom_flags |= WidthValue|HeightValue|XValue|YValue; 420 geom_flags |= WidthValue|HeightValue|XValue|YValue;
414 } 421 }
415 else if (CHECK_GEOM_OPS("root")) 422 else if (CHECK_GEOM_OPS ("root"))
416 { 423 {
417 w = h = noScale; 424 w = h = noScale;
418 x = y = rootAlign; 425 x = y = rootAlign;
419 geom_flags |= WidthValue|HeightValue|XValue|YValue; 426 geom_flags |= WidthValue|HeightValue|XValue|YValue;
420 } 427 }
421# undef CHECK_GEOM_OPS 428# undef CHECK_GEOM_OPS
429
422 while (*ops != ':' && *ops != '\0') ++ops; 430 while (*ops != ':' && *ops != '\0') ++ops;
423 } /* done parsing ops */ 431 } /* done parsing ops */
424 } 432 }
425 433
426 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 434 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
427 ++changed;
428 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 435 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
429 ++changed;
430 if (check_set_align_value (geom_flags, XValue, h_align, x)) 436 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
431 ++changed;
432 if (check_set_align_value (geom_flags, YValue, v_align, y)) 437 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
433 ++changed;
434 } 438 }
435 439
436 if (new_flags != flags) 440 if (new_flags != flags)
437 { 441 {
438 flags = new_flags; 442 flags = new_flags;
439 changed++; 443 changed++;
440 } 444 }
445
441//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 446//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
442// flags, h_scale, v_scale, h_align, v_align); 447// flags, h_scale, v_scale, h_align, v_align);
443 return (changed > 0); 448 return (changed > 0);
444} 449}
445 450
446# ifdef HAVE_AFTERIMAGE 451# ifdef HAVE_AFTERIMAGE
447bool 452bool
448bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 453bgPixmap_t::render_asim (unsigned long background_flags)
449{ 454{
450 if (target == NULL) 455 if (target == NULL)
451 return false; 456 return false;
452 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
453 int target_width = (int)target->szHint.width; 497 int target_width = target->szHint.width;
454 int target_height = (int)target->szHint.height; 498 int target_height = target->szHint.height;
455 int new_pmap_width = target_width, new_pmap_height = target_height; 499 int new_pmap_width = target_width;
456 ASImage *result = NULL; 500 int new_pmap_height = target_height;
457 501
458 int x = 0; 502 int x = 0;
459 int y = 0; 503 int y = 0;
460 int w = h_scale * target_width / 100; 504 int w = h_scale * target_width / 100;
461 int h = v_scale * target_height / 100; 505 int h = v_scale * target_height / 100;
… …
468 { 512 {
469 target->get_window_origin(x, y); 513 target->get_window_origin(x, y);
470 x = -x; 514 x = -x;
471 y = -y; 515 y = -y;
472 } 516 }
517
473 if (h_align != rootAlign) 518 if (h_align != rootAlign)
474 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
475 if (v_align != rootAlign) 521 if (v_align != rootAlign)
476 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);
477 } 523 }
478 524
479 if (original_asim == NULL 525 if (!original_asim
480 || x >= target_width 526 || x >= target_width
481 || y >= target_height 527 || y >= target_height
482 || (w > 0 && x + w <= 0) 528 || (w > 0 && x + w <= 0)
483 || (h > 0 && y + h <= 0)) 529 || (h > 0 && y + h <= 0))
484 { 530 {
485 if (background) 531 if (background)
486 { 532 {
487 new_pmap_width = background->width; 533 new_pmap_width = background->width;
488 new_pmap_height = background->height; 534 new_pmap_height = background->height;
489 result = background; 535 result = background;
536
490 if (background_tint != TINT_LEAVE_SAME) 537 if (background_tint != TINT_LEAVE_SAME)
491 { 538 {
492 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 539 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
493 target_width, target_height, background_tint, 540 target_width, target_height, background_tint,
494 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 541 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
495 if (tmp) 542 if (tmp)
496 result = tmp; 543 result = tmp;
497 } 544 }
… …
500 new_pmap_width = new_pmap_height = 0; 547 new_pmap_width = new_pmap_height = 0;
501 } 548 }
502 else 549 else
503 { 550 {
504 result = original_asim; 551 result = original_asim;
552
505 if ((w > 0 && w != original_asim->width) 553 if ((w > 0 && w != original_asim->width)
506 || (h > 0 && h != original_asim->height)) 554 || (h > 0 && h != original_asim->height))
507 { 555 {
508 result = scale_asimage (target->asv, original_asim, 556 result = scale_asimage (target->asv, original_asim,
509 w > 0 ? w : original_asim->width, 557 w > 0 ? w : original_asim->width,
510 h > 0 ? h : original_asim->height, 558 h > 0 ? h : original_asim->height,
511 background ? ASA_ASImage : ASA_XImage, 559 background ? ASA_ASImage : ASA_XImage,
512 100, ASIMAGE_QUALITY_DEFAULT); 560 100, ASIMAGE_QUALITY_DEFAULT);
513 } 561 }
562
514 if (background == NULL) 563 if (background == NULL)
515 { 564 {
516 /* if tiling - pixmap has to be sized exactly as the image, 565 /* if tiling - pixmap has to be sized exactly as the image,
517 but there is no need to make it bigger than the window! */ 566 but there is no need to make it bigger than the window! */
518 if (h_scale == 0) 567 if (h_scale == 0)
… …
521 new_pmap_height = min (result->height, target_height); 570 new_pmap_height = min (result->height, target_height);
522 /* 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 */
523 if (h_scale == 0 || v_scale == 0) 572 if (h_scale == 0 || v_scale == 0)
524 { 573 {
525 ASImage *tmp = tile_asimage (target->asv, result, 574 ASImage *tmp = tile_asimage (target->asv, result,
526 (h_scale > 0) ? 0 : (int)result->width - x, 575 (h_scale > 0) ? 0 : (int)result->width - x,
527 (v_scale > 0) ? 0 : (int)result->height - y, 576 (v_scale > 0) ? 0 : (int)result->height - y,
528 new_pmap_width, 577 new_pmap_width,
529 new_pmap_height, 578 new_pmap_height,
530 TINT_LEAVE_SAME, ASA_XImage, 579 TINT_LEAVE_SAME, ASA_XImage,
531 100, ASIMAGE_QUALITY_DEFAULT); 580 100, ASIMAGE_QUALITY_DEFAULT);
532 if (tmp) 581 if (tmp)
533 { 582 {
534 if (result != original_asim) 583 if (result != original_asim)
535 destroy_asimage (&result); 584 destroy_asimage (&result);
585
536 result = tmp; 586 result = tmp;
537 } 587 }
538 } 588 }
539 } 589 }
540 else 590 else
541 { 591 {
542 /* 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 */
543 ASImageLayer *layers = create_image_layers (2); 593 ASImageLayer *layers = create_image_layers (2);
544 ASImage *merged_im = NULL;
545 594
546 layers[0].im = background; 595 layers[0].im = background;
547 layers[0].clip_width = target_width; 596 layers[0].clip_width = target_width;
548 layers[0].clip_height = target_height; 597 layers[0].clip_height = target_height;
549 layers[0].tint = background_tint; 598 layers[0].tint = background_tint;
550 layers[1].im = result; 599 layers[1].im = result;
600
551 if (w <= 0) 601 if (w <= 0)
552 { 602 {
553 /* tile horizontally */ 603 /* tile horizontally */
554 while (x > 0) x -= (int)result->width; 604 while (x > 0) x -= (int)result->width;
555 layers[1].dst_x = x; 605 layers[1].dst_x = x;
… …
559 { 609 {
560 /* clip horizontally */ 610 /* clip horizontally */
561 layers[1].dst_x = x; 611 layers[1].dst_x = x;
562 layers[1].clip_width = result->width; 612 layers[1].clip_width = result->width;
563 } 613 }
614
564 if (h <= 0) 615 if (h <= 0)
565 { 616 {
566 while (y > 0) y -= (int)result->height; 617 while (y > 0) y -= (int)result->height;
567 layers[1].dst_y = y; 618 layers[1].dst_y = y;
568 layers[1].clip_height = result->height + target_height; 619 layers[1].clip_height = result->height + target_height;
… …
570 else 621 else
571 { 622 {
572 layers[1].dst_y = y; 623 layers[1].dst_y = y;
573 layers[1].clip_height = result->height; 624 layers[1].clip_height = result->height;
574 } 625 }
626
575 if (target->rs[Rs_blendtype]) 627 if (target->rs[Rs_blendtype])
576 { 628 {
577 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 629 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
578 if (layers[1].merge_scanlines == NULL) 630 if (layers[1].merge_scanlines == NULL)
579 layers[1].merge_scanlines = alphablend_scanlines; 631 layers[1].merge_scanlines = alphablend_scanlines;
580 } 632 }
633
581 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,
582 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 635 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
636
583 if (tmp) 637 if (tmp)
584 { 638 {
585 if (result != original_asim) 639 if (result != original_asim)
586 destroy_asimage (&result); 640 destroy_asimage (&result);
641
587 result = tmp; 642 result = tmp;
588 } 643 }
644
589 free (layers); 645 free (layers);
590 } 646 }
591 } 647 }
592 TIMING_TEST_PRINT_RESULT (asim); 648 TIMING_TEST_PRINT_RESULT (asim);
593 649
… …
622 678
623 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;
624 int dst_width = result->width, dst_height = result->height; 680 int dst_width = result->width, dst_height = result->height;
625 if (background == NULL) 681 if (background == NULL)
626 { 682 {
627 if (h_scale > 0)
628 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 );
629 if (v_scale > 0)
630 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);
631 685
632 if (dst_x > 0 || dst_y > 0 686 if (dst_x > 0 || dst_y > 0
633 || dst_x + dst_width < new_pmap_width 687 || dst_x + dst_width < new_pmap_width
634 || dst_y + dst_height < new_pmap_height) 688 || dst_y + dst_height < new_pmap_height)
635 {
636 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);
637 }
638 } 690 }
639 691
640 /* put result on pixmap */ 692 /* put result on pixmap */
641 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 693 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
642 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);
… …
646 698
647 XFreeGC (target->dpy, gc); 699 XFreeGC (target->dpy, gc);
648 TIMING_TEST_PRINT_RESULT (asim); 700 TIMING_TEST_PRINT_RESULT (asim);
649 } 701 }
650 702
703 if (background)
704 destroy_asimage (&background);
705
651 return true; 706 return true;
652} 707}
653# endif /* HAVE_AFTERIMAGE */ 708# endif /* HAVE_AFTERIMAGE */
654 709
655bool 710bool
656bgPixmap_t::set_file (const char *file) 711bgPixmap_t::set_file (const char *file)
657{ 712{
658 char *f;
659
660 assert (file != NULL); 713 assert (file);
661 714
662 if (*file != '\0') 715 if (*file)
663 { 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
664# ifdef HAVE_AFTERIMAGE 726# ifdef HAVE_AFTERIMAGE
665 if (target->asimman == NULL) 727 if (!target->asimman)
666 target->asimman = create_generic_imageman (target->rs[Rs_path]); 728 target->asimman = create_generic_imageman (target->rs[Rs_path]);
667 if ((f = strchr (file, ';')) == NULL)
668 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 729 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
669 else
670 {
671 size_t len = f - file;
672 f = (char *)malloc (len + 1);
673 strncpy (f, file, len);
674 f[len] = '\0';
675 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
676 free (f);
677 }
678 return (original_asim != NULL); 730 return original_asim;
679# endif 731# endif
680 } 732 }
733
681 return false; 734 return false;
682} 735}
683 736
684# endif /* BG_IMAGE_FROM_FILE */ 737# endif /* BG_IMAGE_FROM_FILE */
685 738
… …
690 if (!(flags & isTransparent)) 743 if (!(flags & isTransparent))
691 { 744 {
692 flags |= isTransparent; 745 flags |= isTransparent;
693 return true; 746 return true;
694 } 747 }
748
695 return false; 749 return false;
696} 750}
697 751
698bool 752bool
699bgPixmap_t::set_blur_radius (const char *geom) 753bgPixmap_t::set_blur_radius (const char *geom)
… …
832 unsigned long result = 0; 886 unsigned long result = 0;
833 887
834 if (target == NULL) 888 if (target == NULL)
835 return 0; 889 return 0;
836 890
837 /* 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
838 * be always up-to-date, so let's use it : 892 * be always up-to-date, so let's use it :
839 */ 893 */
840 Window root = target->display->root; 894 Window root = target->display->root;
841 int screen = target->display->screen; 895 int screen = target->display->screen;
842 Display *dpy = target->dpy; 896 Display *dpy = target->dpy;
… …
931 else 985 else
932 result |= transpPmapTiled; 986 result |= transpPmapTiled;
933 } 987 }
934 else 988 else
935 { 989 {
936 /* strightforward pixmap copy */ 990 /* straightforward pixmap copy */
937 gcv.tile = root_pixmap; 991 gcv.tile = root_pixmap;
938 gcv.fill_style = FillTiled; 992 gcv.fill_style = FillTiled;
939 993
940 while (sx < 0) sx += (int)root_width; 994 while (sx < 0) sx += (int)root_width;
941 while (sy < 0) sy += (int)root_height; 995 while (sy < 0) sy += (int)root_height;
… …
1092 return false; 1146 return false;
1093} 1147}
1094# endif /* ENABLE_TRANSPARENCY */ 1148# endif /* ENABLE_TRANSPARENCY */
1095 1149
1096# ifndef HAVE_AFTERIMAGE 1150# ifndef HAVE_AFTERIMAGE
1097static 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);
1098# endif 1152# endif
1099 1153
1100bool 1154bool
1101bgPixmap_t::render () 1155bgPixmap_t::render ()
1102{ 1156{
… …
1105 if (target == NULL) 1159 if (target == NULL)
1106 return false; 1160 return false;
1107 1161
1108 TIMING_TEST_START (tp); 1162 TIMING_TEST_START (tp);
1109 1163
1110 invalidate(); 1164 invalidate ();
1111# ifdef ENABLE_TRANSPARENCY 1165# ifdef ENABLE_TRANSPARENCY
1112 if (flags & isTransparent) 1166 if (flags & isTransparent)
1113 { 1167 {
1114 /* we need to re-generate transparency pixmap in that case ! */ 1168 /* we need to re-generate transparency pixmap in that case ! */
1115 background_flags = make_transparency_pixmap (); 1169 background_flags = make_transparency_pixmap ();
… …
1124 XImage *result = NULL; 1178 XImage *result = NULL;
1125# ifdef HAVE_AFTERIMAGE 1179# ifdef HAVE_AFTERIMAGE
1126 if (original_asim 1180 if (original_asim
1127 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1181 || (background_flags & transpTransformations) != (flags & transpTransformations))
1128 { 1182 {
1129 ASImage *background = NULL;
1130 ARGB32 as_tint = TINT_LEAVE_SAME;
1131 if (background_flags)
1132 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1133
1134# ifdef ENABLE_TRANSPARENCY
1135 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1136 {
1137 ShadingInfo as_shade;
1138 as_shade.shading = (shade == 0) ? 100 : shade;
1139
1140 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1141 if (flags & tintSet)
1142 tint.get (c);
1143 as_shade.tintColor.red = c.r;
1144 as_shade.tintColor.green = c.g;
1145 as_shade.tintColor.blue = c.b;
1146
1147 as_tint = shading2tint32 (&as_shade);
1148 }
1149 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1150 {
1151 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1152 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1153 100, ASIMAGE_QUALITY_DEFAULT);
1154 if (tmp)
1155 {
1156 destroy_asimage (&background);
1157 background = tmp;
1158 }
1159 }
1160# endif
1161
1162 if (render_asim (background, as_tint)) 1183 if (render_asim (background_flags))
1163 flags = flags & ~isInvalid; 1184 flags = flags & ~isInvalid;
1164 if (background)
1165 destroy_asimage (&background);
1166 } 1185 }
1167 else if (background_flags && pmap_depth != target->depth) 1186 else if (background_flags && pmap_depth != target->depth)
1187 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1188
1189# elif !XFT /* our own client-side tinting */
1190
1191 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1192 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1193
1194 if (background_flags && (flags & isInvalid))
1168 { 1195 {
1169 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1196 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1170 }
1171 1197
1172# elif !XFT /* our own client-side tinting */
1173
1174 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1175 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1176
1177 if (background_flags && (flags & isInvalid))
1178 {
1179 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1180 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1198 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1181 { 1199 {
1182 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1200 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1183 if (flags & tintSet) 1201 if (flags & tintSet)
1184 tint.get (c); 1202 tint.get (c);
… …
1259# ifdef ENABLE_TRANSPARENCY 1277# ifdef ENABLE_TRANSPARENCY
1260 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1278 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1261# endif 1279# endif
1262 return true; 1280 return true;
1263 } 1281 }
1282
1264 return false; 1283 return false;
1265} 1284}
1266 1285
1267void 1286void
1268bgPixmap_t::apply () 1287bgPixmap_t::apply ()
1269{ 1288{
1270 if (target) 1289 if (target)
1271 { 1290 {
1272 flags &= ~isVtOrigin; 1291 flags &= ~isVtOrigin;
1292
1273 if (pixmap != None) 1293 if (pixmap != None)
1274 { 1294 {
1275 /* set target's background to pixmap */ 1295 /* set target's background to pixmap */
1276# ifdef ENABLE_TRANSPARENCY 1296# ifdef ENABLE_TRANSPARENCY
1277 if (flags & isTransparent) 1297 if (flags & isTransparent)
1278 { 1298 {
1279 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1299 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1280 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1300 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1281# if HAVE_SCROLLBARS 1301
1282 if (target->scrollBar.win) 1302 if (target->scrollBar.win)
1283 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1303 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1284# endif
1285 } 1304 }
1286 else 1305 else
1287# endif 1306# endif
1288 { 1307 {
1289 flags |= isVtOrigin; 1308 flags |= isVtOrigin;
1290 /* force old pixmap dereference in case it was transparent before :*/ 1309 /* force old pixmap dereference in case it was transparent before :*/
1291 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1310 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1292 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1311 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1293 /* do we also need to set scrollbar's background here ? */ 1312 /* do we also need to set scrollbar's background here ? */
1294# if HAVE_SCROLLBARS 1313
1295 if (target->scrollBar.win) 1314 if (target->scrollBar.win)
1296 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1315 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1297# endif
1298 } 1316 }
1299 } 1317 }
1300 else 1318 else
1301 { 1319 {
1302 /* set target background to a pixel */ 1320 /* set target background to a pixel */
1303 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1321 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1304 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1322 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1305 /* do we also need to set scrollbar's background here ? */ 1323 /* do we also need to set scrollbar's background here ? */
1306# if HAVE_SCROLLBARS
1307 if (target->scrollBar.win) 1324 if (target->scrollBar.win)
1308 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1325 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1309# endif
1310 } 1326 }
1327
1311 /* don't want Expose on the parent or vt. It is better to use 1328 /* don't want Expose on the parent or vt. It is better to use
1312 scr_touch or we get a great deal of flicker otherwise: */ 1329 scr_touch or we get a great deal of flicker otherwise: */
1313 XClearWindow (target->dpy, target->parent[0]); 1330 XClearWindow (target->dpy, target->parent[0]);
1314 1331
1315# if HAVE_SCROLLBARS 1332 if (target->scrollBar.state && target->scrollBar.win)
1316 if (target->scrollBar.win)
1317 { 1333 {
1318 target->scrollBar.setIdle (); 1334 target->scrollBar.state = STATE_IDLE;
1319 target->scrollbar_show (0); 1335 target->scrollBar.show (0);
1320 } 1336 }
1321# endif
1322 1337
1323 target->want_refresh = 1; 1338 target->want_refresh = 1;
1324 flags |= hasChanged; 1339 flags |= hasChanged;
1325 } 1340 }
1326} 1341}
… …
1331/* taken from aterm-0.4.2 */ 1346/* taken from aterm-0.4.2 */
1332 1347
1333typedef uint32_t RUINT32T; 1348typedef uint32_t RUINT32T;
1334 1349
1335static void 1350static void
1336ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1351ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1337{ 1352{
1338 int sh_r, sh_g, sh_b; 1353 int sh_r, sh_g, sh_b;
1339 RUINT32T mask_r, mask_g, mask_b; 1354 RUINT32T mask_r, mask_g, mask_b;
1340 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1355 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1341 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1356 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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