summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -158,58 +158,60 @@ private:
int LcdOn;
public:
QPEScreenSaver()
{
m_disable_suspend = 100;
m_enable_dim = false;
m_enable_lightoff = false;
m_enable_onlylcdoff = false;
m_lcd_status = true;
- m_backlight_bright = -1;
+ m_backlight_normal = -1;
+ m_backlight_current = -1;
m_backlight_forcedoff = false;
// Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off)
- ODevice::inst ( ) -> setDisplayStatus ( true );
+ ODevice::inst ( )-> setDisplayStatus ( true );
+ setBacklight ( -1 );
}
void restore()
{
if ( !m_lcd_status ) { // We must have turned it off
ODevice::inst ( ) -> setDisplayStatus ( true );
m_lcd_status = true;
}
- setBacklight ( -1 );
+ setBacklightInternal ( -1 );
}
bool save( int level )
{
switch ( level ) {
case 0:
if ( m_disable_suspend > 0 && m_enable_dim ) {
- if ( backlight() > 1 )
- setBacklight( 1 ); // lowest non-off
+ if ( m_backlight_current > 1 )
+ setBacklightInternal ( 1 ); // lowest non-off
}
return true;
break;
case 1:
if ( m_disable_suspend > 1 && m_enable_lightoff ) {
- setBacklight( 0 ); // off
+ setBacklightInternal ( 0 ); // off
}
return true;
break;
case 2:
if ( m_enable_onlylcdoff ) {
- ODevice::inst ( ) -> setDisplayStatus ( false );
+ ODevice::inst ( )-> setDisplayStatus ( false );
m_lcd_status = false;
return true;
}
else // We're going to suspend the whole machine
{
if ( ( m_disable_suspend > 2 ) &&
( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) &&
( !Network::networkOnline ( ) ) ) {
QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
return true;
}
}
@@ -260,76 +262,78 @@ public:
void setInterval ( int interval )
{
setIntervals ( -1, -1, interval );
}
void setMode ( int mode )
{
if ( mode > m_disable_suspend )
setInterval( -1 );
m_disable_suspend = mode;
}
-
- int backlight ( )
+
+ void setBacklight ( int bright )
{
- if ( m_backlight_bright == -1 ) {
- // Read from config
- Config config ( "qpe" );
- config. setGroup ( "Screensaver" );
- m_backlight_bright = config. readNumEntry ( "Brightness", 255 );
- }
- return m_backlight_bright;
+ // Read from config
+ Config config ( "qpe" );
+ config. setGroup ( "Screensaver" );
+ m_backlight_normal = config. readNumEntry ( "Brightness", 255 );
+
+ setBacklightInternal ( bright );
}
- void setBacklight ( int bright )
+private:
+ void setBacklightInternal ( int bright )
{
if ( bright == -3 ) {
// Forced on
m_backlight_forcedoff = false;
bright = -1;
}
if ( m_backlight_forcedoff && bright != -2 )
return ;
if ( bright == -2 ) {
// Toggle between off and on
- bright = m_backlight_bright ? 0 : -1;
+ bright = m_backlight_current ? 0 : -1;
m_backlight_forcedoff = !bright;
}
-
- m_backlight_bright = bright;
-
- bright = backlight ( );
- ODevice::inst ( ) -> setDisplayBrightness ( bright );
-
- m_backlight_bright = bright;
+ if ( bright == -1 )
+ bright = m_backlight_normal;
+
+ if ( bright != m_backlight_current ) {
+ ODevice::inst ( )-> setDisplayBrightness ( bright );
+ m_backlight_current = bright;
+ }
}
+public:
void setDisplayState ( bool on )
{
if ( m_lcd_status != on ) {
ODevice::inst ( ) -> setDisplayStatus ( on );
m_lcd_status = on;
}
}
private:
int m_disable_suspend;
bool m_enable_dim;
bool m_enable_lightoff;
bool m_enable_onlylcdoff;
bool m_lcd_status;
- int m_backlight_bright;
+ int m_backlight_normal;
+ int m_backlight_current;
bool m_backlight_forcedoff;
};
void DesktopApplication::switchLCD ( bool on )
{
if ( qApp ) {
DesktopApplication *dapp = (DesktopApplication *) qApp;
if ( dapp-> m_screensaver ) {
if ( on ) {
dapp-> m_screensaver-> setDisplayState ( true );
dapp-> m_screensaver-> setBacklight ( -3 );