[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.100 by root, Sat Jul 24 09:48:43 2021 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:
 =head1 REFERENCE
 =head2 COMMAND LINE SWITCHES
-=over 4
+=over
 =item --background-expr perl-expression
 Specifies the Perl expression to evaluate.
 These functions provide an image, by loading it from disk, grabbing it
 from the root screen or by simply generating it. They are used as starting
 points to get an image you can play with.
-=over 4
+=over
 =item load $path
 Loads the image at the given C<$path>. The image is set to plane tiling
 mode.
 =head2 TILING MODES
 The following operators modify the tiling mode of an image, that is, the
 way that pixels outside the image area are painted when the image is used.
-=over 4
+=over
 =item tile $img
 Tiles the whole plane with the image and returns this new image - or in
 other words, it returns a copy of the image in plane tiling mode.
 dimensions. They are not (Perl-) variables, they just return stuff that
 varies. Most of them make your expression sensitive to some events, for
 example using C<TW> (terminal width) means your expression is evaluated
 again when the terminal is resized.
-=over 4
+=over
 =item TX
 =item TY
 =head2 SHAPE CHANGING OPERATORS
 The following operators modify the shape, size or position of the image.
-=over 4
+=over
 =item clip $img
 =item clip $width, $height, $img
 =head2 COLOUR MODIFICATIONS
 The following operators change the pixels of the image.
-=over 4
+=over
 =item tint $color, $img
 Tints the image in the given colour.
 =head2 OTHER STUFF
 Anything that didn't fit any of the other categories, even after applying
 force and closing our eyes.
-=over 4
+=over
 =item keep { ... }
 This operator takes a code block as argument, that is, one or more
 statements enclosed by braces.
 OSC sequences for setting a background image. These settings are
 B<deprecated> and will be removed in future versions.
 =head2 OPTIONS AND RESOURCES
-=over 4
+=over
 =item B<-pixmap> I<file[;oplist]>
 =item B<backgroundPixmap:> I<file[;oplist]>
 optionally specify a colon separated list of operations to modify it.
 Note that you may need to quote the C<;> character when using the
 command line option, as C<;> is usually a metacharacter in shells.
 Supported operations are:
-=over 4
+=over
 =item B<WxH+X+Y>
 sets scale and position. B<"W" / "H"> specify the horizontal/vertical
 scale (percent), and B<"X" / "Y"> locate the image centre (percent). A
 The default scale and position setting is C<100x100+50+50>.
 Alternatively, a predefined set of templates can be used to achieve
 the most common setups:
-=over 4
+=over
 =item B<style=tiled>
 the image is tiled with no scaling. Equivalent to 0x0+0+0:op=tile
 =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 currently,
+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
+=over
 =item B<< C<ESC ] 705 ; Pt ST> >> Change transparent background tint colour to B<< C<Pt> >>.
 =item B<< C<ESC ]  20 ; Pt ST> >> Change/Query background image
 parameters: the value of B<< C<Pt> >> can be one of the following
 commands:
-=over 4
+=over
 =item B<< C<?> >>
 display scale and position in the title
 =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.100 by root, Sat Jul 24 09:48:43 2021 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.100 by root, Sat Jul 24 09:48:43 2021 UTC