#!/usr/bin/perl -w
-# vidwhacker, for xscreensaver. Copyright (c) 1998-2004 Jamie Zawinski.
+# vidwhacker, for xscreensaver. Copyright (c) 1998-2005 Jamie Zawinski.
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
use strict;
my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.25 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my $version = q{ $Revision: 1.28 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
my $verbose = 0;
my $use_stdin = 0;
my $displayer = "xscreensaver-getimage -root -file";
+sub which($);
# apparently some versions of netpbm call it "pamoil" instead of "pgmoil"...
#
);
-sub error {
- ($_) = @_;
- print STDERR "$progname: $_\n";
- exit 1;
-}
-
# Any files on this list will be deleted at exit.
#
my @all_tmpfiles = ();
-sub exit_cleanup {
+sub exit_cleanup() {
print STDERR "$progname: delete tmp files\n" if ($verbose);
unlink @all_tmpfiles;
}
-sub signal_cleanup {
+sub signal_cleanup() {
my ($sig) = @_;
print STDERR "$progname: caught SIG$sig\n" if ($verbose);
exit 1;
}
-sub init_signals {
+sub init_signals() {
$SIG{HUP} = \&signal_cleanup;
$SIG{INT} = \&signal_cleanup;
END { exit_cleanup(); }
-
-
# returns the full path of the named program, or undef.
#
-sub which {
+sub which($) {
my ($prog) = @_;
foreach (split (/:/, $ENV{PATH})) {
if (-x "$_/$prog") {
# Choose random foreground and background colors
#
-sub randcolors {
+sub randcolors() {
return sprintf ("#%02x%02x%02x-#%02x%02x%02x",
int(rand()*60),
int(rand()*60),
-sub filter_subst {
+sub filter_subst($$$@) {
my ($filter, $width, $height, @tmpfiles) = @_;
my $colors = randcolors();
$filter =~ s/\bWIDTH\b/$width/g;
$i++;
}
if ($filter =~ m/([A-Z]+)/) {
- error "internal error: what is \"$1\"?";
+ error ("internal error: what is \"$1\"?");
}
$filter =~ s/ +/ /g;
return $filter;
# Frobnicate the image in some random way.
#
-sub frob_ppm {
+sub frob_ppm($) {
my ($ppm_data) = @_;
$_ = $ppm_data;
- error "0-length data" if (!defined($ppm_data) || $ppm_data eq "");
- error "not a PPM file" unless (m/^P\d\n/s);
+ error ("0-length data") if (!defined($ppm_data) || $ppm_data eq "");
+ error ("not a PPM file") unless (m/^P\d\n/s);
my ($width, $height) = m/^P\d\n(\d+) (\d+)\n/s;
- error "got a bogus PPM" unless ($width && $height);
+ error ("got a bogus PPM") unless ($width && $height);
my $tmpdir = $ENV{TMPDIR};
$tmpdir = "/tmp" unless $tmpdir;
}
-sub read_config {
+sub read_config() {
my $conf = "$ENV{HOME}/.xscreensaver";
my $had_dir = defined($imagedir);
local *IN;
- open (IN, "<$conf") || error "reading $conf: $!";
+ open (IN, "<$conf") || error ("reading $conf: $!");
while (<IN>) {
if (!$imagedir && m/^imageDirectory:\s+(.*)\s*$/i) { $imagedir = $1; }
elsif (m/^grabVideoFrames:\s+true\s*$/i) { $video_p = 1; }
$imagedir = undef unless ($imagedir && $imagedir ne '');
if (!$file_p && !$video_p) {
-# error "neither grabVideoFrames nor chooseRandomImages are set\n\t" .
+# error ("neither grabVideoFrames nor chooseRandomImages are set\n\t") .
# "in $conf; $progname requires one or both."
$file_p = 1;
}
if ($file_p) {
- error "no imageDirectory set in $conf" unless $imagedir;
- error "imageDirectory $imagedir doesn't exist" unless (-d $imagedir);
+ error ("no imageDirectory set in $conf") unless $imagedir;
+ error ("imageDirectory $imagedir doesn't exist") unless (-d $imagedir);
}
if ($verbose > 1) {
}
-sub get_ppm {
+sub get_ppm() {
if ($use_stdin) {
print STDERR "$progname: reading from stdin\n" if ($verbose > 1);
my $ppm = "";
elsif ($file_p) { $do_file_p = 1; }
elsif ($video_p) { $do_file_p = 0; }
else {
- error "internal error: not grabbing files or video?";
+ error ("internal error: not grabbing files or video?");
}
my $v = ($verbose <= 1 ? "" : "-" . ("v" x ($verbose-1)));
print STDERR "$progname: running: $cmd\n" if ($verbose > 1);
my $fn = `$cmd`;
$fn =~ s/\n$//s;
- error "didn't get a file?" if ($fn eq "");
+ error ("didn't get a file?") if ($fn eq "");
print STDERR "$progname: selected file $fn\n" if ($verbose > 1);
elsif ($fn =~ m/\.tiff?/i) { $cmd = "tifftopnm < \"$fn\""; }
elsif ($fn =~ m/\.p[bgp]m/i) { return `cat \"$fn\"`; }
else {
- error "unrecognized file extension on $fn";
+ print STDERR "$progname: $fn: unrecognized file extension\n";
+ # go around the loop and get another
+ return undef;
}
print STDERR "$progname: converting with: $cmd\n" if ($verbose > 1);
print STDERR "$progname: running: $cmd\n" if ($verbose > 1);
$ppm = `$cmd`;
- error "no data?" if ($ppm eq "");
- error "not a PPM file" unless ($ppm =~ m/^P\d\n/s);
+ error ("no data?") if ($ppm eq "");
+ error ("not a PPM file") unless ($ppm =~ m/^P\d\n/s);
$_ = $ppm;
my ($width, $height) = m/^P\d\n(\d+) (\d+)\n/s;
- error "got a bogus PPM" unless ($width && $height);
+ error ("got a bogus PPM") unless ($width && $height);
print STDERR "$progname: grabbed ${width}x$height PPM\n"
if ($verbose > 1);
$_ = 0;
}
}
-sub dispose_ppm {
+sub dispose_ppm($) {
my ($ppm) = @_;
- error "0-length data" if (!defined($ppm) || $ppm eq "");
- error "not a PPM file" unless ($ppm =~ m/^P\d\n/s);
+ error ("0-length data") if (!defined($ppm) || $ppm eq "");
+ error ("not a PPM file") unless ($ppm =~ m/^P\d\n/s);
if ($use_stdout) {
print STDERR "$progname: writing to stdout\n" if ($verbose > 1);
local *OUT;
unlink $fn;
push @all_tmpfiles, $fn;
- open (OUT, ">$fn") || error "writing $fn: $!";
+ open (OUT, ">$fn") || error ("writing $fn: $!");
print OUT $ppm;
close OUT;
my $stdin_ppm = undef;
-sub vidwhack {
+sub vidwhack() {
my $ppm;
if ($use_stdin) {
if (!defined($stdin_ppm)) {
}
-sub usage {
+sub error($) {
+ my ($err) = @_;
+ print STDERR "$progname: $err\n";
+ exit 1;
+}
+
+sub usage() {
print STDERR "VidWhacker, Copyright (c) 2001 Jamie Zawinski <jwz\@jwz.org>\n";
print STDERR " http://www.jwz.org/xscreensaver/";
print STDERR "\n";
exit 1;
}
-sub main {
+sub main() {
while ($_ = $ARGV[0]) {
shift @ARGV;
if ($_ eq "--verbose") { $verbose++; }
}
}
-main;
+main();
exit 0;
projects / xscreensaver / blobdiff