summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-06-14 12:22:36 (UTC)
committer mickeyl <mickeyl>2003-06-14 12:22:36 (UTC)
commit437e389cc5cca518c5f26677f98c464f9255ec04 (patch) (unidiff)
treee41796d8b9b08423d1108dd587a1eea516a0f68c
parentaa6346b12af5d1e85f5e2f97b8b78b106bb43ecc (diff)
downloadopie-437e389cc5cca518c5f26677f98c464f9255ec04.zip
opie-437e389cc5cca518c5f26677f98c464f9255ec04.tar.gz
opie-437e389cc5cca518c5f26677f98c464f9255ec04.tar.bz2
revert to non-tslib since we are having problems with tslib on SIMpad
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--qt/qte234-for-opie091-simpad.patch77
1 files changed, 71 insertions, 6 deletions
diff --git a/qt/qte234-for-opie091-simpad.patch b/qt/qte234-for-opie091-simpad.patch
index 5b892d4..74a8d83 100644
--- a/qt/qte234-for-opie091-simpad.patch
+++ b/qt/qte234-for-opie091-simpad.patch
@@ -1,5 +1,5 @@
1 --- src/kernel/qkeyboard_qws.cpp.origFri May 30 16:05:20 2003 1 --- qt-2.3.5/src/kernel/qkeyboard_qws.cpp~qte234-for-opie091-simpad2003-06-13 16:59:33.000000000 +0200
2 +++ src/kernel/qkeyboard_qws.cppFri May 30 16:03:41 2003 2 +++ qt-2.3.5/src/kernel/qkeyboard_qws.cpp2003-06-13 16:59:33.000000000 +0200
3@@ -37,6 +37,7 @@ 3@@ -37,6 +37,7 @@
4 #include <qapplication.h> 4 #include <qapplication.h>
5 #include <qsocketnotifier.h> 5 #include <qsocketnotifier.h>
@@ -68,7 +68,7 @@
68 #ifdef QT_QWS_SL5XXX 68 #ifdef QT_QWS_SL5XXX
69 static const QWSServer::KeyMap keyM[] = { 69 static const QWSServer::KeyMap keyM[] = {
70 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 00 70 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 00
71@@ -1440,7 +1494,11 @@ 71@@ -1444,7 +1498,11 @@
72 } else { 72 } else {
73 type = spec; 73 type = spec;
74 } 74 }
@@ -81,7 +81,7 @@
81 if ( type == "Buttons" ) { 81 if ( type == "Buttons" ) {
82 #if defined(QT_QWS_YOPY) 82 #if defined(QT_QWS_YOPY)
83 handler = new QWSyopyButtonsHandler(); 83 handler = new QWSyopyButtonsHandler();
84@@ -1469,6 +1527,217 @@ 84@@ -1473,6 +1531,217 @@
85 return keyM; 85 return keyM;
86 } 86 }
87 87
@@ -91,7 +91,7 @@
91+ * SIMpad switches handler 91+ * SIMpad switches handler
92+ * (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> 92+ * (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
93+ */ 93+ */
94+ 94
95+ 95+
96+QWSsimpadButtonsHandler::QWSsimpadButtonsHandler() 96+QWSsimpadButtonsHandler::QWSsimpadButtonsHandler()
97+ :QWSKeyboardHandler(), fd( -1 ), 97+ :QWSKeyboardHandler(), fd( -1 ),
@@ -106,7 +106,7 @@
106+ qWarning( "SimpadButtonsHandler(): can't open %s", SIMPAD_SWITCHES_DEVICE ); 106+ qWarning( "SimpadButtonsHandler(): can't open %s", SIMPAD_SWITCHES_DEVICE );
107+ return; 107+ return;
108+ } 108+ }
109 109+
110+ notifier = new QSocketNotifier( fd, QSocketNotifier::Read, this ); 110+ notifier = new QSocketNotifier( fd, QSocketNotifier::Read, this );
111+ connect( notifier, SIGNAL( activated(int) ),this, SLOT( readSwitchesData() ) ); 111+ connect( notifier, SIGNAL( activated(int) ),this, SLOT( readSwitchesData() ) );
112+ 112+
@@ -300,3 +300,68 @@
300+ 300+
301+ 301+
302+#endif // QT_NO_QWS_KEYBOARD 302+#endif // QT_NO_QWS_KEYBOARD
303 --- qt-2.3.5/src/kernel/qwsmouse_qws.cpp~qte234-for-opie091-simpad2003-04-02 03:26:52.000000000 +0200
304 +++ qt-2.3.5/src/kernel/qwsmouse_qws.cpp2003-06-13 16:59:33.000000000 +0200
305@@ -47,6 +47,7 @@
306 #include <stdlib.h>
307 #include <stdio.h>
308 #include <sys/ioctl.h>
309+#include <sys/time.h>
310 #include <sys/types.h>
311 #include <sys/stat.h>
312 #include <fcntl.h>
313@@ -67,6 +68,7 @@
314 unsigned short x;
315 unsigned short y;
316 unsigned short pad;
317+ struct timeval stamp;
318 } TS_EVENT;
319 #elif defined(QT_QWS_SL5XXX)
320 #define QT_QWS_SL5XXX_RAW
321@@ -1238,29 +1240,11 @@
322 : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0),
323 numSamples(0), skipCount(0)
324 {
325-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
326-#if defined(QT_QWS_IPAQ)
327-# ifdef QT_QWS_IPAQ_RAW
328- if ((mouseFD = open( "/dev/h3600_tsraw", O_RDONLY | O_NDELAY)) < 0) {
329-# else
330- if ((mouseFD = open( "/dev/h3600_ts", O_RDONLY | O_NDELAY)) < 0) {
331-# endif
332- qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno));
333+#ifdef QT_QWS_SIMPAD
334+ if ((mouseFD = open( "/dev/touchscreen/ucb1x00", O_RDONLY | O_NONBLOCK )) < 0) {
335+ qWarning( "Cannot open /dev/touchscreen/ucb1x00 (%s)", strerror(errno));
336 return;
337 }
338-#elif defined(QT_QWS_SL5XXX)
339-//# ifdef QT_QWS_SL5XXX_TSRAW
340-# if 0
341- if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) {
342- qWarning( "Cannot open /dev/tsraw (%s)", strerror(errno));
343- return;
344- }
345-# else
346- if ((mouseFD = open( "/dev/ts", O_RDONLY | O_NDELAY)) < 0) {
347- qWarning( "Cannot open /dev/ts (%s)", strerror(errno));
348- return;
349- }
350-# endif
351 #endif
352
353 QSocketNotifier *mouseNotifier;
354@@ -1269,12 +1253,11 @@
355 connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData()));
356 waspressed=FALSE;
357 mouseIdx = 0;
358-#endif
359 }
360
361 QTPanelHandlerPrivate::~QTPanelHandlerPrivate()
362 {
363-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
364+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SIMPAD)
365 if (mouseFD >= 0)
366 close(mouseFD);
367 #endif