X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FXScreenSaver_ad.h;h=550600cbe05fff5f167cfaed721c39e7687686a9;hb=93f25dc6827112d98b8b855ea85c8f5eb8123086;hp=8ed41bbf339f9c966a8ca2fde8b8ab289a8519b5;hpb=06e9a7886a77cad92f9ddbc169d6d199a4d8b76d;p=xscreensaver

diff --git a/driver/XScreenSaver_ad.h b/driver/XScreenSaver_ad.h
index 8ed41bbf..550600cb 100644
--- a/driver/XScreenSaver_ad.h
+++ b/driver/XScreenSaver_ad.h
@@ -1,3 +1,6 @@
+"#error Do not run app-defaults files through xrdb!",
+"#error That does not do what you might expect.",
+"#error Put this file in /usr/lib/X11/app-defaults/XScreenSaver instead.",
 "*timeout:		10",
 "*cycle:			10",
 "*lockTimeout:		0",
@@ -149,6 +152,9 @@
 				bumps -root				    \\n\
 				xteevee -root				    \\n\
 				xspirograph -root			    \\n\
+				nerverot -root				    \\n\
+-	    \"NerveRot (dense)\"	nerverot -root -count 1000		    \\n\
+-	    \"NerveRot (thick)\"	nerverot -root -count 64 -line-width 4	    \\n\
   color: 			bubbles -root				    \\n\
   default-n:			webcollage -root			    \\n\
   default-n:  \"WebCollage (whacked)\"					      \
@@ -175,6 +181,7 @@
 				  -texture_quality -light -fog		    \\n\
 	   GL:			extrusion -root				    \\n\
 	   GL:			sierpinski3d -root			    \\n\
+	   GL:			starwars -root				    \\n\
 									      \
 -				xdaliclock -root -builtin3 -cycle	    \\n\
 - default-n:			xearth -nofork -nostars -ncolors 50	      \
@@ -185,7 +192,7 @@
 -	\"XMountains (top)\"	xmountains -b -M -Z 0 -r 1 -m		    \\n\
 -                               xaos -root -autopilot -incoloring -1	      \
                                   -nogui -outcoloring -1	            \\n\
--				xfishtank -d                                \\n\
+-				xfishtank -d -s                             \\n\
 -				xsnow                                       \\n\
 -				goban -root                                 \\n\
 -				electricsheep                               \\n",
@@ -334,10 +341,6 @@
 "*Cancel.rightOffset:		10",
 "*Cancel.bottomOffset:		10",
 "*hacks.documentation.isInstalled: True",
-"*hacks.grav.documentation:						\
-This program draws a simple orbital simulation.	 If you turn on		\
-trails, it looks kind of like a cloud-chamber photograph.  Written by	\
-Greg Bowering.",
 "*hacks.qix.documentation:						\
 This is the swiss army chainsaw of qix programs.  It bounces a series	\
 of line segments around the screen, and uses variations on this basic	\
@@ -789,6 +792,10 @@ loss of vertical hold, and a test pattern.  By Greg Knauss.",
 "*hacks.xspirograph.documentation:					\
 Simulates that pen-in-nested-plastic-gears toy from your childhood.     \
 By Rohit Singh.",
+"*hacks.nerverot.name: NerveRot",
+"*hacks.nerverot.documentation:                                          \
+Draws a rolling tube, composed of nervously vibrating squiggles.	\
+By Dan Bornstein.",
 "*hacks.webcollage.name: WebCollage",
 "*hacks.webcollage.documentation:					\
 This program makes collages out of random images pulled off of the	\