now opie grabs the powerkey on ipaq too, not only zaurus

1 files changed, 6 insertions, 2 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index da535d9..680cc06 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -178,128 +178,132 @@ void DesktopApplication::receive( const QCString &msg, const QByteArray &data )
   
 }
 
 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;
 
           if (!keyRegisterList.isEmpty())
                 {
                   KeyRegisterList::Iterator it;
                   for( it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it )
                         {
                           if ((*it).getKeyCode() == ke->simpleData.keycode)
                                 QCopEnvelope((*it).getChannel().utf8(), (*it).getMessage().utf8());
                         }
                 }
 
           if ( !keyboardGrabbed() ) {
             if ( ke->simpleData.keycode == Key_F9 ) {
                   if ( press ) emit datebook();
                   return TRUE;
             }
             if ( ke->simpleData.keycode == Key_F10 ) {
               if ( !press && cardSendTimer ) {
                     emit contacts();
                     delete cardSendTimer;
                   } else if ( press ) {
                     cardSendTimer = new QTimer();
                     cardSendTimer->start( 2000, TRUE );
                     connect( cardSendTimer, SIGNAL( timeout() ), this, SLOT( sendCard() ) );
                   }
                   return TRUE;
             }
             /* menu key now opens application menu/toolbar
                    if ( ke->simpleData.keycode == Key_F11 ) {
                    if ( press ) emit menu();
                    return TRUE;
                    }
             */
             if ( ke->simpleData.keycode == Key_F12 ) {
                   while( activePopupWidget() )
                     activePopupWidget()->close();
                   if ( press ) emit launch();
                   return TRUE;
             }
             if ( ke->simpleData.keycode == Key_F13 ) {
                   if ( press ) emit email();
                   return TRUE;
             }
           }
 
           if ( ke->simpleData.keycode == Key_F34 ) {
             if ( press ) emit power();
             return TRUE;
           }
+          if ( ke->simpleData.keycode == Key_SysReq ) {
+            if ( press ) emit power();
+            return TRUE;
+          }
           if ( ke->simpleData.keycode == Key_F35 ) {
             if ( press ) emit backlight();
             return TRUE;
           }
           if ( ke->simpleData.keycode == Key_F32 ) {
             if ( press ) QCopEnvelope e( "QPE/Desktop", "startSync()" );
             return TRUE;
           }
           if ( ke->simpleData.keycode == Key_F31 && !ke->simpleData.modifiers ) {
             if ( press ) emit symbol();
             return TRUE;
           }
           if ( ke->simpleData.keycode == Key_NumLock ) {
             if ( press ) emit numLockStateToggle();
           }
           if ( ke->simpleData.keycode == Key_CapsLock ) {
             if ( press ) emit capsLockStateToggle();
           }
           if ( press )
             qpedesktop->keyClick();
     } else {
           if ( e->type == QWSEvent::Mouse ) {
             QWSMouseEvent *me = (QWSMouseEvent *)e;
             static bool up = TRUE;
             if ( me->simpleData.state&LeftButton ) {
                   if ( up ) {
                     up = FALSE;
                     qpedesktop->screenClick();
                   }
             } else {
                   up = TRUE;
             }
           }
     }
         
     return QPEApplication::qwsEventFilter( e );
 }
 #endif
 
 void DesktopApplication::psTimeout()
 {
     qpedesktop->checkMemory(); // in case no events are being generated
 
     *ps = PowerStatusManager::readStatus();
 
     if ( (ps->batteryStatus() == PowerStatus::VeryLow ) ) {
         pa->alert( tr( "Battery is running very low." ), 6 );
     }
 
     if (  ps->batteryStatus() == PowerStatus::Critical ) {
         pa->alert(  tr( "Battery level is critical!\n"
                         "Keep power off until power restored!" ), 1 );
     }
 
     if (  ps->backupBatteryStatus() == PowerStatus::VeryLow ) {
         pa->alert( tr( "The Back-up battery is very low.\nPlease charge the back-up battery." ), 3 );
     }
 }
 
 
 void DesktopApplication::sendCard()
 {
     delete cardSendTimer;
     cardSendTimer = 0;
@@ -491,139 +495,139 @@ void Desktop::raiseContacts()
 
 void Desktop::raiseMenu()
 {
     Global::terminateBuiltin("calibrate");
     tb->startMenu()->launch();
 }
 
 void Desktop::raiseEmail()
 {
     executeOrModify("Applications/qtmail.desktop");
 }
 
 // autoStarts apps on resume and start
 void Desktop::execAutoStart()
 {
   QString appName;
   Config cfg( "autostart" );
   cfg.setGroup( "AutoStart" );
   appName = cfg.readEntry("Apps", "");
   QCopEnvelope e("QPE/System", "execute(QString)");
   e << QString(appName);
 }
 
 #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()
 {
   bool wasloggedin = loggedin;
   loggedin=0;
   darkScreen();
   if ( wasloggedin )
     blankScreen();
   
   system("apm --suspend");
-  execAutoStart();
+  
   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()!!!!!!");
 }
 
 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()
 {
     if ( type() != GuiServer )
         return;
     ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose );
     connect( sd, SIGNAL(shutdown(ShutdownImpl::Type)),
              this, SLOT(shutdown(ShutdownImpl::Type)) );
     sd->showMaximized();
 }
 
 void DesktopApplication::shutdown( ShutdownImpl::Type t )
 {
     switch ( t ) {
         case ShutdownImpl::ShutdownSystem:
             execlp("shutdown", "shutdown", "-h", "now", (void*)0);
             break;
         case ShutdownImpl::RebootSystem:
             execlp("shutdown", "shutdown", "-r", "now", (void*)0);
             break;
         case ShutdownImpl::RestartDesktop:
             restart();
             break;
         case ShutdownImpl::TerminateDesktop:
             prepareForTermination(FALSE);
             quit();
             break;
     }
 }