summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp56
1 files changed, 30 insertions, 26 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 387650b..d2bd8ae 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -154,66 +154,68 @@ void DesktopPowerAlerter::hideEvent( QHideEvent *e )
154 154
155class QPEScreenSaver : public QWSScreenSaver 155class QPEScreenSaver : public QWSScreenSaver
156{ 156{
157private: 157private:
158 int LcdOn; 158 int LcdOn;
159 159
160public: 160public:
161 QPEScreenSaver() 161 QPEScreenSaver()
162 { 162 {
163 m_disable_suspend = 100; 163 m_disable_suspend = 100;
164 m_enable_dim = false; 164 m_enable_dim = false;
165 m_enable_lightoff = false; 165 m_enable_lightoff = false;
166 m_enable_onlylcdoff = false; 166 m_enable_onlylcdoff = false;
167 167
168 m_lcd_status = true; 168 m_lcd_status = true;
169 169
170 m_backlight_bright = -1; 170 m_backlight_normal = -1;
171 m_backlight_current = -1;
171 m_backlight_forcedoff = false; 172 m_backlight_forcedoff = false;
172 173
173 // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off) 174 // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off)
174 ODevice::inst ( ) -> setDisplayStatus ( true ); 175 ODevice::inst ( )-> setDisplayStatus ( true );
176 setBacklight ( -1 );
175 } 177 }
176 void restore() 178 void restore()
177 { 179 {
178 if ( !m_lcd_status ) { // We must have turned it off 180 if ( !m_lcd_status ) { // We must have turned it off
179 ODevice::inst ( ) -> setDisplayStatus ( true ); 181 ODevice::inst ( ) -> setDisplayStatus ( true );
180 m_lcd_status = true; 182 m_lcd_status = true;
181 } 183 }
182 184
183 setBacklight ( -1 ); 185 setBacklightInternal ( -1 );
184 } 186 }
185 bool save( int level ) 187 bool save( int level )
186 { 188 {
187 switch ( level ) { 189 switch ( level ) {
188 case 0: 190 case 0:
189 if ( m_disable_suspend > 0 && m_enable_dim ) { 191 if ( m_disable_suspend > 0 && m_enable_dim ) {
190 if ( backlight() > 1 ) 192 if ( m_backlight_current > 1 )
191 setBacklight( 1 ); // lowest non-off 193 setBacklightInternal ( 1 ); // lowest non-off
192 } 194 }
193 return true; 195 return true;
194 break; 196 break;
195 case 1: 197 case 1:
196 if ( m_disable_suspend > 1 && m_enable_lightoff ) { 198 if ( m_disable_suspend > 1 && m_enable_lightoff ) {
197 setBacklight( 0 ); // off 199 setBacklightInternal ( 0 ); // off
198 } 200 }
199 return true; 201 return true;
200 break; 202 break;
201 case 2: 203 case 2:
202 if ( m_enable_onlylcdoff ) { 204 if ( m_enable_onlylcdoff ) {
203 ODevice::inst ( ) -> setDisplayStatus ( false ); 205 ODevice::inst ( )-> setDisplayStatus ( false );
204 m_lcd_status = false; 206 m_lcd_status = false;
205 return true; 207 return true;
206 } 208 }
207 else // We're going to suspend the whole machine 209 else // We're going to suspend the whole machine
208 { 210 {
209 if ( ( m_disable_suspend > 2 ) && 211 if ( ( m_disable_suspend > 2 ) &&
210 ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) && 212 ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) &&
211 ( !Network::networkOnline ( ) ) ) { 213 ( !Network::networkOnline ( ) ) ) {
212 QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE ); 214 QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
213 return true; 215 return true;
214 } 216 }
215 } 217 }
216 break; 218 break;
217 } 219 }
218 return false; 220 return false;
219 } 221 }
@@ -256,84 +258,86 @@ public:
256 QWSServer::setScreenSaverInterval( 0 ); 258 QWSServer::setScreenSaverInterval( 0 );
257 else 259 else
258 QWSServer::setScreenSaverIntervals( v ); 260 QWSServer::setScreenSaverIntervals( v );
259 } 261 }
260 262
261 void setInterval ( int interval ) 263 void setInterval ( int interval )
262 { 264 {
263 setIntervals ( -1, -1, interval ); 265 setIntervals ( -1, -1, interval );
264 } 266 }
265 267
266 void setMode ( int mode ) 268 void setMode ( int mode )
267 { 269 {
268 if ( mode > m_disable_suspend ) 270 if ( mode > m_disable_suspend )
269 setInterval( -1 ); 271 setInterval( -1 );
270 m_disable_suspend = mode; 272 m_disable_suspend = mode;
271 } 273 }
272 274
273 int backlight ( ) 275 void setBacklight ( int bright )
274 { 276 {
275 if ( m_backlight_bright == -1 ) { 277 // Read from config
276 // Read from config 278 Config config ( "qpe" );
277 Config config ( "qpe" ); 279 config. setGroup ( "Screensaver" );
278 config. setGroup ( "Screensaver" ); 280 m_backlight_normal = config. readNumEntry ( "Brightness", 255 );
279 m_backlight_bright = config. readNumEntry ( "Brightness", 255 ); 281
280 } 282 setBacklightInternal ( bright );
281 return m_backlight_bright;
282 } 283 }
283 284
284 void setBacklight ( int bright ) 285private:
286 void setBacklightInternal ( int bright )
285 { 287 {
286 if ( bright == -3 ) { 288 if ( bright == -3 ) {
287 // Forced on 289 // Forced on
288 m_backlight_forcedoff = false; 290 m_backlight_forcedoff = false;
289 bright = -1; 291 bright = -1;
290 } 292 }
291 if ( m_backlight_forcedoff && bright != -2 ) 293 if ( m_backlight_forcedoff && bright != -2 )
292 return ; 294 return ;
293 if ( bright == -2 ) { 295 if ( bright == -2 ) {
294 // Toggle between off and on 296 // Toggle between off and on
295 bright = m_backlight_bright ? 0 : -1; 297 bright = m_backlight_current ? 0 : -1;
296 m_backlight_forcedoff = !bright; 298 m_backlight_forcedoff = !bright;
297 } 299 }
298 300 if ( bright == -1 )
299 m_backlight_bright = bright; 301 bright = m_backlight_normal;
300 302
301 bright = backlight ( ); 303 if ( bright != m_backlight_current ) {
302 ODevice::inst ( ) -> setDisplayBrightness ( bright ); 304 ODevice::inst ( )-> setDisplayBrightness ( bright );
303 305 m_backlight_current = bright;
304 m_backlight_bright = bright; 306 }
305 } 307 }
306 308
309public:
307 void setDisplayState ( bool on ) 310 void setDisplayState ( bool on )
308 { 311 {
309 if ( m_lcd_status != on ) { 312 if ( m_lcd_status != on ) {
310 ODevice::inst ( ) -> setDisplayStatus ( on ); 313 ODevice::inst ( ) -> setDisplayStatus ( on );
311 m_lcd_status = on; 314 m_lcd_status = on;
312 } 315 }
313 } 316 }
314 317
315private: 318private:
316 int m_disable_suspend; 319 int m_disable_suspend;
317 bool m_enable_dim; 320 bool m_enable_dim;
318 bool m_enable_lightoff; 321 bool m_enable_lightoff;
319 bool m_enable_onlylcdoff; 322 bool m_enable_onlylcdoff;
320 323
321 bool m_lcd_status; 324 bool m_lcd_status;
322 325
323 int m_backlight_bright; 326 int m_backlight_normal;
327 int m_backlight_current;
324 bool m_backlight_forcedoff; 328 bool m_backlight_forcedoff;
325}; 329};
326 330
327void DesktopApplication::switchLCD ( bool on ) 331void DesktopApplication::switchLCD ( bool on )
328{ 332{
329 if ( qApp ) { 333 if ( qApp ) {
330 DesktopApplication *dapp = (DesktopApplication *) qApp; 334 DesktopApplication *dapp = (DesktopApplication *) qApp;
331 335
332 if ( dapp-> m_screensaver ) { 336 if ( dapp-> m_screensaver ) {
333 if ( on ) { 337 if ( on ) {
334 dapp-> m_screensaver-> setDisplayState ( true ); 338 dapp-> m_screensaver-> setDisplayState ( true );
335 dapp-> m_screensaver-> setBacklight ( -3 ); 339 dapp-> m_screensaver-> setBacklight ( -3 );
336 } 340 }
337 else { 341 else {
338 dapp-> m_screensaver-> setDisplayState ( false ); 342 dapp-> m_screensaver-> setDisplayState ( false );
339 } 343 }