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.32 by root, Tue Nov 4 14:38:29 2008 UTC vs.
Revision 1.60 by sf-exg, Sun Oct 3 20:41:32 2010 UTC

… …
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.
57 * WxH+X Assumes Y == X 61 * WxH+X Assumes Y == X
58 * WxH Assumes Y == X == 50 (centers the image) 62 * WxH Assumes Y == X == 50 (centers the image)
59 * W+X+Y Assumes H == W 63 * W+X+Y Assumes H == W
60 * W+X Assumes H == W and Y == X 64 * W+X Assumes H == W and Y == X
61 * W Assumes H == W and Y == X == 50 65 * W Assumes H == W and Y == X == 50
62 * 66 *
63 * Adjusting position only : 67 * Adjusting position only :
64 * =+X+Y Set position to X% by Y% (absolute). 68 * =+X+Y Set position to X% by Y% (absolute).
65 * =+X Set position to X% by X%. 69 * =+X Set position to X% by X%.
66 * +X+Y Adjust position horizontally X% and vertically Y% 70 * +X+Y Adjust position horizontally X% and vertically Y%
67 * from current position (relative). 71 * from current position (relative).
68 * +X Adjust position horizontally X% and vertically X% 72 * +X Adjust position horizontally X% and vertically X%
69 * from current position. 73 * from current position.
70 * 74 *
71 * Adjusting scale only : 75 * Adjusting scale only :
72 * Wx0 Multiply horizontal scaling factor by W% 76 * Wx0 Multiply horizontal scaling factor by W%
73 * 0xH Multiply vertical scaling factor by H% 77 * 0xH Multiply vertical scaling factor by H%
74 * 0x0 No scaling (show image at normal size). 78 * 0x0 No scaling (show image at normal size).
75 * 79 *
76 * Pixmap Operations : (should be prepended by a colon) 80 * Pixmap Operations : (should be prepended by a colon)
77 * tile Tile image. Scaling/position modifiers above will affect 81 * tile Tile image. Scaling/position modifiers above will affect
78 * the tile size and origin. 82 * the tile size and origin.
79 * propscale When scaling, scale proportionally. That is, maintain the 83 * propscale When scaling, scale proportionally. That is, maintain the
80 * proper aspect ratio for the image. Any portion of the 84 * proper aspect ratio for the image. Any portion of the
81 * background not covered by the image is filled with the 85 * background not covered by the image is filled with the
82 * current background color. 86 * current background color.
83 * hscale Scale horizontally, tile vertically ? 87 * hscale Scale horizontally, tile vertically ?
84 * vscale Tile horizontally, scale vertically ? 88 * vscale Tile horizontally, scale vertically ?
… …
92 // this is basically redundant as bgPixmap_t is only used in 96 // this is basically redundant as bgPixmap_t is only used in
93 // zero_initialised-derived structs 97 // zero_initialised-derived structs
94#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL; 99 original_asim = NULL;
96#endif 100#endif
101#ifdef HAVE_PIXBUF
102 pixbuf = NULL;
103#endif
97#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
105 have_image = false;
98 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
99 h_align = v_align = 0; 107 h_align = v_align = 0;
100#endif 108#endif
101 flags = 0; 109 flags = 0;
102 pixmap = None; 110 pixmap = None;
… …
110#ifdef HAVE_AFTERIMAGE 118#ifdef HAVE_AFTERIMAGE
111 if (original_asim) 119 if (original_asim)
112 safe_asimage_destroy (original_asim); 120 safe_asimage_destroy (original_asim);
113#endif 121#endif
114 122
123#ifdef HAVE_PIXBUF
124 if (pixbuf)
125 g_object_unref (pixbuf);
126#endif
127
115 if (pixmap && target) 128 if (pixmap && target)
116 XFreePixmap (target->dpy, pixmap); 129 XFreePixmap (target->dpy, pixmap);
117} 130}
118 131
119bool 132bool
… …
123 if (flags & isTransparent) 136 if (flags & isTransparent)
124 return true; 137 return true;
125# endif 138# endif
126 139
127# ifdef BG_IMAGE_FROM_FILE 140# ifdef BG_IMAGE_FROM_FILE
128# ifdef HAVE_AFTERIMAGE 141 if (have_image)
129 if (original_asim)
130# endif
131 { 142 {
132 if (h_scale != 0 || v_scale != 0 143 if (h_scale != 0 || v_scale != 0
133 || h_align != 0 || v_align != 0) 144 || h_align != 0 || v_align != 0)
134 return true; 145 return true;
135 } 146 }
136# endif 147# endif
137 148
138 return false; 149 return false;
139} 150}
140 151
141bool 152bool
142bgPixmap_t::window_position_sensitive () 153bgPixmap_t::window_position_sensitive ()
143{ 154{
144# ifdef ENABLE_TRANSPARENCY 155# ifdef ENABLE_TRANSPARENCY
145 if (flags & isTransparent) 156 if (flags & isTransparent)
146 return true; 157 return true;
147# endif 158# endif
148 159
149# ifdef BG_IMAGE_FROM_FILE 160# ifdef BG_IMAGE_FROM_FILE
150# ifdef HAVE_AFTERIMAGE 161 if (have_image)
151 if (original_asim)
152# endif
153 { 162 {
154 if (h_align == rootAlign || v_align == rootAlign) 163 if (h_align == rootAlign || v_align == rootAlign)
155 return true; 164 return true;
156 } 165 }
157# endif 166# endif
… …
219 228
220static inline int 229static inline int
221make_align_position (int align, int window_size, int image_size) 230make_align_position (int align, int window_size, int image_size)
222{ 231{
223 int diff = window_size - image_size; 232 int diff = window_size - image_size;
224 int smaller = MIN (image_size,window_size); 233 int smaller = min (image_size, window_size);
225 234
226 if (align >= 0 && align <= 50) 235 if (align >= 0 && align <= 50)
227 return diff * align / 100; 236 return diff * align / 100;
228 else if (align > 50 && align <= 100) 237 else if (align > 50 && align <= 100)
229 return window_size - image_size - diff * (100 - align) / 100; 238 return window_size - image_size - diff * (100 - align) / 100;
… …
238make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 247make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
239{ 248{
240 int src_pos = 0; 249 int src_pos = 0;
241 dst_pos = 0; 250 dst_pos = 0;
242 dst_size = size; 251 dst_size = size;
243 if (pos < 0 && size > target_size) 252 if (pos < 0)
244 { 253 {
245 src_pos = -pos; 254 src_pos = -pos;
246 dst_size += pos; 255 dst_size += pos;
247 } 256 }
248 else if (pos > 0) 257 else if (pos > 0)
… …
259 int geom_flags = 0, changed = 0; 268 int geom_flags = 0, changed = 0;
260 int x = 0, y = 0; 269 int x = 0, y = 0;
261 unsigned int w = 0, h = 0; 270 unsigned int w = 0, h = 0;
262 unsigned int n; 271 unsigned int n;
263 unsigned long new_flags = (flags & (~geometryFlags)); 272 unsigned long new_flags = (flags & (~geometryFlags));
264 char *p; 273 const char *p;
265# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 274# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
266 275
267 if (geom == NULL) 276 if (geom == NULL)
268 return false; 277 return false;
269 278
… …
437 { 446 {
438 flags = new_flags; 447 flags = new_flags;
439 changed++; 448 changed++;
440 } 449 }
441 450
442//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
443// flags, h_scale, v_scale, h_align, v_align); 452 // flags, h_scale, v_scale, h_align, v_align);
444 return (changed > 0); 453 return (changed > 0);
454}
455
456void
457bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
458{
459 int target_width = target->szHint.width;
460 int target_height = target->szHint.height;
461
462 w = h_scale * target_width / 100;
463 h = v_scale * target_height / 100;
464
465 if (h_align == rootAlign || v_align == rootAlign)
466 {
467 target->get_window_origin (x, y);
468 x = -x;
469 y = -y;
470 }
471
472 if (h_align != rootAlign)
473 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
474
475 if (v_align != rootAlign)
476 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
445} 477}
446 478
447# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
448bool 480bool
449bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 481bgPixmap_t::render_image (unsigned long background_flags)
450{ 482{
451 if (target == NULL) 483 if (target == NULL)
452 return false; 484 return false;
453 485
454 target->init_asv (); 486 target->init_asv ();
487
488 ASImage *background = NULL;
489 ARGB32 background_tint = TINT_LEAVE_SAME;
490
491# ifdef ENABLE_TRANSPARENCY
492 if (background_flags)
493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
494
495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
496 {
497 ShadingInfo as_shade;
498 as_shade.shading = (shade == 0) ? 100 : shade;
499
500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
501 if (flags & tintSet)
502 tint.get (c);
503 as_shade.tintColor.red = c.r;
504 as_shade.tintColor.green = c.g;
505 as_shade.tintColor.blue = c.b;
506
507 background_tint = shading2tint32 (&as_shade);
508 }
509
510 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
511 {
512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
514 100, ASIMAGE_QUALITY_DEFAULT);
515 if (tmp)
516 {
517 destroy_asimage (&background);
518 background = tmp;
519 }
520 }
521# endif
455 522
456 ASImage *result = 0; 523 ASImage *result = 0;
457 524
458 int target_width = target->szHint.width; 525 int target_width = target->szHint.width;
459 int target_height = target->szHint.height; 526 int target_height = target->szHint.height;
460 int new_pmap_width = target_width; 527 int new_pmap_width = target_width;
461 int new_pmap_height = target_height; 528 int new_pmap_height = target_height;
462 529
463 int x = 0; 530 int x = 0;
464 int y = 0; 531 int y = 0;
465 int w = h_scale * target_width / 100; 532 int w = 0;
466 int h = v_scale * target_height / 100; 533 int h = 0;
467 534
468 TIMING_TEST_START (asim); 535 TIMING_TEST_START (asim);
469 536
470 if (original_asim) 537 if (original_asim)
471 { 538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
472 if (h_align == rootAlign || v_align == rootAlign)
473 {
474 target->get_window_origin(x, y);
475 x = -x;
476 y = -y;
477 }
478
479 if (h_align != rootAlign)
480 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
481
482 if (v_align != rootAlign)
483 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
484 }
485 539
486 if (!original_asim 540 if (!original_asim
487 || x >= target_width 541 || x >= target_width
488 || y >= target_height 542 || y >= target_height
489 || (w > 0 && x + w <= 0) 543 || (w > 0 && x + w <= 0)
… …
495 new_pmap_height = background->height; 549 new_pmap_height = background->height;
496 result = background; 550 result = background;
497 551
498 if (background_tint != TINT_LEAVE_SAME) 552 if (background_tint != TINT_LEAVE_SAME)
499 { 553 {
500 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 554 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
501 target_width, target_height, background_tint, 555 target_width, target_height, background_tint,
502 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 556 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
503 if (tmp) 557 if (tmp)
504 result = tmp; 558 result = tmp;
505 } 559 }
… …
521 100, ASIMAGE_QUALITY_DEFAULT); 575 100, ASIMAGE_QUALITY_DEFAULT);
522 } 576 }
523 577
524 if (background == NULL) 578 if (background == NULL)
525 { 579 {
526 /* if tiling - pixmap has to be sized exactly as the image,
527 but there is no need to make it bigger than the window! */
528 if (h_scale == 0)
529 new_pmap_width = min (result->width, target_width);
530 if (v_scale == 0)
531 new_pmap_height = min (result->height, target_height);
532 /* we also need to tile our image in one or both directions */
533 if (h_scale == 0 || v_scale == 0) 580 if (h_scale == 0 || v_scale == 0)
534 { 581 {
582 /* if tiling - pixmap has to be sized exactly as the image,
583 but there is no need to make it bigger than the window! */
584 new_pmap_width = min (result->width, target_width);
585 new_pmap_height = min (result->height, target_height);
586
587 /* we also need to tile our image in both directions */
535 ASImage *tmp = tile_asimage (target->asv, result, 588 ASImage *tmp = tile_asimage (target->asv, result,
536 (h_scale > 0) ? 0 : (int)result->width - x, 589 (int)result->width - x,
537 (v_scale > 0) ? 0 : (int)result->height - y, 590 (int)result->height - y,
538 new_pmap_width, 591 new_pmap_width,
539 new_pmap_height, 592 new_pmap_height,
540 TINT_LEAVE_SAME, ASA_XImage, 593 TINT_LEAVE_SAME, ASA_XImage,
541 100, ASIMAGE_QUALITY_DEFAULT); 594 100, ASIMAGE_QUALITY_DEFAULT);
542 if (tmp) 595 if (tmp)
543 { 596 {
… …
550 } 603 }
551 else 604 else
552 { 605 {
553 /* if blending background and image - pixmap has to be sized same as target window */ 606 /* if blending background and image - pixmap has to be sized same as target window */
554 ASImageLayer *layers = create_image_layers (2); 607 ASImageLayer *layers = create_image_layers (2);
555 ASImage *merged_im = NULL;
556 608
557 layers[0].im = background; 609 layers[0].im = background;
558 layers[0].clip_width = target_width; 610 layers[0].clip_width = target_width;
559 layers[0].clip_height = target_height; 611 layers[0].clip_height = target_height;
560 layers[0].tint = background_tint; 612 layers[0].tint = background_tint;
… …
607 free (layers); 659 free (layers);
608 } 660 }
609 } 661 }
610 TIMING_TEST_PRINT_RESULT (asim); 662 TIMING_TEST_PRINT_RESULT (asim);
611 663
612 if (pixmap) 664 bool ret = false;
613 {
614 if (result == NULL
615 || pmap_width != new_pmap_width
616 || pmap_height != new_pmap_height
617 || pmap_depth != target->depth)
618 {
619 XFreePixmap (target->dpy, pixmap);
620 pixmap = None;
621 }
622 }
623 665
624 if (result) 666 if (result)
625 { 667 {
626 XGCValues gcv; 668 XGCValues gcv;
627 GC gc; 669 GC gc;
670
671 if (pixmap)
672 {
673 if (pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
676 {
677 XFreePixmap (target->dpy, pixmap);
678 pixmap = None;
679 }
680 }
628 681
629 /* create Pixmap */ 682 /* create Pixmap */
630 if (pixmap == None) 683 if (pixmap == None)
631 { 684 {
632 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 685 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
633 pmap_width = new_pmap_width; 686 pmap_width = new_pmap_width;
634 pmap_height = new_pmap_height; 687 pmap_height = new_pmap_height;
635 pmap_depth = target->depth; 688 pmap_depth = target->depth;
636 } 689 }
637 /* fill with background color ( if result's not completely overlapping it)*/ 690 /* fill with background color (if result's not completely overlapping it) */
638 gcv.foreground = target->pix_colors[Color_bg]; 691 gcv.foreground = target->pix_colors[Color_bg];
639 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 692 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
640 693
641 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 694 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
642 int dst_width = result->width, dst_height = result->height; 695 int dst_width = result->width, dst_height = result->height;
643 if (background == NULL) 696 if (background == NULL)
644 { 697 {
698 if (!(h_scale == 0 || v_scale == 0))
699 {
645 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 700 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
646 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 701 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
702 }
647 703
648 if (dst_x > 0 || dst_y > 0 704 if (dst_x > 0 || dst_y > 0
649 || dst_x + dst_width < new_pmap_width 705 || dst_x + dst_width < new_pmap_width
650 || dst_y + dst_height < new_pmap_height) 706 || dst_y + dst_height < new_pmap_height)
651 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 707 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
… …
658 if (result != background && result != original_asim) 714 if (result != background && result != original_asim)
659 destroy_asimage (&result); 715 destroy_asimage (&result);
660 716
661 XFreeGC (target->dpy, gc); 717 XFreeGC (target->dpy, gc);
662 TIMING_TEST_PRINT_RESULT (asim); 718 TIMING_TEST_PRINT_RESULT (asim);
663 }
664 719
720 ret = true;
721 }
722
723 if (background)
724 destroy_asimage (&background);
725
665 return true; 726 return ret;
666} 727}
667# endif /* HAVE_AFTERIMAGE */ 728# endif /* HAVE_AFTERIMAGE */
729
730# ifdef HAVE_PIXBUF
731bool
732bgPixmap_t::render_image (unsigned long background_flags)
733{
734 if (target == NULL)
735 return false;
736
737 if (!pixbuf)
738 return false;
739
740 // TODO: add alpha blending
741 if (background_flags)
742 return false;
743
744 GdkPixbuf *result;
745
746 int image_width = gdk_pixbuf_get_width (pixbuf);
747 int image_height = gdk_pixbuf_get_height (pixbuf);
748
749 int target_width = target->szHint.width;
750 int target_height = target->szHint.height;
751 int new_pmap_width = target_width;
752 int new_pmap_height = target_height;
753
754 int x = 0;
755 int y = 0;
756 int w = 0;
757 int h = 0;
758
759 get_image_geometry (image_width, image_height, w, h, x, y);
760
761 if (x >= target_width
762 || y >= target_height
763 || (w > 0 && x + w <= 0)
764 || (h > 0 && y + h <= 0))
765 return false;
766
767 result = pixbuf;
768
769 if ((w > 0 && w != image_width)
770 || (h > 0 && h != image_height))
771 {
772 result = gdk_pixbuf_scale_simple (pixbuf,
773 w > 0 ? w : image_width,
774 h > 0 ? h : image_height,
775 GDK_INTERP_BILINEAR);
776 }
777
778 bool ret = false;
779
780 if (result)
781 {
782 XGCValues gcv;
783 GC gc;
784
785 image_width = gdk_pixbuf_get_width (result);
786 image_height = gdk_pixbuf_get_height (result);
787
788 if (h_scale == 0 || v_scale == 0)
789 {
790 new_pmap_width = min (image_width, target_width);
791 new_pmap_height = min (image_height, target_height);
792 }
793
794 if (pixmap)
795 {
796 if (pmap_width != new_pmap_width
797 || pmap_height != new_pmap_height
798 || pmap_depth != target->depth)
799 {
800 XFreePixmap (target->dpy, pixmap);
801 pixmap = None;
802 }
803 }
804
805 if (pixmap == None)
806 {
807 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
808 pmap_width = new_pmap_width;
809 pmap_height = new_pmap_height;
810 pmap_depth = target->depth;
811 }
812
813 gcv.foreground = target->pix_colors[Color_bg];
814 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
815
816 if (h_scale == 0 || v_scale == 0)
817 {
818 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
819 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
820 0, 0,
821 0, 0,
822 image_width, image_height,
823 XLIB_RGB_DITHER_NONE,
824 0, 0);
825
826 gcv.tile = tile;
827 gcv.fill_style = FillTiled;
828 gcv.ts_x_origin = x;
829 gcv.ts_y_origin = y;
830 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
831
832 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
833 XFreePixmap (target->dpy, tile);
834 }
835 else
836 {
837 int src_x, src_y, dst_x, dst_y;
838 int dst_width, dst_height;
839
840 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
841 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
842
843 if (dst_x > 0 || dst_y > 0
844 || dst_x + dst_width < new_pmap_width
845 || dst_y + dst_height < new_pmap_height)
846 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
847
848 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
849 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
850 src_x, src_y,
851 dst_x, dst_y,
852 dst_width, dst_height,
853 XLIB_RGB_DITHER_NONE,
854 0, 0);
855 }
856
857 if (result != pixbuf)
858 g_object_unref (result);
859
860 XFreeGC (target->dpy, gc);
861
862 ret = true;
863 }
864
865 return ret;
866}
867# endif /* HAVE_PIXBUF */
668 868
669bool 869bool
670bgPixmap_t::set_file (const char *file) 870bgPixmap_t::set_file (const char *file)
671{ 871{
672 assert (file); 872 assert (file);
673 873
674 if (*file) 874 if (*file)
675 { 875 {
876 if (const char *p = strchr (file, ';'))
877 {
878 size_t len = p - file;
879 char *f = rxvt_temp_buf<char> (len + 1);
880 memcpy (f, file, len);
881 f[len] = '\0';
882 file = f;
883 }
884
676# ifdef HAVE_AFTERIMAGE 885# ifdef HAVE_AFTERIMAGE
677 if (!target->asimman) 886 if (!target->asimman)
678 target->asimman = create_generic_imageman (target->rs[Rs_path]); 887 target->asimman = create_generic_imageman (target->rs[Rs_path]);
679
680 if (char *f = strchr (file, ';'))
681 {
682 size_t len = f - file;
683 f = (char *)malloc (len + 1);
684 memcpy (f, file, len);
685 f[len] = '\0';
686 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
687 free (f);
688 }
689 else
690 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 888 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
889 if (original_asim)
890 have_image = true;
891 return have_image;
892# endif
691 893
692 return original_asim; 894# ifdef HAVE_PIXBUF
895 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
896 if (pixbuf)
897 have_image = true;
898 return have_image;
693# endif 899# endif
694 } 900 }
695 901
696 return false; 902 return false;
697} 903}
… …
717 int changed = 0; 923 int changed = 0;
718 unsigned int hr, vr; 924 unsigned int hr, vr;
719 int junk; 925 int junk;
720 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 926 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
721 927
722 if (!(geom_flags&WidthValue)) 928 if (!(geom_flags & WidthValue))
723 hr = 1; 929 hr = 1;
724 if (!(geom_flags&HeightValue)) 930 if (!(geom_flags & HeightValue))
725 vr = hr; 931 vr = hr;
726 932
727 if (h_blurRadius != hr) 933 if (h_blurRadius != hr)
728 { 934 {
729 ++changed; 935 ++changed;
… …
739 if (v_blurRadius == 0 && h_blurRadius == 0) 945 if (v_blurRadius == 0 && h_blurRadius == 0)
740 flags &= ~blurNeeded; 946 flags &= ~blurNeeded;
741 else 947 else
742 flags |= blurNeeded; 948 flags |= blurNeeded;
743 949
744 return (changed>0); 950 return (changed > 0);
745} 951}
746 952
747static inline unsigned long 953static inline unsigned long
748compute_tint_shade_flags (rxvt_color *tint, int shade) 954compute_tint_shade_flags (rxvt_color *tint, int shade)
749{ 955{
… …
766 flags |= bgPixmap_t::tintNeeded; 972 flags |= bgPixmap_t::tintNeeded;
767 else if (tint) 973 else if (tint)
768 { 974 {
769 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 975 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
770 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 976 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
771 { 977 {
772 flags |= bgPixmap_t::tintNeeded; 978 flags |= bgPixmap_t::tintNeeded;
773 } 979 }
774 } 980 }
775 981
776 if (flags & bgPixmap_t::tintNeeded) 982 if (flags & bgPixmap_t::tintNeeded)
777 { 983 {
778 if (flags & bgPixmap_t::tintWholesome) 984 if (flags & bgPixmap_t::tintWholesome)
… …
807{ 1013{
808 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1014 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
809 1015
810 if (new_flags != (flags & tintFlags)) 1016 if (new_flags != (flags & tintFlags))
811 { 1017 {
812 flags = (flags&~tintFlags)|new_flags; 1018 flags = (flags & ~tintFlags) | new_flags;
813 return true; 1019 return true;
814 } 1020 }
815 1021
816 return false; 1022 return false;
817} 1023}
818 1024
… …
848 unsigned long result = 0; 1054 unsigned long result = 0;
849 1055
850 if (target == NULL) 1056 if (target == NULL)
851 return 0; 1057 return 0;
852 1058
853 /* root dimentions may change from call to call - but Display structure should 1059 /* root dimensions may change from call to call - but Display structure should
854 * be always up-to-date, so let's use it : 1060 * be always up-to-date, so let's use it :
855 */ 1061 */
856 Window root = target->display->root; 1062 Window root = target->display->root;
857 int screen = target->display->screen; 1063 int screen = target->display->screen;
858 Display *dpy = target->dpy; 1064 Display *dpy = target->dpy;
… …
903 1109
904 attr.background_pixmap = ParentRelative; 1110 attr.background_pixmap = ParentRelative;
905 attr.backing_store = Always; 1111 attr.backing_store = Always;
906 attr.event_mask = ExposureMask; 1112 attr.event_mask = ExposureMask;
907 attr.override_redirect = True; 1113 attr.override_redirect = True;
908 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1114 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
909 CopyFromParent, CopyFromParent, CopyFromParent, 1115 CopyFromParent, CopyFromParent, CopyFromParent,
910 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1116 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
911 &attr); 1117 &attr);
912 1118
913 if (src != None) 1119 if (src != None)
… …
937 XDestroyWindow (dpy, src); 1143 XDestroyWindow (dpy, src);
938 XUngrabServer (dpy); 1144 XUngrabServer (dpy);
939 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1145 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
940 } 1146 }
941 1147
942 if (!success) 1148 if (!success)
943 { 1149 {
944 XFreePixmap (dpy, tiled_root_pmap); 1150 XFreePixmap (dpy, tiled_root_pmap);
945 tiled_root_pmap = None; 1151 tiled_root_pmap = None;
946 } 1152 }
947 else 1153 else
948 result |= transpPmapTiled; 1154 result |= transpPmapTiled;
949 } 1155 }
950 else 1156 else
951 { 1157 {
952 /* strightforward pixmap copy */ 1158 /* straightforward pixmap copy */
953 gcv.tile = root_pixmap; 1159 gcv.tile = root_pixmap;
954 gcv.fill_style = FillTiled; 1160 gcv.fill_style = FillTiled;
955 1161
956 while (sx < 0) sx += (int)root_width; 1162 while (sx < 0) sx += (int)root_width;
957 while (sy < 0) sy += (int)root_height; 1163 while (sy < 0) sy += (int)root_height;
… …
1070# if DO_TIMING_TEST 1276# if DO_TIMING_TEST
1071 XSync (dpy, False); 1277 XSync (dpy, False);
1072# endif 1278# endif
1073# endif 1279# endif
1074 } 1280 }
1075 } 1281 }
1076 } /* server side rendering completed */ 1282 } /* server side rendering completed */
1077 1283
1078 if (pixmap) 1284 if (pixmap)
1079 XFreePixmap (dpy, pixmap); 1285 XFreePixmap (dpy, pixmap);
1080 1286
… …
1108 return false; 1314 return false;
1109} 1315}
1110# endif /* ENABLE_TRANSPARENCY */ 1316# endif /* ENABLE_TRANSPARENCY */
1111 1317
1112# ifndef HAVE_AFTERIMAGE 1318# ifndef HAVE_AFTERIMAGE
1113static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1319static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1114# endif 1320# endif
1115 1321
1116bool 1322bool
1117bgPixmap_t::render () 1323bgPixmap_t::render ()
1118{ 1324{
… …
1130 /* we need to re-generate transparency pixmap in that case ! */ 1336 /* we need to re-generate transparency pixmap in that case ! */
1131 background_flags = make_transparency_pixmap (); 1337 background_flags = make_transparency_pixmap ();
1132 if (background_flags == 0) 1338 if (background_flags == 0)
1133 return false; 1339 return false;
1134 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1340 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1135 && pmap_depth == target->depth) 1341 && pmap_depth == target->depth)
1136 flags = flags & ~isInvalid; 1342 flags = flags & ~isInvalid;
1137 } 1343 }
1138# endif 1344# endif
1139 1345
1346# ifdef BG_IMAGE_FROM_FILE
1347 if (have_image
1348 || (background_flags & transpTransformations) != (flags & transpTransformations))
1349 {
1350 if (render_image (background_flags))
1351 flags = flags & ~isInvalid;
1352 }
1353# endif
1354
1140 XImage *result = NULL; 1355 XImage *result = NULL;
1141# ifdef HAVE_AFTERIMAGE
1142 target->init_asv ();
1143 1356
1144 if (original_asim 1357 if (background_flags && (flags & isInvalid))
1145 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1358 {
1359 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1146 { 1360 }
1147 ASImage *background = NULL;
1148 ARGB32 as_tint = TINT_LEAVE_SAME;
1149 if (background_flags)
1150 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1151 1361
1152# ifdef ENABLE_TRANSPARENCY 1362 if (result)
1363 {
1364# if !defined(HAVE_AFTERIMAGE) && !XFT
1365 /* our own client-side tinting */
1366 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1367 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1153 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1368 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1154 {
1155 ShadingInfo as_shade;
1156 as_shade.shading = (shade == 0) ? 100 : shade;
1157
1158 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1159 if (flags & tintSet)
1160 tint.get (c);
1161 as_shade.tintColor.red = c.r;
1162 as_shade.tintColor.green = c.g;
1163 as_shade.tintColor.blue = c.b;
1164
1165 as_tint = shading2tint32 (&as_shade);
1166 }
1167
1168 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1169 {
1170 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1171 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1172 100, ASIMAGE_QUALITY_DEFAULT);
1173 if (tmp)
1174 {
1175 destroy_asimage (&background);
1176 background = tmp;
1177 }
1178 }
1179# endif
1180
1181 if (render_asim (background, as_tint))
1182 flags = flags & ~isInvalid;
1183 if (background)
1184 destroy_asimage (&background);
1185 }
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 neccessary server-side.
1192 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1193
1194 if (background_flags && (flags & isInvalid))
1195 {
1196 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1197
1198 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1199 { 1369 {
1200 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1370 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1201 if (flags & tintSet) 1371 if (flags & tintSet)
1202 tint.get (c); 1372 tint.get (c);
1203 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1373 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1204 } 1374 }
1205 } 1375# endif
1206# endif /* HAVE_AFTERIMAGE */
1207 1376
1208 if (result)
1209 {
1210 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1377 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1211 1378
1212 if (gc) 1379 if (gc)
1213 { 1380 {
1214 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1381 if (/*pmap_depth != target->depth &&*/ pixmap != None)
… …
1243 1410
1244 XFreeGC (target->dpy, gc); 1411 XFreeGC (target->dpy, gc);
1245 flags = flags & ~isInvalid; 1412 flags = flags & ~isInvalid;
1246 } 1413 }
1247 1414
1248 XDestroyImage (result); 1415 XDestroyImage (result);
1249 } 1416 }
1250 1417
1251 if (flags & isInvalid) 1418 if (flags & isInvalid)
1252 { 1419 {
1253 if (pixmap != None) 1420 if (pixmap != None)
… …
1327 1494
1328 /* don't want Expose on the parent or vt. It is better to use 1495 /* don't want Expose on the parent or vt. It is better to use
1329 scr_touch or we get a great deal of flicker otherwise: */ 1496 scr_touch or we get a great deal of flicker otherwise: */
1330 XClearWindow (target->dpy, target->parent[0]); 1497 XClearWindow (target->dpy, target->parent[0]);
1331 1498
1332 if (target->scrollBar.win) 1499 if (target->scrollBar.state && target->scrollBar.win)
1333 { 1500 {
1334 target->scrollBar.state = STATE_IDLE; 1501 target->scrollBar.state = STATE_IDLE;
1335 target->scrollBar.show (0); 1502 target->scrollBar.show (0);
1336 } 1503 }
1337 1504
… …
1346/* taken from aterm-0.4.2 */ 1513/* taken from aterm-0.4.2 */
1347 1514
1348typedef uint32_t RUINT32T; 1515typedef uint32_t RUINT32T;
1349 1516
1350static void 1517static void
1351ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1518ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1352{ 1519{
1353 int sh_r, sh_g, sh_b; 1520 int sh_r, sh_g, sh_b;
1354 RUINT32T mask_r, mask_g, mask_b; 1521 RUINT32T mask_r, mask_g, mask_b;
1355 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1522 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1356 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1523 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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