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.46 by sf-exg, Mon Aug 30 23:08:06 2010 UTC vs.
Revision 1.67 by sf-exg, Mon Oct 4 21:56:42 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 ?
… …
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 100#endif
101#ifdef HAVE_PIXBUF
102 pixbuf = NULL;
103#endif
101#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
105 have_image = false;
102 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
103 h_align = v_align = 0; 107 h_align = v_align = 0;
104#endif 108#endif
105 flags = 0; 109 flags = 0;
106 pixmap = None; 110 pixmap = None;
… …
114#ifdef HAVE_AFTERIMAGE 118#ifdef HAVE_AFTERIMAGE
115 if (original_asim) 119 if (original_asim)
116 safe_asimage_destroy (original_asim); 120 safe_asimage_destroy (original_asim);
117#endif 121#endif
118 122
123#ifdef HAVE_PIXBUF
124 if (pixbuf)
125 g_object_unref (pixbuf);
126#endif
127
119 if (pixmap && target) 128 if (pixmap && target)
120 XFreePixmap (target->dpy, pixmap); 129 XFreePixmap (target->dpy, pixmap);
121} 130}
122 131
123bool 132bool
… …
127 if (flags & isTransparent) 136 if (flags & isTransparent)
128 return true; 137 return true;
129# endif 138# endif
130 139
131# ifdef BG_IMAGE_FROM_FILE 140# ifdef BG_IMAGE_FROM_FILE
132# ifdef HAVE_AFTERIMAGE 141 if (have_image)
133 if (original_asim)
134# endif
135 { 142 {
136 if (h_scale != 0 || v_scale != 0 143 if (flags & sizeSensitive)
137 || h_align != 0 || v_align != 0)
138 return true; 144 return true;
139 } 145 }
140# endif 146# endif
141 147
142 return false; 148 return false;
… …
149 if (flags & isTransparent) 155 if (flags & isTransparent)
150 return true; 156 return true;
151# endif 157# endif
152 158
153# ifdef BG_IMAGE_FROM_FILE 159# ifdef BG_IMAGE_FROM_FILE
154# ifdef HAVE_AFTERIMAGE 160 if (have_image)
155 if (original_asim)
156# endif
157 { 161 {
158 if (h_align == rootAlign || v_align == rootAlign) 162 if (flags & rootAlign)
159 return true; 163 return true;
160 } 164 }
161# endif 165# endif
162 166
163 return false; 167 return false;
… …
203static inline bool 207static inline bool
204check_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)
205{ 209{
206 if (geom_flags & flag) 210 if (geom_flags & flag)
207 { 211 {
208 if (new_value != bgPixmap_t::rootAlign)
209 {
210 if (new_value < -100) 212 if (new_value < -100)
211 new_value = -100; 213 new_value = -100;
212 else if (new_value > 200) 214 else if (new_value > 200)
213 new_value = 200; 215 new_value = 200;
214 }
215 if (new_value != align) 216 if (new_value != align)
216 { 217 {
217 align = new_value; 218 align = new_value;
218 return true; 219 return true;
219 } 220 }
… …
223 224
224static inline int 225static inline int
225make_align_position (int align, int window_size, int image_size) 226make_align_position (int align, int window_size, int image_size)
226{ 227{
227 int diff = window_size - image_size; 228 int diff = window_size - image_size;
228 int smaller = MIN (image_size,window_size); 229 int smaller = min (image_size, window_size);
229 230
230 if (align >= 0 && align <= 50) 231 if (align >= 0 && align <= 100)
231 return diff * align / 100; 232 return diff * align / 100;
232 else if (align > 50 && align <= 100)
233 return window_size - image_size - diff * (100 - align) / 100;
234 else if (align > 100 && align <= 200 ) 233 else if (align > 100 && align <= 200 )
235 return ((align - 100) * smaller / 100) + window_size - smaller; 234 return ((align - 100) * smaller / 100) + window_size - smaller;
236 else if (align > -100 && align < 0) 235 else if (align >= -100 && align < 0)
237 return ((align + 100) * smaller / 100) - image_size; 236 return ((align + 100) * smaller / 100) - image_size;
238 return 0; 237 return 0;
239} 238}
240 239
241static inline int 240static inline int
242make_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)
243{ 242{
244 int src_pos = 0; 243 int src_pos = 0;
245 dst_pos = 0; 244 dst_pos = pos;
246 dst_size = size; 245 dst_size = size;
247 if (pos < 0 && size > target_size) 246 if (pos < 0)
248 { 247 {
249 src_pos = -pos; 248 src_pos = -pos;
249 dst_pos = 0;
250 dst_size += pos; 250 dst_size += pos;
251 } 251 }
252 else if (pos > 0)
253 dst_pos = pos;
254 252
255 if (dst_pos + dst_size > target_size) 253 if (dst_pos + dst_size > target_size)
256 dst_size = target_size - dst_pos; 254 dst_size = target_size - dst_pos;
257 return src_pos; 255 return src_pos;
258} 256}
… …
383 w = h = noScale; 381 w = h = noScale;
384 geom_flags |= WidthValue|HeightValue; 382 geom_flags |= WidthValue|HeightValue;
385 } 383 }
386 else if (CHECK_GEOM_OPS ("propscale")) 384 else if (CHECK_GEOM_OPS ("propscale"))
387 { 385 {
388 if (w == 0 && h == 0)
389 {
390 w = windowScale;
391 geom_flags |= WidthValue;
392 }
393 new_flags |= propScale; 386 new_flags |= propScale;
394 } 387 }
395 else if (CHECK_GEOM_OPS ("hscale")) 388 else if (CHECK_GEOM_OPS ("hscale"))
396 { 389 {
397 if (w == 0) w = windowScale; 390 if (w == 0) w = windowScale;
… …
419 x = y = centerAlign; 412 x = y = centerAlign;
420 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue|XValue|YValue;
421 } 414 }
422 else if (CHECK_GEOM_OPS ("root")) 415 else if (CHECK_GEOM_OPS ("root"))
423 { 416 {
417 new_flags |= rootAlign;
424 w = h = noScale; 418 w = h = noScale;
425 x = y = rootAlign;
426 geom_flags |= WidthValue|HeightValue|XValue|YValue; 419 geom_flags |= WidthValue|HeightValue;
427 } 420 }
428# undef CHECK_GEOM_OPS 421# undef CHECK_GEOM_OPS
429 422
430 while (*ops != ':' && *ops != '\0') ++ops; 423 while (*ops != ':' && *ops != '\0') ++ops;
431 } /* done parsing ops */ 424 } /* done parsing ops */
… …
441 { 434 {
442 flags = new_flags; 435 flags = new_flags;
443 changed++; 436 changed++;
444 } 437 }
445 438
446//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 439 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
447// flags, h_scale, v_scale, h_align, v_align); 440 // flags, h_scale, v_scale, h_align, v_align);
448 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 (flags & rootAlign)
464 {
465 target->get_window_origin (x, y);
466 x = -x;
467 y = -y;
468 }
469 else
470 {
471 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
472 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
473 }
474
475 flags &= ~sizeSensitive;
476 if (h_scale != 0 || v_scale != 0
477 || h_align != 0 || v_align != 0
478 || image_width > target_width || image_height > target_height)
479 flags |= sizeSensitive;
449} 480}
450 481
451# ifdef HAVE_AFTERIMAGE 482# ifdef HAVE_AFTERIMAGE
452bool 483bool
453bgPixmap_t::render_asim (unsigned long background_flags) 484bgPixmap_t::render_image (unsigned long background_flags)
454{ 485{
455 if (target == NULL) 486 if (target == NULL)
456 return false; 487 return false;
457 488
458 target->init_asv (); 489 target->init_asv ();
… …
480 } 511 }
481 512
482 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 513 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
483 { 514 {
484 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 515 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, 516 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
486 100, ASIMAGE_QUALITY_DEFAULT); 517 100, ASIMAGE_QUALITY_DEFAULT);
487 if (tmp) 518 if (tmp)
488 { 519 {
489 destroy_asimage (&background); 520 destroy_asimage (&background);
490 background = tmp; 521 background = tmp;
… …
499 int new_pmap_width = target_width; 530 int new_pmap_width = target_width;
500 int new_pmap_height = target_height; 531 int new_pmap_height = target_height;
501 532
502 int x = 0; 533 int x = 0;
503 int y = 0; 534 int y = 0;
504 int w = h_scale * target_width / 100; 535 int w = 0;
505 int h = v_scale * target_height / 100; 536 int h = 0;
506 537
507 TIMING_TEST_START (asim); 538 TIMING_TEST_START (asim);
508 539
509 if (original_asim) 540 if (original_asim)
510 { 541 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
511 if (h_align == rootAlign || v_align == rootAlign)
512 {
513 target->get_window_origin(x, y);
514 x = -x;
515 y = -y;
516 }
517
518 if (h_align != rootAlign)
519 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
520
521 if (v_align != rootAlign)
522 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
523 }
524 542
525 if (!original_asim 543 if (!original_asim
544 || (!(flags & rootAlign)
526 || x >= target_width 545 && (x >= target_width
527 || y >= target_height 546 || y >= target_height
528 || (w > 0 && x + w <= 0) 547 || (w > 0 && x + w <= 0)
529 || (h > 0 && y + h <= 0)) 548 || (h > 0 && y + h <= 0))))
530 { 549 {
531 if (background) 550 if (background)
532 { 551 {
533 new_pmap_width = background->width; 552 new_pmap_width = background->width;
534 new_pmap_height = background->height; 553 new_pmap_height = background->height;
… …
560 100, ASIMAGE_QUALITY_DEFAULT); 579 100, ASIMAGE_QUALITY_DEFAULT);
561 } 580 }
562 581
563 if (background == NULL) 582 if (background == NULL)
564 { 583 {
565 /* if tiling - pixmap has to be sized exactly as the image,
566 but there is no need to make it bigger than the window! */
567 if (h_scale == 0)
568 new_pmap_width = min (result->width, target_width);
569 if (v_scale == 0)
570 new_pmap_height = min (result->height, target_height);
571 /* we also need to tile our image in one or both directions */
572 if (h_scale == 0 || v_scale == 0) 584 if (h_scale == 0 || v_scale == 0)
573 { 585 {
586 /* if tiling - pixmap has to be sized exactly as the image,
587 but there is no need to make it bigger than the window! */
588 new_pmap_width = min (result->width, target_width);
589 new_pmap_height = min (result->height, target_height);
590
591 /* we also need to tile our image in both directions */
574 ASImage *tmp = tile_asimage (target->asv, result, 592 ASImage *tmp = tile_asimage (target->asv, result,
575 (h_scale > 0) ? 0 : (int)result->width - x, 593 (int)result->width - x,
576 (v_scale > 0) ? 0 : (int)result->height - y, 594 (int)result->height - y,
577 new_pmap_width, 595 new_pmap_width,
578 new_pmap_height, 596 new_pmap_height,
579 TINT_LEAVE_SAME, ASA_XImage, 597 TINT_LEAVE_SAME, ASA_XImage,
580 100, ASIMAGE_QUALITY_DEFAULT); 598 100, ASIMAGE_QUALITY_DEFAULT);
581 if (tmp) 599 if (tmp)
… …
645 free (layers); 663 free (layers);
646 } 664 }
647 } 665 }
648 TIMING_TEST_PRINT_RESULT (asim); 666 TIMING_TEST_PRINT_RESULT (asim);
649 667
650 if (pixmap) 668 bool ret = false;
651 {
652 if (result == NULL
653 || pmap_width != new_pmap_width
654 || pmap_height != new_pmap_height
655 || pmap_depth != target->depth)
656 {
657 XFreePixmap (target->dpy, pixmap);
658 pixmap = None;
659 }
660 }
661 669
662 if (result) 670 if (result)
663 { 671 {
664 XGCValues gcv; 672 XGCValues gcv;
665 GC gc; 673 GC gc;
674
675 if (pixmap)
676 {
677 if (pmap_width != new_pmap_width
678 || pmap_height != new_pmap_height
679 || pmap_depth != target->depth)
680 {
681 XFreePixmap (target->dpy, pixmap);
682 pixmap = None;
683 }
684 }
666 685
667 /* create Pixmap */ 686 /* create Pixmap */
668 if (pixmap == None) 687 if (pixmap == None)
669 { 688 {
670 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 689 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
671 pmap_width = new_pmap_width; 690 pmap_width = new_pmap_width;
672 pmap_height = new_pmap_height; 691 pmap_height = new_pmap_height;
673 pmap_depth = target->depth; 692 pmap_depth = target->depth;
674 } 693 }
675 /* fill with background color ( if result's not completely overlapping it)*/ 694 /* fill with background color (if result's not completely overlapping it) */
676 gcv.foreground = target->pix_colors[Color_bg]; 695 gcv.foreground = target->pix_colors[Color_bg];
677 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 696 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
678 697
679 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 698 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
680 int dst_width = result->width, dst_height = result->height; 699 int dst_width = result->width, dst_height = result->height;
681 if (background == NULL) 700 if (background == NULL)
682 { 701 {
702 if (!(h_scale == 0 || v_scale == 0))
703 {
683 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 704 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
684 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 705 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
706 }
685 707
686 if (dst_x > 0 || dst_y > 0 708 if (dst_x > 0 || dst_y > 0
687 || dst_x + dst_width < new_pmap_width 709 || dst_x + dst_width < new_pmap_width
688 || dst_y + dst_height < new_pmap_height) 710 || dst_y + dst_height < new_pmap_height)
689 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 711 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
… …
696 if (result != background && result != original_asim) 718 if (result != background && result != original_asim)
697 destroy_asimage (&result); 719 destroy_asimage (&result);
698 720
699 XFreeGC (target->dpy, gc); 721 XFreeGC (target->dpy, gc);
700 TIMING_TEST_PRINT_RESULT (asim); 722 TIMING_TEST_PRINT_RESULT (asim);
723
724 ret = true;
701 } 725 }
702 726
703 if (background) 727 if (background)
704 destroy_asimage (&background); 728 destroy_asimage (&background);
705 729
706 return true; 730 return ret;
707} 731}
708# endif /* HAVE_AFTERIMAGE */ 732# endif /* HAVE_AFTERIMAGE */
733
734# ifdef HAVE_PIXBUF
735bool
736bgPixmap_t::render_image (unsigned long background_flags)
737{
738 if (target == NULL)
739 return false;
740
741 if (!pixbuf)
742 return false;
743
744 // TODO: add alpha blending
745 if (background_flags)
746 return false;
747
748 GdkPixbuf *result;
749
750 int image_width = gdk_pixbuf_get_width (pixbuf);
751 int image_height = gdk_pixbuf_get_height (pixbuf);
752
753 int target_width = target->szHint.width;
754 int target_height = target->szHint.height;
755 int new_pmap_width = target_width;
756 int new_pmap_height = target_height;
757
758 int x = 0;
759 int y = 0;
760 int w = 0;
761 int h = 0;
762
763 get_image_geometry (image_width, image_height, w, h, x, y);
764
765 if (!(flags & rootAlign)
766 && (x >= target_width
767 || y >= target_height
768 || (w > 0 && x + w <= 0)
769 || (h > 0 && y + h <= 0)))
770 return false;
771
772 result = pixbuf;
773
774 if ((w > 0 && w != image_width)
775 || (h > 0 && h != image_height))
776 {
777 result = gdk_pixbuf_scale_simple (pixbuf,
778 w > 0 ? w : image_width,
779 h > 0 ? h : image_height,
780 GDK_INTERP_BILINEAR);
781 }
782
783 bool ret = false;
784
785 if (result)
786 {
787 XGCValues gcv;
788 GC gc;
789
790 image_width = gdk_pixbuf_get_width (result);
791 image_height = gdk_pixbuf_get_height (result);
792
793 if (h_scale == 0 || v_scale == 0)
794 {
795 new_pmap_width = min (image_width, target_width);
796 new_pmap_height = min (image_height, target_height);
797 }
798
799 if (pixmap)
800 {
801 if (pmap_width != new_pmap_width
802 || pmap_height != new_pmap_height
803 || pmap_depth != target->depth)
804 {
805 XFreePixmap (target->dpy, pixmap);
806 pixmap = None;
807 }
808 }
809
810 if (pixmap == None)
811 {
812 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
813 pmap_width = new_pmap_width;
814 pmap_height = new_pmap_height;
815 pmap_depth = target->depth;
816 }
817
818 gcv.foreground = target->pix_colors[Color_bg];
819 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
820
821 if (h_scale == 0 || v_scale == 0)
822 {
823 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
824 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
825 0, 0,
826 0, 0,
827 image_width, image_height,
828 XLIB_RGB_DITHER_NONE,
829 0, 0);
830
831 gcv.tile = tile;
832 gcv.fill_style = FillTiled;
833 gcv.ts_x_origin = x;
834 gcv.ts_y_origin = y;
835 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
836
837 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
838 XFreePixmap (target->dpy, tile);
839 }
840 else
841 {
842 int src_x, src_y, dst_x, dst_y;
843 int dst_width, dst_height;
844
845 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
846 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
847
848 if (dst_x > 0 || dst_y > 0
849 || dst_x + dst_width < new_pmap_width
850 || dst_y + dst_height < new_pmap_height)
851 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
852
853 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
854 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
855 src_x, src_y,
856 dst_x, dst_y,
857 dst_width, dst_height,
858 XLIB_RGB_DITHER_NONE,
859 0, 0);
860 }
861
862 if (result != pixbuf)
863 g_object_unref (result);
864
865 XFreeGC (target->dpy, gc);
866
867 ret = true;
868 }
869
870 return ret;
871}
872# endif /* HAVE_PIXBUF */
709 873
710bool 874bool
711bgPixmap_t::set_file (const char *file) 875bgPixmap_t::set_file (const char *file)
712{ 876{
713 assert (file); 877 assert (file);
… …
725 889
726# ifdef HAVE_AFTERIMAGE 890# ifdef HAVE_AFTERIMAGE
727 if (!target->asimman) 891 if (!target->asimman)
728 target->asimman = create_generic_imageman (target->rs[Rs_path]); 892 target->asimman = create_generic_imageman (target->rs[Rs_path]);
729 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 893 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
730 return original_asim; 894 if (original_asim)
895 have_image = true;
896 return have_image;
897# endif
898
899# ifdef HAVE_PIXBUF
900 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
901 if (pixbuf)
902 have_image = true;
903 return have_image;
731# endif 904# endif
732 } 905 }
733 906
734 return false; 907 return false;
735} 908}
… …
755 int changed = 0; 928 int changed = 0;
756 unsigned int hr, vr; 929 unsigned int hr, vr;
757 int junk; 930 int junk;
758 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 931 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
759 932
760 if (!(geom_flags&WidthValue)) 933 if (!(geom_flags & WidthValue))
761 hr = 1; 934 hr = 1;
762 if (!(geom_flags&HeightValue)) 935 if (!(geom_flags & HeightValue))
763 vr = hr; 936 vr = hr;
764 937
765 if (h_blurRadius != hr) 938 if (h_blurRadius != hr)
766 { 939 {
767 ++changed; 940 ++changed;
… …
777 if (v_blurRadius == 0 && h_blurRadius == 0) 950 if (v_blurRadius == 0 && h_blurRadius == 0)
778 flags &= ~blurNeeded; 951 flags &= ~blurNeeded;
779 else 952 else
780 flags |= blurNeeded; 953 flags |= blurNeeded;
781 954
782 return (changed>0); 955 return (changed > 0);
783} 956}
784 957
785static inline unsigned long 958static inline unsigned long
786compute_tint_shade_flags (rxvt_color *tint, int shade) 959compute_tint_shade_flags (rxvt_color *tint, int shade)
787{ 960{
… …
804 flags |= bgPixmap_t::tintNeeded; 977 flags |= bgPixmap_t::tintNeeded;
805 else if (tint) 978 else if (tint)
806 { 979 {
807 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 980 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
808 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 981 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
809 { 982 {
810 flags |= bgPixmap_t::tintNeeded; 983 flags |= bgPixmap_t::tintNeeded;
811 } 984 }
812 } 985 }
813 986
814 if (flags & bgPixmap_t::tintNeeded) 987 if (flags & bgPixmap_t::tintNeeded)
815 { 988 {
816 if (flags & bgPixmap_t::tintWholesome) 989 if (flags & bgPixmap_t::tintWholesome)
… …
845{ 1018{
846 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1019 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
847 1020
848 if (new_flags != (flags & tintFlags)) 1021 if (new_flags != (flags & tintFlags))
849 { 1022 {
850 flags = (flags&~tintFlags)|new_flags; 1023 flags = (flags & ~tintFlags) | new_flags;
851 return true; 1024 return true;
852 } 1025 }
853 1026
854 return false; 1027 return false;
855} 1028}
856 1029
… …
871 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1044 flags = (flags & (~tintFlags | tintSet)) | new_flags;
872 return true; 1045 return true;
873 } 1046 }
874 1047
875 return false; 1048 return false;
1049}
1050
1051bool
1052bgPixmap_t::tint_pixmap (Pixmap pixmap)
1053{
1054 Window root = target->display->root;
1055 Display *dpy = target->dpy;
1056 int window_width = target->szHint.width;
1057 int window_height = target->szHint.height;
1058 bool ret = false;
1059
1060 if (flags & tintWholesome)
1061 {
1062 XGCValues gcv;
1063 GC gc;
1064
1065 /* In this case we can tint image server-side getting significant
1066 * performance improvements, as we eliminate XImage transfer
1067 */
1068 gcv.foreground = Pixel (tint);
1069 gcv.function = GXand;
1070 gcv.fill_style = FillSolid;
1071 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1072 if (gc)
1073 {
1074 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
1075 ret = true;
1076 XFreeGC (dpy, gc);
1077 }
1078 }
1079 else
1080 {
1081# if XFT
1082 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1083
1084 if (flags & tintSet)
1085 tint.get (c);
1086
1087 if (shade > 0 && shade < 100)
1088 {
1089 c.r = (c.r * shade) / 100;
1090 c.g = (c.g * shade) / 100;
1091 c.b = (c.b * shade) / 100;
1092 }
1093 else if (shade > 100 && shade < 200)
1094 {
1095 c.r = (c.r * (200 - shade)) / 100;
1096 c.g = (c.g * (200 - shade)) / 100;
1097 c.b = (c.b * (200 - shade)) / 100;
1098 }
1099
1100 XRenderPictFormat pf;
1101 pf.type = PictTypeDirect;
1102 pf.depth = 32;
1103 pf.direct.redMask = 0xff;
1104 pf.direct.greenMask = 0xff;
1105 pf.direct.blueMask = 0xff;
1106 pf.direct.alphaMask = 0xff;
1107
1108 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1109 (PictFormatType|
1110 PictFormatDepth|
1111 PictFormatRedMask|
1112 PictFormatGreenMask|
1113 PictFormatBlueMask|
1114 PictFormatAlphaMask),
1115 &pf,
1116 0);
1117 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1118 XRenderPictureAttributes pa;
1119
1120 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa);
1121
1122 pa.repeat = True;
1123
1124 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1125 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1126 XFreePixmap (dpy, overlay_pmap);
1127
1128 pa.component_alpha = True;
1129 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1130 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1131 XFreePixmap (dpy, mask_pmap);
1132
1133 if (mask_pic && overlay_pic && back_pic)
1134 {
1135 XRenderColor mask_c;
1136
1137 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1138 mask_c.alpha = 0xffff;
1139 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1140
1141 mask_c.alpha = 0;
1142 mask_c.red = 0xffff - c.r;
1143 mask_c.green = 0xffff - c.g;
1144 mask_c.blue = 0xffff - c.b;
1145 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1146 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1147 ret = true;
1148 }
1149
1150 XRenderFreePicture (dpy, mask_pic);
1151 XRenderFreePicture (dpy, overlay_pic);
1152 XRenderFreePicture (dpy, back_pic);
1153# if DO_TIMING_TEST
1154 XSync (dpy, False);
1155# endif
1156# endif
1157 }
1158
1159 return ret;
876} 1160}
877 1161
878/* make_transparency_pixmap() 1162/* make_transparency_pixmap()
879 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1163 * Builds a pixmap sized the same as terminal window, with depth same as the root window
880 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1164 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
941 1225
942 attr.background_pixmap = ParentRelative; 1226 attr.background_pixmap = ParentRelative;
943 attr.backing_store = Always; 1227 attr.backing_store = Always;
944 attr.event_mask = ExposureMask; 1228 attr.event_mask = ExposureMask;
945 attr.override_redirect = True; 1229 attr.override_redirect = True;
946 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1230 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
947 CopyFromParent, CopyFromParent, CopyFromParent, 1231 CopyFromParent, CopyFromParent, CopyFromParent,
948 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1232 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
949 &attr); 1233 &attr);
950 1234
951 if (src != None) 1235 if (src != None)
… …
975 XDestroyWindow (dpy, src); 1259 XDestroyWindow (dpy, src);
976 XUngrabServer (dpy); 1260 XUngrabServer (dpy);
977 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1261 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
978 } 1262 }
979 1263
980 if (!success) 1264 if (!success)
981 { 1265 {
982 XFreePixmap (dpy, tiled_root_pmap); 1266 XFreePixmap (dpy, tiled_root_pmap);
983 tiled_root_pmap = None; 1267 tiled_root_pmap = None;
984 } 1268 }
985 else 1269 else
986 result |= transpPmapTiled; 1270 result |= transpPmapTiled;
987 } 1271 }
988 else 1272 else
989 { 1273 {
990 /* straightforward pixmap copy */ 1274 /* straightforward pixmap copy */
991 gcv.tile = root_pixmap; 1275 gcv.tile = root_pixmap;
… …
1010 { 1294 {
1011 if (!need_client_side_rendering ()) 1295 if (!need_client_side_rendering ())
1012 { 1296 {
1013 if ((flags & tintNeeded)) 1297 if ((flags & tintNeeded))
1014 { 1298 {
1015 if (flags & tintWholesome) 1299 if (tint_pixmap (tiled_root_pmap))
1016 {
1017 /* In this case we can tint image server-side getting significant
1018 * performance improvements, as we eliminate XImage transfer
1019 */
1020 gcv.foreground = Pixel (tint);
1021 gcv.function = GXand;
1022 gcv.fill_style = FillSolid;
1023 if (gc)
1024 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
1025 else
1026 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1027 if (gc)
1028 {
1029 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1030 result |= transpPmapTinted; 1300 result |= transpPmapTinted;
1031 }
1032 }
1033 else
1034 {
1035# if XFT
1036 Picture back_pic = 0;
1037 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1038
1039 if (flags & tintSet)
1040 tint.get (c);
1041
1042 if (shade > 0 && shade < 100)
1043 {
1044 c.r = (c.r * shade) / 100;
1045 c.g = (c.g * shade) / 100;
1046 c.b = (c.b * shade) / 100;
1047 }
1048 else if (shade > 100 && shade < 200)
1049 {
1050 c.r = (c.r * (200 - shade)) / 100;
1051 c.g = (c.g * (200 - shade)) / 100;
1052 c.b = (c.b * (200 - shade)) / 100;
1053 }
1054
1055 XRenderPictFormat pf;
1056 pf.type = PictTypeDirect;
1057 pf.depth = 32;
1058 pf.direct.redMask = 0xff;
1059 pf.direct.greenMask = 0xff;
1060 pf.direct.blueMask = 0xff;
1061 pf.direct.alphaMask = 0xff;
1062
1063 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1064 (PictFormatType|
1065 PictFormatDepth|
1066 PictFormatRedMask|
1067 PictFormatGreenMask|
1068 PictFormatBlueMask|
1069 PictFormatAlphaMask),
1070 &pf,
1071 0);
1072 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1073 XRenderPictureAttributes pa ;
1074
1075 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1076
1077 pa.repeat = True;
1078
1079 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1080 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1081 XFreePixmap (dpy, overlay_pmap);
1082
1083 pa.component_alpha = True;
1084 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1085 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1086 XFreePixmap (dpy, mask_pmap);
1087
1088 if (mask_pic && overlay_pic && back_pic)
1089 {
1090 XRenderColor mask_c;
1091
1092 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1093 mask_c.alpha = 0xffff;
1094 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1095
1096 mask_c.alpha = 0;
1097 mask_c.red = 0xffff - c.r;
1098 mask_c.green = 0xffff - c.g;
1099 mask_c.blue = 0xffff - c.b;
1100 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1101 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1102 result |= transpPmapTinted;
1103 }
1104
1105 XRenderFreePicture (dpy, mask_pic);
1106 XRenderFreePicture (dpy, overlay_pic);
1107 XRenderFreePicture (dpy, back_pic);
1108# if DO_TIMING_TEST
1109 XSync (dpy, False);
1110# endif
1111# endif
1112 }
1113 } 1301 }
1114 } /* server side rendering completed */ 1302 } /* server side rendering completed */
1115 1303
1116 if (pixmap) 1304 if (pixmap)
1117 XFreePixmap (dpy, pixmap); 1305 XFreePixmap (dpy, pixmap);
1118 1306
… …
1168 /* we need to re-generate transparency pixmap in that case ! */ 1356 /* we need to re-generate transparency pixmap in that case ! */
1169 background_flags = make_transparency_pixmap (); 1357 background_flags = make_transparency_pixmap ();
1170 if (background_flags == 0) 1358 if (background_flags == 0)
1171 return false; 1359 return false;
1172 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1360 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1173 && pmap_depth == target->depth) 1361 && pmap_depth == target->depth)
1174 flags = flags & ~isInvalid; 1362 flags = flags & ~isInvalid;
1175 } 1363 }
1176# endif 1364# endif
1177 1365
1178# ifdef HAVE_AFTERIMAGE 1366# ifdef BG_IMAGE_FROM_FILE
1179 if (original_asim 1367 if (have_image
1180 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1368 || (background_flags & transpTransformations) != (flags & transpTransformations))
1181 { 1369 {
1182 if (render_asim (background_flags)) 1370 if (render_image (background_flags))
1183 flags = flags & ~isInvalid; 1371 flags = flags & ~isInvalid;
1184 } 1372 }
1185# endif 1373# endif
1186 1374
1187 XImage *result = NULL; 1375 XImage *result = NULL;
1188 1376
1189 if (background_flags && (flags & isInvalid)) 1377 if (background_flags && (flags & isInvalid))
1190 { 1378 {
1191 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1379 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1380 }
1192 1381
1382 if (result)
1383 {
1193# if !defined(HAVE_AFTERIMAGE) && !XFT 1384# if !defined(HAVE_AFTERIMAGE) && !XFT
1194 /* our own client-side tinting */ 1385 /* our own client-side tinting */
1195 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side. 1386 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1196 This may need to be changed in need_client_side_rendering() logic is altered !!! */ 1387 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1197 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1388 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1198 { 1389 {
1199 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1390 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1200 if (flags & tintSet) 1391 if (flags & tintSet)
1201 tint.get (c); 1392 tint.get (c);
1202 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1393 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1203 } 1394 }
1204# endif 1395# endif
1205 }
1206 1396
1207 if (result)
1208 {
1209 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1397 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1210 1398
1211 if (gc) 1399 if (gc)
1212 { 1400 {
1213 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1401 if (/*pmap_depth != target->depth &&*/ pixmap != None)
… …
1242 1430
1243 XFreeGC (target->dpy, gc); 1431 XFreeGC (target->dpy, gc);
1244 flags = flags & ~isInvalid; 1432 flags = flags & ~isInvalid;
1245 } 1433 }
1246 1434
1247 XDestroyImage (result); 1435 XDestroyImage (result);
1248 } 1436 }
1249 1437
1250 if (flags & isInvalid) 1438 if (flags & isInvalid)
1251 { 1439 {
1252 if (pixmap != None) 1440 if (pixmap != None)

Diff Legend

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