X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FXScreenSaver.ad.in;h=bdfc2dc28db147e534514e07fee10b97c330a7fb;hb=6f5482d73adb0165c0130bb47d852644ab0c4869;hp=c12c3cf75915cd0131ee40469a7c45d31a3031a8;hpb=50be9bb40dc60130c99ffa568e6677779904ff70;p=xscreensaver

diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in
index c12c3cf7..bdfc2dc2 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 5.12
-!                              15-Sep-2010
+!                              version 5.18
+!                              03-Jul-2012
 !
 ! See "man xscreensaver" for more info.  The latest version is always
 ! available at http://www.jwz.org/xscreensaver/
@@ -34,12 +34,14 @@
 *lockTimeout:		0:00:00
 *passwdTimeout:		0:00:30
 *dpmsEnabled:		False
+*dpmsQuickoffEnabled:	False
 *dpmsStandby:		2:00:00
 *dpmsSuspend:		2:00:00
 *dpmsOff:		4:00:00
 *grabDesktopImages:	True
 *grabVideoFrames:	False
 *chooseRandomImages:	@DEFAULT_IMAGES_P@
+! This can be a local directory name, or the URL of an RSS or Atom feed.
 *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@
 *nice:			10
 *memoryLimit:		0
@@ -60,8 +62,8 @@
 *textLiteral:		XScreenSaver
 *textFile:		@DEFAULT_TEXT_FILE@
 *textProgram:		fortune
-*textURL:		http://www.livejournal.com/stats/latest-rss.bml
-!*textURL:		http://twitter.com/statuses/public_timeline.atom
+*textURL:		http://twitter.com/statuses/public_timeline.atom
+!*textURL:		http://www.livejournal.com/stats/latest-rss.bml
 
 *overlayTextForeground:	#FFFF00
 *overlayTextBackground:	#000000
@@ -72,7 +74,9 @@
 *sgiSaverExtension:	True
 *xidleExtension:	True
 *procInterrupts:	True
-*xinputExtensionDev:	True
+
+! Turning this on makes pointerHysteresis not work.
+*xinputExtensionDev:	False
 
 ! Set this to True if you are experiencing longstanding XFree86 bug #421
 ! (xscreensaver not covering the whole screen)
@@ -129,6 +133,7 @@ GetViewPortIsFullOfLies: False
 ! This command is executed by the "New Login" button on the lock dialog.
 ! (That button does not appear on the dialog if this program does not exist.)
 ! For Gnome: probably "gdmflexiserver -ls".  KDE, probably "kdmctl reserve".
+! Or maybe yet another wheel-reinvention, "lxdm -c USER_SWITCH".
 !
 @NEW_LOGIN_COMMAND_P@*newLoginCommand:	@NEW_LOGIN_COMMAND@
 
@@ -348,7 +353,10 @@ GetViewPortIsFullOfLies: False
 -				lcdscrub -root				    \n\
 @GL_KLUDGE@ GL: 				photopile -root				    \n\
 @GL_KLUDGE@ GL: 				skytentacles -root			    \n\
-@GL_KLUDGE@ GL: 				rubikblocks -root			    \n
+@GL_KLUDGE@ GL: 				rubikblocks -root			    \n\
+@GL_KLUDGE@ GL: 				companioncube -root			    \n\
+@GL_KLUDGE@ GL: 				hilbert -root				    \n\
+@GL_KLUDGE@ GL: 				tronbit -root				    \n
 
 
 
@@ -407,7 +415,7 @@ XScreenSaver.bourneShell:		/bin/sh
 *passwd.uname:                  True
 
 *splash.heading.label:		XScreenSaver %s
-*splash.body.label:		Copyright © 1991-2010 by
+*splash.body.label:		Copyright © 1991-2012 by
 *splash.body2.label:		Jamie Zawinski <jwz@jwz.org>
 *splash.demo.label:		Settings
 *splash.help.label:		Help
@@ -431,6 +439,7 @@ XScreenSaver.bourneShell:		/bin/sh
 *hacks.bubble3d.name:       Bubble3D
 *hacks.ccurve.name:         CCurve
 *hacks.cloudlife.name:      CloudLife
+*hacks.companioncube.name:  CompanionCube
 *hacks.cubestorm.name:      CubeStorm
 *hacks.cubicgrid.name:      CubicGrid
 *hacks.cwaves.name:         CWaves
@@ -481,6 +490,7 @@ XScreenSaver.bourneShell:		/bin/sh
 *hacks.t3d.name:            T3D
 *hacks.timetunnel.name:     TimeTunnel
 *hacks.topblock.name:       TopBlock
+*hacks.tronbit.name:        TronBit
 *hacks.vidwhacker.name:     VidWhacker
 *hacks.webcollage.name:     WebCollage
 *hacks.whirlwindwarp.name:  WhirlWindWarp