X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver-getimage-video;h=6383bd85d4ee691ec089d08f67b8b409b1ea7acb;hb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;hp=468bf3afc1f2615b0c4923792a9c8ae68c13f622;hpb=ccb7f4903325f92555a9722bba74b58346654ba0;p=xscreensaver

diff --git a/driver/xscreensaver-getimage-video b/driver/xscreensaver-getimage-video
index 468bf3af..6383bd85 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-2011 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
@@ -18,23 +18,26 @@
 # "jigsaw", etc.) get the image to manipulate by running the
 # "xscreensaver-getimage" program.
 #
-# "xscreensaver-getimage" will invoke this program, depending on the
-# value of the "grabVideoFrames" setting in the ~/.xscreensaver file
-# (or in /usr/lib/X11/app-defaults/XScreenSaver).
+# The various screen savers invoke "xscreensaver-getimage", which will in
+# turn invoke this program, depending on the value of the "grabVideoFrames"
+# setting in the ~/.xscreensaver file (or in the app-defaults file, usually
+# /usr/lib/X11/app-defaults/XScreenSaver).
 #
 # Created: 13-Apr-2001.
 
 require 5;
-use diagnostics;
+#use diagnostics;	# Fails on some MacOS 10.5 systems
 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.21 $ }; $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
@@ -67,18 +70,21 @@ my @programs = (
 
   "vidtomem -f $tmpfile 2>&- " .		# Silicon Graphics
 	"&& mv $tmpfile-00000.rgb $tmpfile",
+
+  # "mplayer -really-quiet tv://0 " .		# Maybe works with some cams?
+  #         "-ao null -vo pnm -frames 1 2>&- " .
+  #	"&& mv 00000001.ppm $tmpfile",
+
 );
 
 
-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 +95,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 +115,7 @@ sub grab_image {
   if (-z $tmpfile)
     {
       unlink $tmpfile;
-      error "\"$cmd\" produced no data.";
+      error ("\"$cmd\" produced no data.");
     }
 
   if ($return_filename_p) {
@@ -121,21 +123,21 @@ sub grab_image {
     print STDOUT "$tmpfile\n";
 
   } elsif ($use_stdout_p) {
-    local *IN;
     my $ppm = "";
     my $reader  = "<$tmpfile";
 
     # horrid kludge for SGIs, since they don't use PPM...
-    if ($displayer eq "vidtomem") {
-      $reader = "sgitopnm $tmpfile";
+    if ($cmd =~ m/^vidtomem\s/) {
+      $reader  = "sgitopnm $tmpfile";
       $reader .= " 2>/dev/null" if ($verbose <= 1);
       $reader .= " |";
     }
 
-    open(IN, $reader) || error "reading $tmpfile: $!";
+    open (my $in, $reader) || error ("reading $tmpfile: $!");
     print STDERR "$progname: reading $tmpfile\n" if ($verbose > 1);
-    while (<IN>) { $ppm .= $_; }
-    close IN;
+    local $/ = undef;  # read entire file
+    $ppm = <$in>;
+    close $in;
     unlink $tmpfile;
     print STDOUT $ppm;
 
@@ -153,12 +155,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++; }