/*

 * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice (including the next

 * paragraph) shall be included in all copies or substantial portions of the

 * Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 * DEALINGS IN THE SOFTWARE.

 */

Various settings to meet Sun/Solaris policies/customizations, including:

   -    enable screen lock by default, disable splash screen

   -    disable using screen grabs in hacks to avoid security leaks

   -    set default mode to screen blank

   -    disable bsod by default to avoid confusion in shops with real NT boxes

   -    enable & disable various hacks by default for aesthetic reasons

   -    branding changes for various hacks & defaults (like RSS feed)

4871833 DPMS settings should be consistent between CDE and Gnome

6368607 increase unlock dialog box timeout to 2 minutes

6526791 xscreensaver and Xorg need to change timeouts for MOU4

6652454 xscreensaver does not invoke after IDLE time expires from a Sun Ray DTU

diff --git xscreensaver-5.11/driver/XScreenSaver.ad.in xscreensaver-5.11/driver/XScreenSaver.ad.in

--- xscreensaver-5.11/driver/XScreenSaver.ad.in

+++ xscreensaver-5.11/driver/XScreenSaver.ad.in

@@ -28,39 +28,40 @@

 ! /* (xrdb prevention kludge: whole file)

-*mode:			random

+! We want the default mode to be just blank the screen

+*mode:                  blank

 *timeout:		0:10:00

 *cycle:			0:10:00

 *lockTimeout:		0:00:00

-*passwdTimeout:		0:00:30

-*dpmsEnabled:		False

-*dpmsStandby:		2:00:00

-*dpmsSuspend:		2:00:00

-*dpmsOff:		4:00:00

-*grabDesktopImages:	True

+*passwdTimeout:		0:02:00

+*dpmsEnabled:		True

+*dpmsStandby:		0:10:00

+*dpmsSuspend:		0:10:00

+*dpmsOff:		0:10:00

+*grabDesktopImages:	False

 *grabVideoFrames:	False

 *chooseRandomImages:	@DEFAULT_IMAGES_P@

 *imageDirectory:	@DEFAULT_IMAGE_DIRECTORY@

-*nice:			10

+*nice:			19

 *memoryLimit:		0

-*lock:			False

+*lock:			True

 *verbose:		False

 *timestamp:		True

 *fade:			True

 *unfade:		False

 *fadeSeconds:		0:00:03

 *fadeTicks:		20

-*splash:		True

+*splash:		False

 *splashDuration:	0:00:05

 *visualID:		default

 *captureStderr: 	True

 *ignoreUninstalledPrograms: False

-*textMode:		file

+*textMode:		date

 *textLiteral:		XScreenSaver

 *textFile:		@DEFAULT_TEXT_FILE@

-*textProgram:		fortune

-*textURL:		http://www.livejournal.com/stats/latest-rss.bml

+*textProgram:		date

+*textURL:		http://blogs.sun.com/observatory/en_US/feed/entries/atom

 !*textURL:		http://twitter.com/statuses/public_timeline.atom

 *overlayTextForeground:	#FFFF00

@@ -155,23 +156,23 @@ GetViewPortIsFullOfLies: False

 @GL_KLUDGE@ GL: 				superquadrics -root			    \n\

 				attraction -root			    \n\

 				blitspin -root				    \n\

-				greynetic -root				    \n\

-				helix -root				    \n\

+-				greynetic -root				    \n\

+-				helix -root				    \n\

 				hopalong -root				    \n\

 				imsmap -root				    \n\

 -				noseguy -root				    \n\

 -				pyro -root				    \n\

 				qix -root				    \n\

 -				rocks -root				    \n\

-				rorschach -root				    \n\

+-				rorschach -root				    \n\

 				decayscreen -root			    \n\

-				flame -root				    \n\

+-				flame -root				    \n\

 				halo -root				    \n\

 				slidescreen -root			    \n\

-				pedal -root				    \n\

+-				pedal -root				    \n\

 				bouboule -root				    \n\

 -				braid -root				    \n\

-				coral -root				    \n\

+-				coral -root				    \n\

 				deco -root				    \n\

 				drift -root				    \n\

 -				fadeplot -root				    \n\

@@ -180,13 +181,13 @@ GetViewPortIsFullOfLies: False

 				grav -root				    \n\

 				ifs -root				    \n\

 @GL_KLUDGE@ GL: 				jigsaw -root				    \n\

-				julia -root				    \n\

+-				julia -root				    \n\

 -				kaleidescope -root			    \n\

 @GL_KLUDGE@ GL: 				moebius -root				    \n\

-				moire -root				    \n\

+-				moire -root				    \n\

 @GL_KLUDGE@ GL: 				morph3d -root				    \n\

 				mountain -root				    \n\

-				munch -root				    \n\

+-				munch -root				    \n\

 				penrose -root				    \n\

 @GL_KLUDGE@ GL: 				pipes -root				    \n\

 				rd-bomb -root				    \n\

@@ -201,7 +202,7 @@ GetViewPortIsFullOfLies: False

 				xjack -root				    \n\

 				xlyap -root				    \n\

 @GL_KLUDGE@ GL: 				atlantis -root				    \n\

-				bsod -root				    \n\

+-				bsod -root				    \n\

 @GL_KLUDGE@ GL: 				bubble3d -root				    \n\

 @GL_KLUDGE@ GL: 				cage -root				    \n\

 -				crystal -root				    \n\

@@ -214,7 +215,7 @@ GetViewPortIsFullOfLies: False

 				interference -root			    \n\

 				kumppa -root				    \n\

 @GL_KLUDGE@ GL: 				lament -root				    \n\

-				moire2 -root				    \n\

+-				moire2 -root				    \n\

 @GL_KLUDGE@ GL: 				sonar -root				    \n\

 @GL_KLUDGE@ GL: 				stairs -root				    \n\

 				truchet -root				    \n\

@@ -222,9 +223,9 @@ GetViewPortIsFullOfLies: False

 				blaster -root				    \n\

 				bumps -root				    \n\

 				ccurve -root				    \n\

-				compass -root				    \n\

+-				compass -root				    \n\

 				deluxe -root				    \n\

--				demon -root				    \n\

+				demon -root				    \n\

 @GLE_KLUDGE@ GL: 				extrusion -root				    \n\

 -				loop -root				    \n\

 				penetrate -root				    \n\

@@ -238,7 +239,7 @@ GetViewPortIsFullOfLies: False

 				squiral -root				    \n\

 				wander -root				    \n\

 -				webcollage -root			    \n\

-				xflame -root				    \n\

+				xflame -root -bitmap /usr/share/pixmaps/osLogo.png \n\

 				xmatrix -root				    \n\

 @GL_KLUDGE@ GL: 				gflux -root				    \n\

 -				nerverot -root				    \n\

@@ -253,14 +254,14 @@ GetViewPortIsFullOfLies: False

 @GL_KLUDGE@ GL: 				menger -root				    \n\

 @GL_KLUDGE@ GL: 				molecule -root				    \n\

 				rotzoomer -root				    \n\

-				speedmine -root				    \n\

+-				speedmine -root				    \n\

 @GL_KLUDGE@ GL: 				starwars -root				    \n\

 @GL_KLUDGE@ GL: 				stonerview -root			    \n\

 				vermiculate -root			    \n\

 				whirlwindwarp -root			    \n\

 				zoom -root				    \n\

 				anemone -root				    \n\

-				apollonian -root			    \n\

+-				apollonian -root			    \n\

 @GL_KLUDGE@ GL: 				boxed -root				    \n\

 @GL_KLUDGE@ GL: 				cubenetic -root				    \n\

 @GL_KLUDGE@ GL: 				endgame -root				    \n\

@@ -289,12 +290,11 @@ GetViewPortIsFullOfLies: False

 @GL_KLUDGE@ GL: 				cubestorm -root				    \n\

 				eruption -root				    \n\

 @GL_KLUDGE@ GL: 				flipflop -root				    \n\

-@GL_KLUDGE@ GL: 				flyingtoasters -root			    \n\

 				fontglide -root				    \n\

 @GL_KLUDGE@ GL: 				gleidescope -root			    \n\

 @GL_KLUDGE@ GL: 				glknots -root				    \n\

 @GL_KLUDGE@ GL: 				glmatrix -root				    \n\

-- GL: 				glslideshow -root			    \n\

+@GL_KLUDGE@ GL: 				glslideshow -root			    \n\

 @GL_KLUDGE@ GL: 				hypertorus -root			    \n\

 - GL: 				jigglypuff -root			    \n\

 				metaballs -root				    \n\

@@ -314,7 +314,6 @@ GetViewPortIsFullOfLies: False

 				intermomentary -root			    \n\

 				memscroller -root			    \n\

 @GL_KLUDGE@ GL: 				noof -root				    \n\

-				pacman -root				    \n\

 @GL_KLUDGE@ GL: 				pinion -root				    \n\

 @GL_KLUDGE@ GL: 				polyhedra -root				    \n\

 - GL: 				providence -root			    \n\

@@ -442,7 +441,6 @@ XScreenSaver.bourneShell:		/bin/sh

 *hacks.flipscreen3d.name:   FlipScreen3D

 *hacks.fliptext.name:       FlipText

 *hacks.fluidballs.name:     FluidBalls

-*hacks.flyingtoasters.name: FlyingToasters

 *hacks.fontglide.name:      FontGlide

 *hacks.fuzzyflakes.name:    FuzzyFlakes

 *hacks.gflux.name:          GFlux