summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-06-03 14:38:09 (UTC)
committer mickeyl <mickeyl>2003-06-03 14:38:09 (UTC)
commit4e0c9efab5f3c73a1843e96983c9cd1894e44810 (patch) (unidiff)
tree8d885b0a0c08047f7cfb194c7f3bc6539e927f2c
parentf80c2829f8660402df7a6d5667d6022f366cd44b (diff)
downloadopie-4e0c9efab5f3c73a1843e96983c9cd1894e44810.zip
opie-4e0c9efab5f3c73a1843e96983c9cd1894e44810.tar.gz
opie-4e0c9efab5f3c73a1843e96983c9cd1894e44810.tar.bz2
eliminate the non-tslib patch for the simpad.
simpad support now _needs_ tslib with Qt/Embedded.
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,74 +1,48 @@
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+