X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2FXScreenSaver.ad.in;h=5796f021ff31977009527c544967fbd9f4e3edb3;hp=e2d79ebd8e7416d4e62283152d7cf42a20885dca;hb=3c58fb6311db49c46f1670922933b27c6ea0c065;hpb=585e1a6717d1dd9b90fbb53acaaae82106354d33

diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in
index e2d79ebd..5796f021 100644
--- a/driver/XScreenSaver.ad.in
+++ b/driver/XScreenSaver.ad.in
@@ -4,8 +4,8 @@
 !            a screen saver and locker for the X window system
 !                            by Jamie Zawinski
 !
-!                              version 3.32
-!                              15-Apr-2001
+!                              version 3.33
+!                              03-Jun-2001
 !
 ! See "man xscreensaver" for more info.  The latest version is always
 ! available at http://www.jwz.org/xscreensaver/
@@ -41,6 +41,7 @@
 *chooseRandomImages:	False
 *imageDirectory:	
 *nice:			10
+*memoryLimit:		50M
 *lock:			False
 *lockVTs:		True
 *verbose:		False
@@ -79,10 +80,10 @@
 *loadURL: netscape -remote 'openURL(%s)' || netscape '%s'
 
 ! This is what the "Manual" button in xscreensaver-demo runs (/bin/sh syntax.)
-*manualCommand: xterm +sb -fg black -bg gray75 -T '%s manual' \
-        -e /bin/sh -c 'man "%s" || read foo'
-! Gnome folks might prefer this:
-!*manualCommand: gnome-help-browser 'man:%s'
+@GNOMEHELP_N@*manualCommand: xterm +sb -fg black -bg gray75 -T '%s manual' \
+@GNOMEHELP_N@        -e /bin/sh -c 'man "%s" || read foo'
+! For GNOME systems:
+@GNOMEHELP_Y@*manualCommand: gnome-help-browser 'man:%s'
 
 
 ! The format used for printing the date and time in the password dialog box
@@ -267,6 +268,10 @@
 -	   "RotZoomer (mobile)" rotzoomer -root -move			    \n\
 -	   "RotZoomer (sweep)"  rotzoomer -root -sweep			    \n\
 				whirlwindwarp -root			    \n\
+ 	            "WhirlyGig"	whirlygig -root -nlines 20 -whirlies 40       \
+                                  -xspeed 0.5				    \n\
+ 	            "SpeedMine"	speedmine -root				    \n\
+ 	            "SpeedWorm"	speedmine -root -worm			    \n\
   color: 			bubbles -root				    \n\
   default-n:			webcollage -root			    \n\
   default-n:  "WebCollage (whacked)"					      \
@@ -324,16 +329,8 @@
 !    default-n:  "Slideshow"	xv -root -rmode 5 -random -viewonly           \
 !				  -wloop -wait 30 $HOME/bitmaps/*.jpg	    \n\
 !
-! or, if you prefer "xli" to "xv", like this: (but note that xli's "-delay"
-! option doesn't work in conjunction with "-onroot", so you need to add a
-! line for each image individually... "xv" is better in this respect.)
-!
-!    default-n: xli -quiet -onroot -center -border black		      \
-!		  $HOME/bitmaps/pic1.jpg				    \n\
-!    default-n: xli -quiet -onroot -center -border black		      \
-!		  $HOME/bitmaps/pic2.jpg				    \n\
-!    default-n: xli -quiet -onroot -center -border black		      \
-!		  $HOME/bitmaps/pic3.jpg				    \n\
+! Recipes for using other slideshow programs can be found in the
+! XScreenSaver FAQ: http://www.jwz.org/xscreensaver/faq.html
 !
 ! Note that we've used "default-n" as the visual name, rather than just
 ! "default": this means "default visual, no install", that is, it's like
@@ -631,27 +628,19 @@ Written by Juergen Nickelsen and Jamie Zawinski.
 
 *hacks.slidescreen.name: SlideScreen
 *hacks.slidescreen.documentation:					\
-This grabs an image of whatever is on your screen, divides it into a	\
-grid, and then randomly shuffles the squares around as if it was one	\
-of those annoying ``16-puzzle'' games, where there is a grid of		\
-squares, one of which is missing.  I hate trying to solve those		\
-puzzles, but watching one permute itself is more amusing.  Written by	\
-Jamie Zawinski.
+This takes an image, divides it into a grid, and then randomly shuffles \
+the squares around as if it was one of those annoying ``16-puzzle''     \
+games, where there is a grid of squares, one of which is missing.       \
+I hate trying to solve those puzzles, but watching one permute itself   \
+is more amusing.  Written by Jamie Zawinski.
 
 *hacks.decayscreen.name: DecayScreen
 *hacks.decayscreen.documentation:					\
-This grabs an image of whatever is on your screen, and makes it melt.	\
-You've no doubt seen this effect before, but no screensaver would	\
-really be complete without it.	It works best if there's something	\
-colorful visible.  Warning, if the effect continues after the screen	\
-saver is off, seek medical attention.  Written by David Wald and	\
-Vivek Khera.								\
-								    \n\n\
-A number of these screenhacks have the ability to take an image of	\
-your desktop and manipulate it in some way.  On SGI systems, these	\
-programs are able to (at random) pull their source image from the	\
-system's video input instead!  This works nicely if you leave some	\
-some random television station plugged in.
+This takes an image and makes it melt.  You've no doubt seen this       \
+effect before, but no screensaver would really be complete without it.  \
+It works best if there's something colorful visible.  Warning, if the   \
+effect continues after the screen saver is off, seek medical attention. \
+Written by David Wald and Vivek Khera.
 
 *hacks.jigsaw.documentation:						\
 This grabs a screen image, carves it up into a jigsaw puzzle,		\
@@ -1286,6 +1275,15 @@ files as input.  Written by Jamie Zawinski.
 Draws a ball that periodically extrudes many random spikes.  Ouch!   \
 Written by Jamie Zawinski.
 
+*hacks.whirlygig.name: WhirlyGig
+*hacks.whirlygig.documentation:                                     \
+Draws zooming chains of sinusoidal spots.  Written by Ashton Trey Belew.
+
+*hacks.speedmine.name: SpeedMine
+*hacks.speedmine.documentation:                                     \
+Simulates speeding down a rocky mineshaft, or a funky dancing worm. \
+Written by Conrad Parker.
+
 
 !=============================================================================
 !