dont send keyRegister message if keycode is 0, or key is released

1 files changed, 684 insertions, 683 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index bca95b2..4640a12 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -60,30 +60,30 @@
 
 class QCopKeyRegister
 {
 public:
-	QCopKeyRegister() : keyCode( 0 )
-	{ }
-	QCopKeyRegister( int k, const QString &c, const QString &m )
-			: keyCode( k ), channel( c ), message( m )
-	{ }
-
-	int getKeyCode() const
-	{
-		return keyCode;
-	}
-	QString getChannel() const
-	{
-		return channel;
-	}
-	QString getMessage() const
-	{
-		return message;
-	}
+  QCopKeyRegister() : keyCode( 0 )
+  { }
+  QCopKeyRegister( int k, const QString &c, const QString &m )
+      : keyCode( k ), channel( c ), message( m )
+  { }
+
+  int getKeyCode() const
+  {
+    return keyCode;
+  }
+  QString getChannel() const
+  {
+    return channel;
+  }
+  QString getMessage() const
+  {
+    return message;
+  }
 
 private:
-	int keyCode;
-	QString channel, message;
+  int keyCode;
+  QString channel, message;
 };
 
 typedef QValueList<QCopKeyRegister> KeyRegisterList;
 KeyRegisterList keyRegisterList;
@@ -91,19 +91,19 @@ KeyRegisterList keyRegisterList;
 static Desktop* qpedesktop = 0;
 static int loggedin = 0;
 static void login( bool at_poweron )
 {
-	if ( !loggedin ) {
-		Global::terminateBuiltin( "calibrate" );
-		Password::authenticate( at_poweron );
-		loggedin = 1;
-		QCopEnvelope e( "QPE/Desktop", "unlocked()" );
-	}
+  if ( !loggedin ) {
+    Global::terminateBuiltin( "calibrate" );
+    Password::authenticate( at_poweron );
+    loggedin = 1;
+    QCopEnvelope e( "QPE/Desktop", "unlocked()" );
+  }
 }
 
 bool Desktop::screenLocked()
 {
-	return loggedin == 0;
+  return loggedin == 0;
 }
 
 /*
   Priority is number of alerts that are needed to pop up
@@ -111,463 +111,464 @@ bool Desktop::screenLocked()
  */
 class DesktopPowerAlerter : public QMessageBox
 {
 public:
-	DesktopPowerAlerter( QWidget *parent, const char *name = 0 )
-			: QMessageBox( tr( "Battery Status" ), "Low Battery",
-			               QMessageBox::Critical,
-			               QMessageBox::Ok | QMessageBox::Default,
-			               QMessageBox::NoButton, QMessageBox::NoButton,
-			               parent, name, FALSE )
-	{
-		currentPriority = INT_MAX;
-		alertCount = 0;
-	}
-
-	void alert( const QString &text, int priority );
-	void hideEvent( QHideEvent * );
+  DesktopPowerAlerter( QWidget *parent, const char *name = 0 )
+      : QMessageBox( tr( "Battery Status" ), "Low Battery",
+                     QMessageBox::Critical,
+                     QMessageBox::Ok | QMessageBox::Default,
+                     QMessageBox::NoButton, QMessageBox::NoButton,
+                     parent, name, FALSE )
+  {
+    currentPriority = INT_MAX;
+    alertCount = 0;
+  }
+
+  void alert( const QString &text, int priority );
+  void hideEvent( QHideEvent * );
 private:
-	int currentPriority;
-	int alertCount;
+  int currentPriority;
+  int alertCount;
 };
 
 void DesktopPowerAlerter::alert( const QString &text, int priority )
 {
-	alertCount++;
-	if ( alertCount < priority )
-		return ;
-	if ( priority > currentPriority )
-		return ;
-	currentPriority = priority;
-	setText( text );
-	show();
+  alertCount++;
+  if ( alertCount < priority )
+    return ;
+  if ( priority > currentPriority )
+    return ;
+  currentPriority = priority;
+  setText( text );
+  show();
 }
 
 
 void DesktopPowerAlerter::hideEvent( QHideEvent *e )
 {
-	QMessageBox::hideEvent( e );
-	alertCount = 0;
-	currentPriority = INT_MAX;
+  QMessageBox::hideEvent( e );
+  alertCount = 0;
+  currentPriority = INT_MAX;
 }
 
 
 class QPEScreenSaver : public QWSScreenSaver
 {
 private:
-	int LcdOn;
+  int LcdOn;
 
 public:
-	QPEScreenSaver()
-	{
-		m_disable_suspend = 100;
-		m_enable_dim = false;
-		m_enable_lightoff = false;
-		m_enable_onlylcdoff = false;
-
-		m_lcd_status = true;
-
-		m_backlight_bright = -1;
-		m_backlight_forcedoff = false;
-
-		// Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off)
-		ODevice::inst ( ) -> setDisplayStatus ( true );
-	}
-	void restore()
-	{
-		if ( !m_lcd_status )     // We must have turned it off
-			ODevice::inst ( ) -> setDisplayStatus ( true );
-
-		setBacklight ( -1 );
-	}
-	bool save( int level )
-	{
-		switch ( level ) {
-			case 0:
-				if ( m_disable_suspend > 0 && m_enable_dim ) {
-					if ( backlight() > 1 )
-						setBacklight( 1 ); // lowest non-off
-				}
-				return true;
-				break;
-			case 1:
-				if ( m_disable_suspend > 1 && m_enable_lightoff ) {
-					setBacklight( 0 ); // off
-				}
-				return true;
-				break;
-			case 2:
-				if ( m_enable_onlylcdoff ) {
-					ODevice::inst ( ) -> setDisplayStatus ( false );
-					m_lcd_status = false;
-					return true;
-				}
-				else // We're going to suspend the whole machine
-				{
-					if ( ( m_disable_suspend > 2 ) &&
-					        ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) &&
-					        ( !Network::networkOnline ( ) ) ) {
-						QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
-						return true;
-					}
-				}
-				break;
-		}
-		return false;
-	}
+  QPEScreenSaver()
+  {
+    m_disable_suspend = 100;
+    m_enable_dim = false;
+    m_enable_lightoff = false;
+    m_enable_onlylcdoff = false;
+
+    m_lcd_status = true;
+
+    m_backlight_bright = -1;
+    m_backlight_forcedoff = false;
+
+    // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off)
+    ODevice::inst ( ) -> setDisplayStatus ( true );
+  }
+  void restore()
+  {
+    if ( !m_lcd_status )     // We must have turned it off
+      ODevice::inst ( ) -> setDisplayStatus ( true );
+
+    setBacklight ( -1 );
+  }
+  bool save( int level )
+  {
+    switch ( level ) {
+      case 0:
+        if ( m_disable_suspend > 0 && m_enable_dim ) {
+          if ( backlight() > 1 )
+            setBacklight( 1 ); // lowest non-off
+        }
+        return true;
+        break;
+      case 1:
+        if ( m_disable_suspend > 1 && m_enable_lightoff ) {
+          setBacklight( 0 ); // off
+        }
+        return true;
+        break;
+      case 2:
+        if ( m_enable_onlylcdoff ) {
+          ODevice::inst ( ) -> setDisplayStatus ( false );
+          m_lcd_status = false;
+          return true;
+        }
+        else // We're going to suspend the whole machine
+        {
+          if ( ( m_disable_suspend > 2 ) &&
+                  ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) &&
+                  ( !Network::networkOnline ( ) ) ) {
+            QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
+            return true;
+          }
+        }
+        break;
+    }
+    return false;
+  }
 
 private:
