5 files changed, 253 insertions, 48 deletions

diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 16c0538..791e409 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -1,27 +1,27 @@
 /*
-                             This file is part of the Opie Project
-                             Copyright (C) The Opie Team <opie-devel@handhelds.org>
+                     This file is part of the Opie Project
+                      Copyright (C) The Opie Team <opie-devel@handhelds.org>
               =.
             .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program is distributed in the hope that
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
-++=   -.     .`     .:       details.
- :     =  ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+     .>+-=
+_;:,   .>  :=|.         This program is free software; you can
+.> <`_,  > .  <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
+.="- .-=="i,   .._         License as published by the Free Software
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
+  ._= =}    :          or (at your option) any later version.
+  .%`+i>    _;_.
+  .i_,=:_.   -<s.       This program is distributed in the hope that
+  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+  : ..  .:,   . . .    without even the implied warranty of
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=    =    ;      Library General Public License for more
+++=  -.   .`   .:       details.
+:   = ...= . :.=-
+-.  .:....=;==+<;          You should have received a copy of the GNU
+ -_. . .  )=. =           Library General Public License along with
+  --    :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
@@ -40,6 +40,7 @@
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <opie2/okeyfilter.h>
 
 /* STD */
 #include <fcntl.h>
@@ -167,8 +168,10 @@ void iPAQ::initButtons()
     if ( d->m_buttons )
         return;
 
-    if ( isQWS( ) )
-        QWSServer::setKeyboardFilter ( this );
+    if ( isQWS( ) ) {
+        Opie::Core::OKeyFilter::inst()->addPreHandler(this);
+        //QWSServer::setKeyboardFilter ( this );
+    }
 
     d->m_buttons = new QValueList <ODeviceButton>;
 
@@ -271,7 +274,7 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
             break;
         }
 
-        // Rotate cursor keys 180° or 270°
+        // Rotate cursor keys 180 or 270
         case Key_Left :
         case Key_Right:
         case Key_Up   :
@@ -280,7 +283,7 @@ bool iPAQ::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
                 ( d->m_model == Model_iPAQ_H38xx )) {
                 newkeycode = Key_Left + ( keycode - Key_Left + 2 ) % 4;
             }
-            // Rotate the cursor keys by 270°
+            // Rotate the cursor keys by 270
             // keycode - Key_Left = position of the button starting from left clockwise
             // add the rotation to it and modolo. No we've the original offset
             // add the offset to the Key_Left key
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp
index e62ea18..6c3253c 100644
--- a/libopie2/opiecore/device/odevice_simpad.cpp
+++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -1,27 +1,27 @@
 /*
-                             This file is part of the Opie Project
-                             Copyright (C) The Opie Team <opie-devel@handhelds.org>
+                     This file is part of the Opie Project
+                      Copyright (C) The Opie Team <opie-devel@handhelds.org>
               =.
             .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program is distributed in the hope that
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
-++=   -.     .`     .:       details.
- :     =  ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+     .>+-=
+_;:,   .>  :=|.         This program is free software; you can
+.> <`_,  > .  <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--  :           the terms of the GNU Library General Public
+.="- .-=="i,   .._         License as published by the Free Software
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
+  ._= =}    :          or (at your option) any later version.
+  .%`+i>    _;_.
+  .i_,=:_.   -<s.       This program is distributed in the hope that
+  + . -:.    =       it will be useful,  but WITHOUT ANY WARRANTY;
+  : ..  .:,   . . .    without even the implied warranty of
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=    =    ;      Library General Public License for more
+++=  -.   .`   .:       details.
+:   = ...= . :.=-
+-.  .:....=;==+<;          You should have received a copy of the GNU
+ -_. . .  )=. =           Library General Public License along with
+  --    :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
@@ -40,6 +40,7 @@
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <opie2/okeyfilter.h>
 
 /* STD */
 #include <fcntl.h>
@@ -145,8 +146,11 @@ void SIMpad::initButtons()
     if ( d->m_buttons )
         return;
 
