1 files changed, 160 insertions, 32 deletions

diff --git a/qt/qte234-for-opie091-simpad.patch b/qt/qte234-for-opie091-simpad.patch
index 93f4be3..5959469 100644
--- a/qt/qte234-for-opie091-simpad.patch
+++ b/qt/qte234-for-opie091-simpad.patch
@@ -25,7 +25,15 @@
      if ((mouseFD = open( "/dev/h3600_ts", O_RDONLY | O_NDELAY)) < 0) {
  # endif
-        --- src/kernel/qkeyboard_qws.cpp.origSat May 24 16:49:38 2003
-        +++ src/kernel/qkeyboard_qws.cppMon May 26 19:52:05 2003
-@@ -131,6 +131,53 @@
+        --- src/kernel/qkeyboard_qws.cpp.origFri May 30 16:05:20 2003
+        +++ src/kernel/qkeyboard_qws.cppFri May 30 16:03:41 2003
+@@ -37,6 +37,7 @@
+ #include <qapplication.h>
+ #include <qsocketnotifier.h>
+ #include <qnamespace.h>
++#include <qdatetime.h>
+ #include <qtimer.h>
+ 
+ #include <stdlib.h>
+@@ -131,6 +132,59 @@
  
  #endif // QNX6
@@ -41,13 +49,12 @@
 +#define SIMPAD_SWITCHES_DEVICE "/dev/misc/switches"
 +
-+// switches from top to down over the SIMpad surface
++// switches from left top to right down over the SIMpad surface
 +
++#define SIMPAD_SWITCH_POWER 0x02
 +#define SIMPAD_SWITCH_UPPER 0x10
-+
 +#define SIMPAD_SWITCH_UP 0x20
 +#define SIMPAD_SWITCH_DOWN 0x40
 +#define SIMPAD_SWITCH_LEFT 0x80
 +#define SIMPAD_SWITCH_RIGHT 0x100
-+
 +#define SIMPAD_SWITCH_LOWER 0x8
 +
@@ -72,6 +79,13 @@
 +    int repeatdelay;
 +    int repeatperiod;
-+    int k;
 +
++    int lastCode;         // last native code
++    int lastPress;        // last press/release state
++
++    int k;                // last emitted Qt key code
++    int shiftKeyPressed;  // true if one of the SHIFT keys has been pressed and not yet released
++    bool shiftUsed;       // true if SHIFT has been used
++
++    QTime eventTimer;     // tracks time between raw events
 +    QTimer* repeater;
 +    QSocketNotifier *notifier;
@@ -81,5 +95,5 @@
  static const QWSServer::KeyMap keyM[] = {
              {  Qt::Key_unknown,0xffff  , 0xffff  , 0xffff  }, // 00
-@@ -396,7 +443,7 @@
+@@ -396,7 +450,7 @@
         for the list of codes).
    <li>\a modifiers is the set of modifier keys (see Qt::Modifier).
@@ -90,5 +104,5 @@
    </ul>
  */
-@@ -1440,7 +1486,11 @@
+@@ -1440,7 +1494,11 @@
      } else {
          type = spec;
@@ -103,19 +117,21 @@
  #if defined(QT_QWS_YOPY)
          handler = new QWSyopyButtonsHandler();
-@@ -1469,6 +1519,103 @@
+@@ -1469,6 +1527,217 @@
      return keyM;
  }
  
 -#endif // QT_NO_QWS_KEYBOARD
-+
+ 
 +/*
 + * SIMpad switches handler
 + * (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
 + */
- 
- 
++
++
 +QWSsimpadButtonsHandler::QWSsimpadButtonsHandler()
 +                        :QWSKeyboardHandler(), fd( -1 ),
-+                        repeatdelay( 400 ), repeatperiod( 80 )
++                        repeatdelay( 700 ), repeatperiod( 80 ),
++                        lastCode( 0 ), lastPress( 0 ),
++                        k( -1 ), shiftKeyPressed( 0 ), shiftUsed( false )
 +{
 +    qDebug( "SimpadButtonsHandler()" );
@@ -126,5 +142,5 @@
 +        return;
 +    }