-	static int ssi( int interval, Config & config, const QString & enable, const QString & value, int def )
-	{
-		if ( !enable.isEmpty() && config.readNumEntry( enable, 0 ) == 0 )
-			return 0;
-
-		if ( interval < 0 ) {
-			// Restore screen blanking and power saving state
-			interval = config.readNumEntry( value, def );
-		}
-		return interval;
-	}
+  static int ssi( int interval, Config & config, const QString & enable, const QString & value, int def )
+  {
+    if ( !enable.isEmpty() && config.readNumEntry( enable, 0 ) == 0 )
+      return 0;
+
+    if ( interval < 0 ) {
+      // Restore screen blanking and power saving state
+      interval = config.readNumEntry( value, def );
+    }
+    return interval;
+  }
 
 public:
-	void setIntervals( int i1, int i2, int i3 )
-	{
-		Config config( "qpe" );
-		config.setGroup( "Screensaver" );
-
-		int v[ 4 ];
-		i1 = ssi( i1, config, "Dim", "Interval_Dim", 30 );
-		i2 = ssi( i2, config, "LightOff", "Interval_LightOff", 20 );
-		i3 = ssi( i3, config, "", "Interval", 60 );
-
-		//qDebug("screen saver intervals: %d %d %d", i1, i2, i3);
-
-		v [ 0 ] = QMAX( 1000 * i1, 100 );
-		v [ 1 ] = QMAX( 1000 * i2, 100 );
-		v [ 2 ] = QMAX( 1000 * i3, 100 );
-		v [ 3 ] = 0;
-		m_enable_dim = ( ( i1 != 0 ) ? config. readNumEntry ( "Dim", 1 ) : false );
-		m_enable_lightoff = ( ( i2 != 0 ) ? config. readNumEntry ( "LightOff", 1 ) : false );
-		m_enable_onlylcdoff = config. readNumEntry ( "LcdOffOnly", 0 );
-
-		if ( !i1 && !i2 && !i3 )
-			QWSServer::setScreenSaverInterval( 0 );
-		else
-			QWSServer::setScreenSaverIntervals( v );
-	}
-
-	void setInterval ( int interval )
-	{
-		setIntervals ( -1, -1, interval );
-	}
-
-	void setMode ( int mode )
-	{
-		if ( mode > m_disable_suspend )
-			setInterval( -1 );
-		m_disable_suspend = mode;
-	}
-
-	int backlight ( )
-	{
-		if ( m_backlight_bright == -1 ) {
-			// Read from config
-			Config config ( "qpe" );
-			config. setGroup ( "Screensaver" );
-			m_backlight_bright = config. readNumEntry ( "Brightness", 255 );
-		}
-		return m_backlight_bright;
-	}
-
-	void setBacklight ( int bright )
-	{
-		if ( bright == -3 ) {
-			// Forced on
-			m_backlight_forcedoff = false;
-			bright = -1;
-		}
-		if ( m_backlight_forcedoff && bright != -2 )
-			return ;
-		if ( bright == -2 ) {
-			// Toggle between off and on
-			bright = m_backlight_bright ? 0 : -1;
-			m_backlight_forcedoff = !bright;
-		}
-
-		m_backlight_bright = bright;
-
-		bright = backlight ( );
-		ODevice::inst ( ) -> setDisplayBrightness ( bright );
-
-		m_backlight_bright = bright;
-	}
+  void setIntervals( int i1, int i2, int i3 )
+  {
+    Config config( "qpe" );
+    config.setGroup( "Screensaver" );
+
+    int v[ 4 ];
+    i1 = ssi( i1, config, "Dim", "Interval_Dim", 30 );
+    i2 = ssi( i2, config, "LightOff", "Interval_LightOff", 20 );
+    i3 = ssi( i3, config, "", "Interval", 60 );
+
+    //qDebug("screen saver intervals: %d %d %d", i1, i2, i3);
+
+    v [ 0 ] = QMAX( 1000 * i1, 100 );
+    v [ 1 ] = QMAX( 1000 * i2, 100 );
+    v [ 2 ] = QMAX( 1000 * i3, 100 );
+    v [ 3 ] = 0;
+    m_enable_dim = ( ( i1 != 0 ) ? config. readNumEntry ( "Dim", 1 ) : false );
+    m_enable_lightoff = ( ( i2 != 0 ) ? config. readNumEntry ( "LightOff", 1 ) : false );
+    m_enable_onlylcdoff = config. readNumEntry ( "LcdOffOnly", 0 );
+
+    if ( !i1 && !i2 && !i3 )
+      QWSServer::setScreenSaverInterval( 0 );
+    else
+      QWSServer::setScreenSaverIntervals( v );
+  }
+
+  void setInterval ( int interval )
+  {
+    setIntervals ( -1, -1, interval );
+  }
+
+  void setMode ( int mode )
+  {
+    if ( mode > m_disable_suspend )
+      setInterval( -1 );
+    m_disable_suspend = mode;
+  }
+
+  int backlight ( )
+  {
+    if ( m_backlight_bright == -1 ) {
+      // Read from config
+      Config config ( "qpe" );
+      config. setGroup ( "Screensaver" );
+      m_backlight_bright = config. readNumEntry ( "Brightness", 255 );
+    }
+    return m_backlight_bright;
+  }
+
+  void setBacklight ( int bright )
+  {
+    if ( bright == -3 ) {
+      // Forced on
+      m_backlight_forcedoff = false;
+      bright = -1;
+    }
+    if ( m_backlight_forcedoff && bright != -2 )
+      return ;
+    if ( bright == -2 ) {
+      // Toggle between off and on
+      bright = m_backlight_bright ? 0 : -1;
+      m_backlight_forcedoff = !bright;
+    }
+
+    m_backlight_bright = bright;
+
+    bright = backlight ( );
+    ODevice::inst ( ) -> setDisplayBrightness ( bright );
+
+    m_backlight_bright = bright;
+  }
 
 private:
