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

Comparing rxvt-unicode/src/perl/background (file contents):
Revision 1.5 by root, Tue Jun 5 13:42:59 2012 UTC vs.
Revision 1.14 by root, Tue Jun 5 22:23:07 2012 UTC

 #! perl
+#:META:RESOURCE:$$:string:background expression
+#:META:RESOURCE:$$-enable:boolean:some boolean
 our $EXPR = 'move load "/root/pix/das_fette_schwein.jpg", repeat_wrap, X, Y';
-$EXPR = 'rotate load "/root/pix/das_fette_schwein.jpg", W, H, 50, 50, counter 1/60, repeat_mirror';
+$EXPR = '
+   rotate W, H, 50, 50, counter 1/59.95, repeat_mirror,
+   clip X, Y, W, H, repeat_mirror,
+   load "/root/pix/das_fette_schwein.jpg"
+';
 #$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);
+# enforce at leats this time between updates
+our $MIN_INTERVAL = 1/100;
 {
    package urxvt::bgdsl; # background language
    *repeat_black  = \&urxvt::RepeatNone; #TODO wtf
       $new->{load}{$path} = $old->{load}{$path} || $bgdsl_self->new_img_from_file ($path);
    }
    sub root() {
+      $new->{rootpmap_sensitive} = 1;
       die "root op not supported, exg, we need you";
    }
 #   sub clone($) {
 #      $_[0]->clone
 #   }
-   sub subrect($$$$$;$) {
+   sub clip($$$$$;$) {
+      my $img = pop;
-      $_[0]->sub_rect ($_[1], $_[2], $_[3], $_[4], $_[5])
+      $img->sub_rect ($_[0], $_[1], $_[2], $_[3], $_[4])
    }
    sub resize($$$) {
-      $_[0]->scale ($_[1], $_[2])
+      my $img = pop;
+      $img->scale ($_[0], $_[1])
    }
+   # TODO: ugly
-   sub move($$$;$) {
+   sub move($$;$) {
-      # TODO: must be simpler
+      my $img = pop;
-      $_[0]->transform ($_[0]->w, $_[0]->h,
+      $img->sub_rect (
-         1, 0, $_[1],
+         $_[0], $_[1],
-         0, 1, $_[2],
+         $img->w, $img->h,
-         0, 0,     1,
-         $_[3],
+         $_[2],
       )
    }
    sub rotate($$$$$$;$) {
+      my $img = pop;
-      $_[0]->rotate (
+      $img->rotate (
+         $_[0],
          $_[1],
-         $_[2],
-         $_[3] * $_[0]->w * .01,
+         $_[2] * $img->w * .01,
-         $_[4] * $_[0]->h * .01,
+         $_[3] * $img->h * .01,
-         $_[5] * (3.14159265 / 180),
+         $_[4] * (3.14159265 / 180),
-         $_[6],
+         $_[5],
       )
    }
    sub blur($$$) {
-      my ($img, $rh, $rv) = @_;
+      my ($rh, $rv, $img) = @_;
-      $img = $img->clone;
       $img->blur ($rh, $rv);
-      $img
    }
    sub contrast($$;$$;$) {
+      my $img = pop;
-      my ($img, $r, $g, $b, $a) = @_;
+      my ($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($$;$$;$) {
+      my $img = pop;
-      my ($img, $r, $g, $b, $a) = @_;
+      my ($r, $g, $b, $a) = @_;
       ($g, $b) = ($r, $r) if @_ < 4;
       $a       = 1        if @_ < 5;
       $img = $img->clone;
       $new->{again} = $_[0];
    }
    sub counter($) {
       $new->{again} = $_[0];
-      $bgdsl_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}";
 # evaluate the current bg expression
 sub recalculate {
    my ($self) = @_;
+   # rate limit evaluation
+   if ($self->{next_refresh} > urxvt::NOW) {
+      $self->{next_refresh_timer} = urxvt::timer->new->after ($self->{next_refresh} - urxvt::NOW)->cb (sub {
+         $self->recalculate;
+      });
+      return;
+   }
+   $self->{next_refresh} = urxvt::NOW + $MIN_INTERVAL;
+   # set environment to evaluate user expression
    local $bgdsl_self = $self;
    local $old = $self->{state};
    local $new = my $state = $self->{state} = {};
    ($l, $t, $w, $h) =
       $self->get_geometry;
+   # evaluate user expression
    my $img = eval { $self->{expr}->() };
    warn $@ if $@;#d#
-   %$old = ();
+   # if the expression is sensitive to external events, prepare reevaluation then
    my $repeat;
    if (my $again = $state->{again}) {
       $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->{counter};
+                             $self->recalculate
+                          });
    }
    if (delete $state->{position_sensitive}) {
       $repeat = 1;
       $self->enable (position_change => sub { $_[0]->recalculate });
       $self->enable (size_change => sub { $_[0]->recalculate });
    } else {
       $self->disable ("size_change");
    }
+   if (delete $state->{rootpmap_sensitive}) {
+      $repeat = 1;
+      $self->enable (rootpmap_change => sub { $_[0]->recalculate });
+   } else {
+      $self->disable ("rootpmap_change");
+   }
+   # clear stuff we no longer need
+   %$old = ();
    unless ($repeat) {
       delete $self->{state};
       delete $self->{expr};
    }
+   # prepare and set background pixmap
    $img = $img->sub_rect (0, 0, $w, $h)
       if $img->w != $w || $img->h != $h;
    $self->set_background ($img);
    $self->scr_recolour (0);

Diff Legend

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

Comparing rxvt-unicode/src/perl/background (file contents): Revision 1.5 by root, Tue Jun 5 13:42:59 2012 UTC vs. Revision 1.14 by root, Tue Jun 5 22:23:07 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/perl/background (file contents):
Revision 1.5 by root, Tue Jun 5 13:42:59 2012 UTC vs.
Revision 1.14 by root, Tue Jun 5 22:23:07 2012 UTC