[ViewVC] Diff of: cvs/rxvt-unicode/src/perl/background

Comparing rxvt-unicode/src/perl/background (file contents):
Revision 1.59 by root, Thu Jun 14 19:31:17 2012 UTC vs.
Revision 1.61 by root, Fri Jun 15 19:50:56 2012 UTC

 =item merge $img ...
 Takes any number of images and merges them together, creating a single
 image containing them all.
+This function is called automatically when an expression returns multiple
+images.
 =cut
    sub merge(@) {
+      return $_[0] unless $#_;
       # rather annoyingly clumsy, but optimisation is for another time
       my $x0 = +1e9;
       my $y0 = +1e9;
       my $x1 = -1e9;
 =cut
    sub rotate($$$$) {
       my $img = pop;
       $img->rotate (
-         $_[0] * $img->w,
+         $_[0] * ($img->w + $img->x),
-         $_[1] * $img->h,
+         $_[1] * ($img->h + $img->y),
          $_[2] * (3.14159265 / 180),
       )
    }
 =back
    ($x, $y, $w, $h) =
       $self->background_geometry ($self->{border});
    # evaluate user expression
-   my $img = eval { $self->{expr}->() };
+   my $img = eval { urxvt::bgdsl::merge $self->{expr}->() };
-   warn $@ if $@;#d#
+   die $@ if $@;
    die "background-expr did not return an image.\n" if !UNIVERSAL::isa $img, "urxvt::img";
    # if the expression is sensitive to external events, prepare reevaluation then
    my $again = delete $state->{again};

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