X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fxscreensaver-getimage-video;h=6b9c1408ea87f94a661061caae1ea666ffc0eccb;hp=468bf3afc1f2615b0c4923792a9c8ae68c13f622;hb=c8c6deae79b408cffbc88043c766b3bc12cf0f13;hpb=c494fd2e6b3b25582375d62e40f4f5cc984ca424

diff --git a/driver/xscreensaver-getimage-video b/driver/xscreensaver-getimage-video
index 468bf3af..6b9c1408 100755
--- a/driver/xscreensaver-getimage-video
+++ b/driver/xscreensaver-getimage-video
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright © 2001, 2002, 2003, 2005 Jamie Zawinski <jwz@jwz.org>.
+# Copyright © 2001-2007 Jamie Zawinski <jwz@jwz.org>.
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
@@ -29,12 +29,14 @@ use diagnostics;
 use strict;
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.16 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my $version  = q{ $Revision: 1.17 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
 
-my $verbose = 0;
+my $tmpdir   = $ENV{TMPDIR} || "/tmp";
+my $tmpfile  = sprintf("%s/xssv.%08x.ppm", $tmpdir, rand(0xFFFFFFFF));
 
-my $tmpdir  = $ENV{TMPDIR} || "/tmp";
-my $tmpfile = sprintf ("%s/xssgv.%08x.ppm", $tmpdir, rand(0xFFFFFFFF));
+my $verbose           = 0;
+my $use_stdout_p      = 0;
+my $return_filename_p = 0;
 
 
 # These are programs that can be used to grab a video frame.  The first one
@@ -70,15 +72,13 @@ my @programs = (
 );
 
 
-sub error {
-  ($_) = @_;
-  print STDERR "$progname: $_\n";
+sub error($) {
+  my ($e) = @_;
+  print STDERR "$progname: $e\n";
   exit 1;
 }
 
-my $displayer = undef;
-
-sub pick_grabber {
+sub pick_grabber() {
   my @names = ();
 
   foreach my $cmd (@programs) {
@@ -89,21 +89,17 @@ sub pick_grabber {
     foreach my $dir (split (/:/, $ENV{PATH})) {
       print STDERR "$progname:   checking $dir/$name\n" if ($verbose > 3);
       if (-x "$dir/$name") {
-        $displayer = $name;
         return $cmd;
       }
     }
   }
 
   $names[$#names] = "or " . $names[$#names];
-  error "none of: " . join (", ", @names) . " were found on \$PATH.";
+  error ("none of: " . join (", ", @names) . " were found on \$PATH.");
 }
 
 
-my $use_stdout_p = 0;
-my $return_filename_p = 0;
-
-sub grab_image {
+sub grab_image() {
   my $cmd = pick_grabber();
   unlink $tmpfile;
 
@@ -113,7 +109,7 @@ sub grab_image {
   if (-z $tmpfile)
     {
       unlink $tmpfile;
-      error "\"$cmd\" produced no data.";
+      error ("\"$cmd\" produced no data.");
     }
 
   if ($return_filename_p) {
@@ -126,13 +122,13 @@ sub grab_image {
     my $reader  = "<$tmpfile";
 
     # horrid kludge for SGIs, since they don't use PPM...
-    if ($displayer eq "vidtomem") {
+    if ($cmd =~ m/^vidtomem\s/) {
       $reader = "sgitopnm $tmpfile";
       $reader .= " 2>/dev/null" if ($verbose <= 1);
       $reader .= " |";
     }
 
-    open(IN, $reader) || error "reading $tmpfile: $!";
+    open(IN, $reader) || error ("reading $tmpfile: $!");
     print STDERR "$progname: reading $tmpfile\n" if ($verbose > 1);
     while (<IN>) { $ppm .= $_; }
     close IN;
@@ -153,12 +149,12 @@ sub grab_image {
 }
 
 
-sub usage {
+sub usage() {
   print STDERR "usage: $progname [--verbose] [--name | --stdout]\n";
   exit 1;
 }
 
-sub main {
+sub main() {
   while ($_ = $ARGV[0]) {
     shift @ARGV;
     if ($_ eq "--verbose") { $verbose++; }