1 files changed, 21 insertions, 7 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 6ee7132..0e60839 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -163,34 +163,36 @@ public:
   {
     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_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 );
   }
   void restore()
   {
-    if ( !m_lcd_status )     // We must have turned it off
+    if ( !m_lcd_status ) {    // We must have turned it off
       ODevice::inst ( ) -> setDisplayStatus ( true );
+      m_lcd_status = true;
+    }
 
     setBacklight ( -3 );
   }
   bool save( int level )
   {
     switch ( level ) {
       case 0:
         if ( m_disable_suspend > 0 && m_enable_dim ) {
           if ( backlight() > 1 )
             setBacklight( 1 ); // lowest non-off
         }
         return true;
         break;
       case 1:
         if ( m_disable_suspend > 1 && m_enable_lightoff ) {
           setBacklight( 0 ); // off
@@ -290,32 +292,40 @@ public:
     if ( m_backlight_forcedoff && bright != -2 )
       return ;
     if ( bright == -2 ) {
       // Toggle between off and on
       bright = m_backlight_bright ? 0 : -1;
       m_backlight_forcedoff = !bright;
     }
 
     m_backlight_bright = bright;
 
     bright = backlight ( );
     ODevice::inst ( ) -> setDisplayBrightness ( bright );
 
     m_backlight_bright = bright;
   }
 
+  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;
   bool m_backlight_forcedoff;
 };
 
 
 void DesktopApplication::switchLCD ( bool on )
 {
   if ( qApp ) {
@@ -364,67 +374,69 @@ DesktopApplication::~DesktopApplication()
 }
 
 void DesktopApplication::desktopMessage( const QCString &msg, const QByteArray &data )
 {
 #ifdef Q_WS_QWS
   QDataStream stream( data, IO_ReadOnly );
   if ( msg == "keyRegister(int key, QString channel, QString message)" ) {
     int k;
     QString c, m;
     stream >> k;
     stream >> c;
     stream >> m;
 
     qWarning( "KeyRegisterReceived: %i, %s, %s", k, ( const char* ) c, ( const char * ) m );
     keyRegisterList.append( QCopKeyRegister( k, c, m ) );
   }
-  else if ( msg == "suspend()" ) {
-    emit power();
-  }
-  else if ( msg == "home()" ) {
-  qpedesktop-> home ( ); 
-  }
 #endif
 }
 
 
 void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & data )
 {
 #ifdef Q_WS_QWS
   QDataStream stream ( data, IO_ReadOnly );
 
   if ( msg == "setScreenSaverInterval(int)" ) {
     int time;
     stream >> time;
     m_screensaver-> setInterval( time );
   }
   else if ( msg == "setScreenSaverIntervals(int,int,int)" ) {
     int t1, t2, t3;
     stream >> t1 >> t2 >> t3;
     m_screensaver-> setIntervals( t1, t2, t3 );
   }
   else if ( msg == "setBacklight(int)" ) {
     int bright;
     stream >> bright;
     m_screensaver-> setBacklight( bright );
   }
   else if ( msg == "setScreenSaverMode(int)" ) {
     int mode;
     stream >> mode;
     m_screensaver-> setMode ( mode );
   }
+  else if ( msg == "setDisplayState(int)" ) {
+  	int state;
+  	stream >> state;
+  	m_screensaver-> setDisplayState ( state != 0 );
+  }
+  else if ( msg == "suspend()" ) {
+    emit power();
+  }
 #endif
 }
 
 enum MemState { Unknown, VeryLow, Low, Normal } memstate = Unknown;
 
 #ifdef Q_WS_QWS
 bool DesktopApplication::qwsEventFilter( QWSEvent *e )
 {
   qpedesktop->checkMemory();
 
   if ( e->type == QWSEvent::Key ) {
     QWSKeyEvent * ke = ( QWSKeyEvent * ) e;
     if ( !loggedin && ke->simpleData.keycode != Key_F34 )
       return TRUE;
     bool press = ke->simpleData.is_press;
     bool autoRepeat = ke->simpleData.is_auto_repeat;
@@ -615,32 +627,34 @@ Desktop::Desktop() :
   launcher->showMaximized();
   launcher->show();
   launcher->raise();
 #if defined(QPE_HAVE_MEMALERTER)
 
   initMemalerter();
 #endif
   // start services
   startTransferServer();
   ( void ) new IrServer( this );
   rereadVolumes();
 
   packageSlave = new PackageSlave( this );
   connect( qApp, SIGNAL( volumeChanged( bool ) ), this, SLOT( rereadVolumes() ) );
 
   qApp->installEventFilter( this );
+  
+  qApp-> setMainWidget ( launcher );
 }
 
 void Desktop::show()
 {
   login( TRUE );
   QWidget::show();
 }
 
 Desktop::~Desktop()
 {
   delete launcher;
   delete tb;
   delete qcopBridge;
   delete transferServer;
 }