-	int m_disable_suspend;
-	bool m_enable_dim;
-	bool m_enable_lightoff;
-	bool m_enable_onlylcdoff;
+  int m_disable_suspend;
+  bool m_enable_dim;
+  bool m_enable_lightoff;
+  bool m_enable_onlylcdoff;
 
-	bool m_lcd_status;
+  bool m_lcd_status;
 
-	int m_backlight_bright;
-	bool m_backlight_forcedoff;
+  int m_backlight_bright;
+  bool m_backlight_forcedoff;
 };
 
 
 void DesktopApplication::switchLCD ( bool on )
 {
-	if ( qApp ) {
-		DesktopApplication *dapp = (DesktopApplication *) qApp;
+  if ( qApp ) {
+    DesktopApplication *dapp = (DesktopApplication *) qApp;
 
-		if ( dapp-> m_screensaver )
-			dapp-> m_screensaver-> setBacklight ( on ? -3 : -1 );
-	}
+    if ( dapp-> m_screensaver )
+      dapp-> m_screensaver-> setBacklight ( on ? -3 : -1 );
+  }
 }
 
 
 DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType )
-		: QPEApplication( argc, argv, appType )
+    : QPEApplication( argc, argv, appType )
 {
 
-	QTimer * t = new QTimer( this );
-	connect( t, SIGNAL( timeout() ), this, SLOT( psTimeout() ) );
-	t->start( 10000 );
-	ps = new PowerStatus;
-	pa = new DesktopPowerAlerter( 0 );
+  QTimer * t = new QTimer( this );
+  connect( t, SIGNAL( timeout() ), this, SLOT( psTimeout() ) );
+  t->start( 10000 );
+  ps = new PowerStatus;
+  pa = new DesktopPowerAlerter( 0 );
 
-	channel = new QCopChannel( "QPE/Desktop", this );
-	connect( channel, SIGNAL( received( const QCString&, const QByteArray& ) ),
-	         this, SLOT( desktopMessage( const QCString&, const QByteArray& ) ) );
+  channel = new QCopChannel( "QPE/Desktop", this );
+  connect( channel, SIGNAL( received( const QCString&, const QByteArray& ) ),
+           this, SLOT( desktopMessage( const QCString&, const QByteArray& ) ) );
 
-	channel = new QCopChannel( "QPE/System", this );
-	connect( channel, SIGNAL( received( const QCString&, const QByteArray& ) ),
-	         this, SLOT( systemMessage( const QCString&, const QByteArray& ) ) );
+  channel = new QCopChannel( "QPE/System", this );
+  connect( channel, SIGNAL( received( const QCString&, const QByteArray& ) ),
+           this, SLOT( systemMessage( const QCString&, const QByteArray& ) ) );
 
-	m_screensaver = new QPEScreenSaver;
+  m_screensaver = new QPEScreenSaver;
 
-	m_screensaver-> setInterval ( -1 );
-	QWSServer::setScreenSaver( m_screensaver );
+  m_screensaver-> setInterval ( -1 );
+  QWSServer::setScreenSaver( m_screensaver );
 }
 
 
 DesktopApplication::~DesktopApplication()
 {
-	delete ps;
-	delete pa;
+  delete ps;
+  delete pa;
 }
 
 void DesktopApplication::desktopMessage( const QCString &msg, const QByteArray &data )
 {
 #ifdef Q_WS_QWS
-	QDataStream stream( data, IO_ReadOnly );
-	if ( msg == "keyRegister(int key, QString channel, QString message)" ) {
-		int k;
-		QString c, m;
-		stream >> k;
-		stream >> c;
-		stream >> m;
-
-		qWarning( "KeyRegisterReceived: %i, %s, %s", k, ( const char* ) c, ( const char * ) m );
-		keyRegisterList.append( QCopKeyRegister( k, c, m ) );
-	}
-	else if ( msg == "suspend()" ) {
-		emit power();
-	}
+  QDataStream stream( data, IO_ReadOnly );
+  if ( msg == "keyRegister(int key, QString channel, QString message)" ) {
+    int k;
+    QString c, m;
+    stream >> k;
+    stream >> c;
+    stream >> m;
+
+    qWarning( "KeyRegisterReceived: %i, %s, %s", k, ( const char* ) c, ( const char * ) m );
+    keyRegisterList.append( QCopKeyRegister( k, c, m ) );
+  }
+  else if ( msg == "suspend()" ) {
+    emit power();
+  }
 #endif
 }
 
 
 void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & data )
 {
 #ifdef Q_WS_QWS
-	QDataStream stream ( data, IO_ReadOnly );
-
-	if ( msg == "setScreenSaverInterval(int)" ) {
-		int time;
-		stream >> time;
-		m_screensaver-> setInterval( time );
-	}
-	else if ( msg == "setScreenSaverIntervals(int,int,int)" ) {
-		int t1, t2, t3;
-		stream >> t1 >> t2 >> t3;
-		m_screensaver-> setIntervals( t1, t2, t3 );
-	}
-	else if ( msg == "setBacklight(int)" ) {
-		int bright;
-		stream >> bright;
-		m_screensaver-> setBacklight( bright );
-	}
-	else if ( msg == "setScreenSaverMode(int)" ) {
-		int mode;
-		stream >> mode;
-		m_screensaver-> setMode ( mode );
-	}
+  QDataStream stream ( data, IO_ReadOnly );
+
+  if ( msg == "setScreenSaverInterval(int)" ) {
+    int time;
+    stream >> time;
+    m_screensaver-> setInterval( time );
+  }
+  else if ( msg == "setScreenSaverIntervals(int,int,int)" ) {
+    int t1, t2, t3;
+    stream >> t1 >> t2 >> t3;
+    m_screensaver-> setIntervals( t1, t2, t3 );
+  }
+  else if ( msg == "setBacklight(int)" ) {
+    int bright;
+    stream >> bright;
+    m_screensaver-> setBacklight( bright );
+  }
+  else if ( msg == "setScreenSaverMode(int)" ) {
+    int mode;
+    stream >> mode;
+    m_screensaver-> setMode ( mode );
+  }
 #endif
 }
 
 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;
