X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FXScreenSaver.ad.in;h=8e4c6fe3297ecb06cb6791e59910d00c71e77a89;hb=ec8d2b32b63649e6d32bdfb306eda062769af823;hp=2af4832f8cd26a6332ffd0d2a7c8a39a30f0b5f6;hpb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;p=xscreensaver

diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in
index 2af4832f..8e4c6fe3 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.13
-!                              18-Apr-2011
+!                              version 5.15
+!                              28-Sep-2011
 !
 ! 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)
@@ -348,7 +352,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
 
 
 
@@ -431,6 +438,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 +489,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