summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qte234-for-opie091-simpad.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/qt/qte234-for-opie091-simpad.patch b/qt/qte234-for-opie091-simpad.patch
index e4af4f7..5b892d4 100644
--- a/qt/qte234-for-opie091-simpad.patch
+++ b/qt/qte234-for-opie091-simpad.patch
@@ -1,154 +1,128 @@
1--- src/kernel/qwsmouse_qws.cpp.orig 2003-01-31 04:34:52.000000000 +0100
2+++ src/kernel/qwsmouse_qws.cpp 2003-03-10 12:26:40.000000000 +0100
3@@ -61,12 +61,14 @@
4 #endif
5
6 #if defined(QT_QWS_IPAQ)
7+#include <sys/time.h>
8 #define QT_QWS_IPAQ_RAW
9 typedef struct {
10 unsigned short pressure;
11 unsigned short x;
12 unsigned short y;
13 unsigned short pad;
14+ struct timeval stamp;
15 } TS_EVENT;
16 #elif defined(QT_QWS_SL5XXX)
17 #define QT_QWS_SL5XXX_RAW
18@@ -1241,7 +1243,7 @@
19 #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
20 #if defined(QT_QWS_IPAQ)
21 # ifdef QT_QWS_IPAQ_RAW
22- if ((mouseFD = open( "/dev/h3600_tsraw", O_RDONLY | O_NDELAY)) < 0) {
23+ if ((mouseFD = open( "/dev/touchscreen/ucb1x00", O_RDONLY | O_NONBLOCK /*O_NDELAY*/)) < 0) {
24 # else
25 if ((mouseFD = open( "/dev/h3600_ts", O_RDONLY | O_NDELAY)) < 0) {
26 # endif
27 --- src/kernel/qkeyboard_qws.cpp.origFri May 30 16:05:20 2003 1 --- src/kernel/qkeyboard_qws.cpp.origFri May 30 16:05:20 2003
28 +++ src/kernel/qkeyboard_qws.cppFri May 30 16:03:41 2003 2 +++ src/kernel/qkeyboard_qws.cppFri May 30 16:03:41 2003
29@@ -37,6 +37,7 @@ 3@@ -37,6 +37,7 @@
30 #include <qapplication.h> 4 #include <qapplication.h>
31 #include <qsocketnotifier.h> 5 #include <qsocketnotifier.h>
32 #include <qnamespace.h> 6 #include <qnamespace.h>
33+#include <qdatetime.h> 7+#include <qdatetime.h>
34 #include <qtimer.h> 8 #include <qtimer.h>
35 9
36 #include <stdlib.h> 10 #include <stdlib.h>
37@@ -131,6 +132,59 @@ 11@@ -131,6 +132,59 @@
38 12
39 #endif // QNX6 13 #endif // QNX6
40 14
41+/* 15+/*
42+ * SIMpad switches handler 16+ * SIMpad switches handler
43+ * (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> 17+ * (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
44+ */ 18+ */
45+ 19+
46+//TODO: guard this against inclusion with #ifdef QT_QWS_SIMPAD 20+//TODO: guard this against inclusion with #ifdef QT_QWS_SIMPAD
47+ 21+
48+#include <linux/switches.h> 22+#include <linux/switches.h>
49+#define SIMPAD_SWITCHES_DEVICE "/dev/misc/switches" 23+#define SIMPAD_SWITCHES_DEVICE "/dev/misc/switches"
50+ 24+
51+// switches from left top to right down over the SIMpad surface 25+// switches from left top to right down over the SIMpad surface
52+ 26+
53+#define SIMPAD_SWITCH_POWER 0x02 27+#define SIMPAD_SWITCH_POWER 0x02
54+#define SIMPAD_SWITCH_UPPER 0x10 28+#define SIMPAD_SWITCH_UPPER 0x10
55+#define SIMPAD_SWITCH_UP 0x20 29+#define SIMPAD_SWITCH_UP 0x20
56+#define SIMPAD_SWITCH_DOWN 0x40 30+#define SIMPAD_SWITCH_DOWN 0x40
57+#define SIMPAD_SWITCH_LEFT 0x80 31+#define SIMPAD_SWITCH_LEFT 0x80
58+#define SIMPAD_SWITCH_RIGHT 0x100 32+#define SIMPAD_SWITCH_RIGHT 0x100
59+#define SIMPAD_SWITCH_LOWER 0x8 33+#define SIMPAD_SWITCH_LOWER 0x8
60+ 34+
61+class QWSsimpadButtonsHandler : public QWSKeyboardHandler 35+class QWSsimpadButtonsHandler : public QWSKeyboardHandler
62+{ 36+{
63+ Q_OBJECT 37+ Q_OBJECT
64+ 38+
65+ public: 39+ public:
66+ QWSsimpadButtonsHandler(); 40+ QWSsimpadButtonsHandler();
67+ virtual ~QWSsimpadButtonsHandler(); 41+ virtual ~QWSsimpadButtonsHandler();
68+ 42+
69+ bool isOpen() { return fd > 0; } 43+ bool isOpen() { return fd > 0; }
70+ 44+
71+ private slots: 45+ private slots:
72+ void readSwitchesData(); 46+ void readSwitchesData();
73+ void autoRepeat(); 47+ void autoRepeat();
74+ 48+
75+ private: 49+ private:
76+ switches_mask_t switches; 50+ switches_mask_t switches;
77+ 51+
78+ int fd; 52+ int fd;
79+ int repeatdelay; 53+ int repeatdelay;
80+ int repeatperiod; 54+ int repeatperiod;
81+ 55+
82+ int lastCode; // last native code 56+ int lastCode; // last native code
83+ int lastPress; // last press/release state 57+ int lastPress; // last press/release state
84+ 58+
85+ int k; // last emitted Qt key code 59+ int k; // last emitted Qt key code
86+ int shiftKeyPressed; // true if one of the SHIFT keys has been pressed and not yet released 60+ int shiftKeyPressed; // true if one of the SHIFT keys has been pressed and not yet released
87+ bool shiftUsed; // true if SHIFT has been used 61+ bool shiftUsed; // true if SHIFT has been used
88+ 62+
89+ QTime eventTimer; // tracks time between raw events 63+ QTime eventTimer; // tracks time between raw events
90+ QTimer* repeater; 64+ QTimer* repeater;
91+ QSocketNotifier *notifier; 65+ QSocketNotifier *notifier;
92+}; 66+};
93+ 67+
94 #ifdef QT_QWS_SL5XXX 68 #ifdef QT_QWS_SL5XXX
95 static const QWSServer::KeyMap keyM[] = { 69 static const QWSServer::KeyMap keyM[] = {
96 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 00 70 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 00
97@@ -1440,7 +1494,11 @@ 71@@ -1440,7 +1494,11 @@
98 } else { 72 } else {
99 type = spec; 73 type = spec;
100 } 74 }
101- 75-
102+ if ( type == "SIMpad" ) 76+ if ( type == "SIMpad" )
103+ { 77+ {
104+ qDebug( "QWSKeyboardHandler: using SIMpad keyboard handler..." ); 78+ qDebug( "QWSKeyboardHandler: using SIMpad keyboard handler..." );
105+ handler = new QWSsimpadButtonsHandler(); 79+ handler = new QWSsimpadButtonsHandler();
106+ } 80+ }
107 if ( type == "Buttons" ) { 81 if ( type == "Buttons" ) {
108 #if defined(QT_QWS_YOPY) 82 #if defined(QT_QWS_YOPY)
109 handler = new QWSyopyButtonsHandler(); 83 handler = new QWSyopyButtonsHandler();
110@@ -1469,6 +1527,217 @@ 84@@ -1469,6 +1527,217 @@
111 return keyM; 85 return keyM;
112 } 86 }
113 87
114-#endif // QT_NO_QWS_KEYBOARD 88-#endif // QT_NO_QWS_KEYBOARD
115 89
116+/* 90+/*
117+ * SIMpad switches handler 91+ * SIMpad switches handler
118+ * (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> 92+ * (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
119+ */ 93+ */
120+ 94+
121+ 95+
122+QWSsimpadButtonsHandler::QWSsimpadButtonsHandler() 96+QWSsimpadButtonsHandler::QWSsimpadButtonsHandler()
123+ :QWSKeyboardHandler(), fd( -1 ), 97+ :QWSKeyboardHandler(), fd( -1 ),
124+ repeatdelay( 700 ), repeatperiod( 80 ), 98+ repeatdelay( 700 ), repeatperiod( 80 ),
125+ lastCode( 0 ), lastPress( 0 ), 99+ lastCode( 0 ), lastPress( 0 ),
126+ k( -1 ), shiftKeyPressed( 0 ), shiftUsed( false ) 100+ k( -1 ), shiftKeyPressed( 0 ), shiftUsed( false )
127+{ 101+{
128+ qDebug( "SimpadButtonsHandler() - V4.1" ); 102+ qDebug( "SimpadButtonsHandler() - V4.1" );
129+ fd = ::open( SIMPAD_SWITCHES_DEVICE, O_RDWR | O_NDELAY, 0 ); 103+ fd = ::open( SIMPAD_SWITCHES_DEVICE, O_RDWR | O_NDELAY, 0 );
130+ if ( fd < 0 ) 104+ if ( fd < 0 )
131+ { 105+ {
132+ qWarning( "SimpadButtonsHandler(): can't open %s", SIMPAD_SWITCHES_DEVICE ); 106+ qWarning( "SimpadButtonsHandler(): can't open %s", SIMPAD_SWITCHES_DEVICE );
133+ return; 107+ return;
134+ } 108+ }
135 109
136+ notifier = new QSocketNotifier( fd, QSocketNotifier::Read, this ); 110+ notifier = new QSocketNotifier( fd, QSocketNotifier::Read, this );
137+ connect( notifier, SIGNAL( activated(int) ),this, SLOT( readSwitchesData() ) ); 111+ connect( notifier, SIGNAL( activated(int) ),this, SLOT( readSwitchesData() ) );
138+ 112+
139+ repeater = new QTimer(this); 113+ repeater = new QTimer(this);
140+ connect(repeater, SIGNAL(timeout()), this, SLOT(autoRepeat())); 114+ connect(repeater, SIGNAL(timeout()), this, SLOT(autoRepeat()));
141+ 115+
142+} 116+}
143+ 117+
144+ 118+
145+QWSsimpadButtonsHandler::~QWSsimpadButtonsHandler() 119+QWSsimpadButtonsHandler::~QWSsimpadButtonsHandler()
146+{ 120+{
147+ qDebug( "~SimpadButtonsHandler()" ); 121+ qDebug( "~SimpadButtonsHandler()" );
148+ if ( fd > 0 ) 122+ if ( fd > 0 )
149+ { 123+ {
150+ ::close( fd ); 124+ ::close( fd );
151+ fd = -1; 125+ fd = -1;
152+ } 126+ }
153+} 127+}
154+ 128+