--- rxvt-unicode/src/perl/background	2012/06/05 14:46:54	1.9
+++ rxvt-unicode/src/perl/background	2012/06/06 20:55:37	1.19
@@ -1,11 +1,16 @@
 #! perl
 
-our $EXPR = 'move load "/root/pix/das_fette_schwein.jpg", repeat_wrap, X, Y';
-$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"
-';
+#:META:X_RESOURCE:%.expr:string:background expression
+#:META:X_RESOURCE:%.enable:boolean:some boolean
+#:META:X_RESOURCE:%.extra.:value:extra config
+
+our $EXPR = 'move X, Y, 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
@@ -15,16 +20,25 @@
 our ($bgdsl_self, $old, $new);
 our ($l, $t, $w, $h);
 
-our $MIN_INTERVAL = 1/60;
+# 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_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) = @_;
 
@@ -36,6 +50,20 @@
       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 OPERATORS
+
+=over 4
+
+=cut
+
 #   sub clone($) {
 #      $_[0]->clone
 #   }
@@ -75,9 +103,7 @@
    sub blur($$$) {
       my ($rh, $rv, $img) = @_;
 
-      $img = $img->clone;
       $img->blur ($rh, $rv);
-      $img
    }
 
    sub contrast($$;$$;$) {
@@ -119,6 +145,11 @@
       $new->{again} = $_[0];
       $bgdsl_self->{counter} + 0
    }
+
+=back
+
+=cut
+
 }
 
 sub parse_expr {
@@ -139,15 +170,18 @@
 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;
 
-   #TODO: rate limit calls
+   # set environment to evaluate user expression
 
    local $bgdsl_self = $self;
 
@@ -157,8 +191,13 @@
    ($l, $t, $w, $h) =
       $self->get_geometry;
 
+   # 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;
 
@@ -193,6 +232,8 @@
       $self->disable ("rootpmap_change");
    }
 
+   # clear stuff we no longer need
+
    %$old = ();
 
    unless ($repeat) {
@@ -200,6 +241,8 @@
       delete $self->{expr};
    }
 
+   # prepare and set background pixmap
+
    $img = $img->sub_rect (0, 0, $w, $h)
       if $img->w != $w || $img->h != $h;