Added new QCop support. Desktop now listens on channel QPE/Desktop to the

keyRegister(int key, QString channel, QString message) message. What this
will do is allow an app to reiceve keyboard input for a particular key
no matter if they have focus or not.

3 files changed, 100 insertions, 40 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index d39af25..ce99bad 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -38,27 +38,49 @@
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
 #ifdef QT_QWS_CUSTOM
 #include "qpe/custom.h"
 #endif
 
 #include <qgfx_qws.h>
 #include <qmainwindow.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qwindowsystem_qws.h>
 
+#include <qvaluelist.h>
+
 #include <stdlib.h>
 #include <unistd.h>
 
+
+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; }
+
+private:
+  int keyCode;
+  QString channel, message;
+};
+
+typedef QValueList<QCopKeyRegister> KeyRegisterList;
+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()" );
     }
 }
 
@@ -114,118 +136,152 @@ void DesktopPowerAlerter::hideEvent( QHideEvent *e )
 
 
 
 DesktopApplication::DesktopApplication( int& argc, char **argv, Type t )
     : QPEApplication( argc, argv, t )
 {
 
     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(receive(const QCString&, const QByteArray&)) );
 }
 
 
 DesktopApplication::~DesktopApplication()
 {
     delete ps;
     delete pa;
 }
 
+void DesktopApplication::receive( const QCString &msg, const QByteArray &data )
+{
+  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("KeyRegisterRecieved: %i, %s, %s", k, (const char*)c, (const char *)m);
+	  keyRegisterList.append(QCopKeyRegister(k,c,m));
+	}
+}
 
 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 )
+	  QWSKeyEvent *ke = (QWSKeyEvent *)e;
+	  if ( !loggedin && ke->simpleData.keycode != Key_F34 )
 	    return TRUE;
-	bool press = ke->simpleData.is_press;
-	if ( !keyboardGrabbed() ) {
+	  bool press = ke->simpleData.is_press;
+
+	  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 ( press ) emit datebook();
+		  return TRUE;
 	    }
 	    if ( ke->simpleData.keycode == Key_F10 ) {
 	      if ( !press && cardSendTimer ) {
 		    emit contacts();
 		    delete cardSendTimer;
-		} else if ( press ) {
+		  } else if ( press ) {
 		    cardSendTimer = new QTimer();
 		    cardSendTimer->start( 2000, TRUE );
 		    connect( cardSendTimer, SIGNAL( timeout() ), this, SLOT( sendCard() ) );
-		}
-		return TRUE;
+		  }
+		  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_F11 ) {
+		   if ( press ) emit menu();
+		   return TRUE;
+		   }
 	    */
 	    if ( ke->simpleData.keycode == Key_F12 ) {
-		while( activePopupWidget() )
+		  while( activePopupWidget() )
 		    activePopupWidget()->close();
-		if ( press ) emit launch();
-		return TRUE;
+		  if ( press ) emit launch();
+		  return TRUE;
 	    }
 	    if ( ke->simpleData.keycode == Key_F13 ) {
-		if ( press ) emit email();
-		return TRUE;
+		  if ( press ) emit email();
+		  return TRUE;
 	    }
-	}
-	if ( ke->simpleData.keycode == Key_F34 ) {
+	  }
+	  /*
+	  if ( ke->simpleData.keycode == 4096 ) {
+		QCopEnvelope e("QPE/VMemo", "toggleRecord()");
+		return TRUE;
+	  }
+	  */
+	  if ( ke->simpleData.keycode == Key_F34 ) {
 	    if ( press ) emit power();
 	    return TRUE;
-	}
-	if ( ke->simpleData.keycode == Key_F35 ) {
+	  }
+	  if ( ke->simpleData.keycode == Key_F35 ) {
 	    if ( press ) emit backlight();
 	    return TRUE;
-	}
-	if ( ke->simpleData.keycode == Key_F32 ) {
+	  }
+	  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 ( ke->simpleData.keycode == Key_F31 && !ke->simpleData.modifiers ) {
 	    if ( press ) emit symbol();
 	    return TRUE;
-	}
-	if ( ke->simpleData.keycode == Key_NumLock ) {
+	  }
+	  if ( ke->simpleData.keycode == Key_NumLock ) {
 	    if ( press ) emit numLockStateToggle();
-	}
-	if ( ke->simpleData.keycode == Key_CapsLock ) {
+	  }
+	  if ( ke->simpleData.keycode == Key_CapsLock ) {
 	    if ( press ) emit capsLockStateToggle();
-	}
-	if ( press )
+	  }
+	  if ( press )
 	    qpedesktop->keyClick();
     } else {
-	if ( e->type == QWSEvent::Mouse ) {
+	  if ( e->type == QWSEvent::Mouse ) {
 	    QWSMouseEvent *me = (QWSMouseEvent *)e;
 	    static bool up = TRUE;
 	    if ( me->simpleData.state&LeftButton ) {
-		if ( up ) {
+		  if ( up ) {
 		    up = FALSE;
 		    qpedesktop->screenClick();
-		}
+		  }
 	    } else {
-		up = TRUE;
+		  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 );
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h
index dfdbeab..f0a7cba 100644
--- a/core/launcher/desktop.h
+++ b/core/launcher/desktop.h
@@ -54,32 +54,36 @@ signals:
     void symbol();
     void numLockStateToggle();
     void capsLockStateToggle();
     void prepareForRestart();
 
 protected:
 #ifdef Q_WS_QWS
     bool qwsEventFilter( QWSEvent * );
 #endif
     void shutdown();
     void restart();
 
+public slots:
+  void receive( const QCString &msg, const QByteArray &data );
+
 protected slots:
     void shutdown(ShutdownImpl::Type);
     void psTimeout();
     void sendCard();
 private:
     DesktopPowerAlerter *pa;
     PowerStatus *ps;
     QTimer *cardSendTimer;
+	QCopChannel *channel;
 };
 
 
 class Desktop : public QWidget {
     Q_OBJECT
 public:
     Desktop();
     ~Desktop();
 
     static bool screenLocked();
 
     void show();
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index 53daa82..3db0480 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -1,9 +1,9 @@
 Files: bin/qpe apps/Settings/Calibrate.desktop
 Priority: required
 Section: opie/system
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
+Version: $QPE_VERSION-$SUB_VERSION.1
 Depends: qt-embedded (>=$QTE_VERSION)
 Description: Launcher for Opie
- The "finder" or "explorer", or whatever you want to call it.
+ The "finder" or "explorer", or whatever you want to call it.
\ No newline at end of file