X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fwebcollage;h=42f20ab4b65345d443974399e76c21f91e838a45;hb=bbd0773f2adde4927a6196361d4061e70bf48cd9;hp=c913cef45803db5a80edc979747420c7bb187623;hpb=6cee540bdbb571485cd5e519f89f389faebd0495;p=xscreensaver

diff --git a/hacks/webcollage b/hacks/webcollage
index c913cef4..42f20ab4 100755
--- a/hacks/webcollage
+++ b/hacks/webcollage
@@ -15,8 +15,8 @@
 
 # To run this as a display mode with xscreensaver, add this to `programs':
 #
-#   default-n:  webcollage -root                                        \n\
-#   default-n:  webcollage -root -filter 'vidwhacker -stdin -stdout'    \n\
+#     webcollage -root
+#     webcollage -root -filter 'vidwhacker -stdin -stdout'
 
 
 # If you have the "driftnet" program installed, webcollage can display a
@@ -27,7 +27,7 @@
 # Driftnet is available here: http://www.ex-parrot.com/~chris/driftnet/
 # Use it like so:
 #
-#   default-n:  webcollage -root -driftnet                             \n\
+#     webcollage -root -driftnet
 #
 # Driftnet is the Unix implementation of the MacOS "EtherPEG" program.
 
@@ -53,7 +53,7 @@ use bytes;  # Larry can take Unicode and shove it up his ass sideways.
 
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my $version = q{ $Revision: 1.103 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my $version = q{ $Revision: 1.107 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
 my $copyright = "WebCollage $version, Copyright (c) 1999-2002" .
     " Jamie Zawinski <jwz\@jwz.org>\n" .
     "            http://www.jwz.org/xscreensaver/\n";
@@ -92,6 +92,7 @@ my @search_methods = (  77, "altavista",  \&pick_from_alta_vista_random_link,
 # programs we can use to write to the root window (tried in ascending order.)
 #
 my @root_displayers = (
+  "xscreensaver-getimage -root -file",
   "chbg       -once -xscreensaver -max_size 100",
   "xv         -root -quit -viewonly +noresetroot -quick24 -rmode 5" .
   "           -rfg black -rbg black",
@@ -267,6 +268,7 @@ sub get_document_1 {
   my $port2 = $port;
   if ($http_proxy) {
     $serverstring = $http_proxy if $http_proxy;
+    $serverstring =~ s@^[a-z]+://@@;
     ($them2,$port2) = split(/:/, $serverstring);
     $port2 = 80 unless $port2;
   }
@@ -337,6 +339,11 @@ sub get_document_1 {
       print S $hdrs;
       my $http = <S> || "";
 
+      # Kludge: the Yahoo Random Link is now returning as its first
+      # line "Status: 301" instead of "HTTP/1.0 301 Found".  Fix it...
+      #
+      $http =~ s@^Status:\s+(\d+)\b@HTTP/1.0 $1@i;
+
       $_  = $http;
       s/[\r\n]+$//s;
       LOG ($verbose_http, "  <== $_");
@@ -422,6 +429,7 @@ sub get_document {
 
     if ( $http =~ m@^HTTP/[0-9.]+ 30[123]@ ) {
       $_ = $head;
+
       my ( $location ) = m@^location:[ \t]*(.*)$@im;
       if ( $location ) {
         $location =~ s/[\r\n]$//;
@@ -982,7 +990,7 @@ sub pick_image_from_pages {
 ############################################################################
 
 # yahoorand
-my $yahoo_random_link = "http://random.yahoo.com/bin/ryl";
+my $yahoo_random_link = "http://random.yahoo.com/fast/ryl";
 
 
 # Picks a random page; picks a random image on that page;