-+
+ 
 +    notifier = new QSocketNotifier( fd, QSocketNotifier::Read, this );
 +    connect( notifier, SIGNAL( activated(int) ),this, SLOT( readSwitchesData() ) );
@@ -157,25 +173,138 @@
 +    }
 +
-+    qDebug( "SimpadButtonsHandler() - SwitchEvent = %0x | %0x",
-+            switches.events[0], switches.states[0] );
++    qDebug( "SimpadButtonsHandler() - Shift: %0x [used: %0x] + Event = %0x | %0x",
++            shiftKeyPressed, shiftUsed, switches.events[0], switches.states[0] );
 +
 +    bool press = switches.states[0]; // == switches.event[0];
 +    int code = switches.events[0];
-+    k = -1;
 +
-+    switch(code)
++    //=========================================================================
++
++    /**
++     * Work around a bug in the kernel keyboard driver emitting
++     * bogus events when pressing multiple switches at once
++     **/
++
++    if ( lastCode == 0 )
++    {
++        // first press ever
++        eventTimer.start();
++        lastPress = press;
++        lastCode = code;
++    }
++    else
 +    {
-+        case SIMPAD_SWITCH_UPPER: k = Qt::Key_Escape;   break;
-+        case SIMPAD_SWITCH_UP:    k = Qt::Key_Up;       break;
-+        case SIMPAD_SWITCH_DOWN:  k = Qt::Key_Down;     break;
-+        case SIMPAD_SWITCH_LEFT:  k = Qt::Key_Left;     break;
-+        case SIMPAD_SWITCH_RIGHT: k = Qt::Key_Right;    break;
-+        case SIMPAD_SWITCH_LOWER: k = Qt::Key_Return;   break;
-+        default: k=-1; qWarning( "SimpadButtonsHandler() - unhandled event!" ); break;
++        int interval = eventTimer.restart();
++        qDebug( "event interval = %d", interval );
++        if ( code == lastCode && interval < 30 )
++        {
++            qDebug( "event interval too small - ignoring bogus event" );
++            qDebug( "did I say i hate buggy kernel drivers? :-D" );
++            return;
++        }
++
++        lastPress = press;
++        lastCode = code;
 +    }
 +
-+    bool repeatable = ( k != SIMPAD_SWITCH_UPPER && k != SIMPAD_SWITCH_LOWER );
++    /**
++     * Actually it may also be a hardware problem, but I really don't like
++     * to review kernel code for further inquiry. So just being lazy and
++     * do the workaround in user space :-D
++     **/
 +
