| -rw-r--r-- | core/launcher/serverapp.cpp | 46 |
1 files changed, 28 insertions, 18 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp index f1bce40..a2302d8 100644 --- a/core/launcher/serverapp.cpp +++ b/core/launcher/serverapp.cpp @@ -53,36 +53,42 @@ using namespace Opie::Core; #include <unistd.h> #endif #include <stdlib.h> static ServerApplication *serverApp = 0; static int loggedin=0; QCopKeyRegister::QCopKeyRegister() - : m_keyCode( 0 ) { + : m_keyCode( 0 ) +{ } QCopKeyRegister::QCopKeyRegister( int k, const QCString& c, const QCString& m ) - :m_keyCode( k ), m_channel( c ), m_message( m ) { + :m_keyCode( k ), m_channel( c ), m_message( m ) +{ } -int QCopKeyRegister::keyCode()const { +int QCopKeyRegister::keyCode() const +{ return m_keyCode; } -QCString QCopKeyRegister::channel()const { +QCString QCopKeyRegister::channel() const +{ return m_channel; } -QCString QCopKeyRegister::message()const { +QCString QCopKeyRegister::message() const +{ return m_message; } -bool QCopKeyRegister::send() { +bool QCopKeyRegister::send() +{ if (m_channel.isNull() ) return false; QCopEnvelope( m_channel, m_message ); return true; } @@ -152,33 +158,35 @@ void KeyFilter::timerEvent(QTimerEvent* e) if ( heldButton ) { emit activate(heldButton, TRUE); heldButton = 0; } held_tid = 0; } } -void KeyFilter::registerKey( const QCopKeyRegister& key ) { +void KeyFilter::registerKey( const QCopKeyRegister& key ) +{ m_keys.insert( key.keyCode(), key ); } -void KeyFilter::unregisterKey( const QCopKeyRegister& key ) { +void KeyFilter::unregisterKey( const QCopKeyRegister& key ) +{ m_keys.remove( key.keyCode() ); } -bool KeyFilter::keyRegistered( int key ) { +bool KeyFilter::keyRegistered( int key ) +{ /* * Check if we've a key registered */ if ( !m_keys[key].send()) return false; else return true; - } bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepeat) { if ( !loggedin // Permitted keys && keycode != Key_F34 // power && keycode != Key_F30 // select @@ -192,17 +200,16 @@ bool KeyFilter::checkButtonAction(bool db, int keycode, int press, int autoRepe return TRUE; /* check if it was registered */ if (!db ) { if (keycode != 0 &&press && !autoRepeat && keyRegistered(keycode) ) return true; }else { - // First check to see if DeviceButtonManager knows something about this button: const ODeviceButton* button = ODevice::inst()->buttonForKeycode(keycode); if (button && !autoRepeat) { if ( held_tid ) { killTimer(held_tid); held_tid = 0; } if ( button->heldAction().isNull() ) { @@ -261,17 +268,18 @@ QPE_MEMALERTER_IMPL //--------------------------------------------------------------------------- bool ServerApplication::doRestart = FALSE; bool ServerApplication::allowRestart = TRUE; bool ServerApplication::ms_is_starting = TRUE; -void ServerApplication::switchLCD( bool on ) { +void ServerApplication::switchLCD( bool on ) +{ if ( !qApp ) return; ServerApplication *dapp = ServerApplication::me() ; if ( !dapp-> m_screensaver ) return; @@ -354,23 +362,23 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) Q_CONST_UNUSED( but ) } ServerApplication::~ServerApplication() { ungrabKeyboard(); - delete pa; delete m_ps; delete m_ps_last; } -void ServerApplication::apmTimeout() { +void ServerApplication::apmTimeout() +{ serverApp-> checkMemory( ); // in case no events are generated *m_ps_last = *m_ps; *m_ps = PowerStatusManager::readStatus(); if ( m_ps->acStatus() != m_ps_last-> acStatus() ) m_screensaver-> powerStatusChanged( *m_ps ); if ( m_ps->acStatus() == PowerStatus::Online ) { @@ -403,17 +411,18 @@ void ServerApplication::apmTimeout() { QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton, 0, QString::null, TRUE, WStyle_StaysOnTop); battlow.setButtonText(QMessageBox::Cancel, tr("Ok")); battlow.exec(); } } void ServerApplication::systemMessage( const QCString& msg, - const QByteArray& data ) { + const QByteArray& data ) +{ QDataStream stream ( data, IO_ReadOnly ); if ( msg == "setScreenSaverInterval(int)" ) { int time; stream >> time; m_screensaver-> setInterval( time ); } else if ( msg == "setScreenSaverIntervals(int,int,int)" ) { @@ -548,17 +557,16 @@ void ServerApplication::togglePower() excllock = true; bool wasloggedin = loggedin; loggedin = 0; m_suspendTime = QDateTime::currentDateTime(); #ifdef QWS - if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) { // Should use a big black window instead. // But this would not show up fast enough QGfx *g = qt_screen-> screenGfx ( ); g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( )); delete g; } #endif @@ -622,17 +630,18 @@ bool ServerApplication::qwsEventFilter( QWSEvent *e ) if ( up ) { up = FALSE; screenClick(TRUE); } } else if ( !up ) { up = TRUE; screenClick(FALSE); } - }else if ( e->type == QWSEvent::Key ) { + } else + if ( e->type == QWSEvent::Key ) { QWSKeyEvent * ke = static_cast<QWSKeyEvent*>( e ); if ( kf->checkButtonAction( false, ke-> simpleData.keycode, ke-> simpleData.is_press, ke-> simpleData.is_auto_repeat ) ) return true; } @@ -645,17 +654,18 @@ bool ServerApplication::qwsEventFilter( QWSEvent *e ) void ServerApplication::showSafeMode() { #if 0 if ( QMessageBox::warning(0, tr("Safe Mode"), tr("<P>A system startup error occurred, " "and the system is now in Safe Mode. " "Plugins are not loaded in Safe Mode. " "You can use the Plugin Manager to " - "disable plugins that cause system error."), tr("OK"), tr("Plugin Manager..."), 0) == 1 ) { + "disable plugins that cause system error."), tr("OK"), tr("Plugin Manager..."), 0) == 1 ) + { Global::execute( "pluginmanager" ); } #endif } void ServerApplication::clearSafeMode() { #if 0 |