-		bool autoRepeat = ke->simpleData.is_auto_repeat;
-
-		/*
-		  app that registers key/message to be sent back to the app, when it doesn't have focus,
-		  when user presses key, unless keyboard has been requested from app.
-		  will not send multiple repeats if user holds key
-		  i.e. one shot
-		 */
-		if ( !keyRegisterList.isEmpty() ) {
-			KeyRegisterList::Iterator it;
-			for ( it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it ) {
-				if ( ( *it ).getKeyCode() == ke->simpleData.keycode && !autoRepeat && !keyboardGrabbed() && press ) {
-					if ( press )
-						qDebug( "press" );
-					else
-						qDebug( "release" );
-					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;
-		}
-		// This was used for the iPAQ PowerButton
-		// See main.cpp for new KeyboardFilter
-		//
-		//    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 && !autoRepeat ) || ( !press && autoRepeat ) )
-			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 );
+  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;
+    bool autoRepeat = ke->simpleData.is_auto_repeat;
+
+    /*
+      app that registers key/message to be sent back to the app, when it doesn't have focus,
+      when user presses key, unless keyboard has been requested from app.
+      will not send multiple repeats if user holds key
+      i.e. one shot
+     */
+    if ( !keyRegisterList.isEmpty() &&  ke->simpleData.keycode !=0 && press) {
+//        qDebug("<<<<<<<<<<<<<keycode %d", ke->simpleData.keycode);
+      KeyRegisterList::Iterator it;
+      for ( it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it ) {
+        if ( ( *it ).getKeyCode() == ke->simpleData.keycode && !autoRepeat && !keyboardGrabbed() ) {
+          if ( press )
+            qDebug( "press" );
+          else
+            qDebug( "release" );
+          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;
+    }
+    // This was used for the iPAQ PowerButton
+    // See main.cpp for new KeyboardFilter
+    //
+    //    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 && !autoRepeat ) || ( !press && autoRepeat ) )
+      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
+  qpedesktop->checkMemory(); // in case no events are being generated
 
-	*ps = PowerStatusManager::readStatus();
+  *ps = PowerStatusManager::readStatus();
 
-	if ( ( ps->batteryStatus() == PowerStatus::VeryLow ) ) {
-		pa->alert( tr( "Battery is running very low." ), 6 );
-	}
+  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->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 );
-	}
+  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;
-	QString card = getenv( "HOME" );
-	card += "/Applications/addressbook/businesscard.vcf";
-
-	if ( QFile::exists( card ) ) {
-		QCopEnvelope e( "QPE/Obex", "send(QString,QString,QString)" );
-		QString mimetype = "text/x-vCard";
-		e << tr( "business card" ) << card << mimetype;
-	}
+  delete cardSendTimer;
+  cardSendTimer = 0;
+  QString card = getenv( "HOME" );
+  card += "/Applications/addressbook/businesscard.vcf";
+
+  if ( QFile::exists( card ) ) {
+    QCopEnvelope e( "QPE/Obex", "send(QString,QString,QString)" );
+    QString mimetype = "text/x-vCard";
+    e << tr( "business card" ) << card << mimetype;
+  }
 }
 
 #if defined(QPE_HAVE_MEMALERTER)
 QPE_MEMALERTER_IMPL
