use strict;
my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.30 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my ($version) = ('$Revision: 1.33 $' =~ m/\s(\d[.\d]+)\s/s);
my $verbose = 0;
my $use_stdin = 0;
my $fn = `$cmd`;
$fn =~ s/\n$//s;
error ("didn't get a file?") if ($fn eq "");
+ $fn = "$imagedir/$fn" unless ($fn =~ m@^/@s);
print STDERR "$progname: selected file $fn\n" if ($verbose > 1);
sub usage() {
print STDERR "VidWhacker, Copyright (c) 2001 Jamie Zawinski <jwz\@jwz.org>\n";
- print STDERR " http://www.jwz.org/xscreensaver/";
+ print STDERR " https://www.jwz.org/xscreensaver/";
print STDERR "\n";
print STDERR "usage: $0 [-display dpy] [-verbose]\n";
print STDERR "\t\t[-root | -window | -window-id 0xXXXXX ]\n";
sub main() {
while ($_ = $ARGV[0]) {
shift @ARGV;
- if ($_ eq "--verbose") { $verbose++; }
+ if (m/^--?verbose$/) { $verbose++; }
elsif (m/^-v+$/) { $verbose += length($_)-1; }
elsif (m/^(-display|-disp|-dis|-dpy|-d)$/) { $ENV{DISPLAY} = shift @ARGV; }
elsif (m/^--?stdin$/) { $use_stdin = 1; }