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

Comparing rxvt-unicode/src/perl/background (file contents):
Revision 1.92 by sf-exg, Thu Jul 14 05:33:26 2016 UTC vs.
Revision 1.97 by root, Tue Sep 17 18:17:14 2019 UTC

       return;
    }
    $arg_self->{next_refresh} = urxvt::NOW + $MIN_INTERVAL;
+   unless ($arg_self->has_render) {
+      warn "background extension needs RENDER extension 0.10 or higher, ignoring background-expr.\n";
+      return;
+   }
    # set environment to evaluate user expression
    local $self  = $arg_self;
    local $HOME  = $ENV{HOME};
    local $frame = $self->{root};
    return unless $str[0] or $self->{bg_opts}->{path};
    my $bg_opts = $self->{bg_opts};
    if ($str[0]) {
-      $bg_opts->{tile} = 0;
+      $bg_opts->{tile}        = 0;
       $bg_opts->{keep_aspect} = 0;
-      $bg_opts->{root_align} = 0;
+      $bg_opts->{root_align}  = 0;
-      $bg_opts->{h_scale} = $bg_opts->{v_scale} = 100;
+      $bg_opts->{h_scale}     = $bg_opts->{v_scale} = 100;
-      $bg_opts->{h_align} = $bg_opts->{v_align} = 50;
+      $bg_opts->{h_align}     = $bg_opts->{v_align} = 50;
-      $bg_opts->{path} = unpack "H*", $str[0];
+      $bg_opts->{path}        = $str[0];
    }
    my @oplist = split /:/, $str[1];
    for (@oplist) {
          $bg_opts->{root_align} = 1;
          $bg_opts->{h_scale} = $bg_opts->{v_scale} = 0;
          $bg_opts->{h_align} = $bg_opts->{v_align} = 0;
       } elsif (/op=tile/i) {
          $bg_opts->{tile} = 1;
-      } elsif (/op=keep_aspect/i) {
+      } elsif (/op=keep-aspect/i) {
          $bg_opts->{keep_aspect} = 1;
-      } elsif (/op=root_align/i) {
+      } elsif (/op=root-align/i) {
          $bg_opts->{root_align} = 1;
       } elsif (/^ =? ([0-9]+)? (?:[xX] ([0-9]+))? ([+-][0-9]+)? ([+-][0-9]+)? $/x) {
          my ($w, $h, $x, $y) = ($1, $2, $3, $4);
          if ($str[0]) {
          $bg_opts->{v_align} = $y if defined $y;
       }
    }
 }
+# helper function, quote string as perl without allowing
+# any code execution or other shenanigans. does not
+# support binary NULs in string.
+sub q0 {
+   (my $str = shift) =~ s/\x00//g; # make sure there really aren't any embedded NULs
+   "q\x00$str\x00"
+}
 sub old_bg_expr {
    my ($self) = @_;
    my $expr;
    my $bg_opts = $self->{bg_opts};
-   if ($bg_opts->{root}) {
+   if ($bg_opts->{root} =~ /^\s*(?:true|yes|on|1)\s*$/i) {
       $expr .= "tile (";
       my $shade = $bg_opts->{shade};
       if ($shade) {
       }
       my $tint = $bg_opts->{tint};
       if ($tint) {
+         $tint = q0 $tint;
-         $expr .= "tint $tint, ";
+         $expr .= "tint $tint,";
       }
       my $blur = $bg_opts->{blur};
       if ($blur and $blur =~ /^ =? ([0-9]+)? (?:[xX] ([0-9]+))? $/x) {
       if ($h_scale != 0 and $v_scale != 0) {
          my $op = $bg_opts->{keep_aspect} ? "fit" : "resize";
          $file_expr .= "$op TW * $h_scale, TH * $v_scale, ";
       }
+      my $path = q0 $bg_opts->{path};
-      $file_expr .= "keep { load pack \"H*\", \"$bg_opts->{path}\" })";
+      $file_expr .= "keep { load $path })";
       if ($expr) {
          $expr .= ", tint (\"[50]white\", $file_expr)";
       } else {
          $expr = $file_expr;
 sub on_osc_seq {
    my ($self, $op, $arg) = @_;
    $self->{bg_opts} or return;
-   $op =~ /^(20|705)$/ or return;
+   $op =~ /^(?:20|705)$/ or return;
    if ($op eq "20") {
       if ($arg eq "?") {
          my $h_scale = $self->{bg_opts}->{h_scale};
          my $v_scale = $self->{bg_opts}->{v_scale};
    1
 }
 sub find_resource {
-   my ($self, $a, $b) = @_;
+   my ($self, $res, $opt) = @_;
-   my $v = $self->x_resource ($a);
+   my $v = $self->x_resource ($opt);
-   $v = $self->x_resource ($b) unless defined $v;
+   $v = $self->x_resource ($res) unless defined $v;
    $v
 }
 sub on_start {
    if (!$expr) {
       $self->{bg_opts} = { h_scale => 100, v_scale => 100,
                            h_align => 50, v_align => 50 };
-      $self->{bg_opts}->{shade} = $self->find_resource ("shading", "sh");
+      $self->{bg_opts}{shade} = $self->find_resource ("shading", "sh");
-      $self->{bg_opts}->{tint} = $self->find_resource ("tintColor", "tint");
+      $self->{bg_opts}{tint}  = $self->find_resource ("tintColor", "tint");
-      $self->{bg_opts}->{blur} = $self->find_resource ("blurRadius", "blr");
+      $self->{bg_opts}{blur}  = $self->find_resource ("blurRadius", "blr");
-      if ($self->x_resource_boolean ("transparent")
+      $self->{bg_opts}{root}  = $self->find_resource ("transparent", "tr");
-          or $self->x_resource_boolean ("tr")) {
-         $self->{bg_opts}->{root} = 1;
-      }
       $self->old_bg_opts ($self->find_resource ("backgroundPixmap", "pixmap"));
       $expr = $self->old_bg_expr;
    }
    $expr or return;
-   $self->has_render
-      or die "background extension needs RENDER extension 0.10 or higher, ignoring background-expr.\n";
    $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.92 by sf-exg, Thu Jul 14 05:33:26 2016 UTC vs. Revision 1.97 by root, Tue Sep 17 18:17:14 2019 UTC

Diff Legend

Comparing rxvt-unicode/src/perl/background (file contents):
Revision 1.92 by sf-exg, Thu Jul 14 05:33:26 2016 UTC vs.
Revision 1.97 by root, Tue Sep 17 18:17:14 2019 UTC