@@ -575,242 +576,242 @@ QPE_MEMALERTER_IMPL
 
 //===========================================================================
 
 Desktop::Desktop() :
-		QWidget( 0, 0, WStyle_Tool | WStyle_Customize ),
-		qcopBridge( 0 ),
-		transferServer( 0 ),
-		packageSlave( 0 )
+    QWidget( 0, 0, WStyle_Tool | WStyle_Customize ),
+    qcopBridge( 0 ),
+    transferServer( 0 ),
+    packageSlave( 0 )
 {
-	qpedesktop = this;
+  qpedesktop = this;
 
-	//    bg = new Info( this );
-	tb = new TaskBar;
+  //    bg = new Info( this );
+  tb = new TaskBar;
 
-	launcher = new Launcher( 0, 0, WStyle_Customize | QWidget::WGroupLeader );
+  launcher = new Launcher( 0, 0, WStyle_Customize | QWidget::WGroupLeader );
 
-	connect( launcher, SIGNAL( busy() ), tb, SLOT( startWait() ) );
-	connect( launcher, SIGNAL( notBusy( const QString& ) ), tb, SLOT( stopWait( const QString& ) ) );
+  connect( launcher, SIGNAL( busy() ), tb, SLOT( startWait() ) );
+  connect( launcher, SIGNAL( notBusy( const QString& ) ), tb, SLOT( stopWait( const QString& ) ) );
 
-	int displayw = qApp->desktop() ->width();
-	int displayh = qApp->desktop() ->height();
+  int displayw = qApp->desktop() ->width();
+  int displayh = qApp->desktop() ->height();
 
 
-	QSize sz = tb->sizeHint();
+  QSize sz = tb->sizeHint();
 
-	setGeometry( 0, displayh - sz.height(), displayw, sz.height() );
-	tb->setGeometry( 0, displayh - sz.height(), displayw, sz.height() );
+  setGeometry( 0, displayh - sz.height(), displayw, sz.height() );
+  tb->setGeometry( 0, displayh - sz.height(), displayw, sz.height() );
 
-	tb->show();
-	launcher->showMaximized();
-	launcher->show();
-	launcher->raise();
+  tb->show();
+  launcher->showMaximized();
+  launcher->show();
+  launcher->raise();
 #if defined(QPE_HAVE_MEMALERTER)
 
-	initMemalerter();
+  initMemalerter();
 #endif
-	// start services
-	startTransferServer();
-	( void ) new IrServer( this );
-	rereadVolumes();
+  // start services
+  startTransferServer();
+  ( void ) new IrServer( this );
+  rereadVolumes();
 
-	packageSlave = new PackageSlave( this );
-	connect( qApp, SIGNAL( volumeChanged( bool ) ), this, SLOT( rereadVolumes() ) );
+  packageSlave = new PackageSlave( this );
+  connect( qApp, SIGNAL( volumeChanged( bool ) ), this, SLOT( rereadVolumes() ) );
 
-	qApp->installEventFilter( this );
+  qApp->installEventFilter( this );
 }
 
 void Desktop::show()
 {
-	login( TRUE );
-	QWidget::show();
+  login( TRUE );
+  QWidget::show();
 }
 
 Desktop::~Desktop()
 {
-	delete launcher;
-	delete tb;
-	delete qcopBridge;
-	delete transferServer;
+  delete launcher;
+  delete tb;
+  delete qcopBridge;
+  delete transferServer;
 }
 
 bool Desktop::recoverMemory()
 {
-	return tb->recoverMemory();
+  return tb->recoverMemory();
 }
 
 void Desktop::checkMemory()
 {
 #if defined(QPE_HAVE_MEMALERTER)
-	static bool ignoreNormal = FALSE;
-	static bool existingMessage = FALSE;
-
-	if ( existingMessage )
-		return ; // don't show a second message while still on first
-
-	existingMessage = TRUE;
-	switch ( memstate ) {
-		case Unknown:
-			break;
-		case Low:
-			memstate = Unknown;
-			if ( recoverMemory() )
-				ignoreNormal = TRUE;
-			else
-				QMessageBox::warning( 0 , "Memory Status",
-				                      "The memory smacks of shortage. \n"
-				                      "Please save data. " );
-			break;
-		case Normal:
-			memstate = Unknown;
-			if ( ignoreNormal )
-				ignoreNormal = FALSE;
-			else
-				QMessageBox::information ( 0 , "Memory Status",
-				                           "There is enough memory again." );
-			break;
-		case VeryLow:
-			memstate = Unknown;
-			QMessageBox::critical( 0 , "Memory Status",
-			                       "The memory is very low. \n"
-			                       "Please end this application \n"
-			                       "immediately." );
-			recoverMemory();
-	}
-	existingMessage = FALSE;
+  static bool ignoreNormal = FALSE;
+  static bool existingMessage = FALSE;
+
+  if ( existingMessage )
+    return ; // don't show a second message while still on first
+
+  existingMessage = TRUE;
+  switch ( memstate ) {
+    case Unknown:
+      break;
+    case Low:
+      memstate = Unknown;
+      if ( recoverMemory() )
+        ignoreNormal = TRUE;
+      else
+        QMessageBox::warning( 0 , "Memory Status",
+                              "The memory smacks of shortage. \n"
+                              "Please save data. " );
+      break;
+    case Normal:
+      memstate = Unknown;
+      if ( ignoreNormal )
+        ignoreNormal = FALSE;
+      else
+        QMessageBox::information ( 0 , "Memory Status",
+                                   "There is enough memory again." );
+      break;
+    case VeryLow:
+      memstate = Unknown;
+      QMessageBox::critical( 0 , "Memory Status",
+                             "The memory is very low. \n"
+                             "Please end this application \n"
+                             "immediately." );
+      recoverMemory();
+  }
+  existingMessage = FALSE;
 #endif
 }
 
 static bool isVisibleWindow( int wid )
 {
-	const QList<QWSWindow> &list = qwsServer->clientWindows();
-	QWSWindow* w;
-	for ( QListIterator<QWSWindow> it( list ); ( w = it.current() ); ++it ) {
-		if ( w->winId() == wid )
-			return !w->isFullyObscured();
-	}
-	return FALSE;
+  const QList<QWSWindow> &list = qwsServer->clientWindows();
+  QWSWindow* w;
+  for ( QListIterator<QWSWindow> it( list ); ( w = it.current() ); ++it ) {
+    if ( w->winId() == wid )
+      return !w->isFullyObscured();
+  }
+  return FALSE;
 }
 
 static bool hasVisibleWindow( const QString& clientname )
 {
-	const QList<QWSWindow> &list = qwsServer->clientWindows();
-	QWSWindow* w;
-	for ( QListIterator<QWSWindow> it( list ); ( w = it.current() ); ++it ) {
-		if ( w->client() ->identity() == clientname && !w->isFullyObscured() )
-			return TRUE;
-	}
-	return FALSE;
+  const QList<QWSWindow> &list = qwsServer->clientWindows();
+  QWSWindow* w;
+  for ( QListIterator<QWSWindow> it( list ); ( w = it.current() ); ++it ) {
+    if ( w->client() ->identity() == clientname && !w->isFullyObscured() )
+      return TRUE;
+  }
+  return FALSE;
 }
 
 void Desktop::raiseLauncher()
 {
-	Config cfg( "qpe" ); //F12 'Home'
-	cfg.setGroup( "AppsKey" );
-	QString tempItem;
-	tempItem = cfg.readEntry( "Middle", "Home" );
-	if ( tempItem == "Home" || tempItem.isEmpty() ) {
-		if ( isVisibleWindow( launcher->winId() ) )
-			launcher->nextView();
-		else
-			launcher->raise();
-	}
-	else {
-		QCopEnvelope e( "QPE/System", "execute(QString)" );
-		e << tempItem;
-	}
+  Config cfg( "qpe" ); //F12 'Home'
+  cfg.setGroup( "AppsKey" );
+  QString tempItem;
+  tempItem = cfg.readEntry( "Middle", "Home" );
+  if ( tempItem == "Home" || tempItem.isEmpty() ) {
+    if ( isVisibleWindow( launcher->winId() ) )
+      launcher->nextView();
+    else
+      launcher->raise();
+  }
+  else {
+    QCopEnvelope e( "QPE/System", "execute(QString)" );
+    e << tempItem;
+  }
 }
 
 void Desktop::executeOrModify( const QString& appLnkFile )
 {
-	AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile );
-	if ( lnk.isValid() ) {
-		QCString app = lnk.exec().utf8();
-		Global::terminateBuiltin( "calibrate" );
-		if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) {
-                    //	MRUList::addTask( &lnk );
-			if ( hasVisibleWindow( app ) )
-				QCopChannel::send( "QPE/Application/" + app, "nextView()" );
-			else
-				QCopChannel::send( "QPE/Application/" + app, "raise()" );
-		}
-		else {
-			lnk.execute();
-		}
-	}
+  AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile );
+  if ( lnk.isValid() ) {
+    QCString app = lnk.exec().utf8();
+    Global::terminateBuiltin( "calibrate" );
+    if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) {
+                    //  MRUList::addTask( &lnk );
+      if ( hasVisibleWindow( app ) )
+        QCopChannel::send( "QPE/Application/" + app, "nextView()" );
+      else
+        QCopChannel::send( "QPE/Application/" + app, "raise()" );
+    }
+    else {
+      lnk.execute();
+    }
+  }
 }
 
 void Desktop::raiseDatebook()
 {
-	Config cfg( "qpe" ); //F9 'Activity'
-	cfg.setGroup( "AppsKey" );
-	QString tempItem;
-	tempItem = cfg.readEntry( "LeftEnd" , "Calendar" );
-	if ( tempItem == "Calendar" || tempItem.isEmpty() ) {
-		tempItem = "datebook";
-	}
-	QCopEnvelope e( "QPE/System", "execute(QString)" );
-	e << tempItem;
+  Config cfg( "qpe" ); //F9 'Activity'
+  cfg.setGroup( "AppsKey" );
+  QString tempItem;
+  tempItem = cfg.readEntry( "LeftEnd" , "Calendar" );
+  if ( tempItem == "Calendar" || tempItem.isEmpty() ) {
+    tempItem = "datebook";
+  }
+  QCopEnvelope e( "QPE/System", "execute(QString)" );
+  e << tempItem;
 }
 
 void Desktop::raiseContacts()
 {
-	Config cfg( "qpe" ); //F10, 'Contacts'
-	cfg.setGroup( "AppsKey" );
-	QString tempItem;
-	tempItem = cfg.readEntry( "Left2nd", "Address Book" );
-	if ( tempItem == "Address Book" || tempItem.isEmpty() ) {
-		tempItem = "addressbook";
-	}
-	QCopEnvelope e( "QPE/System", "execute(QString)" );
-	e << tempItem;
+  Config cfg( "qpe" ); //F10, 'Contacts'
+  cfg.setGroup( "AppsKey" );
+  QString tempItem;
+  tempItem = cfg.readEntry( "Left2nd", "Address Book" );
+  if ( tempItem == "Address Book" || tempItem.isEmpty() ) {
+    tempItem = "addressbook";
+  }
+  QCopEnvelope e( "QPE/System", "execute(QString)" );
+  e << tempItem;
 }
 
 void Desktop::raiseMenu()
 {
-	Config cfg( "qpe" ); //F11, 'Menu
-	cfg.setGroup( "AppsKey" );
-	QString tempItem;
-	tempItem = cfg.readEntry( "Right2nd" , "Popup Menu" );
-	if ( tempItem == "Popup Menu" || tempItem.isEmpty() ) {
-		Global::terminateBuiltin( "calibrate" );
-		tb->startMenu() ->launch();
-	}
-	else {
-		QCopEnvelope e( "QPE/System", "execute(QString)" );
-		e << tempItem;
-	}
+  Config cfg( "qpe" ); //F11, 'Menu
+  cfg.setGroup( "AppsKey" );
+  QString tempItem;
+  tempItem = cfg.readEntry( "Right2nd" , "Popup Menu" );
+  if ( tempItem == "Popup Menu" || tempItem.isEmpty() ) {
+    Global::terminateBuiltin( "calibrate" );
+    tb->startMenu() ->launch();
+  }
+  else {
+    QCopEnvelope e( "QPE/System", "execute(QString)" );
+    e << tempItem;
+  }
 }
 
 void Desktop::raiseEmail()
 {
-	Config cfg( "qpe" ); //F13, 'Mail' // only in zaurus, on ipaq mail key is F11
-	cfg.setGroup( "AppsKey" );
-	QString tempItem;
-	tempItem = cfg.readEntry( "RightEnd", "Mail" );
-	if ( tempItem == "Mail" || tempItem == "qtmail" || tempItem.isEmpty() ) {
-		tempItem = "mail";
-	}
-	QCopEnvelope e( "QPE/System", "execute(QString)" );
-	e << tempItem;
+  Config cfg( "qpe" ); //F13, 'Mail' // only in zaurus, on ipaq mail key is F11
+  cfg.setGroup( "AppsKey" );
+  QString tempItem;
+  tempItem = cfg.readEntry( "RightEnd", "Mail" );
+  if ( tempItem == "Mail" || tempItem == "qtmail" || tempItem.isEmpty() ) {
+    tempItem = "mail";
+  }
+  QCopEnvelope e( "QPE/System", "execute(QString)" );
+  e << tempItem;
 }
 
 // autoStarts apps on resume and start
 void Desktop::execAutoStart()
 {
-	QString appName;
-	int delay;
-	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 ) && !appName.isEmpty() ) {
-		QCopEnvelope e( "QPE/System", "execute(QString)" );
-		e << QString( appName );
-	}
+  QString appName;
+  int delay;
+  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 ) && !appName.isEmpty() ) {
+    QCopEnvelope e( "QPE/System", "execute(QString)" );
+    e << QString( appName );
+  }
 }
 
 #if defined(QPE_HAVE_TOGGLELIGHT)
 #include <qpe/config.h>
