X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2FXScreenSaver.ad.in;h=825c4c724bd25e60b2558e86750a3b4a12049b07;hp=bc0f4031777c0e795e920c6a782602b302aa6861;hb=0ed85ca0e4b0eae40a4f50a51d63f2f41e45373a;hpb=72c1f4c1dc6ab07fe121a327ff1c30bf51ef74c1
diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in
index bc0f4031..825c4c72 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.20
-! 12-Nov-99
+! version 3.21
+! 18-Nov-99
!
! See "man xscreensaver" for more info. The latest version is always
! available at http://www.jwz.org/xscreensaver/
@@ -59,6 +59,12 @@
! The "helpURL" will be substituted for up to two occurrences of "%s".
*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'
+! Gnome folks might prefer this:
+!*manualCommand: gnome-help-browser 'man:%s'
+
! The format used for printing the date and time in the password dialog box
! (see the strftime(3) manual page for details.)
@@ -118,14 +124,20 @@
"Qix (transparent)" qix -root -count 4 -solid -transparent \n\
"Qix (linear)" qix -root -count 5 -solid -transparent \
-linear -segments 250 -size 100 \n\
+- mono: "Qix (xor)" qix -root -linear -count 5 -size 200 \
+ -spread 30 -segments 75 -solid -xor \n\
+ \
"Attraction (balls)" attraction -root -mode balls \n\
"Attraction (lines)" attraction -root -mode lines -points 3 \
-segments 200 \n\
+- "Attraction (poly)" attraction -root -mode polygons \n\
"Attraction (splines)" attraction -root -mode splines -segments \
300 \n\
"Attraction (orbital)" attraction -root -mode lines -radius 300 \
-orbit -vmult 0.5 \n\
+ \
pyro -root \n\
+ rocks -root \n\
helix -root \n\
pedal -root \n\
rorschach -root -offset 7 \n\
@@ -223,22 +235,13 @@
ccurve -root \n\
blaster -root \n\
bumps -root \n\
+ color: bubbles -root \n\
default-n: webcollage -root \n\
default-n: "WebCollage (whacked)" \
webcollage -root -filter \
'vidwhacker -stdin -stdout' \n\
- default-n: vidwhacker -root \n\
\
-- mono: "Rocks (mono)" rocks -root \n\
- color: "Rocks (color)" rocks -root -fg darksalmon \n\
-- mono: "Qix (xor)" qix -root -linear -count 5 -size 200 \
- -spread 30 -segments 75 -solid -xor \n\
- color: "Attraction (poly)" attraction -root -mode polygons \n\
-- color: "Attraction (filled)" attraction -root -mode filled-splines \
- -segments 0 \n\
-- Color: "Attraction (glow)" attraction -root -glow -points 10 \n\
- color: bubbles -root \n\
- \
@GL_KLUDGE@ GL: gears -root \n\
@GL_KLUDGE@ GL: superquadrics -root \n\
@GL_KLUDGE@ GL: morph3d -root \n\
@@ -258,28 +261,19 @@
-texture_quality -light -fog \n\
@GLE_KLUDGE@GL: extrusion -root \n\
@GL_KLUDGE@ GL: sierpinski3d -root \n\
-
+ \
+- xdaliclock -root -builtin3 -cycle \n\
+- default-n: xearth -nofork -nostars -ncolors 50 \
+ -night 3 -wait 0 -timewarp 400.0 -pos \
+ sunrel/38/-30 \n\
+- ssystem -fullscreen :32 \n\
+- xmountains -b -M -Z 0 -r 1 \n\
+- "XMountains (top)" xmountains -b -M -Z 0 -r 1 -m \n\
+- xaos -root -autopilot -incoloring -1 \
+ -nogui -outcoloring -1 \n\
+- xfishtank -d \n
+
-! Some other programs that you might want to track down (these work as
-! XScreenSaver helpers, but are not distributed with it):
-!
-! xdaliclock -root -builtin2 \n\
-! xswarm -r 2>&- \n\
-! xwave -root \n\
-! xbouncebits ... \n\
-! ico -r -faces -sleep 1 -obj ico \n\
-! xsplinefun \n\
-! xmountains -b -M \n\
-! color: xfishtank -c black -d -r 2 \n\
-!
-! xtacy is ok, but it only works on the default visual. We can satisfy
-! that constraint like so:
-!
-! default: "Xtacy (funky)" xtacy -root -delay 100 -funky -number 3 \n\
-! default: "Xtacy (grav)" xtacy -root -delay 100 -gravity \n\
-! default: "Xtacy (mixer)" xtacy -root -delay 100 -mixer \n\
-! default: "Xtacy (taffy)" xtacy -root -delay 100 -taffy -pal 4 \n\
-!
! To display a randomized slideshow of images, you can do something like this:
!
! default-n: "Slideshow" xv -root -rmode 5 -random -viewonly \
@@ -308,10 +302,6 @@
! (meaning, "-visual default -install") but you probably won't ever need
! to use that.
!
-! XEarth is nice, too:
-!
-! default-n: xearth -nostars -wait 0 -timewarp 400 -pos sunrel/38/-30
-!
!
! Some of the GL demos that SGI ships work with XScreenSaver; most don't.
! XScreenSaver includes a program (not built or installed by default)
@@ -328,16 +318,7 @@
!
! You can also use the "ant" demo, but first you need to wrap a shell script
! around it that cds to its home directory, so that it can find its files;
-! and also pass it the -S argument, to prevent it from forking.
-!
-!
-! Also, since these actually end up mapping their own windows instead of
-! drawing on the XScreenSaver-provided root, when they are being run from
-! demo-mode, you can't pop up the demo-mode dialog just by clicking the
-! mouse: you must first type ESC to make the SGI programs exit. This sucks.
-! Things should work properly when they are being run by xscreensaver in
-! non-demo-mode, however.
-!
+! and also pass it the -S argument, to prevent it from forking. What a mess!
! Basically, the SGI demo writers went out of their way to make my life hell.
@@ -1234,20 +1215,41 @@ like something is dripping into it. Written by Tom Hammersley.
*hacks.xdaliclock.name: XDaliClock
*hacks.xdaliclock.documentation: \
XDaliClock draws a large digital clock, the numbers of which change by \
-``melting'' into their new shapes. Written by Jamie Zawinski.
+``melting'' into their new shapes. Written by Jamie Zawinski. This \
+is not included with the XScreenSaver package, but if you don't have \
+it already, you can find it at .
*hacks.xearth.documentation: \
XEarth draws an image of the Earth, as seen from your favorite vantage \
point in space, correctly shaded for the current position of the Sun. \
-Written by Kirk Johnson.
+Written by Kirk Johnson. This is not included with the XScreenSaver \
+package, but if you don't have it already, you can find it at \
+.
*hacks.ssystem.name: SSystem
*hacks.ssystem.documentation: \
SSystem is a GL Solar System simulator. It simulates flybys of Sun, \
the nine planets and a few major satellites, with four camera modes. \
-Written by Raul Alonso.
+Written by Raul Alonso. This is not included with the XScreenSaver \
+package, but if you don't have it already, you can find it at \
+.
*hacks.xmountains.documentation: \
XMountains generates realistic-looking fractal terrains of snow-capped \
mountains near water, with either a top view or a side view. \
-Written by Stephen Booth.
+Written by Stephen Booth. This is not included with the XScreenSaver \
+package, but if you don't have it already, you can find it at \
+.
+
+*hacks.xaos.name: XaoS
+*hacks.xaos.documentation: \
+XaoS generates fast fly-through animations of the Mandelbrot and other \
+fractal sets. Written by Thomas Marsh and Jan Hubicka. This is not \
+included with the XScreenSaver package, but if you don't have it \
+already, you can find it at .
+
+*hacks.xfishtank.name: XFishTank
+*hacks.xfishtank.documentation: \
+Fish! This is not included with the XScreenSaver package, but if you \
+don't have it already, you can find it at \
+.