| -rw-r--r-- | core/launcher/desktop.cpp | 56 | ||||
| -rw-r--r-- | core/launcher/desktop.h | 4 | ||||
| -rw-r--r-- | core/launcher/opie-taskbar.control | 2 |
3 files changed, 61 insertions, 1 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 @@ -47,9 +47,31 @@ #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) @@ -123,6 +145,10 @@ DesktopApplication::DesktopApplication( int& argc, char **argv, Type t ) 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&)) ); } @@ -132,6 +158,22 @@ DesktopApplication::~DesktopApplication() 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; @@ -145,6 +187,14 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) if ( !loggedin && ke->simpleData.keycode != Key_F34 ) return TRUE; 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(); @@ -178,6 +228,12 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) return TRUE; } } + /* + if ( ke->simpleData.keycode == 4096 ) { + QCopEnvelope e("QPE/VMemo", "toggleRecord()"); + return TRUE; + } + */ if ( ke->simpleData.keycode == Key_F34 ) { if ( press ) emit power(); return TRUE; 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 @@ -63,6 +63,9 @@ protected: void shutdown(); void restart(); +public slots: + void receive( const QCString &msg, const QByteArray &data ); + protected slots: void shutdown(ShutdownImpl::Type); void psTimeout(); @@ -71,6 +74,7 @@ private: DesktopPowerAlerter *pa; PowerStatus *ps; QTimer *cardSendTimer; + QCopChannel *channel; }; 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 @@ -3,7 +3,7 @@ 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. |