--- rxvt-unicode/src/perl/background	2012/06/05 14:07:47	1.8
+++ rxvt-unicode/src/perl/background	2012/06/07 11:30:20	1.25
@@ -1,12 +1,16 @@
 #! perl
 
-our $EXPR = 'move load "/root/pix/das_fette_schwein.jpg", repeat_wrap, X, Y';
-$EXPR = '
-   blur 10, 10,
-   rotate W, H, 50, 50, counter 1/60, repeat_mirror,
-   clip X, Y, W, H, repeat_mirror,
-   load "/root/pix/das_fette_schwein.jpg"
-';
+#:META:X_RESOURCE:%.expr:string:background expression
+#:META:X_RESOURCE:%.enable:boolean:some boolean
+#:META:X_RESOURCE:%.extra.:value:extra config
+
+our $EXPR = 'repeat_none move W * 0.1, -H * 0.1, resize W * 0.5, H * 0.5, load "MagnoliaAlpha.png"';
+#$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 = 'solid "red"';
 #$EXPR = 'blur root, 10, 10'
 #$EXPR = 'blur move (root, -x, -y), 5, 5'
 #resize load "/root/pix/das_fette_schwein.jpg", w, h
@@ -16,13 +20,24 @@
 our ($bgdsl_self, $old, $new);
 our ($l, $t, $w, $h);
 
+# enforce at least this interval between updates
+our $MIN_INTERVAL = 1/100;
+
 {
    package urxvt::bgdsl; # background language
 
-   *repeat_black  = \&urxvt::RepeatNone; #TODO wtf
-   *repeat_wrap   = \&urxvt::RepeatNormal;
-   *repeat_pad    = \&urxvt::RepeatPad;
-   *repeat_mirror = \&urxvt::RepeatReflect;
+#   *repeat_empty  = \&urxvt::RepeatNone;
+#   *repeat_tile   = \&urxvt::RepeatNormal;
+#   *repeat_pad    = \&urxvt::RepeatPad;
+#   *repeat_mirror = \&urxvt::RepeatReflect;
+
+=head2 PROVIDERS/GENERATORS
+
+=over 4
+
+=item load $path
+
+=cut
 
    sub load($) {
       my ($path) = @_;
@@ -31,16 +46,63 @@
    }
 
    sub root() {
+      $new->{rootpmap_sensitive} = 1;
       die "root op not supported, exg, we need you";
    }
 
+   sub solid($;$$) {
+      my $img = $bgdsl_self->new_img (urxvt::PictStandardARGB32, $_[1] || 1, $_[2] || 1);
+      $img->fill ($_[0]);
+      $img
+   }
+
+=back
+
+=head2 VARIABLES
+
+=over 4
+
+=cut
+
+   sub X() { $new->{position_sensitive} = 1; $l }
+   sub Y() { $new->{position_sensitive} = 1; $t }
+   sub W() { $new->{size_sensitive}     = 1; $w }
+   sub H() { $new->{size_sensitive}     = 1; $h }
+
+   sub now() { urxvt::NOW }
+
+   sub again($) {
+      $new->{again} = $_[0];
+   }
+
+   sub counter($) {
+      $new->{again} = $_[0];
+      $bgdsl_self->{counter} + 0
+   }
+
+=back
+
+=head2 OPERATORS
+
+=over 4
+
+=cut
+
 #   sub clone($) {
 #      $_[0]->clone
 #   }
 
-   sub clip($$$$$;$) {
+   sub repeat_none($) {
+      my $img = $_[0]->clone;
+      $img->repeat_mode (urxvt::RepeatNone);
+      $img
+   }
+
+   sub clip($;$$;$$) {
       my $img = pop;
-      $img->sub_rect ($_[0], $_[1], $_[2], $_[3], $_[4])
+      my $h = pop || H;
+      my $w = pop || W;
+      $img->sub_rect ($_[0], $_[1], $w, $h)
    }
 
    sub resize($$$) {
@@ -50,15 +112,18 @@
 
    # TODO: ugly
    sub move($$;$) {
-      my $img = pop;
-      $img->sub_rect (
-         $_[0], $_[1],
-         $img->w, $img->h,
-         $_[2],
-      )
+      my $img = pop->clone;
+      $img->move ($_[0], $_[1]);
+      $img
+#      my $img = pop;
+#      $img->sub_rect (
+#         $_[0], $_[1],
+#         $img->w, $img->h,
+#         $_[2],
+#      )
    }
 
-   sub rotate($$$$$$;$) {
+   sub rotate($$$$$$) {
       my $img = pop;
       $img->rotate (
          $_[0],
@@ -66,16 +131,13 @@
          $_[2] * $img->w * .01,
          $_[3] * $img->h * .01,
          $_[4] * (3.14159265 / 180),
-         $_[5],
       )
    }
 
    sub blur($$$) {
       my ($rh, $rv, $img) = @_;
 
-      $img = $img->clone;
       $img->blur ($rh, $rv);
-      $img
    }
 
    sub contrast($$;$$;$) {
@@ -102,21 +164,10 @@
       $img
    }
 
-   sub X() { $new->{position_sensitive} = 1; $l }
-   sub Y() { $new->{position_sensitive} = 1; $t }
-   sub W() { $new->{size_sensitive}     = 1; $w }
-   sub H() { $new->{size_sensitive}     = 1; $h }
-
-   sub now() { urxvt::NOW }
+=back
 
-   sub again($) {
-      $new->{again} = $_[0];
-   }
+=cut
 
-   sub counter($) {
-      $new->{again} = $_[0];
-      $bgdsl_self->{counter} + 0
-   }
 }
 
 sub parse_expr {
@@ -137,7 +188,18 @@
 sub recalculate {
    my ($self) = @_;
 
-   #TODO: rate limit calls
+   # 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;
 
@@ -147,8 +209,15 @@
    ($l, $t, $w, $h) =
       $self->get_geometry;
 
+      warn "$l,$t,$w,$h\n";#d#
+
+   # evaluate user expression
+
    my $img = eval { $self->{expr}->() };
    warn $@ if $@;#d#
+   die if !UNIVERSAL::isa $img, "urxvt::img";
+
+   # if the expression is sensitive to external events, prepare reevaluation then
 
    my $repeat;
 
@@ -176,6 +245,15 @@
       $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) {
@@ -183,6 +261,8 @@
       delete $self->{expr};
    }
 
+   # prepare and set background pixmap
+
    $img = $img->sub_rect (0, 0, $w, $h)
       if $img->w != $w || $img->h != $h;