X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fwebcollage.man;h=c84e5032bf9a024c6340a99a6da17855d1c79aad;hb=9c9d475ff889ed8be02e8ce8c17da28b93278fca;hp=51dbb18a1c0e633aa6840d15d77fdf739bf28f6d;hpb=13dbc569cdc6e29019722c0ef9b932a925efbcad;p=xscreensaver

diff --git a/hacks/webcollage.man b/hacks/webcollage.man
index 51dbb18a..c84e5032 100644
--- a/hacks/webcollage.man
+++ b/hacks/webcollage.man
@@ -24,6 +24,7 @@ webcollage - decorate the screen with random images from the web
 [\-background \fIbg\fP]
 [\-no-output]
 [\-urls-only]
+[\-imagemap \fIfilename-base\fP]
 [\-size \fIWxH\fP]
 [\-filter \fIcommand\fP]
 [\-filter2 \fIcommand\fP]
@@ -52,6 +53,11 @@ and requires Perl 5.
 It will be an order of magnitude faster if you also have
 the \fIwebcollage-helper\fP program installed (a GDK/JPEG image
 compositor), but \fIwebcollage\fP works without it as well.
+
+\fIwebcollage\fP can be used in conjunction with the
+.BR driftnet (1)
+program (the Unix equivalent of EtherPEG) to snoop images from traffic
+on your local subnet, instead of getting images from search engines.
 .SH OPTIONS
 .I webcollage
 accepts the following options:
@@ -95,6 +101,13 @@ with \fB\-verbose\fP.
 If this option is specified, then no composite output image will be
 generated: instead, a list of image URLs will be printed on stdout.
 .TP 8
+.B \-imagemap \fIfilename-base\fP
+If this option is specified, then instead of writing an image to the
+root window, two files will be created: "\fIbase\fP.html" and "\fIbase\fP.jpg".
+The JPEG will be the collage; the HTML file will include that image, and
+an image-map making the sub-images be linked to the pages on which they
+were found (just like \fIhttp://www.jwz.org/webcollage/\fP.)
+.TP 8
 .B \-filter \fIcommand\fP
 Filter all source images through this command.  The command must take
 a PPM file on stdin, and write a new PPM file to stdout.  One good 
@@ -151,24 +164,31 @@ stored in the RESOURCE_MANAGER property.
 .B http_proxy\fR or \fPHTTP_PROXY
 to get the default HTTP proxy host and port.
 .SH FILES AND URLS
-.TP
-.I /usr/dict/words \fRor\fP /usr/share/lib/dict/words \fRor\fP /usr/share/dict/words
-To find the random words to feed to search engines.
-.PP
-.I http://random.yahoo.com/bin/ryl, http://image.altavista.com/
-To find random web pages.
-.SH BUGS
-When drawing on the root window, it always uses the default colormap.
-This is actually a limitation of xv.  But regardless, when using this
-program with xscreensaver, it must be given the \fBdefault-n\fP 
-visual specification (see the
-.BR xscreensaver (1)
-manual for more details.)
+.I /usr/dict/words,
+.I /usr/share/lib/dict/words,\fP
+or
+.I /usr/share/dict/words
+to find the random words to feed to certain search engines.
 
-Animating GIFs are not supported.
+    \fIhttp://www.altavista.com/image/randomlink\fP,
+    \fIhttp://random.yahoo.com/fast/ryl\fP,
+    \fIhttp://www.livejournal.com/stats/latest-img.bml\fP, and
+    \fIhttp://news.yahoo.com/\fP
+to find random web pages.
+.SH BOOBIES
+The Internet being what it is, absolutely anything might show up in the
+collage including -- quite possibly -- pornography, or even nudity.
+.SH BUGS
+Animating GIFs are not supported: only the first frame will be used.
+.SH UPGRADES
+The latest version of webcollage can be found as a part of
+xscreensaver, at 
+.B http://www.jwz.org/xscreensaver/,
+or on the WebCollage page at 
+.B http://www.jwz.org/webcollage/.
 
-Too many of the images that it finds are text, not pictures.  This is 
-because most of the web is pictures of text.  Which is pretty sad.
+DriftNet:
+.B http://www.ex-parrot.com/~chris/driftnet/
 .SH SEE ALSO
 .BR X (1),
 .BR xscreensaver (1),
@@ -186,12 +206,14 @@ because most of the web is pictures of text.  Which is pretty sad.
 .BR vidwhacker (1),
 .BR dadadodo (1),
 .BR driftnet (1)
+.BR EtherPEG ,
+.BR EtherPeek
 .SH COPYRIGHT
-Copyright \(co 1998-2002 by 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 the above copyright notice appear 
+Copyright \(co 1998-2004 by 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 the above copyright notice appear
 in all copies and that both that copyright notice and this permission notice
-appear in supporting documentation.  No representations are made about the 
+appear in supporting documentation.  No representations are made about the
 suitability of this software for any purpose.  It is provided "as is" without
 express or implied warranty.
 .SH AUTHOR