-+    qDebug( "SimpadButtonsHandler() - Repeatable = %s", repeatable? "true":"false" );
++     //=====================================================================
++
++    if ( shiftKeyPressed )
++    {
++        // a shift key obviously is being held
++        qDebug( "while shift key is being held..." );
++
++        if ( code != shiftKeyPressed )
++        {
++            // another key is being touched - that means shift mode for us!
++            qDebug( "       another key is being touched -> shift use now = true" );
++
++            shiftUsed = true;
++
++            if ( shiftKeyPressed == SIMPAD_SWITCH_LOWER ) // SHIFT 1
++            {
++                qDebug( "           shift mode 1" );
++                switch(code)
++                {
++                    case SIMPAD_SWITCH_UP:    k = Qt::Key_F9;  break; // Shift1-Up = Calendar
++                    case SIMPAD_SWITCH_DOWN:  k = Qt::Key_F10; break; // Shift1-Down = Contacts
++                    case SIMPAD_SWITCH_LEFT:  k = Qt::Key_F13; break; // Shift1-Left = Mail
++                    case SIMPAD_SWITCH_RIGHT: k = Qt::Key_F11; break; // Shift1-Up = Menu
++                    case SIMPAD_SWITCH_UPPER: k = Qt::Key_F12; break; // Shift1-Upper = Home
++                    default: k=-1; qWarning( "SimpadButtonsHandler() - unhandled event for Shift 1 !" ); break;
++                }
++            }
++            else if ( shiftKeyPressed == SIMPAD_SWITCH_UPPER ) // SHIFT 2
++            {
++                qDebug( "           shift mode 2" );
++                switch(code)
++                {
++                    case SIMPAD_SWITCH_UP:    k = Qt::Key_F5; break;  // Shift2-Up = F5
++                    case SIMPAD_SWITCH_DOWN:  k = Qt::Key_F6; break;  // Shift2-Down = F6
++                    case SIMPAD_SWITCH_LEFT:  k = Qt::Key_F7; break;  // Shift2-Left = F7
++                    case SIMPAD_SWITCH_RIGHT: k = Qt::Key_F8; break;  // Shift2-Up = F8
++                    case SIMPAD_SWITCH_LOWER: k = Qt::Key_F9; break;  // Shift2-Lower = F9
++                    default: k=-1; qWarning( "SimpadButtonsHandler() - unhandled event for Shift 2!" ); break;
++                }
++            }
++        }
++        else
++        {
++            qDebug( "       shift key has been released. checking if being used..." );
++            shiftKeyPressed = 0;
++
++            if ( !shiftUsed )
++            {
++                qDebug( "       ... has _not_ being used -> really emit the key" );
++                k = ( code == SIMPAD_SWITCH_UPPER ? Qt::Key_Escape : Qt::Key_Return );
++                qDebug( "Emitting key = %d (pressed)", k );
++                processKeyEvent( 0, k, 0, true, true );
++                qDebug( "Emitting key = %d (released)", k );
++                processKeyEvent( 0, k, 0, false, true );
++                return;
++            }
++            else
++            {
++                qDebug( "       ... has being used -> doing nothing" );
++                return;
++            }
++        }
++    }
++    else
++    {
++        qDebug( "standard mode - no shift yet..." );
++
++        switch(code)
++        {
++            case SIMPAD_SWITCH_UP:    k = Qt::Key_Up;       break;
++            case SIMPAD_SWITCH_DOWN:  k = Qt::Key_Down;     break;
++            case SIMPAD_SWITCH_LEFT:  k = Qt::Key_Left;     break;
++            case SIMPAD_SWITCH_RIGHT: k = Qt::Key_Right;    break;
++
++            case SIMPAD_SWITCH_UPPER: k=-1; shiftKeyPressed = code; shiftUsed = false; return;
++            case SIMPAD_SWITCH_LOWER: k=-1; shiftKeyPressed = code; shiftUsed = false; return;
++
++            default: k=-1; qWarning( "SimpadButtonsHandler() - unhandled event!" ); break;
++        }
++    }
++
++    if ( k == -1 )
++    {
++        qDebug( "no key to emit - returning." );
++        return;
++    }
++
++    bool repeatable = ( k == Qt::Key_Up || k == Qt::Key_Down ||
++                        k == Qt::Key_Right || k == Qt::Key_Left );
++
++    qDebug( "key to emit = %d [%s] [repeat=%s]", k,
++            press ? "press" : "release",
++            repeatable ? "true":"false" );
 +
 +    if ( qt_screen->isTransformed() && k >= Qt::Key_Left && k <= Qt::Key_Down )
@@ -192,8 +321,5 @@
 +        repeater->stop();
 +
-+    if ( k >= 0 )
-+    {
-+        qwsServer->processKeyEvent( 0, k, 0, press, false );
-+    }
++    qwsServer->processKeyEvent( 0, k, 0, press, false );
 +}
 +
@@ -201,5 +327,7 @@
 +void QWSsimpadButtonsHandler::autoRepeat()
 +{
++    qDebug( "Emitting key = %d (released)", k );
 +    processKeyEvent( 0, k, 0, false, true );
++    qDebug( "Emitting key = %d (pressed)", k );
 +    processKeyEvent( 0, k, 0, true, true );
 +    repeater->start(repeatperiod);