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

Comparing rxvt-unicode/src/perl/background (file contents):
Revision 1.97 by root, Tue Sep 17 18:17:14 2019 UTC vs.
Revision 1.98 by root, Tue Sep 17 20:38:14 2019 UTC

          --background-border
          --background-interval seconds
 =head1 QUICK AND DIRTY CHEAT SHEET
-Just load a random jpeg image and tile the background with it without
+Load a random jpeg image and tile the background with it without scaling
-scaling or anything else:
+or anything else:
    load "/path/to/img.jpg"
 The same, but use mirroring/reflection instead of tiling:
 vertical radius of 0 disables blurring.
 =back
 =head2 OSC sequences
+This extension will react to the following OSC sequences. Note that
+this extension will not be autoloaded when these are used currenmtly,
+so to make urxvt recognize them, you have to enable the C<background>
+extension. One way to achieve that is to use the C<--background-expr ''>
+command line argument or by specifying an empty C<URxvt.background.expr:>>
+resource.
 =over 4
 =item B<< C<ESC ] 705 ; Pt ST> >> Change transparent background tint colour to B<< C<Pt> >>.
 =cut
 }
 sub parse_expr {
+   my ($expr) = @_;
+   # an empty expression is valid and represents the default background
+   if ($expr !~ /\S/) {
+      $expr = sub {
+         undef
+      };
+   } else {
-   my $expr = eval
+      $expr = eval
-      "sub {\n"
+         "sub {\n"
-    . "package urxvt::bgdsl;\n"
+       . "package urxvt::bgdsl;\n"
-    . "#line 0 'background expression'\n"
+       . "#line 0 'background expression'\n"
-    . "$_[0]\n"
+       . "$expr\n"
-    . "}";
+       . "}";
-   die if $@;
+      die if $@;
+   }
    $expr
 }
 # compiles a parsed expression
 sub set_expr {
    # evaluate user expression
    my @img = eval { $self->{expr}->() };
    die $@ if $@;
    die "background-expr did not return anything.\n" unless @img;
+   if ($img[0]) {
-   die "background-expr: expected image(s), got something else.\n"
+      die "background-expr: expected image(s), got something else.\n"
-      if grep { !UNIVERSAL::isa $_, "urxvt::img" } @img;
+         if grep { !UNIVERSAL::isa $_, "urxvt::img" } @img;
-   my $img = urxvt::bgdsl::merge @img;
+      my $img = urxvt::bgdsl::merge @img;
-   $frame->[FR_AGAIN]{size} = 1
+      $frame->[FR_AGAIN]{size} = 1
-      if $img->repeat_mode != urxvt::RepeatNormal;
+         if $img->repeat_mode != urxvt::RepeatNormal;
-   # if the expression is sensitive to external events, prepare reevaluation then
+      # if the expression is sensitive to external events, prepare reevaluation then
-   $self->compile_frame ($frame, sub { $arg_self->recalculate });
+      $self->compile_frame ($frame, sub { $arg_self->recalculate });
-   # clear stuff we no longer need
+      # clear stuff we no longer need
 #   unless (%{ $frame->[FR_STATE] }) {
 #      delete $self->{state};
 #      delete $self->{expr};
 #   }
-   # set background pixmap
+      # set background pixmap
-   $self->set_background ($img, $self->{border});
+      $self->set_background ($img, $self->{border});
+   } else {
+      $self->clr_background;
+   }
    $self->scr_recolor (0);
    $self->want_refresh;
 }
 sub old_bg_opts {
       $self->old_bg_opts ($self->find_resource ("backgroundPixmap", "pixmap"));
       $expr = $self->old_bg_expr;
    }
-   $expr or return;
    $self->set_expr (parse_expr $expr);
    $self->{border} = $self->x_resource_boolean ("%.border");
    $MIN_INTERVAL = $self->x_resource ("%.interval");

Diff Legend

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

Comparing rxvt-unicode/src/perl/background (file contents): Revision 1.97 by root, Tue Sep 17 18:17:14 2019 UTC vs. Revision 1.98 by root, Tue Sep 17 20:38:14 2019 UTC

Diff Legend

Comparing rxvt-unicode/src/perl/background (file contents):
Revision 1.97 by root, Tue Sep 17 18:17:14 2019 UTC vs.
Revision 1.98 by root, Tue Sep 17 20:38:14 2019 UTC