-    if ( isQWS( ) )
-        QWSServer::setKeyboardFilter ( this );
+    if ( isQWS( ) ) {
+        Opie::Core::OKeyFilter::inst()->addPreHandler(this);
+//        QWSServer::setKeyboardFilter ( this );
+    }
+
 
     d->m_buttons = new QValueList <ODeviceButton>;
 
diff --git a/libopie2/opiecore/okeyfilter.cpp b/libopie2/opiecore/okeyfilter.cpp
new file mode 100644
index 0000000..d806dbd
--- a/dev/null
+++ b/libopie2/opiecore/okeyfilter.cpp
@@ -0,0 +1,119 @@
+/*
+                            This file is part of the Opie Project
+             =.             Copyright (C) 2004 Rajko 'Alwin' Albrecht <alwin@handhelds.org>
+           .=l.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
+          .>+-=
+_;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=         redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :          the terms of the GNU Library General Public
+.="- .-=="i,     .._        License as published by the Free Software
+- .   .-<_>     .<>         Foundation; either version 2 of the License,
+    ._= =}       :          or (at your option) any later version.
+   .%`+i>       _;_.
+   .i_,=:_.      -<s.       This program is distributed in the hope that
+    +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+   : ..    .:,     . . .    without even the implied warranty of
+   =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+ _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;     Library General Public License for more
+++=   -.     .`     .:      details.
+:     =  ...= . :.=-
+-.   .:....=;==+<;          You should have received a copy of the GNU
+ -_. . .   )=.  =           Library General Public License along with
+   --        :-=`           this library; see the file COPYING.LIB.
+                            If not, write to the Free Software Foundation,
+                            Inc., 59 Temple Place - Suite 330,
+                            Boston, MA 02111-1307, USA.
+*/
+
+#include "okeyfilter.h"
+#include "device/odevice.h"
+#include "odebug.h"
+
+namespace Opie {
+namespace Core {
+
+QValueList<QWSServer::KeyboardFilter*> OKeyFilter::filterList;
+QValueList<QWSServer::KeyboardFilter*> OKeyFilter::preFilterList;
+
+OKeyFilter::OKeyFilter()
+    :QWSServer::KeyboardFilter()
+{
+    filterList.clear();
+    preFilterList.clear();
+    if ( isQWS( ) ) {
+        QWSServer::setKeyboardFilter ( this );
+    }
+}
+
+OKeyFilter::~OKeyFilter()
+{
+}
+
+OKeyFilter* OKeyFilter::inst()
+{
+    static OKeyFilter*ofilter = 0;
+    if (!ofilter) {
+        ofilter = new OKeyFilter;
+    }
+    return ofilter;
+}
+
+bool OKeyFilter::filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat )
+{
+    QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
+    for (iter=preFilterList.begin();iter!=preFilterList.end();++iter) {
+        if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) {
+            return true;
+        }
+    }
+    for (iter=filterList.begin();iter!=filterList.end();++iter) {
+        if ((*iter)->filter(unicode,keycode,modifiers,isPress,autoRepeat)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+void OKeyFilter::addHandler(QWSServer::KeyboardFilter*aF)
+{
+    if (filterList.find(aF)!=filterList.end()) {
+        return;
+    }
+    odebug << "adding a keyboard filter handler"<<oendl;
+    filterList.append(aF);
+}
+
+void OKeyFilter::remHandler(QWSServer::KeyboardFilter*aF)
+{
+    QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
+    if ( (iter=filterList.find(aF))==filterList.end() ) {
+        return;
+    }
+    odebug << "removing a keyboard filter handler"<<oendl;
+    filterList.remove(iter);
+}
+
+void OKeyFilter::addPreHandler(QWSServer::KeyboardFilter*aF)
+{
+    if (preFilterList.find(aF)!=preFilterList.end()) {
+        return;
+    }
+    odebug << "adding a preferred keyboard filter handler"<<oendl;
+    preFilterList.append(aF);
+}
+
+void OKeyFilter::remPreHandler(QWSServer::KeyboardFilter*aF)
+{
+    QValueList<QWSServer::KeyboardFilter*>::Iterator iter;
+    if ( (iter=preFilterList.find(aF))==preFilterList.end() ) {
+        return;
+    }
+    odebug << "removing a preferred keyboard filter handler"<<oendl;
+    preFilterList.remove(iter);
+}
+
+/* namespace Core */
+}
+/* namespace Opie */
+}
diff --git a/libopie2/opiecore/okeyfilter.h b/libopie2/opiecore/okeyfilter.h
new file mode 100644
index 0000000..3f9f744
--- a/dev/null
+++ b/libopie2/opiecore/okeyfilter.h
@@ -0,0 +1,77 @@
+/*
+                            This file is part of the Opie Project
+             =.             Copyright (C) 2004 Rajko 'Alwin' Albrecht <alwin@handhelds.org>
+           .=l.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
+          .>+-=
+_;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=         redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :          the terms of the GNU Library General Public
+.="- .-=="i,     .._        License as published by the Free Software
+- .   .-<_>     .<>         Foundation; either version 2 of the License,
+    ._= =}       :          or (at your option) any later version.
+   .%`+i>       _;_.
+   .i_,=:_.      -<s.       This program is distributed in the hope that
+    +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+   : ..    .:,     . . .    without even the implied warranty of
+   =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+ _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;     Library General Public License for more
+++=   -.     .`     .:      details.
+:     =  ...= . :.=-
+-.   .:....=;==+<;          You should have received a copy of the GNU
+ -_. . .   )=.  =           Library General Public License along with
+   --        :-=`           this library; see the file COPYING.LIB.
+                            If not, write to the Free Software Foundation,
+                            Inc., 59 Temple Place - Suite 330,
+                            Boston, MA 02111-1307, USA.
+*/
+
+/* QT */
+#include <qwindowsystem_qws.h>
+#include <qvaluelist.h>
+
+namespace Opie {
+namespace Core {
+    class ODevice;
+namespace Internal {
+    class iPAQ;
+    class SIMpad;
+}
+
+/**
+ * A singleton which will manage all possible keyboard filters inside opie.
+ * It makes sure that key handlers of odevice are checked first than the
+ * keyfilters of software.
+ * @short a keyfilter proxy
+ * @see QWSServer::KeyboardFilter
+ * @author Rajko Albrecht
+ * @version 1.0
+ */
+class OKeyFilter:public QWSServer::KeyboardFilter
+{
+    friend class Opie::Core::ODevice;
+    friend class Opie::Core::Internal::iPAQ;
+    friend class Opie::Core::Internal::SIMpad;
+
+    static QValueList<QWSServer::KeyboardFilter*> filterList;
+    static QValueList<QWSServer::KeyboardFilter*> preFilterList;
+
+    OKeyFilter();
+    OKeyFilter(const OKeyFilter&):QWSServer::KeyboardFilter(){};
+
+protected:
+    void addPreHandler(QWSServer::KeyboardFilter*);
+    void remPreHandler(QWSServer::KeyboardFilter*);
+
+public:
+    virtual ~OKeyFilter();
+    virtual bool filter( int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat );
+
+    void addHandler(QWSServer::KeyboardFilter*);
+    void remHandler(QWSServer::KeyboardFilter*);
+
+    static OKeyFilter*inst();
+};
+
+}
+}
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index 5056d48..8189a7c 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -7,6 +7,7 @@ HEADERS     = oapplication.h            \
               oglobal.h                 \
               oglobalsettings.h         \
               okeyconfigmanager.h       \
+              okeyfilter.h              \
               opluginloader.h           \
               oprocess.h                \
               oprocctrl.h               \
@@ -20,6 +21,7 @@ SOURCES     = oapplication.cpp          \
               oglobal.cpp               \
               oglobalsettings.cpp       \
               okeyconfigmanager.cpp     \
+              okeyfilter.cpp            \
               opluginloader.cpp         \
               oprocess.cpp              \
                       oprocctrl.cpp             \