1) Fixes for suspend/resume (improved it for iPAQ, shouldn't have changed

   anything for Z) -- It seems that this also fixes the 70% CPU load
   problem (needs more testing/feedback though)

2) the launcher now creates a /var/run/opie.pid file containing its pid

3) the launcher catches SIGTERM and kills all its child processes

4 files changed, 115 insertions, 11 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index f90da1a..7f24259 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -604,6 +604,13 @@ static void darkScreen()
 
 void Desktop::togglePower()
 {
+	static bool excllock = false;
+	
+	if ( excllock )
+		return;
+		
+	excllock = true;
+
   bool wasloggedin = loggedin;
   loggedin=0;
   suspendTime = QDateTime::currentDateTime();
@@ -611,23 +618,26 @@ void Desktop::togglePower()
   if ( wasloggedin )
     blankScreen();
 
-  system("apm --suspend");
-
-
+	ODevice::inst ( )-> suspend ( );
 
   QWSServer::screenSaverActivate( FALSE );
+
   {
     QCopEnvelope("QPE/Card", "mtabChanged()" ); // might have changed while asleep
     QCopEnvelope e("QPE/System", "setBacklight(int)");
     e << -3; // Force on
   }
-  if ( wasloggedin ) {
+
+	if ( wasloggedin )
     login(TRUE);
-  }
-  sleep(1);
+
   execAutoStart();
   //qcopBridge->closeOpenConnections();
   //qDebug("called togglePower()!!!!!!");
+  
+	qApp-> processEvents ( );
+  
+  	excllock = false;
 }
 
 void Desktop::toggleLight()
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index a19da14..1e741d5 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -333,20 +333,50 @@ int initApplication( int argc, char ** argv )
     return rv;
 }
 
+static const char *pidfile_path = "/var/run/opie.pid";
+
+void create_pidfile ( )
+{
+	FILE *f;
+	
+	if (( f = ::fopen ( pidfile_path, "w" ))) {
+		::fprintf ( f, "%d", getpid ( ));
+		::fclose ( f );
+	}
+}
+
+void remove_pidfile ( )
+{
+	::unlink ( pidfile_path );
+}
+
+void handle_sigterm ( int sig )
+{
+	if ( qApp )
+		qApp-> quit ( );
+}
+
 int main( int argc, char ** argv )
 {
 #ifndef SINGLE_APP
-    signal( SIGCHLD, SIG_IGN );
+    ::signal( SIGCHLD, SIG_IGN );
+
+	::signal ( SIGTERM, handle_sigterm );
+
+	::setsid ( );
+	::setpgid ( 0, 0 );
+	
+	::atexit ( remove_pidfile );
+	create_pidfile ( );
 #endif
 
     int retVal = initApplication( argc, argv );
 
 #ifndef SINGLE_APP
     // Kill them. Kill them all.
-    setpgid( getpid(), getppid() );
-    killpg( getpid(), SIGTERM );
-    sleep( 1 );
-    killpg( getpid(), SIGKILL );
+    ::kill ( 0, SIGTERM );
+    ::sleep( 1 );
+    ::kill ( 0, SIGKILL );
 #endif
 
     return retVal;
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index bc8014a..057c344 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -17,6 +17,8 @@
     Boston, MA 02111-1307, USA.
 */
 
+#include <stdlib.h>
+
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qpe/sound.h>
@@ -47,11 +49,16 @@ protected:
 	virtual void init ( );
 	
 public:
+	virtual bool suspend ( );
+
 	virtual void alarmSound ( );
 
 	virtual uint hasLeds ( ) const;
 	virtual OLedState led ( uint which ) const;
 	virtual bool setLed ( uint which, OLedState st );
+	
+private:
+	static void tstp_sighandler ( int );
 };
 
 class ODeviceZaurus : public ODevice {
@@ -113,6 +120,16 @@ ODevice::~ODevice ( )
 	delete d;
 }
 
+bool ODevice::suspend ( )
+{
+	int rc = ::system ( "apm --suspend" );
+	
+	if (( rc == 127 ) || ( rc == -1 ))
+		return false;
+	else
+		return true;
+}
+
 QString ODevice::vendorString ( )
 {
 	return d-> m_vendorstr;
@@ -251,6 +268,8 @@ void ODeviceIPAQ::init ( )
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include <signal.h>
+#include <sys/time.h>
 #include <linux/soundcard.h>
 #include <qapplication.h>
 #include <qpe/config.h>
@@ -270,6 +289,49 @@ typedef struct h3600_ts_led {
 #define LED_ON    (( 1<<30 ) | ( 'f'<<8 ) | ( 5 ) | ( sizeof(struct h3600_ts_led)<<16 )) // _IOW only defined in kernel headers :(
 
 
+//#include <linux/apm_bios.h>
+
+//#define APM_IOC_SUSPEND        _IO('A',2)
+
+#define APM_IOC_SUSPEND          (( 0<<30 ) | ( 'A'<<8 ) | ( 2 ) | ( 0<<16 ))
+
+
+void ODeviceIPAQ::tstp_sighandler ( int )
+{
+}
+
+
+bool ODeviceIPAQ::suspend ( )
+{
+	int fd;
+	bool res = false;
+	
+	if (( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) {	
+		struct timeval tvs, tvn;
+
+		::signal ( SIGTSTP, tstp_sighandler );		
+		::gettimeofday ( &tvs, 0 );
+	
+		res = ( ::ioctl ( fd, APM_IOC_SUSPEND ) == 0 );
+		::close ( fd );
+
+		if ( res ) {	
+			::kill ( -::getpid ( ), SIGTSTP );
+
+			do {
+				::usleep ( 200 * 1000 );
+				::gettimeofday ( &tvn, 0 );				
+			} while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 1500 );
+			
+			::kill ( -::getpid ( ), SIGCONT );
+		}	
+		
+		::signal ( SIGTSTP, SIG_DFL );
+	}
+	return res;
+}
+
+
 void ODeviceIPAQ::alarmSound ( )
 {
 #if defined( QT_QWS_IPAQ ) // IPAQ
diff --git a/libopie/odevice.h b/libopie/odevice.h
index b54e576..eeae357 100644
--- a/libopie/odevice.h
+++ b/libopie/odevice.h
@@ -66,6 +66,8 @@ public:
 public:
 	static ODevice *inst ( );
 	
+// system	
+	virtual bool suspend ( );
 
 // information