1 Various settings to meet Solaris policies/preferences, including: |
|
2 |
|
3 - enable screen lock by default, disable splash screen |
|
4 - disable using screen grabs in hacks to avoid security leaks |
|
5 - set default mode to screen blank |
|
6 - disable bsod by default to avoid confusion in shops with real NT boxes |
|
7 - enable & disable various hacks by default for branding reasons |
|
8 - branding changes for various hacks & defaults (like RSS feed) |
|
9 15162280 SUNBT4871833 DPMS settings should be consistent between CDE and Gnome |
|
10 15305084 SUNBT6368607 increase unlock dialog box timeout to 2 minutes |
|
11 15379785 SUNBT6526791 xscreensaver and Xorg need to change timeouts for MOU4 |
|
12 15451768 SUNBT6652454 xscreensaver does not invoke after IDLE time expires |
|
13 |
|
14 Not suitable for upstream as these represent our differences of opinion or |
|
15 differences of requirements with upstreams. |
|
16 |
|
17 --- |
|
18 driver/XScreenSaver.ad.in | 68 ++++++++++++++++++++++----------------------- |
|
19 1 files changed, 33 insertions(+), 35 deletions(-) |
|
20 |
|
21 diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in |
|
22 --- a/driver/XScreenSaver.ad.in |
|
23 +++ b/driver/XScreenSaver.ad.in |
|
24 @@ -28,42 +28,43 @@ |
|
25 |
|
26 ! /* (xrdb prevention kludge: whole file) |
|
27 |
|
28 -*mode: random |
|
29 +! We want the default mode to be just blank the screen |
|
30 +*mode: blank |
|
31 *timeout: 0:10:00 |
|
32 *cycle: 0:10:00 |
|
33 *lockTimeout: 0:00:00 |
|
34 -*passwdTimeout: 0:00:30 |
|
35 -*dpmsEnabled: False |
|
36 +*passwdTimeout: 0:02:00 |
|
37 +*dpmsEnabled: True |
|
38 *dpmsQuickoffEnabled: False |
|
39 -*dpmsStandby: 2:00:00 |
|
40 -*dpmsSuspend: 2:00:00 |
|
41 -*dpmsOff: 4:00:00 |
|
42 -*grabDesktopImages: True |
|
43 +*dpmsStandby: 0:10:00 |
|
44 +*dpmsSuspend: 0:10:00 |
|
45 +*dpmsOff: 0:10:00 |
|
46 +*grabDesktopImages: False |
|
47 *grabVideoFrames: False |
|
48 *chooseRandomImages: @DEFAULT_IMAGES_P@ |
|
49 ! This can be a local directory name, or the URL of an RSS or Atom feed. |
|
50 *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@ |
|
51 -*nice: 10 |
|
52 +*nice: 19 |
|
53 *memoryLimit: 0 |
|
54 -*lock: False |
|
55 +*lock: True |
|
56 *verbose: False |
|
57 *timestamp: True |
|
58 *fade: True |
|
59 *unfade: False |
|
60 *fadeSeconds: 0:00:03 |
|
61 *fadeTicks: 20 |
|
62 -*splash: True |
|
63 +*splash: False |
|
64 *splashDuration: 0:00:05 |
|
65 *visualID: default |
|
66 *captureStderr: True |
|
67 *ignoreUninstalledPrograms: False |
|
68 |
|
69 -*textMode: file |
|
70 +*textMode: date |
|
71 *textLiteral: XScreenSaver |
|
72 *textFile: @DEFAULT_TEXT_FILE@ |
|
73 -*textProgram: fortune |
|
74 -*textURL: http://twitter.com/statuses/public_timeline.atom |
|
75 -!*textURL: http://www.livejournal.com/stats/latest-rss.bml |
|
76 +*textProgram: date |
|
77 +*textURL: http://blogs.oracle.com/observatory/en_US/feed/entries/atom |
|
78 +!*textURL: http://twitter.com/statuses/public_timeline.atom |
|
79 |
|
80 *overlayTextForeground: #FFFF00 |
|
81 *overlayTextBackground: #000000 |
|
82 @@ -76,7 +77,7 @@ |
|
83 *procInterrupts: True |
|
84 |
|
85 ! Turning this on makes pointerHysteresis not work. |
|
86 -*xinputExtensionDev: False |
|
87 +*xinputExtensionDev: True |
|
88 |
|
89 ! Set this to True if you are experiencing longstanding XFree86 bug #421 |
|
90 ! (xscreensaver not covering the whole screen) |
|
91 @@ -160,23 +161,23 @@ GetViewPortIsFullOfLies: False |
|
92 @GL_KLUDGE@ GL: superquadrics -root \n\ |
|
93 attraction -root \n\ |
|
94 blitspin -root \n\ |
|
95 - greynetic -root \n\ |
|
96 - helix -root \n\ |
|
97 +- greynetic -root \n\ |
|
98 +- helix -root \n\ |
|
99 hopalong -root \n\ |
|
100 imsmap -root \n\ |
|
101 - noseguy -root \n\ |
|
102 - pyro -root \n\ |
|
103 qix -root \n\ |
|
104 - rocks -root \n\ |
|
105 - rorschach -root \n\ |
|
106 +- rorschach -root \n\ |
|
107 decayscreen -root \n\ |
|
108 - flame -root \n\ |
|
109 +- flame -root \n\ |
|
110 halo -root \n\ |
|
111 slidescreen -root \n\ |
|
112 - pedal -root \n\ |
|
113 +- pedal -root \n\ |
|
114 bouboule -root \n\ |
|
115 - braid -root \n\ |
|
116 - coral -root \n\ |
|
117 +- coral -root \n\ |
|
118 deco -root \n\ |
|
119 drift -root \n\ |
|
120 - fadeplot -root \n\ |
|
121 @@ -185,13 +186,13 @@ GetViewPortIsFullOfLies: False |
|
122 grav -root \n\ |
|
123 ifs -root \n\ |
|
124 @GL_KLUDGE@ GL: jigsaw -root \n\ |
|
125 - julia -root \n\ |
|
126 +- julia -root \n\ |
|
127 - kaleidescope -root \n\ |
|
128 @GL_KLUDGE@ GL: moebius -root \n\ |
|
129 - moire -root \n\ |
|
130 +- moire -root \n\ |
|
131 @GL_KLUDGE@ GL: morph3d -root \n\ |
|
132 mountain -root \n\ |
|
133 - munch -root \n\ |
|
134 +- munch -root \n\ |
|
135 penrose -root \n\ |
|
136 @GL_KLUDGE@ GL: pipes -root \n\ |
|
137 rd-bomb -root \n\ |
|
138 @@ -206,7 +207,7 @@ GetViewPortIsFullOfLies: False |
|
139 xjack -root \n\ |
|
140 xlyap -root \n\ |
|
141 @GL_KLUDGE@ GL: atlantis -root \n\ |
|
142 - bsod -root \n\ |
|
143 +- bsod -root \n\ |
|
144 @GL_KLUDGE@ GL: bubble3d -root \n\ |
|
145 @GL_KLUDGE@ GL: cage -root \n\ |
|
146 - crystal -root \n\ |
|
147 @@ -219,7 +220,7 @@ GetViewPortIsFullOfLies: False |
|
148 interference -root \n\ |
|
149 kumppa -root \n\ |
|
150 @GL_KLUDGE@ GL: lament -root \n\ |
|
151 - moire2 -root \n\ |
|
152 +- moire2 -root \n\ |
|
153 @GL_KLUDGE@ GL: sonar -root \n\ |
|
154 @GL_KLUDGE@ GL: stairs -root \n\ |
|
155 truchet -root \n\ |
|
156 @@ -227,9 +228,9 @@ GetViewPortIsFullOfLies: False |
|
157 blaster -root \n\ |
|
158 bumps -root \n\ |
|
159 ccurve -root \n\ |
|
160 - compass -root \n\ |
|
161 +- compass -root \n\ |
|
162 deluxe -root \n\ |
|
163 -- demon -root \n\ |
|
164 + demon -root \n\ |
|
165 @GLE_KLUDGE@ GL: extrusion -root \n\ |
|
166 - loop -root \n\ |
|
167 penetrate -root \n\ |
|
168 @@ -243,7 +244,7 @@ GetViewPortIsFullOfLies: False |
|
169 squiral -root \n\ |
|
170 wander -root \n\ |
|
171 - webcollage -root \n\ |
|
172 - xflame -root \n\ |
|
173 + xflame -root -bitmap /usr/lib/xscreensaver/config/unlock-logo.png \n\ |
|
174 xmatrix -root \n\ |
|
175 @GL_KLUDGE@ GL: gflux -root \n\ |
|
176 - nerverot -root \n\ |
|
177 @@ -258,14 +259,14 @@ GetViewPortIsFullOfLies: False |
|
178 @GL_KLUDGE@ GL: menger -root \n\ |
|
179 @GL_KLUDGE@ GL: molecule -root \n\ |
|
180 rotzoomer -root \n\ |
|
181 - speedmine -root \n\ |
|
182 +- speedmine -root \n\ |
|
183 @GL_KLUDGE@ GL: starwars -root \n\ |
|
184 @GL_KLUDGE@ GL: stonerview -root \n\ |
|
185 vermiculate -root \n\ |
|
186 whirlwindwarp -root \n\ |
|
187 zoom -root \n\ |
|
188 anemone -root \n\ |
|
189 - apollonian -root \n\ |
|
190 +- apollonian -root \n\ |
|
191 @GL_KLUDGE@ GL: boxed -root \n\ |
|
192 @GL_KLUDGE@ GL: cubenetic -root \n\ |
|
193 @GL_KLUDGE@ GL: endgame -root \n\ |
|
194 @@ -294,12 +295,11 @@ GetViewPortIsFullOfLies: False |
|
195 @GL_KLUDGE@ GL: cubestorm -root \n\ |
|
196 eruption -root \n\ |
|
197 @GL_KLUDGE@ GL: flipflop -root \n\ |
|
198 -@GL_KLUDGE@ GL: flyingtoasters -root \n\ |
|
199 fontglide -root \n\ |
|
200 @GL_KLUDGE@ GL: gleidescope -root \n\ |
|
201 @GL_KLUDGE@ GL: glknots -root \n\ |
|
202 @GL_KLUDGE@ GL: glmatrix -root \n\ |
|
203 -- GL: glslideshow -root \n\ |
|
204 +@GL_KLUDGE@ GL: glslideshow -root \n\ |
|
205 @GL_KLUDGE@ GL: hypertorus -root \n\ |
|
206 - GL: jigglypuff -root \n\ |
|
207 metaballs -root \n\ |
|
208 @@ -319,7 +319,6 @@ GetViewPortIsFullOfLies: False |
|
209 intermomentary -root \n\ |
|
210 memscroller -root \n\ |
|
211 @GL_KLUDGE@ GL: noof -root \n\ |
|
212 - pacman -root \n\ |
|
213 @GL_KLUDGE@ GL: pinion -root \n\ |
|
214 @GL_KLUDGE@ GL: polyhedra -root \n\ |
|
215 - GL: providence -root \n\ |
|
216 @@ -451,7 +450,6 @@ XScreenSaver.bourneShell: /bin/sh |
|
217 *hacks.flipscreen3d.name: FlipScreen3D |
|
218 *hacks.fliptext.name: FlipText |
|
219 *hacks.fluidballs.name: FluidBalls |
|
220 -*hacks.flyingtoasters.name: FlyingToasters |
|
221 *hacks.fontglide.name: FontGlide |
|
222 *hacks.fuzzyflakes.name: FuzzyFlakes |
|
223 *hacks.gflux.name: GFlux |
|
224 |
|