- Fix for the "iPAQ won't suspend until apm --suspend is called" problem

- Improved the resume delay until the LCD backlight is on again

1 files changed, 8 insertions, 4 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 7f24259..552c7c3 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -559,118 +559,122 @@ void Desktop::execAutoStart() {
     QDateTime now = QDateTime::currentDateTime();
     Config cfg( "autostart" );
     cfg.setGroup( "AutoStart" );
     appName = cfg.readEntry("Apps", "");
     delay = (cfg.readEntry("Delay", "0" )).toInt();
     // If the time between suspend and resume was longer then the
     // value saved as delay, start the app
     if ( suspendTime.secsTo(now) >= (delay*60) ) {
         QCopEnvelope e("QPE/System", "execute(QString)");
         e << QString(appName);
     } //else {
     //}
 }
 
 #if defined(QPE_HAVE_TOGGLELIGHT)
 #include <qpe/config.h>
 
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include <linux/ioctl.h>
 #include <time.h>
 #endif
 
 static bool blanked=FALSE;
 
 static void blankScreen()
 {
     if ( !qt_screen ) return;
     /* Should use a big black window instead.
     QGfx* g = qt_screen->screenGfx();
     g->fillRect(0,0,qt_screen->width(),qt_screen->height());
     delete g;
     */
     blanked = TRUE;
 }
 
 static void darkScreen()
 {
     extern void qpe_setBacklight(int);
     qpe_setBacklight(0); // force off
 }
 
 
 void Desktop::togglePower()
 {
+	extern void qpe_setBacklight ( int ); // We need to toggle the LCD fast - no time to send a QCop
+
 	static bool excllock = false;
 	
 	if ( excllock )
 		return;
 		
 	excllock = true;
 
 	bool wasloggedin = loggedin;
 	loggedin=0;
 	suspendTime = QDateTime::currentDateTime();
-	darkScreen();
+
+	qpe_setBacklight ( 0 ); // force LCD off
+
 	if ( wasloggedin )
     	blankScreen();
 
 	ODevice::inst ( )-> suspend ( );
 
-	QWSServer::screenSaverActivate( FALSE );
+	QWSServer::screenSaverActivate ( false );
+
+	qpe_setBacklight ( -3 ); // force LCD on
 
 	{
 		QCopEnvelope("QPE/Card", "mtabChanged()" ); // might have changed while asleep
-		QCopEnvelope e("QPE/System", "setBacklight(int)");
-		e << -3; // Force on
 	}
 
 	if ( wasloggedin )
 		login(TRUE);
 
 	execAutoStart();
 	//qcopBridge->closeOpenConnections();
 	//qDebug("called togglePower()!!!!!!");
   
 	qApp-> processEvents ( );
   
   	excllock = false;
 }
 
 void Desktop::toggleLight()
 {
     QCopEnvelope e("QPE/System", "setBacklight(int)");
     e << -2; // toggle
 }
 
 void Desktop::toggleSymbolInput()
 {
     tb->toggleSymbolInput();
 }
 
 void Desktop::toggleNumLockState()
 {
     tb->toggleNumLockState();
 }
 
 void Desktop::toggleCapsLockState()
 {
     tb->toggleCapsLockState();
 }
 
 void Desktop::styleChange( QStyle &s )
 {
     QWidget::styleChange( s );
     int displayw = qApp->desktop()->width();
     int displayh = qApp->desktop()->height();
 
     QSize sz = tb->sizeHint();
 
     tb->setGeometry( 0, displayh-sz.height(), displayw, sz.height() );
 }
 
 void DesktopApplication::shutdown()
 {