X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2FXScreenSaver.ad.in;h=b820738737e25165e89bef6a716ea2053e2e607f;hp=cc35ca4a413b1104613e32e0276669c01823f066;hb=278c59e14c53fd412b734e699bd4f314f766f804;hpb=551b3de3f619c04c2dd1971ee9b3f02e270c28c9

diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in
index cc35ca4a..b8207387 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.10
-!                                27-Apr-99
+!                              version 3.12
+!                                10-May-99
 !
 ! See "man xscreensaver" for more info.  The latest version is always
 ! available at http://www.jwz.org/xscreensaver/
@@ -32,6 +32,7 @@
 *fadeTicks:		20
 *splash:		True
 *splashDuration:	5
+*visualID:		default
 
 *captureStderr: 	True
 *overlayTextForeground:	#FFFF00
@@ -89,15 +90,19 @@
 ! colormaps, but others prefer 24-bit windows, that also can be arranged
 ! (in this case, by using "PseudoColor:" versus "TrueColor:".)
 !
+! Some of the screenhacks are written using OpenGL.  OpenGL programs are
+! a bit different than normal X programs, in that they prefer visuals that
+! are *half* as deep as the screen.  You can tell xscreensaver to select a
+! good visual for a GL program by using the magic visual name "GL".
+!
 ! All programs must be launched in such a way that they draw on the root
 ! window; they should not be spawned in the background with "&".  If shell
 ! metacharacters are used, they must be understandable to `sh', not `csh'
 ! (the $SHELL variable is not consulted, for unfortunate but good reasons.)
 !
-! Be sure to check out Demo Mode: run the command `xscreensaver-command -demo'
-! and it will cause the running XScreenSaver program to pop up a dialog box
-! that lets you try out the following programs interactively.  See the man
-! pages for details.
+! Be sure to check out Demo Mode: run the `xscreensaver-demo' program to
+! edit the current list of programs interactively, try out the various modes,
+! and change other parameters.  See the man page for details.
 !
 *programs:	qix -root -solid -delay 0 -segments 100			\n\
 		attraction -root -mode balls				\n\
@@ -206,45 +211,24 @@
   PseudoColor:	qix -root -count 5 -solid -transparent -linear		  \
 			-segments 250 -size 100				\n\
 									  \
-@GL_KLUDGE@	gears -root					  	\n\
-@GL_KLUDGE@	superquadrics -root				  	\n\
-@GL_KLUDGE@	morph3d -root					  	\n\
-@GL_KLUDGE@	cage -root					  	\n\
-@GL_KLUDGE@	moebius -root					  	\n\
-@GL_KLUDGE@	stairs -root					  	\n\
-@GL_KLUDGE@	pipes -root					  	\n\
-@GL_KLUDGE@	sproingies -root				  	\n\
-@GL_KLUDGE@	rubik -root					  	\n\
-@GL_KLUDGE@	atlantis -root					  	\n\
-@GL_KLUDGE@	lament -root					  	\n\
-@GL_KLUDGE@	bubble3d -root					  	\n\
-@GL_KLUDGE@	glplanet -root					  	\n\
-@GL_KLUDGE@	pulsar -root					  	\n
+@GL_KLUDGE@ GL:	gears -root					  	\n\
+@GL_KLUDGE@ GL:	superquadrics -root				  	\n\
+@GL_KLUDGE@ GL:	morph3d -root					  	\n\
+@GL_KLUDGE@ GL:	cage -root					  	\n\
+@GL_KLUDGE@ GL:	moebius -root					  	\n\
+@GL_KLUDGE@ GL:	stairs -root					  	\n\
+@GL_KLUDGE@ GL:	pipes -root					  	\n\
+@GL_KLUDGE@ GL:	sproingies -root				  	\n\
+@GL_KLUDGE@ GL:	rubik -root					  	\n\
+@GL_KLUDGE@ GL:	atlantis -root					  	\n\
+@GL_KLUDGE@ GL:	lament -root					  	\n\
+@GL_KLUDGE@ GL:	bubble3d -root					  	\n\
+@GL_KLUDGE@ GL:	glplanet -root					  	\n\
+@GL_KLUDGE@ GL:	pulsar -root					  	\n\
+  -	   GL:  pulsar -root -texture -mipmap -texture_quality  	  \
+		       -light -fog					\n
  
 
-! A few of the hacks require OpenGL, and will only be built if you have it.
-! If your vendor doesn't provide real OpenGL, you might want to consider
-! building MesaGL, which is a free implementation -- GL is way cool.
-!
-! Note that those hacks (gears, superquadratics, morph3d, cage, moebius,
-! stairs, pipes, sproingies, and rubik) tend to work best on a visual *half*
-! as deep as the depth of the screen, since that way, they can do
-! double-buffering -- try it and see, but you will probably find that you
-! should specify the deepest visual that is half as deep as the screen.
-!
-! For example, on a screen that supports both 24-bit TrueColor and 12-bit
-! PseudoColor, the 12-bit visual will probably work best (this is true of
-! base-model SGI Indys: the 0x29 visual is the one you want.)  Oddly, on SGI
-! O2s, (machines that have serious hardware support for GL) the 12-bit
-! PseudoColor visual looks awful (you get a black and white, flickery image.)
-! On these machines, the visual you want turns out to be 0x31 -- this is but
-! one of the eight 15-bit TrueColor visuals (yes, 8, and yes, 15) that O2s
-! provide.  This is the only visual that works properly -- as far as xdpyinfo
-! is concerned, all of the 15-bit TrueColor visuals are identical, but some
-! flicker like mad, and some have deeply weird artifacts (hidden surfaces
-! show through!)  I suppose these other visuals must be tied to some arcane
-! hardware feature...  Your mileage, therefore, may vary dramatically.
-!
 ! Some other programs that you might want to track down (these work as
 ! XScreenSaver helpers, but are not distributed with it):
 !