@@ -826,209 +827,209 @@ void Desktop::execAutoStart()
 
 
 void Desktop::togglePower()
 {
-	static bool excllock = false;
+  static bool excllock = false;
 
-	if ( excllock )
-		return ;
+  if ( excllock )
+    return ;
 
-	excllock = true;
+  excllock = true;
 
-	bool wasloggedin = loggedin;
-	loggedin = 0;
-	suspendTime = QDateTime::currentDateTime();
+  bool wasloggedin = loggedin;
+  loggedin = 0;
+  suspendTime = QDateTime::currentDateTime();
 
-	ODevice::inst ( ) -> suspend ( );
+  ODevice::inst ( ) -> suspend ( );
 
-	QWSServer::screenSaverActivate ( false );
-	DesktopApplication::switchLCD ( true ); // force LCD on without slow qcop call
+  QWSServer::screenSaverActivate ( false );
+  DesktopApplication::switchLCD ( true ); // force LCD on without slow qcop call
 
-	{
-		QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep
-	}
+  {
+    QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep
+  }
 
-	if ( wasloggedin )
-		login( TRUE );
+  if ( wasloggedin )
+    login( TRUE );
 
-	execAutoStart();
-	//qcopBridge->closeOpenConnections();
+  execAutoStart();
+  //qcopBridge->closeOpenConnections();
 
-	excllock = false;
+  excllock = false;
 }
 
 void Desktop::toggleLight()
 {
-	QCopEnvelope e( "QPE/System", "setBacklight(int)" );
-	e << -2; // toggle
+  QCopEnvelope e( "QPE/System", "setBacklight(int)" );
+  e << -2; // toggle
 }
 
 void Desktop::toggleSymbolInput()
 {
-	tb->toggleSymbolInput();
+  tb->toggleSymbolInput();
 }
 
 void Desktop::toggleNumLockState()
 {
-	tb->toggleNumLockState();
+  tb->toggleNumLockState();
 }
 
 void Desktop::toggleCapsLockState()
 {
-	tb->toggleCapsLockState();
+  tb->toggleCapsLockState();
 }
 
 void Desktop::styleChange( QStyle &s )
 {
-	QWidget::styleChange( s );
-	int displayw = qApp->desktop() ->width();
-	int displayh = qApp->desktop() ->height();
+  QWidget::styleChange( s );
+  int displayw = qApp->desktop() ->width();
+  int displayh = qApp->desktop() ->height();
 
-	QSize sz = tb->sizeHint();
+  QSize sz = tb->sizeHint();
 
-	tb->setGeometry( 0, displayh - sz.height(), displayw, sz.height() );
+  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();
+  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 );
-
-			// This is a workaround for a Qt bug
-			// clipboard applet has to stop its poll timer, or Qt/E
-			// will hang on quit() right before it emits aboutToQuit()
-			emit aboutToQuit ( );
-
-			quit();
-			break;
-	}
+  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 );
+
+      // This is a workaround for a Qt bug
+      // clipboard applet has to stop its poll timer, or Qt/E
+      // will hang on quit() right before it emits aboutToQuit()
+      emit aboutToQuit ( );
+
+      quit();
+      break;
+  }
 }
 
 void DesktopApplication::restart()
 {
-	prepareForTermination( TRUE );
+  prepareForTermination( TRUE );
 
 #ifdef Q_WS_QWS
 
-	for ( int fd = 3; fd < 100; fd++ )
-		close( fd );
+  for ( int fd = 3; fd < 100; fd++ )
+    close( fd );
 #if defined(QT_DEMO_SINGLE_FLOPPY)
 
-	execl( "/sbin/init", "qpe", 0 );
+  execl( "/sbin/init", "qpe", 0 );
 #elif defined(QT_QWS_CASSIOPEIA)
 
-	execl( "/bin/sh", "sh", 0 );
+  execl( "/bin/sh", "sh", 0 );
 #else
 
-	execl( ( qpeDir() + "/bin/qpe" ).latin1(), "qpe", 0 );
+  execl( ( qpeDir() + "/bin/qpe" ).latin1(), "qpe", 0 );
 #endif
 
-	exit( 1 );
+  exit( 1 );
 #endif
 }
 
 void Desktop::startTransferServer()
 {
-	// start qcop bridge server
-	qcopBridge = new QCopBridge( 4243 );
-	if ( !qcopBridge->ok() ) {
-		delete qcopBridge;
-		qcopBridge = 0;
-	}
-	// start transfer server
-	transferServer = new TransferServer( 4242 );
-	if ( !transferServer->ok() ) {
-		delete transferServer;
-		transferServer = 0;
-	}
-	if ( !transferServer || !qcopBridge )
-		startTimer( 2000 );
+  // start qcop bridge server
+  qcopBridge = new QCopBridge( 4243 );
+  if ( !qcopBridge->ok() ) {
+    delete qcopBridge;
+    qcopBridge = 0;
+  }
+  // start transfer server
+  transferServer = new TransferServer( 4242 );
+  if ( !transferServer->ok() ) {
+    delete transferServer;
+    transferServer = 0;
+  }
+  if ( !transferServer || !qcopBridge )
+    startTimer( 2000 );
 }
 
 void Desktop::timerEvent( QTimerEvent *e )
 {
-	killTimer( e->timerId() );
-	startTransferServer();
+  killTimer( e->timerId() );
+  startTransferServer();
 }
 
 void Desktop::terminateServers()
 {
-	delete transferServer;
-	delete qcopBridge;
-	transferServer = 0;
-	qcopBridge = 0;
+  delete transferServer;
+  delete qcopBridge;
+  transferServer = 0;
+  qcopBridge = 0;
 }
 
 void Desktop::rereadVolumes()
 {
-	Config cfg( "qpe" );
-	cfg.setGroup( "Volume" );
-	touchclick = cfg.readBoolEntry( "TouchSound" );
-	keyclick = cfg.readBoolEntry( "KeySound" );
-	alarmsound = cfg.readBoolEntry( "AlarmSound" );
+  Config cfg( "qpe" );
+  cfg.setGroup( "Volume" );
+  touchclick = cfg.readBoolEntry( "TouchSound" );
+  keyclick = cfg.readBoolEntry( "KeySound" );
+  alarmsound = cfg.readBoolEntry( "AlarmSound" );
 }
 
 void Desktop::keyClick()
 {
-	if ( keyclick )
-		ODevice::inst ( ) -> keySound ( );
+  if ( keyclick )
+    ODevice::inst ( ) -> keySound ( );
 }
 
 void Desktop::screenClick()
 {
-	if ( touchclick )
-		ODevice::inst ( ) -> touchSound ( );
+  if ( touchclick )
+    ODevice::inst ( ) -> touchSound ( );
 }
 
 void Desktop::soundAlarm()
 {
-	if ( qpedesktop-> alarmsound )
-		ODevice::inst ( ) -> alarmSound ( );
+  if ( qpedesktop-> alarmsound )
+    ODevice::inst ( ) -> alarmSound ( );
 }
 
 bool Desktop::eventFilter( QObject *, QEvent *ev )
 {
-	if ( ev-> type ( ) == QEvent::KeyPress ) {
-		QKeyEvent * ke = ( QKeyEvent * ) ev;
-		if ( ke-> key ( ) == Qt::Key_F11 ) { // menu key
-			QWidget * active = qApp-> activeWindow ( );
-
-			if ( active && active-> isPopup ( ) )
-				active->close();
-
-			/*
-			 * On iPAQ 38xx that key is not the "menu key" but the mail key
-			 * To not confuse the users, make it launch the mail app on 38xx
-			 */
-			if ( ODevice::inst() ->model() == OMODEL_iPAQ_H38xx ) {
-				QCopEnvelope e( "QPE/System", "execute(QString)" );
-				e << QString( "mail" );
-				return true;
-			}
-			else {
-				raiseMenu ( );
-				return true;
-			}
-		}
-	}
-	return false;
+  if ( ev-> type ( ) == QEvent::KeyPress ) {
+    QKeyEvent * ke = ( QKeyEvent * ) ev;
+    if ( ke-> key ( ) == Qt::Key_F11 ) { // menu key
+      QWidget * active = qApp-> activeWindow ( );
+
+      if ( active && active-> isPopup ( ) )
+        active->close();
+
+      /*
+       * On iPAQ 38xx that key is not the "menu key" but the mail key
+       * To not confuse the users, make it launch the mail app on 38xx
+       */
+      if ( ODevice::inst() ->model() == OMODEL_iPAQ_H38xx ) {
+        QCopEnvelope e( "QPE/System", "execute(QString)" );
+        e << QString( "mail" );
+        return true;
+      }
+      else {
+        raiseMenu ( );
+        return true;
+      }
+    }
+  }
+  return false;
 }