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

Comparing rxvt-unicode/src/perl/background (file contents):
Revision 1.1 by root, Mon Jun 4 21:39:56 2012 UTC vs.
Revision 1.6 by root, Tue Jun 5 13:56:42 2012 UTC

 #! perl
-our $EXPR = 'resize (blur (load "/root/pix/das_fette_schwein.jpg", 1 + (counter 1) % 10, 10), w, h)';
+our $EXPR = 'move load "/root/pix/das_fette_schwein.jpg", repeat_wrap, X, Y';
+$EXPR = 'rotate (move (load "/root/pix/das_fette_schwein.jpg", X, Y), W, H, 50, 50, counter 1/60, repeat_mirror)';
 #$EXPR = 'blur root, 10, 10'
 #$EXPR = 'blur move (root, -x, -y), 5, 5'
 #resize load "/root/pix/das_fette_schwein.jpg", w, h
 use Safe;
+our ($bgdsl_self, $old, $new);
+our ($l, $t, $w, $h);
 {
-   package urxvt::bgdsl::vars;
-   our ($self, $old, $new);
-   our ($x, $y, $w, $h);
    package urxvt::bgdsl; # background language
    *repeat_black  = \&urxvt::RepeatNone; #TODO wtf
    *repeat_wrap   = \&urxvt::RepeatNormal;
    *repeat_pad    = \&urxvt::RepeatPad;
    *repeat_mirror = \&urxvt::RepeatReflect;
-   sub load {
+   sub load($) {
       my ($path) = @_;
-      $new->{load}{$path} = $old->{load}{$path} || $self->new_img_from_file ($path);
+      $new->{load}{$path} = $old->{load}{$path} || $bgdsl_self->new_img_from_file ($path);
    }
-   sub root {
+   sub root() {
       die "root op not supported, exg, we need you";
    }
+#   sub clone($) {
+#      $_[0]->clone
+#   }
+   sub subrect($$$$$;$) {
+      $_[0]->sub_rect ($_[1], $_[2], $_[3], $_[4], $_[5])
+   }
-   sub resize {
+   sub resize($$$) {
       $_[0]->scale ($_[1], $_[2])
    }
-   sub move {
+   sub move($$$;$) {
       # TODO: must be simpler
-      $_[0]->transform ($_[0]->w, $_[0]->h, $_[1],
+      $_[0]->transform ($_[0]->w, $_[0]->h,
-         1, 0, -$_[2],
+         1, 0, $_[1],
-         0, 1, -$_[3],
+         0, 1, $_[2],
-         0, 0,      1,
+         0, 0,     1,
+         $_[3],
       )
    }
-   sub rotate {
+   sub rotate($$$$$$;$) {
-      $_[0]->rotate ($_[0], $_[1], $_[2], $_[3] * (3.14159265 / 180))
+      $_[0]->rotate (
+         $_[1],
+         $_[2],
+         $_[3] * $_[0]->w * .01,
+         $_[4] * $_[0]->h * .01,
+         $_[5] * (3.14159265 / 180),
+         $_[6],
+      )
    }
-   sub blur {
+   sub blur($$$) {
       my ($img, $rh, $rv) = @_;
       $img = $img->clone;
-      $img->clone->blur ($rh, $rv);
+      $img->blur ($rh, $rv);
       $img
    }
-   sub contrast {
+   sub contrast($$;$$;$) {
       my ($img, $r, $g, $b, $a) = @_;
       ($g, $b) = ($r, $r) if @_ < 4;
       $a       = 1        if @_ < 5;
       $img = $img->clone;
       $img->contrast ($r, $g, $b, $a);
       $img
    }
-   sub brightness {
+   sub brightness($$;$$;$) {
       my ($img, $r, $g, $b, $a) = @_;
       ($g, $b) = ($r, $r) if @_ < 4;
       $a       = 1        if @_ < 5;
       $img = $img->clone;
       $img->brightness ($r, $g, $b, $a);
       $img
    }
-   sub x { $new->{position_sensitive} = 1; $x }
+   sub X() { $new->{position_sensitive} = 1; $l }
-   sub y { $new->{position_sensitive} = 1; $y }
+   sub Y() { $new->{position_sensitive} = 1; $t }
-   sub w { $new->{size_sensitive}     = 1; $w }
+   sub W() { $new->{size_sensitive}     = 1; $w }
-   sub h { $new->{size_sensitive}     = 1; $h }
+   sub H() { $new->{size_sensitive}     = 1; $h }
-   sub now { urxvt::NOW }
+   sub now() { urxvt::NOW }
-   sub again {
+   sub again($) {
       $new->{again} = $_[0];
    }
-   sub counter {
+   sub counter($) {
       $new->{again} = $_[0];
-      $self->{counter}++ + 0
+      $bgdsl_self->{counter}++ + 0
    }
 }
 sub parse_expr {
    my $expr = eval "sub {\npackage urxvt::bgdsl;\n#line 0 'background expression'\n$_[0]\n}";
 # compiles a parsed expression
 sub set_expr {
    my ($self, $expr) = @_;
-   local $Data::Dumper::Deparse=1; use Data::Dumper; warn Dumper $expr;#d#
    $self->{expr} = $expr;
    $self->recalculate;
 }
 # evaluate the current bg expression
 sub recalculate {
    my ($self) = @_;
-   local $urxvt::bgdsl::vars::self = $self;
+   #TODO: rate limit calls
-   local $urxvt::bgdsl::vars::old = $self->{state};
+   local $bgdsl_self = $self;
-   local $urxvt::bgdsl::vars::new = my $state = $self->{state} = {};
-   ($urxvt::bgdsl::vars::x, $urxvt::bgdsl::vars::y, $urxvt::bgdsl::vars::w, $urxvt::bgdsl::vars::h) =
+   local $old = $self->{state};
+   local $new = my $state = $self->{state} = {};
+   ($l, $t, $w, $h) =
       $self->get_geometry;
    my $img = eval { $self->{expr}->() };
    warn $@ if $@;#d#
+   my $repeat;
    if (my $again = $state->{again}) {
-      warn $again;#d#
+      $repeat = 1;
-      $state->{again} = urxvt::timer->new->after ($again)->cb (sub { $self->recalculate });
+      $state->{timer} = $again == $old->{again}
+                        ? $old->{timer}
+                        : urxvt::timer->new->after ($again)->interval ($again)->cb (sub { $self->recalculate });
    }
-   # TODO: install handlers for geometry changes &c
+   if (delete $state->{position_sensitive}) {
+      $repeat = 1;
+      $self->enable (position_change => sub { $_[0]->recalculate });
+   } else {
+      $self->disable ("position_change");
+   }
-   warn $img;
+   if (delete $state->{size_sensitive}) {
+      $repeat = 1;
+      $self->enable (size_change => sub { $_[0]->recalculate });
+   } else {
+      $self->disable ("size_change");
+   }
+   %$old = ();
+   unless ($repeat) {
+      delete $self->{state};
+      delete $self->{expr};
+   }
+   $img = $img->sub_rect (0, 0, $w, $h)
+      if $img->w != $w || $img->h != $h;
    $self->set_background ($img);
    $self->scr_recolour (0);
    $self->want_refresh;
 }

Diff Legend

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

Comparing rxvt-unicode/src/perl/background (file contents): Revision 1.1 by root, Mon Jun 4 21:39:56 2012 UTC vs. Revision 1.6 by root, Tue Jun 5 13:56:42 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/perl/background (file contents):
Revision 1.1 by root, Mon Jun 4 21:39:56 2012 UTC vs.
Revision 1.6 by root, Tue Jun 5 13:56:42 2012 UTC