fix for keyboard handling under certain conditions, like when grabkeyboard is requested by a user app, so apps such as konsole will have proper keyboard input.

1 files changed, 32 insertions, 26 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 7662e48..24dce73 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -173,56 +173,62 @@ void DesktopApplication::receive( const QCString &msg, const QByteArray &data )
     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();
   }
 
 }
 
 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;
-    if (!keyRegisterList.isEmpty())
-    {
+
+    /*
+      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) {
-                  if(press) qDebug("press"); else qDebug("release");
-                  QCopEnvelope((*it).getChannel().utf8(), (*it).getMessage().utf8());
+      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;
@@ -729,56 +735,56 @@ void Desktop::timerEvent( QTimerEvent *e )
 
 void Desktop::terminateServers()
 {
     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("Sound");
 //     cfg.setGroup("System");
 //     touchclick = cfg.readBoolEntry("Touch");
 //     keyclick = cfg.readBoolEntry("Key");
 }
 
 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();
-
-			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();
+
+      raiseMenu ( );
+      return true;
+    }
+  }
+  return false;
 }