-rw-r--r-- | qt/qte234-for-opie091-simpad.patch | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/qt/qte234-for-opie091-simpad.patch b/qt/qte234-for-opie091-simpad.patch index 5959469..e4af4f7 100644 --- a/qt/qte234-for-opie091-simpad.patch +++ b/qt/qte234-for-opie091-simpad.patch @@ -33,5 +33,5 @@ +#include <qdatetime.h> #include <qtimer.h> - + #include <stdlib.h> @@ -131,6 +132,59 @@ @@ -95,13 +95,4 @@ static const QWSServer::KeyMap keyM[] = { { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 00 -@@ -396,7 +450,7 @@ - for the list of codes). - <li>\a modifiers is the set of modifier keys (see Qt::Modifier). - <li>\a isPress says whether this is a press or a release. -- <li>\a autoRepeat says whether this event was generated by an auto-repeat -+ <li>\a time says whether this event was generated by an auto-repeat - mechanism, or an actual key press. - </ul> - */ @@ -1440,7 +1494,11 @@ } else { @@ -120,7 +111,7 @@ return keyM; } - + -#endif // QT_NO_QWS_KEYBOARD - + +/* + * SIMpad switches handler @@ -135,5 +126,5 @@ + k( -1 ), shiftKeyPressed( 0 ), shiftUsed( false ) +{ -+ qDebug( "SimpadButtonsHandler()" ); ++ qDebug( "SimpadButtonsHandler() - V4.1" ); + fd = ::open( SIMPAD_SWITCHES_DEVICE, O_RDWR | O_NDELAY, 0 ); + if ( fd < 0 ) @@ -142,5 +133,5 @@ + return; + } - + + notifier = new QSocketNotifier( fd, QSocketNotifier::Read, this ); + connect( notifier, SIGNAL( activated(int) ),this, SLOT( readSwitchesData() ) ); @@ -197,5 +188,5 @@ + int interval = eventTimer.restart(); + qDebug( "event interval = %d", interval ); -+ if ( code == lastCode && interval < 30 ) ++ if ( code == lastCode && interval < 10 ) + { + qDebug( "event interval too small - ignoring bogus event" ); @@ -288,6 +279,6 @@ + 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; ++ case SIMPAD_SWITCH_UPPER: k=-1; shiftKeyPressed = press? code:0; shiftUsed = false; qDebug( "shiftkey pressed now = %d", shiftKeyPressed ); return; ++ case SIMPAD_SWITCH_LOWER: k=-1; shiftKeyPressed = press? code:0; shiftUsed = false; qDebug( "shiftkey pressed now = %d", shiftKeyPressed ); return; + + default: k=-1; qWarning( "SimpadButtonsHandler() - unhandled event!" ); break; |