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.50 by sf-exg, Tue Aug 31 15:14:06 2010 UTC vs.
Revision 1.69 by sf-exg, Mon Oct 4 22:06:26 2010 UTC

… …
52 * 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
53 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
54 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
55 * effects on the background image : 55 * effects on the background image :
56 * 56 *
57 * 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%.
58 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
59 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
60 * the image in the window. 60 * the image in the window.
61 * WxH+X Assumes Y == X 61 * WxH+X Assumes Y == X
62 * WxH Assumes Y == X == 50 (centers the image) 62 * WxH Assumes Y == X == 50 (centers the image)
63 * W+X+Y Assumes H == W 63 * W+X+Y Assumes H == W
64 * W+X Assumes H == W and Y == X 64 * W+X Assumes H == W and Y == X
65 * W Assumes H == W and Y == X == 50 65 * W Assumes H == W and Y == X == 50
66 * 66 *
67 * Adjusting position only : 67 * Adjusting position only :
68 * =+X+Y Set position to X% by Y% (absolute). 68 * =+X+Y Set position to X% by Y% (absolute).
69 * =+X Set position to X% by X%. 69 * =+X Set position to X% by X%.
70 * +X+Y Adjust position horizontally X% and vertically Y% 70 * +X+Y Adjust position horizontally X% and vertically Y%
71 * from current position (relative). 71 * from current position (relative).
72 * +X Adjust position horizontally X% and vertically X% 72 * +X Adjust position horizontally X% and vertically X%
73 * from current position. 73 * from current position.
74 * 74 *
75 * Adjusting scale only : 75 * Adjusting scale only :
76 * Wx0 Multiply horizontal scaling factor by W% 76 * Wx0 Multiply horizontal scaling factor by W%
77 * 0xH Multiply vertical scaling factor by H% 77 * 0xH Multiply vertical scaling factor by H%
78 * 0x0 No scaling (show image at normal size). 78 * 0x0 No scaling (show image at normal size).
79 * 79 *
80 * Pixmap Operations : (should be prepended by a colon) 80 * Pixmap Operations : (should be prepended by a colon)
81 * tile Tile image. Scaling/position modifiers above will affect 81 * tile Tile image. Scaling/position modifiers above will affect
82 * the tile size and origin. 82 * the tile size and origin.
83 * propscale When scaling, scale proportionally. That is, maintain the 83 * propscale When scaling, scale proportionally. That is, maintain the
84 * proper aspect ratio for the image. Any portion of the 84 * proper aspect ratio for the image. Any portion of the
85 * background not covered by the image is filled with the 85 * background not covered by the image is filled with the
86 * current background color. 86 * current background color.
87 * hscale Scale horizontally, tile vertically ? 87 * hscale Scale horizontally, tile vertically ?
88 * vscale Tile horizontally, scale vertically ? 88 * vscale Tile horizontally, scale vertically ?
… …
95{ 95{
96 // this is basically redundant as bgPixmap_t is only used in 96 // this is basically redundant as bgPixmap_t is only used in
97 // zero_initialised-derived structs 97 // zero_initialised-derived structs
98#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
99 original_asim = NULL; 99 original_asim = NULL;
100#endif
101#ifdef HAVE_PIXBUF
102 pixbuf = NULL;
100#endif 103#endif
101#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
102 have_image = false; 105 have_image = false;
103 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
104 h_align = v_align = 0; 107 h_align = v_align = 0;
… …
115#ifdef HAVE_AFTERIMAGE 118#ifdef HAVE_AFTERIMAGE
116 if (original_asim) 119 if (original_asim)
117 safe_asimage_destroy (original_asim); 120 safe_asimage_destroy (original_asim);
118#endif 121#endif
119 122
123#ifdef HAVE_PIXBUF
124 if (pixbuf)
125 g_object_unref (pixbuf);
126#endif
127
120 if (pixmap && target) 128 if (pixmap && target)
121 XFreePixmap (target->dpy, pixmap); 129 XFreePixmap (target->dpy, pixmap);
122} 130}
123 131
124bool 132bool
… …
130# endif 138# endif
131 139
132# ifdef BG_IMAGE_FROM_FILE 140# ifdef BG_IMAGE_FROM_FILE
133 if (have_image) 141 if (have_image)
134 { 142 {
135 if (h_scale != 0 || v_scale != 0 143 if (flags & sizeSensitive)
136 || h_align != 0 || v_align != 0)
137 return true; 144 return true;
138 } 145 }
139# endif 146# endif
140 147
141 return false; 148 return false;
… …
150# endif 157# endif
151 158
152# ifdef BG_IMAGE_FROM_FILE 159# ifdef BG_IMAGE_FROM_FILE
153 if (have_image) 160 if (have_image)
154 { 161 {
155 if (h_align == rootAlign || v_align == rootAlign) 162 if (flags & rootAlign)
156 return true; 163 return true;
157 } 164 }
158# endif 165# endif
159 166
160 return false; 167 return false;
… …
200static inline bool 207static inline bool
201check_set_align_value (int geom_flags, int flag, int &align, int new_value) 208check_set_align_value (int geom_flags, int flag, int &align, int new_value)
202{ 209{
203 if (geom_flags & flag) 210 if (geom_flags & flag)
204 { 211 {
205 if (new_value != bgPixmap_t::rootAlign)
206 {
207 if (new_value < -100) 212 if (new_value < -100)
208 new_value = -100; 213 new_value = -100;
209 else if (new_value > 200) 214 else if (new_value > 200)
210 new_value = 200; 215 new_value = 200;
211 }
212 if (new_value != align) 216 if (new_value != align)
213 { 217 {
214 align = new_value; 218 align = new_value;
215 return true; 219 return true;
216 } 220 }
… …
220 224
221static inline int 225static inline int
222make_align_position (int align, int window_size, int image_size) 226make_align_position (int align, int window_size, int image_size)
223{ 227{
224 int diff = window_size - image_size; 228 int diff = window_size - image_size;
225 int smaller = MIN (image_size,window_size); 229 int smaller = min (image_size, window_size);
226 230
227 if (align >= 0 && align <= 50) 231 if (align >= 0 && align <= 100)
228 return diff * align / 100; 232 return diff * align / 100;
229 else if (align > 50 && align <= 100)
230 return window_size - image_size - diff * (100 - align) / 100;
231 else if (align > 100 && align <= 200 ) 233 else if (align > 100 && align <= 200 )
232 return ((align - 100) * smaller / 100) + window_size - smaller; 234 return ((align - 100) * smaller / 100) + window_size - smaller;
233 else if (align > -100 && align < 0) 235 else if (align >= -100 && align < 0)
234 return ((align + 100) * smaller / 100) - image_size; 236 return ((align + 100) * smaller / 100) - image_size;
235 return 0; 237 return 0;
236} 238}
237 239
238static inline int 240static inline int
239make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 241make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
240{ 242{
241 int src_pos = 0; 243 int src_pos = 0;
242 dst_pos = 0; 244 dst_pos = pos;
243 dst_size = size; 245 dst_size = size;
244 if (pos < 0 && size > target_size) 246 if (pos < 0)
245 { 247 {
246 src_pos = -pos; 248 src_pos = -pos;
249 dst_pos = 0;
247 dst_size += pos; 250 dst_size += pos;
248 } 251 }
249 else if (pos > 0)
250 dst_pos = pos;
251 252
252 if (dst_pos + dst_size > target_size) 253 if (dst_pos + dst_size > target_size)
253 dst_size = target_size - dst_pos; 254 dst_size = target_size - dst_pos;
254 return src_pos; 255 return src_pos;
255} 256}
… …
380 w = h = noScale; 381 w = h = noScale;
381 geom_flags |= WidthValue|HeightValue; 382 geom_flags |= WidthValue|HeightValue;
382 } 383 }
383 else if (CHECK_GEOM_OPS ("propscale")) 384 else if (CHECK_GEOM_OPS ("propscale"))
384 { 385 {
385 if (w == 0 && h == 0)
386 {
387 w = windowScale;
388 geom_flags |= WidthValue;
389 }
390 new_flags |= propScale; 386 new_flags |= propScale;
391 } 387 }
392 else if (CHECK_GEOM_OPS ("hscale")) 388 else if (CHECK_GEOM_OPS ("hscale"))
393 { 389 {
394 if (w == 0) w = windowScale; 390 if (w == 0) w = windowScale;
… …
416 x = y = centerAlign; 412 x = y = centerAlign;
417 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue|XValue|YValue;
418 } 414 }
419 else if (CHECK_GEOM_OPS ("root")) 415 else if (CHECK_GEOM_OPS ("root"))
420 { 416 {
417 new_flags |= rootAlign;
421 w = h = noScale; 418 w = h = noScale;
422 x = y = rootAlign;
423 geom_flags |= WidthValue|HeightValue|XValue|YValue; 419 geom_flags |= WidthValue|HeightValue;
424 } 420 }
425# undef CHECK_GEOM_OPS 421# undef CHECK_GEOM_OPS
426 422
427 while (*ops != ':' && *ops != '\0') ++ops; 423 while (*ops != ':' && *ops != '\0') ++ops;
428 } /* done parsing ops */ 424 } /* done parsing ops */
… …
441 } 437 }
442 438
443 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 439 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
444 // flags, h_scale, v_scale, h_align, v_align); 440 // flags, h_scale, v_scale, h_align, v_align);
445 return (changed > 0); 441 return (changed > 0);
442}
443
444void
445bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
446{
447 int target_width = target->szHint.width;
448 int target_height = target->szHint.height;
449
450 if (flags & propScale)
451 {
452 float scale = (float)target_width / image_width;
453 min_it (scale, (float)target_height / image_height);
454 w = image_width * scale + 0.5;
455 h = image_height * scale + 0.5;
456 }
457 else
458 {
459 w = h_scale * target_width / 100;
460 h = v_scale * target_height / 100;
461 }
462
463 if (!w) w = image_width;
464 if (!h) h = image_height;
465
466 if (flags & rootAlign)
467 {
468 target->get_window_origin (x, y);
469 x = -x;
470 y = -y;
471 }
472 else
473 {
474 x = make_align_position (h_align, target_width, w);
475 y = make_align_position (v_align, target_height, h);
476 }
477
478 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0
480 || h_align != 0 || v_align != 0
481 || w > target_width || h > target_height)
482 flags |= sizeSensitive;
446} 483}
447 484
448# ifdef HAVE_AFTERIMAGE 485# ifdef HAVE_AFTERIMAGE
449bool 486bool
450bgPixmap_t::render_image (unsigned long background_flags) 487bgPixmap_t::render_image (unsigned long background_flags)
… …
496 int new_pmap_width = target_width; 533 int new_pmap_width = target_width;
497 int new_pmap_height = target_height; 534 int new_pmap_height = target_height;
498 535
499 int x = 0; 536 int x = 0;
500 int y = 0; 537 int y = 0;
501 int w = h_scale * target_width / 100; 538 int w = 0;
502 int h = v_scale * target_height / 100; 539 int h = 0;
503 540
504 TIMING_TEST_START (asim); 541 TIMING_TEST_START (asim);
505 542
506 if (original_asim) 543 if (original_asim)
507 { 544 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
508 if (h_align == rootAlign || v_align == rootAlign)
509 {
510 target->get_window_origin (x, y);
511 x = -x;
512 y = -y;
513 }
514
515 if (h_align != rootAlign)
516 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
517
518 if (v_align != rootAlign)
519 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
520 }
521 545
522 if (!original_asim 546 if (!original_asim
547 || (!(flags & rootAlign)
523 || x >= target_width 548 && (x >= target_width
524 || y >= target_height 549 || y >= target_height
525 || (w > 0 && x + w <= 0) 550 || (x + w <= 0)
526 || (h > 0 && y + h <= 0)) 551 || (y + h <= 0))))
527 { 552 {
528 if (background) 553 if (background)
529 { 554 {
530 new_pmap_width = background->width; 555 new_pmap_width = background->width;
531 new_pmap_height = background->height; 556 new_pmap_height = background->height;
… …
545 } 570 }
546 else 571 else
547 { 572 {
548 result = original_asim; 573 result = original_asim;
549 574
550 if ((w > 0 && w != original_asim->width) 575 if ((w != original_asim->width)
551 || (h > 0 && h != original_asim->height)) 576 || (h != original_asim->height))
552 { 577 {
553 result = scale_asimage (target->asv, original_asim, 578 result = scale_asimage (target->asv, original_asim,
554 w > 0 ? w : original_asim->width, 579 w, h,
555 h > 0 ? h : original_asim->height,
556 background ? ASA_ASImage : ASA_XImage, 580 background ? ASA_ASImage : ASA_XImage,
557 100, ASIMAGE_QUALITY_DEFAULT); 581 100, ASIMAGE_QUALITY_DEFAULT);
558 } 582 }
559 583
560 if (background == NULL) 584 if (background == NULL)
561 { 585 {
562 /* if tiling - pixmap has to be sized exactly as the image,
563 but there is no need to make it bigger than the window! */
564 if (h_scale == 0)
565 new_pmap_width = min (result->width, target_width);
566 if (v_scale == 0)
567 new_pmap_height = min (result->height, target_height);
568 /* we also need to tile our image in one or both directions */
569 if (h_scale == 0 || v_scale == 0) 586 if (h_scale == 0 || v_scale == 0)
570 { 587 {
588 /* if tiling - pixmap has to be sized exactly as the image,
589 but there is no need to make it bigger than the window! */
590 new_pmap_width = min (result->width, target_width);
591 new_pmap_height = min (result->height, target_height);
592
593 /* we also need to tile our image in both directions */
571 ASImage *tmp = tile_asimage (target->asv, result, 594 ASImage *tmp = tile_asimage (target->asv, result,
572 (h_scale > 0) ? 0 : (int)result->width - x, 595 (int)result->width - x,
573 (v_scale > 0) ? 0 : (int)result->height - y, 596 (int)result->height - y,
574 new_pmap_width, 597 new_pmap_width,
575 new_pmap_height, 598 new_pmap_height,
576 TINT_LEAVE_SAME, ASA_XImage, 599 TINT_LEAVE_SAME, ASA_XImage,
577 100, ASIMAGE_QUALITY_DEFAULT); 600 100, ASIMAGE_QUALITY_DEFAULT);
578 if (tmp) 601 if (tmp)
… …
642 free (layers); 665 free (layers);
643 } 666 }
644 } 667 }
645 TIMING_TEST_PRINT_RESULT (asim); 668 TIMING_TEST_PRINT_RESULT (asim);
646 669
647 if (pixmap) 670 bool ret = false;
648 {
649 if (result == NULL
650 || pmap_width != new_pmap_width
651 || pmap_height != new_pmap_height
652 || pmap_depth != target->depth)
653 {
654 XFreePixmap (target->dpy, pixmap);
655 pixmap = None;
656 }
657 }
658 671
659 if (result) 672 if (result)
660 { 673 {
661 XGCValues gcv; 674 XGCValues gcv;
662 GC gc; 675 GC gc;
676
677 if (pixmap)
678 {
679 if (pmap_width != new_pmap_width
680 || pmap_height != new_pmap_height
681 || pmap_depth != target->depth)
682 {
683 XFreePixmap (target->dpy, pixmap);
684 pixmap = None;
685 }
686 }
663 687
664 /* create Pixmap */ 688 /* create Pixmap */
665 if (pixmap == None) 689 if (pixmap == None)
666 { 690 {
667 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 691 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
… …
675 699
676 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 700 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
677 int dst_width = result->width, dst_height = result->height; 701 int dst_width = result->width, dst_height = result->height;
678 if (background == NULL) 702 if (background == NULL)
679 { 703 {
704 if (!(h_scale == 0 || v_scale == 0))
705 {
680 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 706 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
681 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 707 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
708 }
682 709
683 if (dst_x > 0 || dst_y > 0 710 if (dst_x > 0 || dst_y > 0
684 || dst_x + dst_width < new_pmap_width 711 || dst_x + dst_width < new_pmap_width
685 || dst_y + dst_height < new_pmap_height) 712 || dst_y + dst_height < new_pmap_height)
686 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 713 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
… …
693 if (result != background && result != original_asim) 720 if (result != background && result != original_asim)
694 destroy_asimage (&result); 721 destroy_asimage (&result);
695 722
696 XFreeGC (target->dpy, gc); 723 XFreeGC (target->dpy, gc);
697 TIMING_TEST_PRINT_RESULT (asim); 724 TIMING_TEST_PRINT_RESULT (asim);
725
726 ret = true;
698 } 727 }
699 728
700 if (background) 729 if (background)
701 destroy_asimage (&background); 730 destroy_asimage (&background);
702 731
703 return true; 732 return ret;
704} 733}
705# endif /* HAVE_AFTERIMAGE */ 734# endif /* HAVE_AFTERIMAGE */
735
736# ifdef HAVE_PIXBUF
737bool
738bgPixmap_t::render_image (unsigned long background_flags)
739{
740 if (target == NULL)
741 return false;
742
743 if (!pixbuf)
744 return false;
745
746 // TODO: add alpha blending
747 if (background_flags)
748 return false;
749
750 GdkPixbuf *result;
751
752 int image_width = gdk_pixbuf_get_width (pixbuf);
753 int image_height = gdk_pixbuf_get_height (pixbuf);
754
755 int target_width = target->szHint.width;
756 int target_height = target->szHint.height;
757 int new_pmap_width = target_width;
758 int new_pmap_height = target_height;
759
760 int x = 0;
761 int y = 0;
762 int w = 0;
763 int h = 0;
764
765 get_image_geometry (image_width, image_height, w, h, x, y);
766
767 if (!(flags & rootAlign)
768 && (x >= target_width
769 || y >= target_height
770 || (x + w <= 0)
771 || (y + h <= 0)))
772 return false;
773
774 result = pixbuf;
775
776 if ((w != image_width)
777 || (h != image_height))
778 {
779 result = gdk_pixbuf_scale_simple (pixbuf,
780 w, h,
781 GDK_INTERP_BILINEAR);
782 }
783
784 bool ret = false;
785
786 if (result)
787 {
788 XGCValues gcv;
789 GC gc;
790
791 image_width = gdk_pixbuf_get_width (result);
792 image_height = gdk_pixbuf_get_height (result);
793
794 if (h_scale == 0 || v_scale == 0)
795 {
796 new_pmap_width = min (image_width, target_width);
797 new_pmap_height = min (image_height, target_height);
798 }
799
800 if (pixmap)
801 {
802 if (pmap_width != new_pmap_width
803 || pmap_height != new_pmap_height
804 || pmap_depth != target->depth)
805 {
806 XFreePixmap (target->dpy, pixmap);
807 pixmap = None;
808 }
809 }
810
811 if (pixmap == None)
812 {
813 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
814 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height;
816 pmap_depth = target->depth;
817 }
818
819 gcv.foreground = target->pix_colors[Color_bg];
820 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
821
822 if (h_scale == 0 || v_scale == 0)
823 {
824 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
825 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
826 0, 0,
827 0, 0,
828 image_width, image_height,
829 XLIB_RGB_DITHER_NONE,
830 0, 0);
831
832 gcv.tile = tile;
833 gcv.fill_style = FillTiled;
834 gcv.ts_x_origin = x;
835 gcv.ts_y_origin = y;
836 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
837
838 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
839 XFreePixmap (target->dpy, tile);
840 }
841 else
842 {
843 int src_x, src_y, dst_x, dst_y;
844 int dst_width, dst_height;
845
846 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
847 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
848
849 if (dst_x > 0 || dst_y > 0
850 || dst_x + dst_width < new_pmap_width
851 || dst_y + dst_height < new_pmap_height)
852 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
853
854 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
855 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
856 src_x, src_y,
857 dst_x, dst_y,
858 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE,
860 0, 0);
861 }
862
863 if (result != pixbuf)
864 g_object_unref (result);
865
866 XFreeGC (target->dpy, gc);
867
868 ret = true;
869 }
870
871 return ret;
872}
873# endif /* HAVE_PIXBUF */
706 874
707bool 875bool
708bgPixmap_t::set_file (const char *file) 876bgPixmap_t::set_file (const char *file)
709{ 877{
710 assert (file); 878 assert (file);
… …
726 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 894 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
727 if (original_asim) 895 if (original_asim)
728 have_image = true; 896 have_image = true;
729 return have_image; 897 return have_image;
730# endif 898# endif
899
900# ifdef HAVE_PIXBUF
901 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
902 if (pixbuf)
903 have_image = true;
904 return have_image;
905# endif
731 } 906 }
732 907
733 return false; 908 return false;
734} 909}
735 910
… …
754 int changed = 0; 929 int changed = 0;
755 unsigned int hr, vr; 930 unsigned int hr, vr;
756 int junk; 931 int junk;
757 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 932 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
758 933
759 if (!(geom_flags&WidthValue)) 934 if (!(geom_flags & WidthValue))
760 hr = 1; 935 hr = 1;
761 if (!(geom_flags&HeightValue)) 936 if (!(geom_flags & HeightValue))
762 vr = hr; 937 vr = hr;
763 938
764 if (h_blurRadius != hr) 939 if (h_blurRadius != hr)
765 { 940 {
766 ++changed; 941 ++changed;
… …
776 if (v_blurRadius == 0 && h_blurRadius == 0) 951 if (v_blurRadius == 0 && h_blurRadius == 0)
777 flags &= ~blurNeeded; 952 flags &= ~blurNeeded;
778 else 953 else
779 flags |= blurNeeded; 954 flags |= blurNeeded;
780 955
781 return (changed>0); 956 return (changed > 0);
782} 957}
783 958
784static inline unsigned long 959static inline unsigned long
785compute_tint_shade_flags (rxvt_color *tint, int shade) 960compute_tint_shade_flags (rxvt_color *tint, int shade)
786{ 961{
… …
844{ 1019{
845 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1020 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
846 1021
847 if (new_flags != (flags & tintFlags)) 1022 if (new_flags != (flags & tintFlags))
848 { 1023 {
849 flags = (flags&~tintFlags)|new_flags; 1024 flags = (flags & ~tintFlags) | new_flags;
850 return true; 1025 return true;
851 } 1026 }
852 1027
853 return false; 1028 return false;
854} 1029}
… …
870 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1045 flags = (flags & (~tintFlags | tintSet)) | new_flags;
871 return true; 1046 return true;
872 } 1047 }
873 1048
874 return false; 1049 return false;
1050}
1051
1052bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap)
1054{
1055 Window root = target->display->root;
1056 Display *dpy = target->dpy;
1057 int window_width = target->szHint.width;
1058 int window_height = target->szHint.height;
1059 bool ret = false;
1060
1061 if (flags & tintWholesome)
1062 {
1063 XGCValues gcv;
1064 GC gc;
1065
1066 /* In this case we can tint image server-side getting significant
1067 * performance improvements, as we eliminate XImage transfer
1068 */
1069 gcv.foreground = Pixel (tint);
1070 gcv.function = GXand;
1071 gcv.fill_style = FillSolid;
1072 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1073 if (gc)
1074 {
1075 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1076 ret = true;
1077 XFreeGC (dpy, gc);
1078 }
1079 }
1080 else
1081 {
1082# if XFT
1083 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1084
1085 if (flags & tintSet)
1086 tint.get (c);
1087
1088 if (shade > 0 && shade < 100)
1089 {
1090 c.r = (c.r * shade) / 100;
1091 c.g = (c.g * shade) / 100;
1092 c.b = (c.b * shade) / 100;
1093 }
1094 else if (shade > 100 && shade < 200)
1095 {
1096 c.r = (c.r * (200 - shade)) / 100;
1097 c.g = (c.g * (200 - shade)) / 100;
1098 c.b = (c.b * (200 - shade)) / 100;
1099 }
1100
1101 XRenderPictFormat pf;
1102 pf.type = PictTypeDirect;
1103 pf.depth = 32;
1104 pf.direct.redMask = 0xff;
1105 pf.direct.greenMask = 0xff;
1106 pf.direct.blueMask = 0xff;
1107 pf.direct.alphaMask = 0xff;
1108
1109 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1110 (PictFormatType|
1111 PictFormatDepth|
1112 PictFormatRedMask|
1113 PictFormatGreenMask|
1114 PictFormatBlueMask|
1115 PictFormatAlphaMask),
1116 &pf,
1117 0);
1118 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1119 XRenderPictureAttributes pa;
1120
1121 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa);
1122
1123 pa.repeat = True;
1124
1125 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1126 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1127 XFreePixmap (dpy, overlay_pmap);
1128
1129 pa.component_alpha = True;
1130 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1131 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1132 XFreePixmap (dpy, mask_pmap);
1133
1134 if (mask_pic && overlay_pic && back_pic)
1135 {
1136 XRenderColor mask_c;
1137
1138 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1139 mask_c.alpha = 0xffff;
1140 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1141
1142 mask_c.alpha = 0;
1143 mask_c.red = 0xffff - c.r;
1144 mask_c.green = 0xffff - c.g;
1145 mask_c.blue = 0xffff - c.b;
1146 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1147 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1148 ret = true;
1149 }
1150
1151 XRenderFreePicture (dpy, mask_pic);
1152 XRenderFreePicture (dpy, overlay_pic);
1153 XRenderFreePicture (dpy, back_pic);
1154# if DO_TIMING_TEST
1155 XSync (dpy, False);
1156# endif
1157# endif
1158 }
1159
1160 return ret;
875} 1161}
876 1162
877/* make_transparency_pixmap() 1163/* make_transparency_pixmap()
878 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1164 * Builds a pixmap sized the same as terminal window, with depth same as the root window
879 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1165 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
1009 { 1295 {
1010 if (!need_client_side_rendering ()) 1296 if (!need_client_side_rendering ())
1011 { 1297 {
1012 if ((flags & tintNeeded)) 1298 if ((flags & tintNeeded))
1013 { 1299 {
1014 if (flags & tintWholesome) 1300 if (tint_pixmap (tiled_root_pmap))
1015 {
1016 /* In this case we can tint image server-side getting significant
1017 * performance improvements, as we eliminate XImage transfer
1018 */
1019 gcv.foreground = Pixel (tint);
1020 gcv.function = GXand;
1021 gcv.fill_style = FillSolid;
1022 if (gc)
1023 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
1024 else
1025 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1026 if (gc)
1027 {
1028 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1029 result |= transpPmapTinted; 1301 result |= transpPmapTinted;
1030 }
1031 }
1032 else
1033 {
1034# if XFT
1035 Picture back_pic = 0;
1036 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1037
1038 if (flags & tintSet)
1039 tint.get (c);
1040
1041 if (shade > 0 && shade < 100)
1042 {
1043 c.r = (c.r * shade) / 100;
1044 c.g = (c.g * shade) / 100;
1045 c.b = (c.b * shade) / 100;
1046 }
1047 else if (shade > 100 && shade < 200)
1048 {
1049 c.r = (c.r * (200 - shade)) / 100;
1050 c.g = (c.g * (200 - shade)) / 100;
1051 c.b = (c.b * (200 - shade)) / 100;
1052 }
1053
1054 XRenderPictFormat pf;
1055 pf.type = PictTypeDirect;
1056 pf.depth = 32;
1057 pf.direct.redMask = 0xff;
1058 pf.direct.greenMask = 0xff;
1059 pf.direct.blueMask = 0xff;
1060 pf.direct.alphaMask = 0xff;
1061
1062 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1063 (PictFormatType|
1064 PictFormatDepth|
1065 PictFormatRedMask|
1066 PictFormatGreenMask|
1067 PictFormatBlueMask|
1068 PictFormatAlphaMask),
1069 &pf,
1070 0);
1071 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1072 XRenderPictureAttributes pa ;
1073
1074 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1075
1076 pa.repeat = True;
1077
1078 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1079 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1080 XFreePixmap (dpy, overlay_pmap);
1081
1082 pa.component_alpha = True;
1083 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1084 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1085 XFreePixmap (dpy, mask_pmap);
1086
1087 if (mask_pic && overlay_pic && back_pic)
1088 {
1089 XRenderColor mask_c;
1090
1091 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1092 mask_c.alpha = 0xffff;
1093 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1094
1095 mask_c.alpha = 0;
1096 mask_c.red = 0xffff - c.r;
1097 mask_c.green = 0xffff - c.g;
1098 mask_c.blue = 0xffff - c.b;
1099 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1100 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1101 result |= transpPmapTinted;
1102 }
1103
1104 XRenderFreePicture (dpy, mask_pic);
1105 XRenderFreePicture (dpy, overlay_pic);
1106 XRenderFreePicture (dpy, back_pic);
1107# if DO_TIMING_TEST
1108 XSync (dpy, False);
1109# endif
1110# endif
1111 }
1112 } 1302 }
1113 } /* server side rendering completed */ 1303 } /* server side rendering completed */
1114 1304
1115 if (pixmap) 1305 if (pixmap)
1116 XFreePixmap (dpy, pixmap); 1306 XFreePixmap (dpy, pixmap);
… …
1186 XImage *result = NULL; 1376 XImage *result = NULL;
1187 1377
1188 if (background_flags && (flags & isInvalid)) 1378 if (background_flags && (flags & isInvalid))
1189 { 1379 {
1190 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1380 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1381 }
1191 1382
1383 if (result)
1384 {
1192# if !defined(HAVE_AFTERIMAGE) && !XFT 1385# if !defined(HAVE_AFTERIMAGE) && !XFT
1193 /* our own client-side tinting */ 1386 /* our own client-side tinting */
1194 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side. 1387 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1195 This may need to be changed in need_client_side_rendering() logic is altered !!! */ 1388 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1196 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1389 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1197 { 1390 {
1198 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1391 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1199 if (flags & tintSet) 1392 if (flags & tintSet)
1200 tint.get (c); 1393 tint.get (c);
1201 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1394 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1202 } 1395 }
1203# endif 1396# endif
1204 }
1205 1397
1206 if (result)
1207 {
1208 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1398 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1209 1399
1210 if (gc) 1400 if (gc)
1211 { 1401 {
1212 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1402 if (/*pmap_depth != target->depth &&*/ pixmap != None)

Diff Legend

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