| -rw-r--r-- | core/launcher/desktop.cpp | 58 | ||||
| -rw-r--r-- | core/launcher/main.cpp | 42 | ||||
| -rw-r--r-- | libopie/odevice.cpp | 62 | ||||
| -rw-r--r-- | libopie/odevice.h | 4 |
4 files changed, 135 insertions, 31 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 @@ -601,36 +601,46 @@ static void darkScreen() qpe_setBacklight(0); // force off } void Desktop::togglePower() { - bool wasloggedin = loggedin; - loggedin=0; - suspendTime = QDateTime::currentDateTime(); - darkScreen(); - if ( wasloggedin ) - blankScreen(); - - system("apm --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 ) { - login(TRUE); - } - sleep(1); - execAutoStart(); - //qcopBridge->closeOpenConnections(); - //qDebug("called togglePower()!!!!!!"); + static bool excllock = false; + + if ( excllock ) + return; + + excllock = true; + + bool wasloggedin = loggedin; + loggedin=0; + suspendTime = QDateTime::currentDateTime(); + darkScreen(); + if ( wasloggedin ) + blankScreen(); + + 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 ) + login(TRUE); + + execAutoStart(); + //qcopBridge->closeOpenConnections(); + //qDebug("called togglePower()!!!!!!"); + + qApp-> processEvents ( ); + + excllock = false; } void Desktop::toggleLight() { QCopEnvelope e("QPE/System", "setBacklight(int)"); e << -2; // toggle 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 @@ -330,25 +330,55 @@ int initApplication( int argc, char ** argv ) delete d; 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 ); + 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 @@ -14,12 +14,14 @@ You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <stdlib.h> + #include <qfile.h> #include <qtextstream.h> #include <qpe/sound.h> #include <qpe/resource.h> @@ -44,17 +46,22 @@ public: class ODeviceIPAQ : public ODevice { 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 { protected: virtual void init ( ); @@ -110,12 +117,22 @@ void ODevice::init ( ) 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; } OVendor ODevice::vendor ( ) @@ -248,12 +265,14 @@ void ODeviceIPAQ::init ( ) d-> m_leds [0] = OLED_Off; } #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> //#include <linux/h3600_ts.h> // including kernel headers is evil ... @@ -267,12 +286,55 @@ typedef struct h3600_ts_led { // #define IOC_H3600_TS_MAGIC 'f' // #define LED_ON _IOW(IOC_H3600_TS_MAGIC, 5, 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 #ifndef QT_NO_SOUND static Sound snd ( "alarm" ); int fd; diff --git a/libopie/odevice.h b/libopie/odevice.h index b54e576..eeae357 100644 --- a/libopie/odevice.h +++ b/libopie/odevice.h @@ -62,13 +62,15 @@ enum OLedState { class ODevice { public: public: static ODevice *inst ( ); - + +// system + virtual bool suspend ( ); // information QString modelString ( ); OModel model ( ); |