use Fcntl ':flock'; # import LOCK_* constants
-my $version = q{ $Revision: 1.32 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my $version = q{ $Revision: 1.41 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
my $copyright = "WebCollage $version, Copyright (c) 1999" .
" Jamie Zawinski <jwz\@jwz.org>\n" .
" http://www.jwz.org/xscreensaver/\n";
my $progname = $argv0; $progname =~ s@.*/@@g;
my $random_redirector = "http://random.yahoo.com/bin/ryl";
-my $image_randomizer_1 = "http://image.altavista.com/cgi-bin/avncgi" .
- "?do=3" .
- "&verb=n" .
- "&oshape=n" .
- "&oorder=" .
- "&ophoto=1&oart=1&ocolor=1&obw=1" .
+my $image_randomizer_1 = "http://www.altavista.com/query" .
+ "?mmdo=3" .
+ "&nbq=12" .
"&stype=simage" .
- "&oprem=0" .
- "&query=";
+ "&oart=1" .
+ "&obw=1" .
+ "&oshape=0" .
+ "&what=web" .
+ "&q=";
my $image_randomizer_2 = "http://www.hotbot.com/?clickSrc=search" .
"&submit=SEARCH&SM=SC&LG=any" .
"&AM0=MC&AT0=words&AW0=" .
my $image_randomizer_3 = "http://www.altavista.com/cgi-bin/query?pg=q" .
"&text=yes&kl=XX&stype=stext&q=";
+# I guess Photopoint got wise to me, because now they are doing error
+# checking on the user ("u=") and album ("a=") parameters. Oh well.
+#
+#my $photo_randomizer = "http://albums.photopoint.com/j/View?u=1&a=1&p=";
+#my $photo_randomizer_lo = 10000001;
+#my $photo_randomizer_hi = 12400000;
+
my $image_ppm = ($ENV{TMPDIR} ? $ENV{TMPDIR} : "/tmp") . "/webcollage." . $$;
my $image_tmp1 = $image_ppm . "-1";
my $image_tmp2 = $image_ppm . "-2";
my $http_proxy = undef;
my $http_timeout = 30;
my $cvt_timeout = 10;
-my $ppm_to_root_window_cmd = "xv -root -rmode 5 -viewonly" .
- " +noresetroot %%PPM%% -quit";
+
+# programs we can use to write to the root window (tried in ascending order.)
+my $ppm_to_root_window_cmd_1 = "xloadimage -onroot -quiet %%PPM%%";
+my $ppm_to_root_window_cmd_2 = "xli -quiet -onroot -center" .
+ " -border black %%PPM%%";
+my $ppm_to_root_window_cmd_3 = "xv -root -rmode 5 -viewonly" .
+ " +noresetroot %%PPM%% -quit";
+
+my $ppm_to_root_window_cmd = undef; # initialized by x_output()
+
my $filter_cmd = undef;
my $post_filter_cmd = undef;
my $background = undef;
my $href_count = 0;
$_ = $body;
- s/[\r\n\t ]+/ /g;
- s/Result Pages:.*$//; # trim off page footer
+ s/Result [Pp]ages:.*$//s; # trim off page footer
+ s/^.*?IMAGE RESULTS//s; # trim off page header
+
+ s/[\r\n\t ]+/ /g;
s/(<A )/\n$1/gi;
foreach (split(/\n/)) {
next unless ($u =~ m@^http://@i); # skip non-http and relative urls.
next if ($u =~ m@[/.]altavista\.com@i); # skip altavista builtins
+ next if ($u =~ m@[/.]av\.com@i);
+ next if ($u =~ m@[/.]virage\.com@i);
+ next if ($u =~ m@[/.]photoloft\.com@i);
+ next if ($u =~ m@[/.]shopping\.com@i);
+ next if ($u =~ m@[/.]thetrip\.com@i);
+ next if ($u =~ m@[/.]cmgi\.com@i);
+ next if ($u =~ m@[/.]intelihealth\.com@i);
+ next if ($u =~ m@[/.]wildweb\.com@i);
next if ($u =~ m@[/.]digital\.com@i);
next if ($u =~ m@[/.]doubleclick\.net@i);
- if ($which == 0 && $u =~ m@[/.]corbis\.com/@) {
+ if ($which == 0 && $u =~ m@[/.]corbis\.com@) {
$skipped = 1;
if ( $verbose > 3 ) {
print STDERR "$progname: skipping corbis URL: $u\n";
}
+# Using the photo site, generate a random URL that will hopefully point
+# to an image. Returns two URLs, both of which are the URL of the image.
+# Returns () if nothing found this time.
+#
+#sub pick_from_photo_randomizer {
+# my ( $timeout ) = @_;
+# my $n = ($photo_randomizer_lo +
+# int(rand() * ($photo_randomizer_hi - $photo_randomizer_lo)));
+# my $url = $photo_randomizer . $n;
+# return ( $url, $url, "photopoint" );
+#}
+
+
# Picks a random image on a random page, and returns two URLs:
# the page containing the image, and the image.
# Returns () if nothing found this time.
my $total_1 = 0;
my $total_2 = 0;
my $total_3 = 0;
+my $total_4 = 0;
my $count_0 = 0;
my $count_1 = 0;
my $count_2 = 0;
my $count_3 = 0;
+my $count_4 = 0;
sub pick_image {
my ( $timeout ) = @_;
$total = ++$total_1;
$count = ++$count_1 if $img;
+# } elsif ($r < 70) {
+# ($base, $img, $source) = pick_from_photo_randomizer ($timeout);
+# $total = ++$total_4;
+# $count = ++$count_4 if $img;
+
# } elsif ($r < 80) {
# # HotBot sucks: 98% of the time, it says "no pages match your
# # search", and then if I load the URL again by hand, it works.
sub x_output {
- my $win_cmd = $ppm_to_root_window_cmd;
- $win_cmd =~ s/^([^ \t\r\n]+).*$/$1/;
+ my $win_cmd_1 = $ppm_to_root_window_cmd_1;
+ my $win_cmd_2 = $ppm_to_root_window_cmd_2;
+ my $win_cmd_3 = $ppm_to_root_window_cmd_3;
+ $win_cmd_1 =~ s/^([^ \t\r\n]+).*$/$1/;
+ $win_cmd_2 =~ s/^([^ \t\r\n]+).*$/$1/;
+ $win_cmd_3 =~ s/^([^ \t\r\n]+).*$/$1/;
# make sure the various programs we execute exist, right up front.
foreach ("ppmmake", "giftopnm", "djpeg", "pnmpaste", "pnmscale",
- "pnmcut", $win_cmd) {
+ "pnmcut") {
which ($_) || die "$progname: $_ not found on \$PATH.\n";
}
+ if (which($win_cmd_1)) {
+ $ppm_to_root_window_cmd = $ppm_to_root_window_cmd_1;
+ } elsif (which($win_cmd_2)) {
+ $ppm_to_root_window_cmd = $ppm_to_root_window_cmd_2;
+ } elsif (which($win_cmd_3)) {
+ $ppm_to_root_window_cmd = $ppm_to_root_window_cmd_3;
+ } else {
+ die "$progname: didn't find $win_cmd_1, $win_cmd_2, or $win_cmd_3 on \$PATH.\n";
+ }
+
$SIG{HUP} = \&x_cleanup;
$SIG{INT} = \&x_cleanup;
$SIG{QUIT} = \&x_cleanup;
which ($_) || die "$progname: $_ not found on \$PATH.\n";
$_ = `$_`;
($img_width, $img_height) = m/dimensions: *(\d+)x(\d+) /;
+ if (!defined($img_height)) {
+ die "$progname: xdpyinfo failed.\n";
+ }
}
my $bgcolor = "#000000";
projects / xscreensaver / blobdiff