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.66 by sf-exg, Mon Oct 4 20:46:20 2010 UTC vs.
Revision 1.67 by sf-exg, Mon Oct 4 21:56:42 2010 UTC

539 539
540 if (original_asim) 540 if (original_asim)
541 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 541 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
542 542
543 if (!original_asim 543 if (!original_asim
544 || (!(flags & rootAlign)
544 || x >= target_width 545 && (x >= target_width
545 || y >= target_height 546 || y >= target_height
546 || (w > 0 && x + w <= 0) 547 || (w > 0 && x + w <= 0)
547 || (h > 0 && y + h <= 0)) 548 || (h > 0 && y + h <= 0))))
548 { 549 {
549 if (background) 550 if (background)
550 { 551 {
551 new_pmap_width = background->width; 552 new_pmap_width = background->width;
552 new_pmap_height = background->height; 553 new_pmap_height = background->height;
759 int w = 0; 760 int w = 0;
760 int h = 0; 761 int h = 0;
761 762
762 get_image_geometry (image_width, image_height, w, h, x, y); 763 get_image_geometry (image_width, image_height, w, h, x, y);
763 764
765 if (!(flags & rootAlign)
764 if (x >= target_width 766 && (x >= target_width
765 || y >= target_height 767 || y >= target_height
766 || (w > 0 && x + w <= 0) 768 || (w > 0 && x + w <= 0)
767 || (h > 0 && y + h <= 0)) 769 || (h > 0 && y + h <= 0)))
768 return false; 770 return false;
769 771
770 result = pixbuf; 772 result = pixbuf;
771 773
772 if ((w > 0 && w != image_width) 774 if ((w > 0 && w != image_width)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines