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.41 by sf-exg, Sat Aug 21 16:07:15 2010 UTC vs.
Revision 1.63 by sf-exg, Sun Oct 3 21:44:39 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 <= 50)
231 return diff * align / 100; 232 return diff * align / 100;
232 else if (align > 50 && align <= 100) 233 else if (align > 50 && align <= 100)
233 return window_size - image_size - diff * (100 - align) / 100; 234 return window_size - image_size - diff * (100 - align) / 100;
… …
242make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 243make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
243{ 244{
244 int src_pos = 0; 245 int src_pos = 0;
245 dst_pos = 0; 246 dst_pos = 0;
246 dst_size = size; 247 dst_size = size;
247 if (pos < 0 && size > target_size) 248 if (pos < 0)
248 { 249 {
249 src_pos = -pos; 250 src_pos = -pos;
250 dst_size += pos; 251 dst_size += pos;
251 } 252 }
252 else if (pos > 0) 253 else if (pos > 0)
… …
383 w = h = noScale; 384 w = h = noScale;
384 geom_flags |= WidthValue|HeightValue; 385 geom_flags |= WidthValue|HeightValue;
385 } 386 }
386 else if (CHECK_GEOM_OPS ("propscale")) 387 else if (CHECK_GEOM_OPS ("propscale"))
387 { 388 {
388 if (w == 0 && h == 0)
389 {
390 w = windowScale;
391 geom_flags |= WidthValue;
392 }
393 new_flags |= propScale; 389 new_flags |= propScale;
394 } 390 }
395 else if (CHECK_GEOM_OPS ("hscale")) 391 else if (CHECK_GEOM_OPS ("hscale"))
396 { 392 {
397 if (w == 0) w = windowScale; 393 if (w == 0) w = windowScale;
… …
419 x = y = centerAlign; 415 x = y = centerAlign;
420 geom_flags |= WidthValue|HeightValue|XValue|YValue; 416 geom_flags |= WidthValue|HeightValue|XValue|YValue;
421 } 417 }
422 else if (CHECK_GEOM_OPS ("root")) 418 else if (CHECK_GEOM_OPS ("root"))
423 { 419 {
420 new_flags |= rootAlign;
424 w = h = noScale; 421 w = h = noScale;
425 x = y = rootAlign;
426 geom_flags |= WidthValue|HeightValue|XValue|YValue; 422 geom_flags |= WidthValue|HeightValue;
427 } 423 }
428# undef CHECK_GEOM_OPS 424# undef CHECK_GEOM_OPS
429 425
430 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
431 } /* done parsing ops */ 427 } /* done parsing ops */
… …
441 { 437 {
442 flags = new_flags; 438 flags = new_flags;
443 changed++; 439 changed++;
444 } 440 }
445 441
446//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 442 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
447// flags, h_scale, v_scale, h_align, v_align); 443 // flags, h_scale, v_scale, h_align, v_align);
448 return (changed > 0); 444 return (changed > 0);
445}
446
447void
448bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
449{
450 int target_width = target->szHint.width;
451 int target_height = target->szHint.height;
452
453 if (flags & propScale)
454 {
455 float scale = (float)target_width / image_width;
456 min_it (scale, (float)target_height / image_height);
457 w = image_width * scale + 0.5;
458 h = image_height * scale + 0.5;
459 }
460 else
461 {
462 w = h_scale * target_width / 100;
463 h = v_scale * target_height / 100;
464 }
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 > 0 ? w : image_width);
475 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
476 }
477
478 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0
480 || h_align != 0 || v_align != 0
481 || image_width > target_width || image_height > target_height)
482 flags |= sizeSensitive;
449} 483}
450 484
451# ifdef HAVE_AFTERIMAGE 485# ifdef HAVE_AFTERIMAGE
452bool 486bool
453bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 487bgPixmap_t::render_image (unsigned long background_flags)
454{ 488{
455 if (target == NULL) 489 if (target == NULL)
456 return false; 490 return false;
457 491
458 target->init_asv (); 492 target->init_asv ();
493
494 ASImage *background = NULL;
495 ARGB32 background_tint = TINT_LEAVE_SAME;
496
497# ifdef ENABLE_TRANSPARENCY
498 if (background_flags)
499 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
500
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 {
503 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade;
505
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet)
508 tint.get (c);
509 as_shade.tintColor.red = c.r;
510 as_shade.tintColor.green = c.g;
511 as_shade.tintColor.blue = c.b;
512
513 background_tint = shading2tint32 (&as_shade);
514 }
515
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
517 {
518 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
519 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
520 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp)
522 {
523 destroy_asimage (&background);
524 background = tmp;
525 }
526 }
527# endif
459 528
460 ASImage *result = 0; 529 ASImage *result = 0;
461 530
462 int target_width = target->szHint.width; 531 int target_width = target->szHint.width;
463 int target_height = target->szHint.height; 532 int target_height = target->szHint.height;
464 int new_pmap_width = target_width; 533 int new_pmap_width = target_width;
465 int new_pmap_height = target_height; 534 int new_pmap_height = target_height;
466 535
467 int x = 0; 536 int x = 0;
468 int y = 0; 537 int y = 0;
469 int w = h_scale * target_width / 100; 538 int w = 0;
470 int h = v_scale * target_height / 100; 539 int h = 0;
471 540
472 TIMING_TEST_START (asim); 541 TIMING_TEST_START (asim);
473 542
474 if (original_asim) 543 if (original_asim)
475 { 544 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
476 if (h_align == rootAlign || v_align == rootAlign)
477 {
478 target->get_window_origin(x, y);
479 x = -x;
480 y = -y;
481 }
482
483 if (h_align != rootAlign)
484 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
485
486 if (v_align != rootAlign)
487 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
488 }
489 545
490 if (!original_asim 546 if (!original_asim
491 || x >= target_width 547 || x >= target_width
492 || y >= target_height 548 || y >= target_height
493 || (w > 0 && x + w <= 0) 549 || (w > 0 && x + w <= 0)
… …
525 100, ASIMAGE_QUALITY_DEFAULT); 581 100, ASIMAGE_QUALITY_DEFAULT);
526 } 582 }
527 583
528 if (background == NULL) 584 if (background == NULL)
529 { 585 {
530 /* if tiling - pixmap has to be sized exactly as the image,
531 but there is no need to make it bigger than the window! */
532 if (h_scale == 0)
533 new_pmap_width = min (result->width, target_width);
534 if (v_scale == 0)
535 new_pmap_height = min (result->height, target_height);
536 /* we also need to tile our image in one or both directions */
537 if (h_scale == 0 || v_scale == 0) 586 if (h_scale == 0 || v_scale == 0)
538 { 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 */
539 ASImage *tmp = tile_asimage (target->asv, result, 594 ASImage *tmp = tile_asimage (target->asv, result,
540 (h_scale > 0) ? 0 : (int)result->width - x, 595 (int)result->width - x,
541 (v_scale > 0) ? 0 : (int)result->height - y, 596 (int)result->height - y,
542 new_pmap_width, 597 new_pmap_width,
543 new_pmap_height, 598 new_pmap_height,
544 TINT_LEAVE_SAME, ASA_XImage, 599 TINT_LEAVE_SAME, ASA_XImage,
545 100, ASIMAGE_QUALITY_DEFAULT); 600 100, ASIMAGE_QUALITY_DEFAULT);
546 if (tmp) 601 if (tmp)
… …
554 } 609 }
555 else 610 else
556 { 611 {
557 /* if blending background and image - pixmap has to be sized same as target window */ 612 /* if blending background and image - pixmap has to be sized same as target window */
558 ASImageLayer *layers = create_image_layers (2); 613 ASImageLayer *layers = create_image_layers (2);
559 ASImage *merged_im = NULL;
560 614
561 layers[0].im = background; 615 layers[0].im = background;
562 layers[0].clip_width = target_width; 616 layers[0].clip_width = target_width;
563 layers[0].clip_height = target_height; 617 layers[0].clip_height = target_height;
564 layers[0].tint = background_tint; 618 layers[0].tint = background_tint;
… …
611 free (layers); 665 free (layers);
612 } 666 }
613 } 667 }
614 TIMING_TEST_PRINT_RESULT (asim); 668 TIMING_TEST_PRINT_RESULT (asim);
615 669
616 if (pixmap) 670 bool ret = false;
617 {
618 if (result == NULL
619 || pmap_width != new_pmap_width
620 || pmap_height != new_pmap_height
621 || pmap_depth != target->depth)
622 {
623 XFreePixmap (target->dpy, pixmap);
624 pixmap = None;
625 }
626 }
627 671
628 if (result) 672 if (result)
629 { 673 {
630 XGCValues gcv; 674 XGCValues gcv;
631 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 }
632 687
633 /* create Pixmap */ 688 /* create Pixmap */
634 if (pixmap == None) 689 if (pixmap == None)
635 { 690 {
636 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);
637 pmap_width = new_pmap_width; 692 pmap_width = new_pmap_width;
638 pmap_height = new_pmap_height; 693 pmap_height = new_pmap_height;
639 pmap_depth = target->depth; 694 pmap_depth = target->depth;
640 } 695 }
641 /* fill with background color ( if result's not completely overlapping it)*/ 696 /* fill with background color (if result's not completely overlapping it) */
642 gcv.foreground = target->pix_colors[Color_bg]; 697 gcv.foreground = target->pix_colors[Color_bg];
643 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 698 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
644 699
645 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;
646 int dst_width = result->width, dst_height = result->height; 701 int dst_width = result->width, dst_height = result->height;
647 if (background == NULL) 702 if (background == NULL)
648 { 703 {
704 if (!(h_scale == 0 || v_scale == 0))
705 {
649 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 );
650 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 }
651 709
652 if (dst_x > 0 || dst_y > 0 710 if (dst_x > 0 || dst_y > 0
653 || dst_x + dst_width < new_pmap_width 711 || dst_x + dst_width < new_pmap_width
654 || dst_y + dst_height < new_pmap_height) 712 || dst_y + dst_height < new_pmap_height)
655 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);
… …
662 if (result != background && result != original_asim) 720 if (result != background && result != original_asim)
663 destroy_asimage (&result); 721 destroy_asimage (&result);
664 722
665 XFreeGC (target->dpy, gc); 723 XFreeGC (target->dpy, gc);
666 TIMING_TEST_PRINT_RESULT (asim); 724 TIMING_TEST_PRINT_RESULT (asim);
667 }
668 725
726 ret = true;
727 }
728
729 if (background)
730 destroy_asimage (&background);
731
669 return true; 732 return ret;
670} 733}
671# 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 (x >= target_width
768 || y >= target_height
769 || (w > 0 && x + w <= 0)
770 || (h > 0 && y + h <= 0))
771 return false;
772
773 result = pixbuf;
774
775 if ((w > 0 && w != image_width)
776 || (h > 0 && h != image_height))
777 {
778 result = gdk_pixbuf_scale_simple (pixbuf,
779 w > 0 ? w : image_width,
780 h > 0 ? h : image_height,
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 */
672 874
673bool 875bool
674bgPixmap_t::set_file (const char *file) 876bgPixmap_t::set_file (const char *file)
675{ 877{
676 assert (file); 878 assert (file);
677 879
678 if (*file) 880 if (*file)
679 { 881 {
882 if (const char *p = strchr (file, ';'))
883 {
884 size_t len = p - file;
885 char *f = rxvt_temp_buf<char> (len + 1);
886 memcpy (f, file, len);
887 f[len] = '\0';
888 file = f;
889 }
890
680# ifdef HAVE_AFTERIMAGE 891# ifdef HAVE_AFTERIMAGE
681 if (!target->asimman) 892 if (!target->asimman)
682 target->asimman = create_generic_imageman (target->rs[Rs_path]); 893 target->asimman = create_generic_imageman (target->rs[Rs_path]);
683
684 if (const char *p = strchr (file, ';'))
685 {
686 size_t len = p - file;
687 char *f = (char *)malloc (len + 1);
688 memcpy (f, file, len);
689 f[len] = '\0';
690 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
691 free (f);
692 }
693 else
694 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 894 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
895 if (original_asim)
896 have_image = true;
897 return have_image;
898# endif
695 899
696 return original_asim; 900# ifdef HAVE_PIXBUF
901 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
902 if (pixbuf)
903 have_image = true;
904 return have_image;
697# endif 905# endif
698 } 906 }
699 907
700 return false; 908 return false;
701} 909}
… …
721 int changed = 0; 929 int changed = 0;
722 unsigned int hr, vr; 930 unsigned int hr, vr;
723 int junk; 931 int junk;
724 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 932 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
725 933
726 if (!(geom_flags&WidthValue)) 934 if (!(geom_flags & WidthValue))
727 hr = 1; 935 hr = 1;
728 if (!(geom_flags&HeightValue)) 936 if (!(geom_flags & HeightValue))
729 vr = hr; 937 vr = hr;
730 938
731 if (h_blurRadius != hr) 939 if (h_blurRadius != hr)
732 { 940 {
733 ++changed; 941 ++changed;
… …
743 if (v_blurRadius == 0 && h_blurRadius == 0) 951 if (v_blurRadius == 0 && h_blurRadius == 0)
744 flags &= ~blurNeeded; 952 flags &= ~blurNeeded;
745 else 953 else
746 flags |= blurNeeded; 954 flags |= blurNeeded;
747 955
748 return (changed>0); 956 return (changed > 0);
749} 957}
750 958
751static inline unsigned long 959static inline unsigned long
752compute_tint_shade_flags (rxvt_color *tint, int shade) 960compute_tint_shade_flags (rxvt_color *tint, int shade)
753{ 961{
… …
770 flags |= bgPixmap_t::tintNeeded; 978 flags |= bgPixmap_t::tintNeeded;
771 else if (tint) 979 else if (tint)
772 { 980 {
773 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 981 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
774 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 982 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
775 { 983 {
776 flags |= bgPixmap_t::tintNeeded; 984 flags |= bgPixmap_t::tintNeeded;
777 } 985 }
778 } 986 }
779 987
780 if (flags & bgPixmap_t::tintNeeded) 988 if (flags & bgPixmap_t::tintNeeded)
781 { 989 {
782 if (flags & bgPixmap_t::tintWholesome) 990 if (flags & bgPixmap_t::tintWholesome)
… …
811{ 1019{
812 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1020 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
813 1021
814 if (new_flags != (flags & tintFlags)) 1022 if (new_flags != (flags & tintFlags))
815 { 1023 {
816 flags = (flags&~tintFlags)|new_flags; 1024 flags = (flags & ~tintFlags) | new_flags;
817 return true; 1025 return true;
818 } 1026 }
819 1027
820 return false; 1028 return false;
821} 1029}
822 1030
… …
907 1115
908 attr.background_pixmap = ParentRelative; 1116 attr.background_pixmap = ParentRelative;
909 attr.backing_store = Always; 1117 attr.backing_store = Always;
910 attr.event_mask = ExposureMask; 1118 attr.event_mask = ExposureMask;
911 attr.override_redirect = True; 1119 attr.override_redirect = True;
912 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1120 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
913 CopyFromParent, CopyFromParent, CopyFromParent, 1121 CopyFromParent, CopyFromParent, CopyFromParent,
914 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1122 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
915 &attr); 1123 &attr);
916 1124
917 if (src != None) 1125 if (src != None)
… …
941 XDestroyWindow (dpy, src); 1149 XDestroyWindow (dpy, src);
942 XUngrabServer (dpy); 1150 XUngrabServer (dpy);
943 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1151 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
944 } 1152 }
945 1153
946 if (!success) 1154 if (!success)
947 { 1155 {
948 XFreePixmap (dpy, tiled_root_pmap); 1156 XFreePixmap (dpy, tiled_root_pmap);
949 tiled_root_pmap = None; 1157 tiled_root_pmap = None;
950 } 1158 }
951 else 1159 else
952 result |= transpPmapTiled; 1160 result |= transpPmapTiled;
953 } 1161 }
954 else 1162 else
955 { 1163 {
956 /* straightforward pixmap copy */ 1164 /* straightforward pixmap copy */
957 gcv.tile = root_pixmap; 1165 gcv.tile = root_pixmap;
… …
1074# if DO_TIMING_TEST 1282# if DO_TIMING_TEST
1075 XSync (dpy, False); 1283 XSync (dpy, False);
1076# endif 1284# endif
1077# endif 1285# endif
1078 } 1286 }
1079 } 1287 }
1080 } /* server side rendering completed */ 1288 } /* server side rendering completed */
1081 1289
1082 if (pixmap) 1290 if (pixmap)
1083 XFreePixmap (dpy, pixmap); 1291 XFreePixmap (dpy, pixmap);
1084 1292
… …
1134 /* we need to re-generate transparency pixmap in that case ! */ 1342 /* we need to re-generate transparency pixmap in that case ! */
1135 background_flags = make_transparency_pixmap (); 1343 background_flags = make_transparency_pixmap ();
1136 if (background_flags == 0) 1344 if (background_flags == 0)
1137 return false; 1345 return false;
1138 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1346 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1139 && pmap_depth == target->depth) 1347 && pmap_depth == target->depth)
1140 flags = flags & ~isInvalid; 1348 flags = flags & ~isInvalid;
1141 } 1349 }
1142# endif 1350# endif
1143 1351
1352# ifdef BG_IMAGE_FROM_FILE
1353 if (have_image
1354 || (background_flags & transpTransformations) != (flags & transpTransformations))
1355 {
1356 if (render_image (background_flags))
1357 flags = flags & ~isInvalid;
1358 }
1359# endif
1360
1144 XImage *result = NULL; 1361 XImage *result = NULL;
1145# ifdef HAVE_AFTERIMAGE 1362
1146 if (original_asim 1363 if (background_flags && (flags & isInvalid))
1147 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1364 {
1365 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1148 { 1366 }
1149 target->init_asv ();
1150 1367
1151 ASImage *background = NULL; 1368 if (result)
1152 ARGB32 as_tint = TINT_LEAVE_SAME; 1369 {
1153 if (background_flags) 1370# if !defined(HAVE_AFTERIMAGE) && !XFT
1154 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 1371 /* our own client-side tinting */
1155 1372 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1156# ifdef ENABLE_TRANSPARENCY 1373 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1157 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1374 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1158 {
1159 ShadingInfo as_shade;
1160 as_shade.shading = (shade == 0) ? 100 : shade;
1161
1162 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1163 if (flags & tintSet)
1164 tint.get (c);
1165 as_shade.tintColor.red = c.r;
1166 as_shade.tintColor.green = c.g;
1167 as_shade.tintColor.blue = c.b;
1168
1169 as_tint = shading2tint32 (&as_shade);
1170 }
1171
1172 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1173 {
1174 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1175 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1176 100, ASIMAGE_QUALITY_DEFAULT);
1177 if (tmp)
1178 {
1179 destroy_asimage (&background);
1180 background = tmp;
1181 }
1182 }
1183# endif
1184
1185 if (render_asim (background, as_tint))
1186 flags = flags & ~isInvalid;
1187 if (background)
1188 destroy_asimage (&background);
1189 }
1190 else if (background_flags && pmap_depth != target->depth)
1191 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1192
1193# elif !XFT /* our own client-side tinting */
1194
1195 /* 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 !!! */
1197
1198 if (background_flags && (flags & isInvalid))
1199 {
1200 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1201
1202 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1203 { 1375 {
1204 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1376 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1205 if (flags & tintSet) 1377 if (flags & tintSet)
1206 tint.get (c); 1378 tint.get (c);
1207 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1379 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1208 } 1380 }
1209 } 1381# endif
1210# endif /* HAVE_AFTERIMAGE */
1211 1382
1212 if (result)
1213 {
1214 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1383 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1215 1384
1216 if (gc) 1385 if (gc)
1217 { 1386 {
1218 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1387 if (/*pmap_depth != target->depth &&*/ pixmap != None)
… …
1247 1416
1248 XFreeGC (target->dpy, gc); 1417 XFreeGC (target->dpy, gc);
1249 flags = flags & ~isInvalid; 1418 flags = flags & ~isInvalid;
1250 } 1419 }
1251 1420
1252 XDestroyImage (result); 1421 XDestroyImage (result);
1253 } 1422 }
1254 1423
1255 if (flags & isInvalid) 1424 if (flags & isInvalid)
1256 { 1425 {
1257 if (pixmap != None) 1426 if (pixmap != None)

Diff Legend

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