diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /qte | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'qte')
50 files changed, 0 insertions, 7177 deletions
diff --git a/qte/qte-2.3.7/beagle.patch b/qte/qte-2.3.7/beagle.patch deleted file mode 100644 index 88c3f94c1c..0000000000 --- a/qte/qte-2.3.7/beagle.patch +++ /dev/null @@ -1,45 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~beagle.patch -+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp -@@ -350,6 +350,11 @@ - { Qt::Key_F12, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 90 -+#ifdef QT_QWS_BEAGLE -+ { Qt::Key_F13, 0xffff, 0xffff, 0xffff }, // lightning -+ { Qt::Key_Up, 0xffff, 0xffff, 0xffff }, // Wheel Up -+ { Qt::Key_Down, 0xffff, 0xffff, 0xffff }, // Wheel Down -+#endif - { 0, 0xffff , 0xffff , 0xffff } - }; - #endif -@@ -406,7 +411,7 @@ - qwsServer->processKeyEvent( unicode, keycode, modifiers, isPress, autoRepeat ); - } - --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_BEAGLE) - #define QT_QWS_AUTOREPEAT_MANUALLY - #endif - -@@ -791,13 +796,15 @@ - bool repeatable = TRUE; - - #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) && !defined(QT_QWS_CUSTOM) -+#warning "Compiling in Keyboard code" - switch (code) { - case 0x7a: case 0x7b: case 0x7c: case 0x7d: - keyCode = code - 0x7a + Key_F9; - repeatable = FALSE; - break; - case 0x79: -- keyCode = Key_SysReq; -+ qWarning("Keyboard Power Button activated!"); -+ keyCode = Key_F34; // Power Button on Beagle - repeatable = FALSE; - break; - case 0x78: diff --git a/qte/qte-2.3.7/c700-hardware.patch b/qte/qte-2.3.7/c700-hardware.patch deleted file mode 100644 index 36d649f746..0000000000 --- a/qte/qte-2.3.7/c700-hardware.patch +++ /dev/null @@ -1,119 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~c700-hardware 2003-07-17 03:20:26.000000000 +0200 -+++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp 2004-06-29 15:42:57.000000000 +0200 -@@ -126,7 +126,7 @@ - static QRect maxwindow_rect; - extern Q_EXPORT QRect qt_maxWindowRect; - static const char *defaultMouse = --#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_YOPY) || defined(QWS_CUSTOMTOUCHPANEL) -+#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) || defined(QT_QWS_YOPY) || defined(QWS_CUSTOMTOUCHPANEL) - "TPanel" - #else - "Auto" -@@ -3067,7 +3067,7 @@ - void QWSServer::screenSaverSleep() - { - qt_screen->blank(TRUE); --#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) -+#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_SLC700) - d->screensavertimer->stop(); - #else - if ( screensaverinterval ) { ---- qt-2.3.7/src/kernel/qwsmouse_qws.cpp~c700-hardware 2004-06-29 15:28:37.000000000 +0200 -+++ qt-2.3.7/src/kernel/qwsmouse_qws.cpp 2004-06-29 15:44:04.000000000 +0200 -@@ -97,6 +97,19 @@ - #define QT_QWS_TP_MOVE_LIMIT 50 - #define QT_QWS_TP_JITTER_LIMIT 2 - #endif -+#elif defined(QT_QWS_SLC700) -+#define QT_QWS_SLC700_RAW -+typedef struct { -+ unsigned short pressure; -+ unsigned short x; -+ unsigned short y; -+ unsigned short millisecs; -+} TS_EVENT; -+#define QT_QWS_TP_SAMPLE_SIZE 10 -+#define QT_QWS_TP_MINIMUM_SAMPLES 4 -+#define QT_QWS_TP_PRESSURE_THRESHOLD 500 -+#define QT_QWS_TP_MOVE_LIMIT 50 -+#define QT_QWS_TP_JITTER_LIMIT 2 - #endif - - #ifndef QT_QWS_TP_SAMPLE_SIZE -@@ -583,7 +596,7 @@ - sub[nsub++] = new QAutoMouseSubHandler_intellimouse(fd); - notify(fd); - } --#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) -+#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_SLC700) - char fn[] = "/dev/ttyS?"; - for (int ch='0'; ch<='3'; ch++) { - fn[9] = ch; -@@ -1459,7 +1472,7 @@ - : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0), - numSamples(0), skipCount(0) - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - #if defined(QT_QWS_IPAQ) - # ifdef QT_QWS_IPAQ_RAW - if ((mouseFD = open( "/dev/h3600_tsraw", O_RDONLY | O_NDELAY)) < 0) { -@@ -1469,7 +1482,7 @@ - qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno)); - return; - } --#elif defined(QT_QWS_SL5XXX) -+#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - //# ifdef QT_QWS_SL5XXX_TSRAW - # if 0 - if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) { -@@ -1495,7 +1508,7 @@ - - QTPanelHandlerPrivate::~QTPanelHandlerPrivate() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - if (mouseFD >= 0) - close(mouseFD); - #endif -@@ -1503,7 +1516,7 @@ - - void QTPanelHandlerPrivate::readMouseData() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - if(!qt_screen) - return; - -@@ -1522,7 +1535,7 @@ - uchar *mb = mouseBuf+idx; - data = (TS_EVENT *) mb; - if(data->pressure >= QT_QWS_TP_PRESSURE_THRESHOLD) { --#ifdef QT_QWS_SL5XXX -+#if defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - samples[currSample] = QPoint( 1000 - data->x, data->y ); - #else - samples[currSample] = QPoint( data->x, data->y ); -@@ -1541,7 +1554,7 @@ - - mousePos = totalMousePos / (sampleCount - 1); - --# if defined(QT_QWS_IPAQ_RAW) || defined(QT_QWS_SL5XXX_RAW) -+# if defined(QT_QWS_IPAQ_RAW) || defined(QT_QWS_SL5XXX_RAW) || defined(QT_QWS_SLC700_RAW) - mousePos = transform( mousePos ); - # endif - if(!waspressed) -@@ -1916,7 +1929,7 @@ - handler = new QCustomTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_YOPY) - handler = new QYopyTPanelHandlerPrivate( mouseProtocol, mouseDev ); --#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -+#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - handler = new QTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_CASSIOPEIA) - handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev ); diff --git a/qte/qte-2.3.7/compile.patch b/qte/qte-2.3.7/compile.patch deleted file mode 100644 index ce4ca82fcb..0000000000 --- a/qte/qte-2.3.7/compile.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- configure 2002-09-06 20:04:34.000000000 -0400 -+++ configure.new 2002-09-06 20:04:16.000000000 -0400 -@@ -250,7 +250,7 @@ - PLATFORM= - XPLATFORM= - FROMMAKE= --QT_CXX="" -+QT_CXX=" \$(CXXFLAGS_EXTRA)" - - - # Parse the arguments, setting things to "yes" or "no". -@@ -1356,6 +1356,7 @@ - COMPILER=`echo $PLATFORM | cut -f 2- -d-` - if [ "$COMPILER" = "g++" ] - then -+ QT_CXX="$QT_CXX -fpermissive" - if [ "$GPLUSPLUS_EXCEPTIONS" = "no" ] - then - QT_C="$QT_C -fno-exceptions" diff --git a/qte/qte-2.3.7/daemonize.patch b/qte/qte-2.3.7/daemonize.patch deleted file mode 100644 index 1f83398988..0000000000 --- a/qte/qte-2.3.7/daemonize.patch +++ /dev/null @@ -1,113 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- qt-2.3.7/src/kernel/qapplication_qws.cpp~daemonize 2004-07-17 22:47:54.840820000 +0200 -+++ qt-2.3.7/src/kernel/qapplication_qws.cpp 2004-07-17 23:34:32.407525912 +0200 -@@ -103,6 +103,7 @@ - #endif - - #include <sys/time.h> -+#include <syslog.h> - - #if defined(_OS_AIX_) && defined(_CC_GNU_) - #include <sys/select.h> -@@ -162,6 +163,7 @@ - //these used to be environment variables, they are initialized from - //environment variables in - -+bool qws_daemon = TRUE; - bool qws_savefonts = FALSE; - bool qws_screen_is_interlaced=FALSE; //### should be detected - bool qws_shared_memory = FALSE; -@@ -1614,6 +1616,10 @@ - mwGeometry = argv[i]; - } else if ( arg == "-shared" ) { - qws_shared_memory = TRUE; -+ } else if ( arg == "-daemon" ) { -+ qws_daemon = TRUE; -+ } else if ( arg == "-nodaemon" ) { -+ qws_daemon = FALSE; - } else if ( arg == "-noshared" ) { - qws_shared_memory = FALSE; - } else if ( arg == "-savefonts" ) { -@@ -1670,6 +1676,78 @@ - qt_appType = type; - qws_single_process = TRUE; - -+ /* Daemonize the server process -- (C) Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> -+ * Added a new command line option which only is relevant if the application is created as a GuiServer. -+ * The option is -daemon respectively -nodaemon. If in daemon mode (which is the default now), the -+ * server will detach from the controlling terminal and continue as a daemon. This is done via the standard -+ * UNIX double fork magic. -+ */ -+ if ( qws_daemon ) -+ { -+ qWarning( "qt_init() - starting in daemon mode..." ); -+ -+ int pid1 = fork(); -+ if ( pid1 == -1 ) -+ { -+ qWarning( "qt_init() - can't perform initial fork: %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( pid1 ) _exit( 0 ); // ok, first fork performed -+ -+ chdir( "/" ); -+ setsid(); -+ umask(0); -+ close(0); -+ close(1); -+ close(2); -+ -+ int fdnull = ::open( "/dev/null", O_RDWR ); -+ if ( fdnull == -1 ) -+ { -+ syslog( 3, "qt_init() - can't open /dev/null to redirect std{in|out|err}: %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ dup2( fdnull, 0 ); // stdin -+ dup2( fdnull, 1 ); // stdout -+ dup2( fdnull, 2 ); // stderr -+ -+ int pid2 = fork(); -+ if ( pid2 == -1 ) -+ { -+ syslog( 3, "qt_init() - can't perform initial fork: %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( pid2 ) -+ { -+ syslog( 4, "qt_init() [%d] - successfully entered daemon mode", pid2 ); -+ _exit( 0 ); // ok, second fork performed -+ } -+ } -+ -+ /* -+ * , , -+ * /( )` -+ * \ \___ / | B E W A R E ! -+ * /- _ `-/ ' We are a DAEMON now! -+ * (/\/ \ \ /\ -+ * / / | ` \ -+ * O O ) / | -+ * `-^--'`< ' -+ * (_.) _ ) / -+ * `.___/` / -+ * `-----' / -+ * <----. __ / __ \ -+ * <----|====O)))==) \) /==== -+ * <----' `--' `.__,' \ -+ * | | -+ * \ / -+ * ______( (_ / \______ -+ * (FL) ,' ,-----' | \ -+ * `--{__________) \/ -+ * -+ */ -+ -+ - /* Allocate a dedicated virtual terminal -- (C) Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> - * Added a new command line option which only is relevant if the application is created as a GuiServer. - * The option is -terminal <num>, where <num> specifies the virtual terminal to be occupied by the server. diff --git a/qte/qte-2.3.7/devfs.patch b/qte/qte-2.3.7/devfs.patch deleted file mode 100644 index 822faa7fd1..0000000000 --- a/qte/qte-2.3.7/devfs.patch +++ /dev/null @@ -1,164 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- qt-2.3.7/configure~devfs -+++ qt-2.3.7/configure -@@ -402,6 +402,9 @@ - -tslib) - TSLIB=yes - ;; -+ -devfs) -+ DEVFS=yes -+ ;; - -no-g++-exceptions) - GPLUSPLUS_EXCEPTIONS=no - ;; -@@ -1261,6 +1264,8 @@ - -tslib ............. Use the TSLib (touchscreen access library) mouse handler - by default, instead of the normal device default. - -+ -devfs ............. Use devfs /dev paths. -+ - -no-g++-exceptions . Disable exceptions on platforms using the GNU C++ - compiler by using the -fno-exceptions flag. - -@@ -1327,6 +1332,11 @@ - QT_LIBS="${QT_LIBS} -lts" - fi - -+if [ "x$DEVFS" = "xyes" ] -+then -+ QT_CXX="${QT_CXX} -DQT_QWS_DEVFS" -+fi -+ - if [ "x$THREAD" = "xyes" ] - then - cat >src-mt.mk <<EOF ---- qt-2.3.7/src/kernel/qgfxlinuxfb_qws.cpp~devfs -+++ qt-2.3.7/src/kernel/qgfxlinuxfb_qws.cpp -@@ -101,11 +101,19 @@ - bool QLinuxFbScreen::connect( const QString &displaySpec ) - { - // Check for explicitly specified device -+#ifdef QT_QWS_DEVFS -+ QRegExp r( "/dev/fb/[0-9]+" ); -+#else - QRegExp r( "/dev/fb[0-9]+" ); -+#endif - int len; - int m = r.match( displaySpec, 0, &len ); - -+#ifdef QT_QWS_DEVFS -+ QString dev = (m>=0) ? displaySpec.mid( m, len ) : QString("/dev/fb/0"); -+#else - QString dev = (m>=0) ? displaySpec.mid( m, len ) : QString("/dev/fb0"); -+#endif - - fd=open( dev.latin1(), O_RDWR ); - if (fd<0) { -@@ -121,14 +129,22 @@ - - /* Get fixed screen information */ - if (ioctl(fd, FBIOGET_FSCREENINFO, &finfo)) { -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else - perror("reading /dev/fb0"); -+#endif - qWarning("Error reading fixed information"); - return FALSE; - } - - /* Get variable screen information */ - if (ioctl(fd, FBIOGET_VSCREENINFO, &vinfo)) { -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else - perror("reading /dev/fb0"); -+#endif - qWarning("Error reading variable information"); - return FALSE; - } -@@ -165,7 +181,11 @@ - data += dataoffset; - - if ((int)data == -1) { -- perror("mapping /dev/fb0"); -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else -+ perror("reading /dev/fb0"); -+#endif - qWarning("Error: failed to map framebuffer device to memory."); - return FALSE; - } -@@ -229,7 +249,11 @@ - - static void writeTerm(const char* termctl, int sizeof_termctl) - { -+#ifdef QT_QWS_DEVFS -+ const char* tt[]={"/dev/vc/1","/dev/console","/dev/tty",0}; -+#else - const char* tt[]={"/dev/console","/dev/tty","/dev/tty0",0}; -+#endif - const char** dev=tt; - while (*dev) { - int tty=::open(*dev,O_WRONLY); -@@ -792,7 +816,11 @@ - fb_var_screeninfo vinfo; - - if (ioctl(fd, FBIOGET_FSCREENINFO, &finfo)) { -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else - perror("reading /dev/fb0"); -+#endif - qFatal("Error reading fixed information"); - } - ---- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~devfs -+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp -@@ -1017,7 +1017,11 @@ - - QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device) - { -+#ifdef QT_QWS_DEVFS -+ kbdFD=open(device.isEmpty() ? "/dev/vc/1" : device.latin1(), O_RDWR | O_NDELAY, 0); -+#else - kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0); -+#endif - - if ( kbdFD >= 0 ) { - QSocketNotifier *notifier; ---- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~devfs -+++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp -@@ -762,7 +762,11 @@ - void openDevice() - { - if ( !sn ) { -+#ifdef QT_QWS_DEVFS -+ int fd = ::open("/dev/sound/dsp",O_RDWR); -+#else - int fd = ::open("/dev/dsp",O_RDWR); -+#endif - if ( fd < 0 ) { - // For debugging purposes - defined QT_NO_SOUND if you - // don't have sound hardware! ---- qt-2.3.7/src/kernel/qsoundqss_qws.cpp~devfs -+++ qt-2.3.7/src/kernel/qsoundqss_qws.cpp -@@ -388,7 +388,12 @@ - // - // Don't block open right away. - // -- if ((fd = ::open("/dev/dsp", O_WRONLY|O_NONBLOCK)) != -1) { -+#ifdef QT_QWS_DEVFS -+ if ((fd = ::open("/dev/sound/dsp", O_WRONLY|O_NONBLOCK)) != -1) -+#else -+ if ((fd = ::open("/dev/dsp", O_WRONLY|O_NONBLOCK)) != -1) -+#endif -+ { - int flags = fcntl(fd, F_GETFL); - flags &= ~O_NONBLOCK; - if (fcntl(fd, F_SETFL, flags) != 0) { diff --git a/qte/qte-2.3.7/encoding.patch b/qte/qte-2.3.7/encoding.patch deleted file mode 100644 index 5ddb43c2f6..0000000000 --- a/qte/qte-2.3.7/encoding.patch +++ /dev/null @@ -1,49 +0,0 @@ -German umlaute quite likely french, italian, spanish did -not work due QFile::[decode,encode]Name did call QString -local8Bit,fromLocal8Bit which plainly tried to use utf8 -encoding even if not useful. So a filename got changed -and QFileInfo recognized the file not beeing present anymore... -which lead to files not be shown. -Also with Year-Names problem exists as the base system sent -it encoded upstream. - -If you want to have UTF-8 encoding use LC_CTYPE as always and -QTextCodec::codecForLocale will use the right UTF-8 encoding. - -As fallback the old behaviour was preserved - - - - - - - ---- qt-2.3.8-old/src/tools/qstring.cpp 2004-07-23 14:33:02.000000000 +0200 -+++ qt-2.3.8/src/tools/qstring.cpp 2004-07-23 14:32:31.000000000 +0200 -@@ -14469,7 +14469,11 @@ - return qt_winQString2MB( *this ); - #endif - #ifdef _WS_QWS_ -- return utf8(); // ##### if there is ANY 8 bit format supported? -+ QTextCodec* codec = QTextCodec::codecForLocale(); -+ return codec -+ ? codec->fromUnicode(*this) -+ : utf8(); -+ //return latin1(); // ##### if there is ANY 8 bit format supported? - #endif - #endif - } -@@ -14515,7 +14519,12 @@ - return qt_winMB2QString( local8Bit ); - #endif - #ifdef _WS_QWS_ -- return fromUtf8(local8Bit,len); -+ QTextCodec* codec = QTextCodec::codecForLocale(); -+ if( len < 0) len = qstrlen(local8Bit); -+ return codec -+ ? codec->toUnicode(local8Bit, len) -+ : QString::fromUtf8(local8Bit,len); -+// return fromLatin1(local8Bit,len); - #endif - #endif // QT_NO_TEXTCODEC - } diff --git a/qte/qte-2.3.7/fix-qgfxraster.patch b/qte/qte-2.3.7/fix-qgfxraster.patch deleted file mode 100644 index 0a2986bfa1..0000000000 --- a/qte/qte-2.3.7/fix-qgfxraster.patch +++ /dev/null @@ -1,30 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~fix-qgfxraster -+++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp -@@ -3876,14 +3876,15 @@ - for( loopc2=0;loopc2<frontadd;loopc2++ ) - *(alphaptr++)=get_value_32(16,(unsigned char **)&temppos); - -- PackType temp2; -- unsigned char * cp; -+ volatile PackType temp2; -+ volatile unsigned short int * cp; - for( loopc2=0;loopc2<count;loopc2++ ) { -- temp2=*((PackType *)temppos); -- cp=(unsigned char *)&temp2; -- *(alphaptr++)=get_value_32(16,&cp); -- *(alphaptr++)=get_value_32(16,&cp); -- temppos += 2; -+ temp2=*reinterpret_cast<PackType *>(temppos); -+ cp=reinterpret_cast<volatile unsigned short int *>(&temp2); -+ *(alphaptr++)=qt_conv16ToRgb(*cp); -+ cp++; -+ *(alphaptr++)=qt_conv16ToRgb(*cp); -+ temppos += 2; - } - - for( loopc2=0;loopc2<backadd;loopc2++ ) diff --git a/qte/qte-2.3.7/gcc3_4.patch b/qte/qte-2.3.7/gcc3_4.patch deleted file mode 100644 index a7f168138d..0000000000 --- a/qte/qte-2.3.7/gcc3_4.patch +++ /dev/null @@ -1,510 +0,0 @@ -diff -ur qt-2.3.7_old/src/kernel/qgfxtransformed_qws.cpp qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp ---- qt-2.3.7_old/src/kernel/qgfxtransformed_qws.cpp 2004-09-10 21:08:04.000000000 +0200 -+++ qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp 2004-09-10 21:08:42.000000000 +0200 -@@ -671,11 +671,11 @@ - inline int tx( int x, int y ) { - switch ( qt_trans_screen->transformation() ) { - case QTransformedScreen::Rot90: -- return y - xoffs + yoffs; -+ return y - this->xoffs + this->yoffs; - case QTransformedScreen::Rot180: -- return (width - x - 1) - xoffs - xoffs; -+ return (this->width - x - 1) - this->xoffs - this->xoffs; - case QTransformedScreen::Rot270: -- return (height - y - 1) - xoffs - yoffs; -+ return (this->height - y - 1) - this->xoffs - this->yoffs; - default: - return x; - } -@@ -683,11 +683,11 @@ - inline int ty( int x, int y ) { - switch ( qt_trans_screen->transformation() ) { - case QTransformedScreen::Rot90: -- return (width - x - 1) - yoffs - xoffs; -+ return (this->width - x - 1) - this->yoffs - this->xoffs; - case QTransformedScreen::Rot180: -- return (height - y - 1) - yoffs - yoffs; -+ return (this->height - y - 1) - this->yoffs - this->yoffs; - case QTransformedScreen::Rot270: -- return x - yoffs + xoffs; -+ return x - this->yoffs + this->xoffs; - default: - return y; - } -@@ -715,23 +715,23 @@ - template <const int depth, const int type> - void QGfxTransformedRaster<depth,type>::setSourceWidgetOffset(int x, int y) - { -- if ( srcbits == buffer ) { -+ if ( this->srcbits == this->buffer ) { - switch ( qt_trans_screen->transformation() ) { - case QTransformedScreen::Rot90: -- srcwidgetoffs = QPoint( y, width - x - srcwidth ); -+ this->srcwidgetoffs = QPoint( y, this->width - x - this->srcwidth ); - break; - case QTransformedScreen::Rot180: -- srcwidgetoffs = QPoint( width - x - srcwidth, height - y - srcheight ); -+ this->srcwidgetoffs = QPoint( this->width - x - this->srcwidth, this->height - y - this->srcheight ); - break; - case QTransformedScreen::Rot270: -- srcwidgetoffs = QPoint( height - y - srcheight, x ); -+ this->srcwidgetoffs = QPoint( this->height - y - this->srcheight, x ); - break; - default: -- srcwidgetoffs = QPoint( x, y ); -+ this->srcwidgetoffs = QPoint( x, y ); - break; - } - } else -- srcwidgetoffs = QPoint( x, y ); -+ this->srcwidgetoffs = QPoint( x, y ); - } - - template <const int depth, const int type> -@@ -739,8 +739,8 @@ - { - QT_TRANS_GFX_BASE<depth,type>::setSource(i); - QSize s = qt_screen->mapToDevice( QSize(i->width(), i->height()) ); -- srcwidth = s.width(); -- srcheight = s.height(); -+ this->srcwidth = s.width(); -+ this->srcheight = s.height(); - } - - template <const int depth, const int type> -@@ -782,7 +782,7 @@ - if ( w == 0 || h == 0 ) - return; - QRect r( x, y, w, h ); -- if ( cbrush.style() == SolidPattern ) { -+ if ( this->cbrush.style() == Qt::SolidPattern ) { - r.setCoords( tx(x,y), ty(x,y), tx(x+w-1,y+h-1), ty(x+w-1,y+h-1) ); - r = r.normalize(); - } -@@ -797,7 +797,7 @@ - // solution. The brush offset logic is complicated enough, so we don't - // fastpath patternedbrush. - -- if ( inDraw || cpen.style()==NoPen || patternedbrush ) { -+ if ( inDraw || this->cpen.style()==Qt::NoPen || this->patternedbrush ) { - //slowpath - QT_TRANS_GFX_BASE<depth,type>::drawPolygon( a, w, idx, num ); - } else { -@@ -819,29 +819,29 @@ - template <const int depth, const int type> - void QGfxTransformedRaster<depth,type>::processSpans( int n, QPoint* point, int* width ) - { -- if ( inDraw || patternedbrush && srcwidth != 0 && srcheight != 0 ) { -+ if ( inDraw || this->patternedbrush && this->srcwidth != 0 && this->srcheight != 0 ) { - //in the patternedbrush case, we let blt do the transformation - // so we leave inDraw false. -- QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width ); -+ QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width ); - } else { - inDraw = TRUE; - while (n--) { - if ( *width > 0 ) { -- int x=tx(point->x(),point->y())+xoffs; -- int y=ty(point->x(),point->y())+yoffs; -+ int x=tx(point->x(),point->y())+this->xoffs; -+ int y=ty(point->x(),point->y())+this->yoffs; - - switch( qt_trans_screen->transformation() ) { - case QTransformedScreen::Rot90: -- vline( x, y-(*width-1), y ); -+ this->vline( x, y-(*width-1), y ); - break; - case QTransformedScreen::Rot180: -- hline( x - (*width-1), x, y ); -+ this->hline( x - (*width-1), x, y ); - break; - case QTransformedScreen::Rot270: -- vline( x, y, y+*width-1 ); -+ this->vline( x, y, y+*width-1 ); - break; - default: -- hline( x, x+*width-1, y ); -+ this->hline( x, x+*width-1, y ); - break; - } - } -@@ -896,14 +896,14 @@ - switch ( qt_trans_screen->transformation() ) { - case QTransformedScreen::Rot90: - rsx = sy; -- rsy = srcwidth - sx - w; -+ rsy = this->srcwidth - sx - w; - break; - case QTransformedScreen::Rot180: -- rsx = srcwidth - sx - w; -- rsy = srcheight - sy - h; -+ rsx = this->srcwidth - sx - w; -+ rsy = this->srcheight - sy - h; - break; - case QTransformedScreen::Rot270: -- rsx = srcheight - sy - h; -+ rsx = this->srcheight - sy - h; - rsy = sx; - break; - default: -@@ -941,39 +941,39 @@ - r.setCoords( tx(rx,ry), ty(rx,ry), tx(rx+w-1,ry+h-1), ty(rx+w-1,ry+h-1) ); - r = r.normalize(); - -- QPoint oldBrushOffs = brushoffs; -+ QPoint oldBrushOffs = this->brushoffs; - int brx, bry; - switch ( qt_trans_screen->transformation() ) { - case QTransformedScreen::Rot90: -- brx = brushoffs.y(); -- bry = srcwidth - brushoffs.x() - w; -+ brx = this->brushoffs.y(); -+ bry = this->srcwidth - this->brushoffs.x() - w; - break; - case QTransformedScreen::Rot180: -- brx = srcwidth - brushoffs.x() - w; -- bry = srcheight - brushoffs.y() - h; -+ brx = this->srcwidth - this->brushoffs.x() - w; -+ bry = this->srcheight - this->brushoffs.y() - h; - break; - case QTransformedScreen::Rot270: -- brx = srcheight - brushoffs.y() - h; -- bry = brushoffs.x(); -+ brx = this->srcheight - this->brushoffs.y() - h; -+ bry = this->brushoffs.x(); - break; - default: -- brx = brushoffs.x(); -- bry = brushoffs.y(); -+ brx = this->brushoffs.x(); -+ bry = this->brushoffs.y(); - break; - } -- brushoffs = QPoint( brx, bry ); -+ this->brushoffs = QPoint( brx, bry ); - -- int oldsw = srcwidth; -- int oldsh = srcheight; -- QSize s = qt_screen->mapToDevice( QSize(srcwidth,srcheight) ); -- srcwidth = s.width(); -- srcheight = s.height(); -+ int oldsw = this->srcwidth; -+ int oldsh = this->srcheight; -+ QSize s = qt_screen->mapToDevice( QSize(this->srcwidth,this->srcheight) ); -+ this->srcwidth = s.width(); -+ this->srcheight = s.height(); - - QT_TRANS_GFX_BASE<depth,type>::tiledBlt( r.x(), r.y(), r.width(), r.height() ); - -- srcwidth = oldsw; -- srcheight = oldsh; -- brushoffs = oldBrushOffs; -+ this->srcwidth = oldsw; -+ this->srcheight = oldsh; -+ this->brushoffs = oldBrushOffs; - inDraw = FALSE; - } - -diff -ur qt-2.3.7_old/src/kernel/qgfxvfb_qws.cpp qt-2.3.7/src/kernel/qgfxvfb_qws.cpp ---- qt-2.3.7_old/src/kernel/qgfxvfb_qws.cpp 2004-09-10 21:08:04.000000000 +0200 -+++ qt-2.3.7/src/kernel/qgfxvfb_qws.cpp 2004-09-10 21:08:42.000000000 +0200 -@@ -31,7 +31,6 @@ - **********************************************************************/ - - #include "qgfxraster_qws.h" -- - #ifndef QT_NO_QWS_VFB - - #include <sys/ipc.h> -@@ -140,8 +139,8 @@ - void QGfxVFb<depth,type>::drawPoint( int x, int y ) - { - QWSDisplay::grab( TRUE ); -- if ( is_screen_gfx ) -- qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) ); -+ if ( this->is_screen_gfx ) -+ qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) ); - QGfxRaster<depth,type>::drawPoint( x, y ); - QWSDisplay::ungrab(); - } -@@ -150,8 +149,8 @@ - void QGfxVFb<depth,type>::drawPoints( const QPointArray &pa,int x,int y ) - { - QWSDisplay::grab( TRUE ); -- if ( is_screen_gfx ) -- qvfb_screen->setDirty( clipbounds ); -+ if ( this->is_screen_gfx ) -+ qvfb_screen->setDirty( this->clipbounds ); - QGfxRaster<depth,type>::drawPoints( pa, x, y ); - QWSDisplay::ungrab(); - } -@@ -160,9 +159,9 @@ - void QGfxVFb<depth,type>::drawLine( int x1,int y1,int x2,int y2 ) - { - QWSDisplay::grab( TRUE ); -- if ( is_screen_gfx ) { -+ if ( this->is_screen_gfx ) { - QRect r; -- r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs ); -+ r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs ); - qvfb_screen->setDirty( r.normalize() ); - } - QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 ); -@@ -173,8 +172,8 @@ - void QGfxVFb<depth,type>::fillRect( int x,int y,int w,int h ) - { - QWSDisplay::grab( TRUE ); -- if ( is_screen_gfx ) -- qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) ); -+ if ( this->is_screen_gfx ) -+ qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) ); - QGfxRaster<depth,type>::fillRect( x, y, w, h ); - QWSDisplay::ungrab(); - } -@@ -183,8 +182,8 @@ - void QGfxVFb<depth,type>::drawPolyline( const QPointArray &pa,int x,int y ) - { - QWSDisplay::grab( TRUE ); -- if ( is_screen_gfx ) -- qvfb_screen->setDirty( clipbounds ); -+ if ( this->is_screen_gfx ) -+ qvfb_screen->setDirty( this->clipbounds ); - QGfxRaster<depth,type>::drawPolyline( pa, x, y ); - QWSDisplay::ungrab(); - } -@@ -193,8 +192,8 @@ - void QGfxVFb<depth,type>::drawPolygon( const QPointArray &pa,bool w,int x,int y ) - { - QWSDisplay::grab( TRUE ); -- if ( is_screen_gfx ) -- qvfb_screen->setDirty( clipbounds ); -+ if ( this->is_screen_gfx ) -+ qvfb_screen->setDirty( this->clipbounds ); - QGfxRaster<depth,type>::drawPolygon( pa, w, x, y ); - QWSDisplay::ungrab(); - } -@@ -203,8 +202,8 @@ - void QGfxVFb<depth,type>::blt( int x,int y,int w,int h, int sx, int sy ) - { - QWSDisplay::grab( TRUE ); -- if ( is_screen_gfx ) -- qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) ); -+ if ( this->is_screen_gfx ) -+ qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) ); - QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy ); - QWSDisplay::ungrab(); - } -@@ -215,8 +214,8 @@ - QWSDisplay::grab( TRUE ); - int dy = sy - y; - int dx = sx - x; -- if ( is_screen_gfx ) -- qvfb_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs, -+ if ( this->is_screen_gfx ) -+ qvfb_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs, - w+abs(dx), h+abs(dy)) ); - QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy ); - QWSDisplay::ungrab(); -@@ -227,8 +226,8 @@ - void QGfxVFb<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy ) - { - QWSDisplay::grab( TRUE ); -- if ( is_screen_gfx ) -- qvfb_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) ); -+ if ( this->is_screen_gfx ) -+ qvfb_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) ); - QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy ); - QWSDisplay::ungrab(); - } -@@ -238,8 +237,8 @@ - void QGfxVFb<depth,type>::tiledBlt( int x,int y,int w,int h ) - { - QWSDisplay::grab( TRUE ); -- if ( is_screen_gfx ) -- qvfb_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) ); -+ if ( this->is_screen_gfx ) -+ qvfb_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) ); - QGfxRaster<depth,type>::tiledBlt( x, y, w, h ); - QWSDisplay::ungrab(); - } -diff -ur qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp qt-2.3.7/src/kernel/qgfxvnc_qws.cpp ---- qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp 2004-09-10 21:08:04.000000000 +0200 -+++ qt-2.3.7/src/kernel/qgfxvnc_qws.cpp 2004-09-10 21:10:54.000000000 +0200 -@@ -971,7 +971,7 @@ - void QGfxVNC<depth,type>::drawPoint( int x, int y ) - { - QWSDisplay::grab( TRUE ); -- qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) & clipbounds ); -+ qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) & this->clipbounds ); - QGfxRaster<depth,type>::drawPoint( x, y ); - QWSDisplay::ungrab(); - } -@@ -981,8 +981,8 @@ - { - QWSDisplay::grab( TRUE ); - QRect r = pa.boundingRect(); -- r.moveBy( xoffs, yoffs ); -- qvnc_screen->setDirty( r & clipbounds ); -+ r.moveBy( this->xoffs, this->yoffs ); -+ qvnc_screen->setDirty( r & this->clipbounds ); - QGfxRaster<depth,type>::drawPoints( pa, x, y ); - QWSDisplay::ungrab(); - } -@@ -992,9 +992,9 @@ - { - QWSDisplay::grab( TRUE ); - QRect r; -- r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs ); -+ r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs ); - r = r.normalize(); -- qvnc_screen->setDirty( r & clipbounds ); -+ qvnc_screen->setDirty( r & this->clipbounds ); - QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 ); - QWSDisplay::ungrab(); - } -@@ -1003,7 +1003,7 @@ - void QGfxVNC<depth,type>::fillRect( int x,int y,int w,int h ) - { - QWSDisplay::grab( TRUE ); -- qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds ); -+ qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds ); - QGfxRaster<depth,type>::fillRect( x, y, w, h ); - QWSDisplay::ungrab(); - } -@@ -1013,8 +1013,8 @@ - { - QWSDisplay::grab( TRUE ); - QRect r = pa.boundingRect(); -- r.moveBy( xoffs, yoffs ); -- qvnc_screen->setDirty( r & clipbounds ); -+ r.moveBy( this->xoffs, this->yoffs ); -+ qvnc_screen->setDirty( r & this->clipbounds ); - QGfxRaster<depth,type>::drawPolyline( pa, x, y ); - QWSDisplay::ungrab(); - } -@@ -1024,8 +1024,8 @@ - { - QWSDisplay::grab( TRUE ); - QRect r = pa.boundingRect(); -- r.moveBy( xoffs, yoffs ); -- qvnc_screen->setDirty( r & clipbounds ); -+ r.moveBy( this->xoffs, this->yoffs ); -+ qvnc_screen->setDirty( r & this->clipbounds ); - QGfxRaster<depth,type>::drawPolygon( pa, w, x, y ); - QWSDisplay::ungrab(); - } -@@ -1034,7 +1034,7 @@ - void QGfxVNC<depth,type>::blt( int x,int y,int w,int h, int sx, int sy ) - { - QWSDisplay::grab( TRUE ); -- qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds ); -+ qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds ); - QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy ); - QWSDisplay::ungrab(); - } -@@ -1045,8 +1045,8 @@ - QWSDisplay::grab( TRUE ); - int dy = sy - y; - int dx = sx - x; -- qvnc_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs, -- w+abs(dx), h+abs(dy)) & clipbounds ); -+ qvnc_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs, -+ w+abs(dx), h+abs(dy)) & this->clipbounds ); - QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy ); - QWSDisplay::ungrab(); - } -@@ -1056,7 +1056,7 @@ - void QGfxVNC<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy ) - { - QWSDisplay::grab( TRUE ); -- qvnc_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) & clipbounds ); -+ qvnc_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds ); - QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy ); - QWSDisplay::ungrab(); - } -@@ -1066,7 +1066,7 @@ - void QGfxVNC<depth,type>::tiledBlt( int x,int y,int w,int h ) - { - QWSDisplay::grab( TRUE ); -- qvnc_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) & clipbounds ); -+ qvnc_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds ); - QGfxRaster<depth,type>::tiledBlt( x, y, w, h ); - QWSDisplay::ungrab(); - } -diff -ur qt-2.3.7_old/src/tools/qcstring.h qt-2.3.7/src/tools/qcstring.h ---- qt-2.3.7_old/src/tools/qcstring.h 2004-09-10 21:08:04.000000000 +0200 -+++ qt-2.3.7/src/tools/qcstring.h 2004-09-10 21:08:42.000000000 +0200 -@@ -119,7 +119,7 @@ - // We want to keep source compatibility for 2.x - // ### TODO for 4.0: completely remove these and the cstr* functions - --#if !defined(QT_GENUINE_STR) -+#if 0 - - #undef strlen - #define strlen qstrlen -diff -ur qt-2.3.7_old/src/tools/qglobal.h qt-2.3.7/src/tools/qglobal.h ---- qt-2.3.7_old/src/tools/qglobal.h 2004-09-10 21:08:04.000000000 +0200 -+++ qt-2.3.7/src/tools/qglobal.h 2004-09-10 21:08:42.000000000 +0200 -@@ -207,8 +207,16 @@ - #if __GNUC__ == 2 && __GNUC_MINOR__ == 96 - #define Q_FP_CCAST_BROKEN - #endif -+/* ARM gcc pads structs to 32 bits, even when they contain a single -+ char, or short. We tell gcc to pack QChars to 16 bits, to avoid -+ QString bloat. However, gcc 3.4 doesn't allow us to create references to -+ members of a packed struct. (Pointers are OK, because then you -+ supposedly know what you are doing.) */ - #if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) - #define Q_PACKED __attribute__ ((packed)) -+# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 -+# define Q_NO_PACKED_REFERENCE -+# endif - #endif - #elif defined(__xlC__) - #define _CC_XLC_ -diff -ur qt-2.3.7_old/src/tools/qsortedlist.h qt-2.3.7/src/tools/qsortedlist.h ---- qt-2.3.7_old/src/tools/qsortedlist.h 2004-09-10 21:08:04.000000000 +0200 -+++ qt-2.3.7/src/tools/qsortedlist.h 2004-09-10 21:08:42.000000000 +0200 -@@ -48,7 +48,7 @@ - public: - QSortedList() {} - QSortedList( const QSortedList<type> &l ) : QList<type>(l) {} -- ~QSortedList() { clear(); } -+ ~QSortedList() { this->clear(); } - QSortedList<type> &operator=(const QSortedList<type> &l) - { return (QSortedList<type>&)QList<type>::operator=(l); } - -diff -ur qt-2.3.7_old/src/tools/qstring.h qt-2.3.7/src/tools/qstring.h ---- qt-2.3.7_old/src/tools/qstring.h 2004-09-10 21:08:04.000000000 +0200 -+++ qt-2.3.7/src/tools/qstring.h 2004-09-10 21:08:42.000000000 +0200 -@@ -163,8 +163,16 @@ - bool isLetterOrNumber() const; - bool isDigit() const; - -+ -+#ifdef Q_NO_PACKED_REFERENCE -+ uchar& cell() { return *(&cl); } -+ uchar& row() { return *(&rw); } -+#else - uchar& cell() { return cl; } -- uchar& row() { return rw; } -+ uchar& row() { return rw; } -+#endif -+ -+ - uchar cell() const { return cl; } - uchar row() const { return rw; } - -diff -ur qt-2.3.7_old/src/kernel/qwsdecoration_qws.h qt-2.3.7/src/kernel/qwsdecoration_qws.h ---- qt-2.3.7_old/src/kernel/qwsdecoration_qws.h 2003-07-17 03:20:26.000000000 +0200 -+++ qt-2.3.7/src/kernel/qwsdecoration_qws.h 2004-09-13 15:44:13.000000000 +0200 -@@ -50,7 +50,7 @@ - enum Region { None=0, All=1, Title=2, Top=3, Bottom=4, Left=5, Right=6, - TopLeft=7, TopRight=8, BottomLeft=9, BottomRight=10, - Close=11, Minimize=12, Maximize=13, Normalize=14, -- Menu=15, LastRegion=Menu }; -+ Menu=15, LastRegion=Menu, UserDefined = 100 }; - - virtual QRegion region(const QWidget *, const QRect &rect, Region r=All) = 0; - virtual void close( QWidget * ); diff --git a/qte/qte-2.3.7/kernel-keymap-tosa.patch b/qte/qte-2.3.7/kernel-keymap-tosa.patch deleted file mode 100644 index 5ff7b03c48..0000000000 --- a/qte/qte-2.3.7/kernel-keymap-tosa.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~kernel-keymap-tosa.patch -+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp -@@ -231,14 +231,24 @@ - { Qt::Key_CapsLock, 0xffff , 0xffff , 0xffff }, // 3c 60 - { Qt::Key_At, '@' , 's' , 'S'-64 }, // 3d - { Qt::Key_Question, '?' , '?' , 0xffff }, // 3e -+#ifdef QT_QWS_SL6000 -+ { Qt::Key_Comma, ',' , ';' , 0xffff }, // 3f -+ { Qt::Key_Period, '.' , ':' , 0xffff }, // 40 -+#else - { Qt::Key_Comma, ',' , ',' , 0xffff }, // 3f - { Qt::Key_Period, '.' , '.' , 0xffff }, // 40 -+#endif - { Qt::Key_Tab, 9 , '\\' , 0xffff }, // 41 - { Qt::Key_X, 0xffff , 'x' , 'X'-64 }, // 42 - { Qt::Key_C, 0xffff , 'c' , 'C'-64 }, // 43 - { Qt::Key_V, 0xffff , 'v' , 'V'-64 }, // 44 -+#ifdef QT_QWS_SL6000 -+ { Qt::Key_Slash, '/' , '?' , 0xffff }, // 45 -+ { Qt::Key_Apostrophe, '\'' , '"' , 0xffff }, // 46 70 -+#else - { Qt::Key_Slash, '/' , '/' , 0xffff }, // 45 - { Qt::Key_Apostrophe, '\'' , '\'' , 0xffff }, // 46 70 -+#endif - { Qt::Key_Semicolon, ';' , ';' , 0xffff }, // 47 - { Qt::Key_QuoteDbl, '\"' , '\"' , 0xffff }, // 48 - { Qt::Key_Colon, ':' , ':' , 0xffff }, // 49 -@@ -388,6 +398,32 @@ - static const int keyMSize = sizeof(keyM)/sizeof(QWSServer::KeyMap)-1; - static QIntDict<QWSServer::KeyMap> *overrideMap = 0; - -+#if defined(QT_QWS_SL6000) -+/* Translation table to obtain a 'legacy' keycode corresponding to -+ Fn+key on tosa -+ Other devices obviously send different keycodes while Fn is down, tosa sends -+ the same keys as usual bracketed by Fn-down/Fn-up. -+ This table is used while Fn is down to obtain the key-code the SL-5xxx would -+ send, so the rest of keyboard processing does not need to be adjusted. */ -+static const uchar sl6kFnTrans[] = { 0x00, -+ 0x5e, 0x3a, 0x43, 0x4a, 0x2b, 0x4b, 0x4c, 0x4d, 0x30, 0x4e, 0x4f, 0x50, -+ // !, -, cpy, #, 3, $, %, _, 8, &, *, (, -+ 0x53, 0x3b, 0x31, 0x32, 0x29, 0x2c, 0x3d, 0x2d, 0x2f, 0x44, 0x2a, 0x42, -+ // =, +, 9, 0, 1, 4, @, 5, 7, pste, 2, cut, -+ // padding for keycodes which don't ever get directly sent on tosa -+ // except for y->6, ret->'>', BS->DEL -+ 0x2e, 0x00, 0x00, 0x57, 0x00, 0x00, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // 6, _Z, shft, ret, F11, fn, BS?, F31, lght, cncl, lft, up, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // dn, rght, OK, home, 1, 2, 3, 4, 5, 6, 7, 8, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ // 9, 0, UNK, UNK, UNK, UNK, UNK, UNK, UNK, -, +, caps, -+ // here are a few translatable codes again... -+ 0x00, 0x00, 0x54, 0x56, 0x3c, 0x00, 0x00, 0x00, 0x70, 0x55 }; -+ // @, ?, ,, ., tab, cut, cpy, pste, /, ' -+static const int sl6kFnSize = sizeof(sl6kFnTrans); -+#endif -+ - /*! - Changes the mapping of the keyboard; adding the scancode to Unicode - mappings from \a map. The server takes over ownership of \a map -@@ -697,6 +733,18 @@ - - void QWSPC101KeyboardHandler::doKey(uchar code) - { -+ -+ qDebug("Key pressed: %x", code); -+ -+#if defined(QT_QWS_SL6000) -+ if (fn) -+ if (code < sl6kFnSize) { -+ code = sl6kFnTrans[code]; -+ qDebug("Translated Fn: %x", code); -+ } else -+ qDebug("Untranslatable Fn: %x", code); -+#endif -+ - #if defined(QT_QWS_IPAQ) - // map ipaq 'action' key (0x60, 0xe0) - // to keycode for space. diff --git a/qte/qte-2.3.7/kernel-keymap.patch b/qte/qte-2.3.7/kernel-keymap.patch deleted file mode 100644 index 3d90ca10b0..0000000000 --- a/qte/qte-2.3.7/kernel-keymap.patch +++ /dev/null @@ -1,298 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~kernel-keymap.patch -+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp -@@ -30,6 +30,34 @@ - ** - **********************************************************************/ - -+/**************************************************************************** -+** -+** Keyboard Handling Redesign -+** Copyright 2003, Chris Larson <kergoth@handhelds.org> -+** -+** TODO: (key: . = in progress, x = completed) -+** -+** [.] Tty driver should load its initial keymap from the kernel, -+** thereby ensuring keymap consistency between X, console, and qt/e -+** [x] Read kernel keymappings. -+** [x] Read kernel keycode -> unicode map. -+** [x] Use them, along with the existing keyM, to push events up. -+** [ ] Create a new table, from transformed keycode -> qt keycode, rather -+** than the existing raw keycode -> qt keycode. -+** [ ] Adapt handleKey to deal with keys that have no unicode value, such as -+** keypresses that are mapped to strings in the string table. (e.g. F keys) -+** [ ] Cursor orientation change based on display rotation should not -+** be bound to Ipaq or 5xxx, but instead as a runtime choice based -+** on whether or not we're using a Transformed display driver. -+** [ ] Double check that VT handling, particularly with regard to switching, -+** is handled properly. -+** [ ] Add a generic means of dealing with additional (outside the realm of -+** ctrl, alt, shift, altgr) modifiers. Also ensure a means of binding -+** a keypress/combination to a 'lock' of said additional modifiers. -+** -+**********************************************************************/ -+ -+ - #include "qwindowsystem_qws.h" - #include "qwsutils_qws.h" - #include "qgfx_qws.h" -@@ -46,6 +74,7 @@ - #include <unistd.h> - #ifdef _OS_LINUX_ - #include <linux/kd.h> -+#include <linux/keyboard.h> - #endif - #include <sys/ioctl.h> - #include <sys/types.h> -@@ -53,6 +82,7 @@ - #include <fcntl.h> - #include <errno.h> - #include <signal.h> -+#include <termios.h> - - #ifndef QT_NO_QWS_KEYBOARD - -@@ -74,11 +104,6 @@ - #include <sys/vt.h> - #endif - --#ifdef QT_QWS_SL5XXX --#include <asm/sharp_char.h> --#endif -- --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) - static int dir_keyrot = -1; - - static int xform_dirkey(int key) -@@ -102,7 +127,6 @@ - int xf = qt_screen->transformOrientation() + dir_keyrot; - return (key-Qt::Key_Left+xf)%4+Qt::Key_Left; - } --#endif - - #define VTSWITCHSIG SIGUSR2 - -@@ -169,11 +193,19 @@ - { Qt::Key_F35, 0xffff , 0xffff , 0xffff }, // 21 light - { Qt::Key_Escape, 0xffff , 0xffff , 0xffff }, // 22 - -+#ifdef QT_QWS_SL6000 - // Direction key code are for *UNROTATED* display. -+ { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, // 23 -+ { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 24 -+ { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 25 -+ { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, // 26 -+#else -+ // Direction key code are for *UNROTATED* display. -+ { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 23 -+ { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, // 24 -+ { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, // 25 -+ { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 26 -+#endif -- { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 23 -- { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, // 24 -- { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, // 25 -- { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 26 - - { Qt::Key_F33, 0xffff , 0xffff , 0xffff }, // 27 OK - { Qt::Key_F12, 0xffff , 0xffff , 0xffff }, // 28 40 home -@@ -246,7 +262,7 @@ - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 63 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 64 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 65 -- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 66 -+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 - { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 68 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 69 -@@ -488,12 +504,18 @@ - public: - QWSTtyKeyboardHandler(const QString&); - virtual ~QWSTtyKeyboardHandler(); -+ void readKeyboardMap(); -+ void readUnicodeMap(); -+ void handleKey(unsigned char code); - - private slots: - void readKeyboardData(); - - private: - struct termios origTermData; -+ unsigned short acm[E_TABSZ]; -+ unsigned char kernel_map[(1<<KG_CAPSSHIFT)][NR_KEYS]; -+ int current_map; - }; - - class QWSUsbKeyboardHandler : public QWSPC101KeyboardHandler -@@ -633,6 +655,7 @@ - fn = FALSE; - - numLock = FALSE; -+#if 0 - sharp_kbdctl_modifstat st; - int dev = ::open("/dev/sharp_kbdctl", O_RDWR); - if( dev >= 0 ) { -@@ -644,6 +667,7 @@ - ::close(dev); - } - #endif -+#endif - #if defined(QT_QWS_IPAQ) - // iPAQ Action Key has ScanCode 0x60: 0x60|0x80 = 0xe0 == extended mode 1 ! - ipaq_return_pressed = FALSE; -@@ -1023,7 +1047,7 @@ - // Tty keyboard - // - --QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device) -+QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device) : current_map(0) - { - kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0); - -@@ -1040,7 +1064,7 @@ - tcgetattr( kbdFD, &termdata ); - - #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) -- ioctl(kbdFD, KDSKBMODE, K_RAW); -+ ioctl(kbdFD, KDSKBMODE, K_MEDIUMRAW); - #endif - - termdata.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP); -@@ -1053,6 +1077,9 @@ - cfsetospeed(&termdata, 9600); - tcsetattr(kbdFD, TCSANOW, &termdata); - -+ readUnicodeMap(); -+ readKeyboardMap(); -+ - signal(VTSWITCHSIG, vtSwitchHandler); - - #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) -@@ -1108,9 +1135,122 @@ - unsigned char buf[81]; - int n = read(kbdFD, buf, 80 ); - for ( int loop = 0; loop < n; loop++ ) -- doKey(buf[loop]); -+ handleKey(buf[loop]); -+} -+ -+void QWSTtyKeyboardHandler::readUnicodeMap() -+{ -+ if (kbdFD < 0) -+ return; -+ if (ioctl(kbdFD,GIO_UNISCRNMAP,acm) != 0) -+ return; -+} -+ -+void QWSTtyKeyboardHandler::readKeyboardMap() -+{ -+ struct kbentry kbe; -+ if (kbdFD < 0) -+ return; -+ -+ for (int map = 0; map < (1<<KG_CAPSSHIFT); ++map) -+ { -+ unsigned short kval; -+ kbe.kb_table = map; -+ -+ for (int key = 0; key < NR_KEYS; ++key) -+ { -+ kbe.kb_index = key; -+ -+ if (ioctl(kbdFD, KDGKBENT, &kbe) != 0) continue; -+ -+ if ((kbe.kb_value == K_HOLE) || (kbe.kb_value == K_NOSUCHMAP)) continue; -+ -+ kval = KVAL(kbe.kb_value); -+ switch (KTYP(kbe.kb_value)) -+ { -+ case KT_LETTER: -+ case KT_LATIN: -+ case KT_ASCII: -+ case KT_PAD: -+ case KT_SHIFT: -+ kernel_map[map][key] = kbe.kb_value; -+ //qWarning("keycode %d, map %d, type %d, val %d, acm %c\n", key, map, KTYP(kbe.kb_value), kval, acm[kval]); -+ break; -+ } -+ } -+ } -+} -+ -+static inline int map_to_modif(int current_map) -+{ -+ int modifiers = 0; -+ -+ if (current_map & KG_ALT) -+ modifiers |= Qt::ALT; -+ else if (current_map & KG_CTRL) -+ modifiers |= Qt::CTRL; -+ else if (current_map & KG_SHIFT) -+ modifiers |= Qt::SHIFT; -+ -+ return modifiers; - } - -+void QWSTtyKeyboardHandler::handleKey(unsigned char code) -+{ -+ struct kbentry kbe; -+ -+ bool release = false; -+ if (code & 0x80) -+ { -+ release = true; -+ code &= 0x7f; -+ } -+ -+ unsigned short mCode = KVAL(kernel_map[current_map][code]); -+ unsigned short unicode = acm[mCode]; -+ -+ const QWSServer::KeyMap *currentKey = 0; -+ int qtKeyCode = Qt::Key_unknown; -+ -+ currentKey = &QWSServer::keyMap()[code]; -+ if ( currentKey ) qtKeyCode = currentKey->key_code; -+ -+ qDebug("code %d, mCode %d, uni %c, qtKeyCode %d\n", code, mCode, unicode, qtKeyCode); -+ -+ // Handle map changes based on press/release of modifiers -+ // hardcoded for now -+ int modif = -1; -+ switch (qtKeyCode) -+ { -+ case Qt::Key_Alt: -+ case Qt::Key_F22: -+ modif = (1<<KG_ALT); -+ break; -+ case Qt::Key_Control: -+ modif = (1<<KG_CTRL); -+ break; -+ case Qt::Key_Shift: -+ modif = (1<<KG_SHIFT); -+ break; -+ case Qt::Key_Left: -+ case Qt::Key_Right: -+ case Qt::Key_Up: -+ case Qt::Key_Down: -+ if (qt_screen->isTransformed()) -+ qtKeyCode = xform_dirkey(qtKeyCode); -+ break; -+ } -+ -+ if (modif != -1) { -+ if (release) -+ current_map &= ~modif; -+ else -+ current_map |= modif; -+ } -+ -+ unsigned int uni = unicode; -+ processKeyEvent(uni & 0xff, qtKeyCode, map_to_modif(current_map), !release, 0); -+} - - /* USB driver */ - diff --git a/qte/qte-2.3.7/lefthand.patch b/qte/qte-2.3.7/lefthand.patch deleted file mode 100644 index 0a0cccf210..0000000000 --- a/qte/qte-2.3.7/lefthand.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -u qt-2.3.7_orig/src/widgets/qscrollview.cpp qt-2.3.7/src/widgets/qscrollview.cpp ---- qt-2.3.7_orig/src/widgets/qscrollview.cpp 2004-06-13 20:42:54.000000000 +0200 -+++ qt-2.3.7/src/widgets/qscrollview.cpp 2004-06-13 20:45:16.000000000 +0200 -@@ -526,15 +526,16 @@ - this, SLOT( doDragAutoScroll() ) ); - #endif - -- connect( &d->hbar, SIGNAL( valueChanged( int ) ), -- this, SLOT( hslide( int ) ) ); -- connect( &d->vbar, SIGNAL( valueChanged( int ) ), -- this, SLOT( vslide( int ) ) ); -+ connect( &d->hbar, SIGNAL( valueChanged(int) ), -+ this, SLOT( hslide(int) ) ); -+ connect( &d->vbar, SIGNAL( valueChanged(int) ), -+ this, SLOT( vslide(int) ) ); - d->viewport.installEventFilter( this ); - - setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); - setLineWidth( style().defaultFrameWidth() ); - setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); -+ - } - - -@@ -683,6 +684,11 @@ - h-tmarg-bmarg - (showh ? hsbExt : 0) ); - } - -+/* -+ The surrounding environment (or application, if there is no -+ environment, may set this. Requires Qt >= 2.3.8. -+*/ -+bool qt_left_hand_scrollbars = FALSE; - - /*! - Updates scrollbars - all possibilities considered. You should never -@@ -786,45 +792,50 @@ - - // Position the scrollbars, viewport, and corner widget. - int bottom; -+ int xoffset = ( qt_left_hand_scrollbars && ( showv || cornerWidget() ) ) ? vsbExt : 0; -+ int xpos = qt_left_hand_scrollbars ? 0 : w-vsbExt; -+ xpos = (style() == WindowsStyle) && qt_left_hand_scrollbars ? xpos + fw : xpos - fw; -+ int ypos = tmarg; -+ ypos = (style() == WindowsStyle) ? ypos +fw : 0; - if ( showh ) { - int right = ( showv || cornerWidget() ) ? w-vsbExt : w; - if ( style() == WindowsStyle ) -- setHBarGeometry(d->hbar, fw, h-hsbExt-fw, -+ setHBarGeometry(d->hbar, fw + xoffset , h-hsbExt-fw, - right-fw-fw, hsbExt ); - else -- setHBarGeometry(d->hbar, 0, h-hsbExt, right, -+ setHBarGeometry(d->hbar, 0+ xoffset, h-hsbExt, right, - hsbExt ); - bottom=h-hsbExt; - } else { - bottom=h; - } - if ( showv ) { -- clipper()->setGeometry( lmarg, tmarg, -+ clipper()->setGeometry( lmarg + xoffset, tmarg, - w-vsbExt-lmarg-rmarg, - bottom-tmarg-bmarg ); - d->viewportResized( w-vsbExt-lmarg-rmarg, bottom-tmarg-bmarg ); - if ( style() == WindowsStyle ) -- changeFrameRect(QRect(0, 0, w, h) ); -+ changeFrameRect(QRect(xoffset, 0, w, h) ); - else -- changeFrameRect(QRect(0, 0, w-vsbExt, bottom)); -+ changeFrameRect(QRect(xoffset, 0, w-vsbExt, bottom)); - if (cornerWidget()) { - if ( style() == WindowsStyle ) -- setVBarGeometry( d->vbar, w-vsbExt-fw, -- fw, vsbExt, -- h-hsbExt-fw-fw ); -+ setVBarGeometry( d->vbar, xpos, -+ ypos, vsbExt, -+ bottom-fw-ypos ); - else -- setVBarGeometry( d->vbar, w-vsbExt, 0, -+ setVBarGeometry( d->vbar, xpos, ypos, - vsbExt, -- h-hsbExt ); -+ bottom-ypos ); - } - else { - if ( style() == WindowsStyle ) -- setVBarGeometry( d->vbar, w-vsbExt-fw, -- fw, vsbExt, -- bottom-fw-fw ); -+ setVBarGeometry( d->vbar, xpos, -+ ypos, vsbExt, -+ bottom-fw-ypos ); - else -- setVBarGeometry( d->vbar, w-vsbExt, 0, -- vsbExt, bottom ); -+ setVBarGeometry( d->vbar, xpos, ypos, -+ vsbExt, bottom-ypos ); - } - } else { - if ( style() == WindowsStyle ) -@@ -837,12 +848,12 @@ - } - if ( d->corner ) { - if ( style() == WindowsStyle ) -- d->corner->setGeometry( w-vsbExt-fw, -+ d->corner->setGeometry( xpos, - h-hsbExt-fw, - vsbExt, - hsbExt ); - else -- d->corner->setGeometry( w-vsbExt, -+ d->corner->setGeometry( xpos, - h-hsbExt, - vsbExt, - hsbExt ); -@@ -1675,7 +1686,7 @@ - } - - /*! -- Scrolls the content by \a x to the left and \a y upwards. -+ Scrolls the content by \a dx to the left and \a dy upwards. - */ - void QScrollView::scrollBy( int dx, int dy ) - { diff --git a/qte/qte-2.3.7/no-moc.patch b/qte/qte-2.3.7/no-moc.patch deleted file mode 100644 index 8d8ea8161e..0000000000 --- a/qte/qte-2.3.7/no-moc.patch +++ /dev/null @@ -1,37 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- qt-2.3.8-snapshot-20040107/Makefile~no-moc 2004-01-07 01:11:04.000000000 +0100 -+++ qt-2.3.8-snapshot-20040107/Makefile 2004-01-07 16:29:38.000000000 +0100 -@@ -8,7 +8,7 @@ - init: FORCE - @$(MAKE) QTDIR=`pwd` all - --all: symlinks src-moc src-mt sub-src sub-tools sub-tutorial sub-examples -+all: symlinks src-mt sub-src sub-tools sub-tutorial sub-examples - @echo - @echo "The Qt library is now built in ./lib" - @echo "The Qt examples are built in the directories in ./examples" -@@ -31,10 +31,10 @@ - symlinks: .buildopts - @cd include; rm -f q*.h; for i in ../src/*/q*.h ../src/3rdparty/*/q*.h ../extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h - --sub-src: src-moc src-mt .buildopts FORCE -+sub-src: src-mt .buildopts FORCE - cd src; $(MAKE) - --src-mt: src-moc .buildopts FORCE -+src-mt: .buildopts FORCE - $(MAKE) -f src-mt.mk - - sub-tutorial: sub-src FORCE -@@ -45,7 +45,6 @@ - - clean: - -rm .buildopts -- cd src/moc; $(MAKE) clean - cd src; $(MAKE) clean - -rm src/tmp/*.o src/tmp/*.a src/allmoc.cpp - -find src/3rdparty -name '*.o' | xargs rm diff --git a/qte/qte-2.3.7/opie.patch b/qte/qte-2.3.7/opie.patch deleted file mode 100644 index 14334da515..0000000000 --- a/qte/qte-2.3.7/opie.patch +++ /dev/null @@ -1,561 +0,0 @@ -diff -ur qt-2.3.7_clean/configs/linux-generic-g++-shared qt-2.3.7/configs/linux-generic-g++-shared ---- qt-2.3.7_clean/configs/linux-generic-g++-shared 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic-g++-shared 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-generic-g++-shared-debug qt-2.3.7/configs/linux-generic-g++-shared-debug ---- qt-2.3.7_clean/configs/linux-generic-g++-shared-debug 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic-g++-shared-debug 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-generic-g++-static qt-2.3.7/configs/linux-generic-g++-static ---- qt-2.3.7_clean/configs/linux-generic-g++-static 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic-g++-static 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-generic-g++-static-debug qt-2.3.7/configs/linux-generic-g++-static-debug ---- qt-2.3.7_clean/configs/linux-generic-g++-static-debug 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic-g++-static-debug 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-generic_rtti-g++-shared qt-2.3.7/configs/linux-generic_rtti-g++-shared ---- qt-2.3.7_clean/configs/linux-generic_rtti-g++-shared 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic_rtti-g++-shared 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-generic_rtti-g++-shared-debug qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug ---- qt-2.3.7_clean/configs/linux-generic_rtti-g++-shared-debug 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-generic_rtti-g++-static qt-2.3.7/configs/linux-generic_rtti-g++-static ---- qt-2.3.7_clean/configs/linux-generic_rtti-g++-static 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic_rtti-g++-static 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-generic_rtti-g++-static-debug qt-2.3.7/configs/linux-generic_rtti-g++-static-debug ---- qt-2.3.7_clean/configs/linux-generic_rtti-g++-static-debug 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-x86rtti-g++-shared qt-2.3.7/configs/linux-x86rtti-g++-shared ---- qt-2.3.7_clean/configs/linux-x86rtti-g++-shared 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-x86rtti-g++-shared 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = -lm - -diff -ur qt-2.3.7_clean/configs/linux-x86rtti-g++-shared-debug qt-2.3.7/configs/linux-x86rtti-g++-shared-debug ---- qt-2.3.7_clean/configs/linux-x86rtti-g++-shared-debug 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-x86rtti-g++-shared-debug 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = -lm - -diff -ur qt-2.3.7_clean/configs/linux-x86rtti-g++-static qt-2.3.7/configs/linux-x86rtti-g++-static ---- qt-2.3.7_clean/configs/linux-x86rtti-g++-static 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-x86rtti-g++-static 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = -lm - -diff -ur qt-2.3.7_clean/configs/linux-x86rtti-g++-static-debug qt-2.3.7/configs/linux-x86rtti-g++-static-debug ---- qt-2.3.7_clean/configs/linux-x86rtti-g++-static-debug 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-x86rtti-g++-static-debug 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = -lm - -diff -ur qt-2.3.7_clean/include/qapplication.h qt-2.3.7/include/qapplication.h ---- qt-2.3.7_clean/include/qapplication.h 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/include/qapplication.h 2004-06-04 02:22:25.000000000 +0200 -@@ -61,6 +61,10 @@ - class QSemaphore; - #endif - -+#if !defined( QT_WEAK_SYMBOL ) -+#define QT_WEAK_SYMBOL -+#endif -+ - // REMOVE IN 3.0 (just here for moc source compatibility) - #define QNonBaseApplication QApplication - -@@ -85,7 +89,10 @@ - - #ifndef QT_NO_STYLE - static QStyle &style(); -- static void setStyle( QStyle* ); -+ static void setStyle( QStyle* ) QT_WEAK_SYMBOL; -+private: -+ static void setStyle_NonWeak( QStyle* ); -+public: - #endif - #if 1 /* OBSOLETE */ - enum ColorMode { NormalColors, CustomColors }; -@@ -106,11 +113,19 @@ - #ifndef QT_NO_PALETTE - static QPalette palette( const QWidget* = 0 ); - static void setPalette( const QPalette &, bool informWidgets=FALSE, -+ const char* className = 0 ) QT_WEAK_SYMBOL; -+private: -+ static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE, - const char* className = 0 ); -+public: - #endif - static QFont font( const QWidget* = 0 ); - static void setFont( const QFont &, bool informWidgets=FALSE, -+ const char* className = 0 ) QT_WEAK_SYMBOL; -+private: -+ static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE, - const char* className = 0 ); -+public: - static QFontMetrics fontMetrics(); - - QWidget *mainWidget() const; -@@ -207,7 +222,10 @@ - void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); - #ifndef QT_NO_QWS_MANAGER - static QWSDecoration &qwsDecoration(); -- static void qwsSetDecoration( QWSDecoration *); -+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; -+private: -+ static void qwsSetDecoration_NonWeak( QWSDecoration *); -+public: - #endif - #endif - -diff -ur qt-2.3.7_clean/include/qfontdatabase.h qt-2.3.7/include/qfontdatabase.h ---- qt-2.3.7_clean/include/qfontdatabase.h 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/include/qfontdatabase.h 2004-06-04 02:22:25.000000000 +0200 -@@ -59,6 +59,10 @@ - class QDiskFont; - #endif - -+#if !defined( QT_WEAK_SYMBOL ) -+#define QT_WEAK_SYMBOL -+#endif -+ - class QFontDatabasePrivate; - - class Q_EXPORT QFontDatabase -@@ -67,9 +71,16 @@ - QFontDatabase(); - - QStringList families( bool onlyForLocale = TRUE ) const; -+ -+ - QValueList<int> pointSizes( const QString &family, - const QString &style = QString::null, -- const QString &charSet = QString::null ); -+ const QString &charSet = QString::null ) QT_WEAK_SYMBOL; -+private: -+ QValueList<int> pointSizes_NonWeak( const QString &family, -+ const QString &style, -+ const QString &charSet ); -+public: - QStringList styles( const QString &family, - const QString &charSet = QString::null ) const; - QStringList charSets( const QString &familyName, -diff -ur qt-2.3.7_clean/src/kernel/qapplication.cpp qt-2.3.7/src/kernel/qapplication.cpp ---- qt-2.3.7_clean/src/kernel/qapplication.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qapplication.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -35,6 +35,8 @@ - ** - **********************************************************************/ - -+#define QT_WEAK_SYMBOL __attribute__(( weak )) -+ - #include "qobjectlist.h" - #include "qobjectdict.h" - #include "qapplication.h" -@@ -933,11 +935,16 @@ - #ifndef QT_NO_STYLE - void QApplication::setStyle( QStyle *style ) - { -+ setStyle_NonWeak ( style ); -+} -+ -+void QApplication::setStyle_NonWeak( QStyle *style ) -+{ - QStyle* old = app_style; -- app_style = style; - - if ( startingUp() ) { - delete old; -+ app_style = style; - return; - } - -@@ -958,6 +965,8 @@ - old->unPolish( qApp ); - } - -+ app_style = style; -+ - // take care of possible palette requirements of certain gui - // styles. Do it before polishing the application since the style - // might call QApplication::setStyle() itself -@@ -1184,13 +1193,30 @@ - \sa QWidget::setPalette(), palette(), QStyle::polish() - */ - --void QApplication::setPalette( const QPalette &palette, bool informWidgets, -+void QApplication::setPalette ( const QPalette &palette, bool informWidgets, -+ const char* className ) -+{ -+ setPalette_NonWeak ( palette, informWidgets, className ); -+} -+ -+void QApplication::setPalette_NonWeak ( const QPalette &palette, bool informWidgets, - const char* className ) - { - QPalette pal = palette; - #ifndef QT_NO_STYLE -- if ( !startingUp() ) -+ if ( !startingUp() ) { - qApp->style().polish( pal ); // NB: non-const reference -+ if ( className ) { -+ // if we just polished a class specific palette (this normally -+ // only called by qt_fix_tooltips - see below), we better re- -+ // polish the global palette. Some styles like liquid can get -+ // confused, because they can not detect if the polished palette -+ // is the global one or only a class specific one. -+ // (liquid uses this palette to calculate blending pixmaps) -+ QPalette p = qApp-> palette ( ); -+ qApp->style().polish ( p ); -+ } -+ } - #endif - bool all = FALSE; - if ( !className ) { -@@ -1275,6 +1301,12 @@ - void QApplication::setFont( const QFont &font, bool informWidgets, - const char* className ) - { -+ setFont_NonWeak ( font, informWidgets, className ); -+} -+ -+void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets, -+ const char* className ) -+{ - bool all = FALSE; - if ( !className ) { - if ( !app_font ) { -diff -ur qt-2.3.7_clean/src/kernel/qapplication.h qt-2.3.7/src/kernel/qapplication.h ---- qt-2.3.7_clean/src/kernel/qapplication.h 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qapplication.h 2004-06-04 02:22:25.000000000 +0200 -@@ -61,6 +61,10 @@ - class QSemaphore; - #endif - -+#if !defined( QT_WEAK_SYMBOL ) -+#define QT_WEAK_SYMBOL -+#endif -+ - // REMOVE IN 3.0 (just here for moc source compatibility) - #define QNonBaseApplication QApplication - -@@ -85,7 +89,10 @@ - - #ifndef QT_NO_STYLE - static QStyle &style(); -- static void setStyle( QStyle* ); -+ static void setStyle( QStyle* ) QT_WEAK_SYMBOL; -+private: -+ static void setStyle_NonWeak( QStyle* ); -+public: - #endif - #if 1 /* OBSOLETE */ - enum ColorMode { NormalColors, CustomColors }; -@@ -106,11 +113,19 @@ - #ifndef QT_NO_PALETTE - static QPalette palette( const QWidget* = 0 ); - static void setPalette( const QPalette &, bool informWidgets=FALSE, -+ const char* className = 0 ) QT_WEAK_SYMBOL; -+private: -+ static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE, - const char* className = 0 ); -+public: - #endif - static QFont font( const QWidget* = 0 ); - static void setFont( const QFont &, bool informWidgets=FALSE, -+ const char* className = 0 ) QT_WEAK_SYMBOL; -+private: -+ static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE, - const char* className = 0 ); -+public: - static QFontMetrics fontMetrics(); - - QWidget *mainWidget() const; -@@ -207,7 +222,10 @@ - void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); - #ifndef QT_NO_QWS_MANAGER - static QWSDecoration &qwsDecoration(); -- static void qwsSetDecoration( QWSDecoration *); -+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; -+private: -+ static void qwsSetDecoration_NonWeak( QWSDecoration *); -+public: - #endif - #endif - -diff -ur qt-2.3.7_clean/src/kernel/qapplication_qws.cpp qt-2.3.7/src/kernel/qapplication_qws.cpp ---- qt-2.3.7_clean/src/kernel/qapplication_qws.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qapplication_qws.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -2804,6 +2804,11 @@ - */ - void QApplication::qwsSetDecoration( QWSDecoration *d ) - { -+ qwsSetDecoration_NonWeak ( d ); -+} -+ -+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d ) -+{ - if ( d ) { - delete qws_decoration; - qws_decoration = d; -diff -ur qt-2.3.7_clean/src/kernel/qfontdatabase.cpp qt-2.3.7/src/kernel/qfontdatabase.cpp ---- qt-2.3.7_clean/src/kernel/qfontdatabase.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qfontdatabase.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -35,6 +35,8 @@ - ** - **********************************************************************/ - -+#define QT_WEAK_SYMBOL __attribute__(( weak )) -+ - #include "qfontdatabase.h" - - #ifndef QT_NO_FONTDATABASE -@@ -2424,6 +2426,13 @@ - const QString &style, - const QString &charSet ) - { -+ return pointSizes_NonWeak ( family, style, charSet ); -+} -+ -+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family, -+ const QString &style, -+ const QString &charSet ) -+{ - QString cs( charSet ); - if ( charSet.isEmpty() ) { - QStringList lst = charSets( family ); -diff -ur qt-2.3.7_clean/src/kernel/qfontdatabase.h qt-2.3.7/src/kernel/qfontdatabase.h ---- qt-2.3.7_clean/src/kernel/qfontdatabase.h 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qfontdatabase.h 2004-06-04 02:22:25.000000000 +0200 -@@ -59,6 +59,10 @@ - class QDiskFont; - #endif - -+#if !defined( QT_WEAK_SYMBOL ) -+#define QT_WEAK_SYMBOL -+#endif -+ - class QFontDatabasePrivate; - - class Q_EXPORT QFontDatabase -@@ -67,9 +71,16 @@ - QFontDatabase(); - - QStringList families( bool onlyForLocale = TRUE ) const; -+ -+ - QValueList<int> pointSizes( const QString &family, - const QString &style = QString::null, -- const QString &charSet = QString::null ); -+ const QString &charSet = QString::null ) QT_WEAK_SYMBOL; -+private: -+ QValueList<int> pointSizes_NonWeak( const QString &family, -+ const QString &style, -+ const QString &charSet ); -+public: - QStringList styles( const QString &family, - const QString &charSet = QString::null ) const; - QStringList charSets( const QString &familyName, -diff -ur qt-2.3.7_clean/src/kernel/qgfxraster_qws.cpp qt-2.3.7/src/kernel/qgfxraster_qws.cpp ---- qt-2.3.7_clean/src/kernel/qgfxraster_qws.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -4237,7 +4237,7 @@ - setAlphaType(IgnoreAlpha); - if ( w <= 0 || h <= 0 || !ncliprect ) return; - GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1)) --#ifdef QWS_EXPERIMENTAL_FASTPATH -+#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !! - // ### fix for 8bpp - // This seems to be reliable now, at least for 16bpp - -#--- qt-2.3.7_clean/src/kernel/qkeyboard_qws.cpp 2004-06-04 02:17:53.000000000 +0200 -#+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp 2004-06-04 02:22:25.000000000 +0200 -#@@ -249,7 +249,7 @@ -# { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 63 -# { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 64 -# { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 65 -#- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 66 -#+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 -# { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 -# { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 68 -# { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 69 -diff -ur qt-2.3.7_clean/src/kernel/qwindowsystem_qws.cpp qt-2.3.7/src/kernel/qwindowsystem_qws.cpp ---- qt-2.3.7_clean/src/kernel/qwindowsystem_qws.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -844,6 +844,18 @@ - { - } - -+static void catchSegvSignal( int ) -+{ -+#ifndef QT_NO_QWS_KEYBOARD -+ if ( qwsServer ) -+ qwsServer->closeKeyboard(); -+#endif -+ QWSServer::closedown(); -+ fprintf(stderr, "Segmentation fault.\n"); -+ exit(1); -+} -+ -+ - /*! - \class QWSServer qwindowsystem_qws.h - \brief Server-specific functionality in Qt/Embedded -@@ -936,6 +948,7 @@ - } - - signal(SIGPIPE, ignoreSignal); //we get it when we read -+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash - #endif - focusw = 0; - mouseGrabber = 0; -diff -ur qt-2.3.7_clean/src/widgets/qcommonstyle.cpp qt-2.3.7/src/widgets/qcommonstyle.cpp ---- qt-2.3.7_clean/src/widgets/qcommonstyle.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/widgets/qcommonstyle.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -566,7 +566,7 @@ - bool enabled, bool active ) - { - #ifndef QT_NO_MENUBAR --#ifndef QT_NO_STYLE_SGI -+#if 1 // #ifndef QT_NO_STYLE_SGI - if (draw_menu_bar_impl != 0) { - QDrawMenuBarItemImpl impl = draw_menu_bar_impl; - (this->*impl)(p, x, y, w, h, mi, g, enabled, active); -diff -ur qt-2.3.7_clean/src/widgets/qlistview.cpp qt-2.3.7/src/widgets/qlistview.cpp ---- qt-2.3.7_clean/src/widgets/qlistview.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/widgets/qlistview.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -4968,9 +4968,9 @@ - l = l->childItem ? l->childItem : l->siblingItem; - - if ( l && l->height() ) -- s.setHeight( s.height() + 10 * l->height() ); -- else -- s.setHeight( s.height() + 140 ); -+ s.setHeight( s.height() + 4 /*10*/ * l->height() ); -+ else // ^v much too big for handhelds -+ s.setHeight( s.height() + 30 /*140*/ ); - - if ( s.width() > s.height() * 3 ) - s.setHeight( s.width() / 3 ); -diff -ur qt-2.3.7_clean/src/widgets/qtoolbutton.cpp qt-2.3.7/src/widgets/qtoolbutton.cpp ---- qt-2.3.7_clean/src/widgets/qtoolbutton.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/widgets/qtoolbutton.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -230,7 +230,7 @@ - else - QToolTip::add( this, textLabel ); - } --#endif -+#endif - } - - -@@ -324,12 +324,12 @@ - QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); - w = pm.width(); - h = pm.height(); -- if ( w < 32 ) -- w = 32; -- if ( h < 32 ) -- h = 32; -+ if ( w < 24 ) -+ w = 24; -+ if ( h < 24 ) -+ h = 24; - } else { -- w = h = 16; -+ w = h = 14; - QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); - w = pm.width(); - h = pm.height(); diff --git a/qte/qte-2.3.7/qiconview-speed.patch b/qte/qte-2.3.7/qiconview-speed.patch deleted file mode 100644 index cf4422942c..0000000000 --- a/qte/qte-2.3.7/qiconview-speed.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -u qt-2.3.7_old/src/iconview/qiconview.cpp qt-2.3.7/src/iconview/qiconview.cpp ---- qt-2.3.7_old/src/iconview/qiconview.cpp 2004-06-13 22:29:56.000000000 +0200 -+++ qt-2.3.7/src/iconview/qiconview.cpp 2004-06-13 22:33:32.000000000 +0200 -@@ -1,5 +1,5 @@ - /**************************************************************************** --** $Id$ -+** $Id$ - ** - ** Implementation of QIconView widget class - ** -@@ -220,6 +220,7 @@ - QIconView::SelectionMode selectionMode; - QIconViewItem *currentItem, *tmpCurrentItem, *highlightedItem, *startDragItem, *pressedItem, *selectAnchor; - QRect *rubber; -+ QPixmap *backBuffer; - QTimer *scrollTimer, *adjustTimer, *updateTimer, *inputTimer, - *fullRedrawTimer; - int rastX, rastY, spacing; -@@ -2263,6 +2264,7 @@ - d->currentItem = 0; - d->highlightedItem = 0; - d->rubber = 0; -+ d->backBuffer = 0; - d->scrollTimer = 0; - d->startDragItem = 0; - d->tmpCurrentItem = 0; -@@ -2411,6 +2413,8 @@ - delete item; - item = tmp; - } -+ delete d->backBuffer; -+ d->backBuffer = 0; - delete d->fm; - d->fm = 0; - #ifndef QT_NO_TOOLTIP -@@ -2877,6 +2881,48 @@ - } - - /*! -+ This function grabs all paintevents that otherwise would have been -+ processed by the QScrollView::viewportPaintEvent(). Here we use a -+ doublebuffer to reduce 'on-paint' flickering on QIconView -+ (and of course its childs). -+ -+ \sa QScrollView::viewportPaintEvent(), QIconView::drawContents() -+*/ -+ -+void QIconView::bufferedPaintEvent( QPaintEvent* pe ) -+{ -+ QWidget* vp = viewport(); -+ QRect r = pe->rect() & vp->rect(); -+ int ex = r.x() + contentsX(); -+ int ey = r.y() + contentsY(); -+ int ew = r.width(); -+ int eh = r.height(); -+ -+ if ( !d->backBuffer ) -+ d->backBuffer = new QPixmap(vp->size()); -+ if ( d->backBuffer->size() != vp->size() ) { -+ //Resize function (with hysteesis). Uses a good compromise between memory -+ //consumption and speed (number) of resizes. -+ float newWidth = (float)vp->width(); -+ float newHeight = (float)vp->height(); -+ if ( newWidth > d->backBuffer->width() || newHeight > d->backBuffer->height() ) -+ { -+ newWidth *= 1.1892; -+ newHeight *= 1.1892; -+ d->backBuffer->resize( (int)newWidth, (int)newHeight ); -+ } else if ( 1.5*newWidth < d->backBuffer->width() || 1.5*newHeight < d->backBuffer->height() ) -+ d->backBuffer->resize( (int)newWidth, (int)newHeight ); -+ } -+ -+ QPainter p; -+ p.begin(d->backBuffer, vp); -+ drawContentsOffset(&p, contentsX(), contentsY(), ex, ey, ew, eh); -+ p.end(); -+ bitBlt(vp, r.x(), r.y(), d->backBuffer, r.x(), r.y(), ew, eh); -+} -+ -+/*! -+ - \reimp - */ - -@@ -4855,7 +4901,7 @@ - if ( !d->rubber ) - drawDragShapes( d->oldDragPos ); - } -- viewportPaintEvent( (QPaintEvent*)e ); -+ bufferedPaintEvent ((QPaintEvent*)e ); - if ( d->dragging ) { - if ( !d->rubber ) - drawDragShapes( d->oldDragPos ); -@@ -5286,11 +5332,19 @@ - return; - - if ( item->d->container1 && d->firstContainer ) { -- item->d->container1->items.removeRef( item ); -+ //Special-case checking of the last item, since this may be -+ //called a few times for the same item. -+ if (item->d->container1->items.last() == item) -+ item->d->container1->items.removeLast(); -+ else -+ item->d->container1->items.removeRef( item ); - } - item->d->container1 = 0; - if ( item->d->container2 && d->firstContainer ) { -- item->d->container2->items.removeRef( item ); -+ if (item->d->container2->items.last() == item) -+ item->d->container2->items.removeLast(); -+ else -+ item->d->container2->items.removeRef( item ); - } - item->d->container2 = 0; - -diff -u qt-2.3.7_old/src/iconview/qiconview.h qt-2.3.7/src/iconview/qiconview.h ---- qt-2.3.7_old/src/iconview/qiconview.h 2004-06-13 22:29:56.000000000 +0200 -+++ qt-2.3.7/src/iconview/qiconview.h 2004-06-13 22:33:32.000000000 +0200 -@@ -444,6 +444,7 @@ - virtual void contentsDropEvent( QDropEvent *e ); - #endif - -+ void bufferedPaintEvent( QPaintEvent* ); - virtual void resizeEvent( QResizeEvent* e ); - virtual void keyPressEvent( QKeyEvent *e ); - virtual void focusInEvent( QFocusEvent *e ); diff --git a/qte/qte-2.3.7/qpe.patch b/qte/qte-2.3.7/qpe.patch deleted file mode 100644 index 4aa92180de..0000000000 --- a/qte/qte-2.3.7/qpe.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- /dev/null -+++ qt-2.3.6/src/tools/qconfig-qpe.h -@@ -0,0 +1,97 @@ -+/********************************************************************** -+** Copyright (C) 2000 Trolltech AS. All rights reserved. -+** -+** This file is part of Qtopia Environment. -+** -+** This file may be distributed and/or modified under the terms of the -+** GNU General Public License version 2 as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL included in the -+** packaging of this file. -+** -+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+** -+** See http://www.trolltech.com/gpl/ for GPL licensing information. -+** -+** Contact info@trolltech.com if any conditions of this licensing are -+** not clear to you. -+** -+**********************************************************************/ -+#ifndef QT_H -+#endif // QT_H -+ -+// Empty leaves all features enabled. See doc/html/features.html for choices. -+ -+// Note that disabling some features will produce a libqt that is not -+// compatible with other libqt builds. Such modifications are only -+// supported on Qt/Embedded where reducing the library size is important -+// and where the application-suite is often a fixed set. -+ -+#ifndef QT_DLL -+#define QT_DLL // Internal -+#endif -+ -+#define QT_NO_QWS_CURSOR -+#define QT_NO_QWS_MOUSE_AUTO -+#ifndef QT_NO_CODECS -+#define QT_NO_CODECS -+#endif -+#define QT_NO_UNICODETABLES -+//#define QT_NO_IMAGEIO_BMP -+#define QT_NO_IMAGEIO_PPM -+//#define QT_NO_ASYNC_IO -+//#define QT_NO_ASYNC_IMAGE_IO -+#define QT_NO_FREETYPE -+#define QT_NO_BDF -+//#define QT_NO_FONTDATABASE -+#define QT_NO_DRAGANDDROP -+//#define QT_NO_CLIPBOARD -+#define QT_NO_PROPERTIES -+#define QT_NO_NETWORKPROTOCOL -+ -+#define QT_NO_IMAGE_TEXT -+ -+//#define QT_NO_TOOLTIP -+#define QT_NO_COLORNAMES -+#define QT_NO_TRANSFORMATIONS -+#define QT_NO_TRANSLATION_BUILDER -+#define QT_NO_COMPLEXTEXT -+#define QT_NO_PRINTER -+#define QT_NO_PICTURE -+//#define QT_NO_ICONVIEW -+#define QT_NO_DIAL -+#define QT_NO_SIZEGRIP -+#define QT_NO_WORKSPACE -+//#define QT_NO_TABLE -+//#define QT_NO_ACTION -+//#define QT_NO_SETTINGS -+#define QT_NO_STYLE_POCKETPC -+#ifndef QT_NO_STYLE_AQUA -+# define QT_NO_STYLE_AQUA -+#endif -+#define QT_NO_STYLE_MOTIF -+#define QT_NO_STYLE_PLATINUM -+#define QT_NO_FILEDIALOG -+#define QT_NO_FONTDIALOG -+#define QT_NO_PRINTDIALOG -+#define QT_NO_COLORDIALOG -+#define QT_NO_INPUTDIALOG -+//#define QT_NO_MESSAGEBOX -+#define QT_NO_PROGRESSDIALOG -+//#define QT_NO_TABDIALOG -+#define QT_NO_WIZARD -+#define QT_NO_EFFECTS -+//#define QT_NO_COMPONENT -+#define QT_NO_DOM -+#define QT_NO_SEMIMODAL -+//#define QT_NO_PROGRESSBAR -+#define QT_NO_SPLITTER -+ -+//#define QT_NO_QWS_SAVEFONTS -+//#define QT_NO_QWS_PROPERTIES -+ -+#define QT_NO_QWS_BEOS_WM_STYLE -+#define QT_NO_QWS_KDE2_WM_STYLE -+#define QT_NO_QWS_KDE_WM_STYLE -+#define QT_NO_QWS_WINDOWS_WM_STYLE -+ diff --git a/qte/qte-2.3.7/qtopia.patch b/qte/qte-2.3.7/qtopia.patch deleted file mode 100644 index 0361aaf915..0000000000 --- a/qte/qte-2.3.7/qtopia.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- /dev/null 2003-01-10 02:39:01.000000000 +1000 -+++ qt-2.3.7/src/tools/qconfig-qpe.h 2003-11-09 18:32:29.000000000 +1000 -@@ -0,0 +1,117 @@ -+/********************************************************************** -+** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. -+** -+** This file is part of the Qtopia Environment. -+** -+** This file may be distributed and/or modified under the terms of the -+** GNU General Public License version 2 as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL included in the -+** packaging of this file. -+** -+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+** -+** See http://www.trolltech.com/gpl/ for GPL licensing information. -+** -+** Contact info@trolltech.com if any conditions of this licensing are -+** not clear to you. -+** -+**********************************************************************/ -+#ifndef QT_H -+#endif // QT_H -+ -+// Note that disabling more features will produce a libqte that is not -+// compatible with other libqte builds. -+ -+#ifndef QT_DLL -+#define QT_DLL // Internal -+#endif -+ -+// Platforms where mouse cursor is never required. -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX) -+# define QT_NO_QWS_CURSOR -+# define QT_NO_QWS_MOUSE_AUTO -+#endif -+ -+// No builtin codecs (Qtopia uses plugins to add codecs individually) -+#ifndef QT_NO_CODECS -+#define QT_NO_CODECS -+#endif -+ -+// No builtin font factories (Qtopia uses plugins) -+#define QT_NO_FREETYPE -+#define QT_NO_BDF -+ -+// No builtin styles (Qtopia uses plugins) -+#define QT_NO_STYLE_POCKETPC -+#ifndef QT_NO_STYLE_AQUA -+# define QT_NO_STYLE_AQUA -+#endif -+#define QT_NO_STYLE_MOTIF -+#define QT_NO_STYLE_PLATINUM -+ -+// No builtin WM styles (Qtopia uses plugins) -+#define QT_NO_QWS_BEOS_WM_STYLE -+#define QT_NO_QWS_KDE2_WM_STYLE -+#define QT_NO_QWS_KDE_WM_STYLE -+#define QT_NO_QWS_WINDOWS_WM_STYLE -+ -+// Space savings: disable expensive features -+#define QT_NO_UNICODETABLES -+#ifndef QT_NO_IMAGEIO_MNG -+# define QT_NO_IMAGEIO_MNG -+#endif -+#define QT_NO_PROPERTIES -+#define QT_NO_COLORNAMES -+ -+// Space savings: features insufficiently useful on handheld device -+#define QT_NO_IMAGEIO_PPM -+#define QT_NO_NETWORKPROTOCOL -+#define QT_NO_PICTURE -+#define QT_NO_PRINTER -+#define QT_NO_QWS_SAVEFONTS -+ -+// Space savings: features impractical on small display -+#define QT_NO_COLORDIALOG -+#define QT_NO_FILEDIALOG -+#define QT_NO_FONTDIALOG -+ -+// Space savings: features impractical on stylus device -+#define QT_NO_DIAL -+#define QT_NO_DRAGANDDROP -+#define QT_NO_IMAGE_TEXT -+#define QT_NO_INPUTDIALOG -+#define QT_NO_PRINTDIALOG -+#define QT_NO_PROGRESSDIALOG -+#define QT_NO_SEMIMODAL -+#define QT_NO_SIZEGRIP -+#define QT_NO_SPLITTER -+#define QT_NO_WORKSPACE -+ -+// Speed savings: features that incur unacceptable performance penalty -+#define QT_NO_DOM -+#define QT_NO_EFFECTS -+#define QT_NO_TRANSFORMATIONS -+ -+// Qt 3 features (not relevant at this time) -+#define QT_NO_TRANSLATION_BUILDER -+#define QT_NO_COMPLEXTEXT -+ -+// Features included directly in Qtopia -+#if !(defined (_OS_WIN32_) || defined (_WS_WIN32_)) -+#define QT_NO_WIZARD_IMPL -+#endif -+ -+// Features for Qtopia under Win32 SDK -+#if defined (_OS_WIN32_) || defined (_WS_WIN32_) -+#define QT_NO_PRINTER -+#define QT_NO_QWS_LINUXFB -+#define QT_NO_QWS_MACH64 -+#define QT_NO_QWS_VOODOO3 -+#define QT_NO_QWS_MATROX -+#define QT_NO_QWS_VNC -+#define QT_NO_QWS_TRANSFORMED -+#define QT_NO_QWS_VGA_16 -+#define QT_NO_QWS_SVGALIB -+#endif -+#define QT_NO_QMEMORYFILE diff --git a/qte/qte-2.3.7/sharp_char.h b/qte/qte-2.3.7/sharp_char.h deleted file mode 100644 index a70f5f690e..0000000000 --- a/qte/qte-2.3.7/sharp_char.h +++ /dev/null @@ -1,309 +0,0 @@ -/* - * linux/include/asm/sharp_char.h - * - * sharp drivers definitions (SHARP) - * - * Copyright (C) 2001 SHARP - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Change Log - * 12-Dec-2002 Sharp Corporation for Poodle and Corgi - */ - -#ifndef __ASM_SHARP_CHAR_H_INCLUDED -#define __ASM_SHARP_CHAR_H_INCLUDED - -/* - * If SHARPCHAR_USE_MISCDEV defined , misc driver architecture used instead of sharp_char - */ - -#define SHARPCHAR_USE_MISCDEV - -/* - * devices defines... - */ - -#ifndef SHARP_DEV_MAJOR -#define SHARP_DEV_MAJOR 11 -#endif - -#ifndef SHARP_DEV_MINOR_START -#define SHARP_DEV_MINOR_START 210 -#endif - -#define SHARP_DEV_MINOR_MAX 4 /* defines last minor number of SHARP device */ - -#define SHARP_LED_MINOR (SHARP_DEV_MINOR_START+0) -#define SHARP_BUZZER_MINOR (SHARP_DEV_MINOR_START+1) -#define SHARP_GSM_MINOR (SHARP_DEV_MINOR_START+2) -#define SHARP_AUDIOCTL_MINOR (SHARP_DEV_MINOR_START+3) -#define SHARP_KBDCTL_MINOR (SHARP_DEV_MINOR_START+4) - -/* - * ioctl defines... - */ - -#define SHARP_DEV_IOCTL_COMMAND_START 0x5680 - -/* --- for SHARP_LED device --- */ -#define SHARP_LED_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) -#define SHARP_LED_GETSTATUS (SHARP_LED_IOCTL_START) -#define SHARP_LED_SETSTATUS (SHARP_LED_IOCTL_START+1) -#define SHARP_LED_ISUPPORTED (SHARP_LED_IOCTL_START+2) - -typedef struct sharp_led_status { - int which; /* select which LED status is wanted. */ - int status; /* set new led status if you call SHARP_LED_SETSTATUS */ -} sharp_led_status; - -#define SHARP_LED_WHICH_MAX 15 /* last number of LED */ - -/* parameters for 'which' member */ -#define SHARP_LED_PDA 0 /* PDA status */ -#define SHARP_LED_DALARM 1 /* daily alarm */ -#define SHARP_LED_SALARM 2 /* schedule alarm */ -#define SHARP_LED_BATTERY 3 /* main battery status */ -#define SHARP_LED_ACSTATUS 4 /* AC line status */ -#define SHARP_LED_CHARGER 5 /* charger status */ -#define SHARP_LED_PHONE_RSSI 6 /* phone status (RSSI...) */ -#define SHARP_LED_PHONE_DIAL 7 /* phone status (dialing...) */ -#define SHARP_LED_PHONE_IN 8 /* phone status (incoming..) */ -#define SHARP_LED_MAIL_EXISTS 9 /* mail status (exists or not) */ -#define SHARP_LED_MAIL_SEND 10 /* mail status (sending...) */ -#define SHARP_LED_MAIL_QUEUE 11 /* mail to send is in queue */ -#define SHARP_LED_COLLIE_0 12 /* 1st pri. battery LED control */ -#define SHARP_LED_COLLIE_1 13 /* 1st pri. mail LED control */ -#define SHARP_LED_COMM 14 /* communication status */ -#define SHARP_LED_BROWSER 15 /* WWW browser status */ - -/* parameters for 'status' member */ -#define LED_PDA_RUNNING 0 /* for SHARP_LED_RUN */ -#define LED_PDA_SUSPENDED 1 /* for SHARP_LED_RUN */ -#define LED_PDA_OFF 2 /* for SHARP_LED_RUN */ -#define LED_PDA_ERROR 3 /* for SHARP_LED_RUN */ - -#define LED_DALARM_OFF 0 /* for SHARP_LED_DALARM */ -#define LED_DALARM_ON 1 /* for SHARP_LED_DALARM */ - -#define LED_SALARM_OFF 0 /* for SHARP_LED_SALARM */ -#define LED_SALARM_ON 1 /* for SHARP_LED_SALARM */ - -#define LED_BATTERY_GOOD 0 /* for SHARP_LED_BATTERY */ -#define LED_BATTERY_LOW 1 /* for SHARP_LED_BATTERY */ -#define LED_BATTERY_VERY_LOW 2 /* for SHARP_LED_BATTERY */ -#define LED_BATTERY_CRITICAL 3 /* for SHARP_LED_BATTERY */ - -#define LED_CHARGER_OFF 0 /* for SHARP_LED_CHARGER */ -#define LED_CHARGER_CHARGING 1 /* for SHARP_LED_CHARGER */ -#define LED_CHARGER_ERROR 2 /* for SHARP_LED_CHARGER */ -#define LED_CHARGER_FLASH 3 - -#define LED_AC_NOT_CONNECTED 0 /* for SHARP_LED_ACSTATUS */ -#define LED_AC_CONNECTED 1 /* for SHARP_LED_ACSTATUS */ - -#define LED_RSSI_OUT 0 /* for SHARP_LED_PHONE_RSSI */ -#define LED_RSSI_IN 1 /* for SHARP_LED_PHONE_RSSI */ - -#define LED_DIAL_OFF 0 /* for SHARP_LED_PHONE_DIAL */ -#define LED_DIAL_DIALING 1 /* for SHARP_LED_PHONE_DIAL */ -#define LED_DIAL_HOLDING 2 /* for SHARP_LED_PHONE_DIAL */ - -#define LED_PHONE_WAITING 0 /* for SHARP_LED_PHONE_IN */ -#define LED_PHONE_INCOMING 1 /* for SHARP_LED_PHONE_IN */ - -#define LED_MAIL_NO_UNREAD_MAIL 0 /* for SHARP_LED_MAIL_EXISTS */ -#define LED_MAIL_NEWMAIL_EXISTS 1 /* for SHARP_LED_MAIL_EXISTS */ -#define LED_MAIL_UNREAD_MAIL_EX 2 /* for SHARP_LED_MAIL_EXISTS */ - -#define LED_SENDMAIL_OFF 0 /* for SHARP_LED_MAIL_SEND */ -#define LED_SENDMAIL_SENDING 1 /* for SHARP_LED_MAIL_SEND */ -#define LED_SENDMAIL_ERROR 2 /* for SHARP_LED_MAIL_SEND */ - -#define LED_MAILQUEUE_NOUNREAD 0 /* for SHARP_LED_MAIL_QUEUE */ -#define LED_MAILQUEUE_NEWMAIL 1 /* for SHARP_LED_MAIL_QUEUE */ -#define LED_MAILQUEUE_UNREAD 2 /* for SHARP_LED_MAIL_QUEUE */ - -#define LED_COLLIE_0_DEFAULT 0 /* for SHARP_LED_COLLIE_0 */ -#define LED_COLLIE_0_OFF 1 /* for SHARP_LED_COLLIE_0 */ -#define LED_COLLIE_0_ON 2 /* for SHARP_LED_COLLIE_0 */ -#define LED_COLLIE_0_FASTBLINK 3 /* for SHARP_LED_COLLIE_0 */ -#define LED_COLLIE_0_SLOWBLINK 4 /* for SHARP_LED_COLLIE_0 */ - -#define LED_COLLIE_1_DEFAULT 0 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_OFF 1 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_ON 2 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_FLASHON 3 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_FLASHOFF 4 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_VFSTBLINK 5 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_FASTBLINK 6 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_NORMBLINK 7 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_SLOWBLINK 8 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_SOFTBLINK 9 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_SOFTFLASH 10 /* for SHARP_LED_COLLIE_1 */ - -#define LED_COMM_OFFLINE 0 /* for SHARP_LED_COMM */ -#define LED_COMM_ONLINE 1 /* for SHARP_LED_COMM */ -#define LED_COMM_ERROR 2 /* for SHARP_LED_COMM */ - -#define LED_BROWSER_OFFLINE 0 /* for SHARP_LED_BROWSER */ -#define LED_BROWSER_ONLINE 1 /* for SHARP_LED_BROWSER */ -#define LED_BROWSER_ERROR 2 /* for SHARP_LED_BROWSER */ - - -/* --- for SHARP_BUZZER device --- */ -#define SHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) -#define SHARP_BUZZER_MAKESOUND (SHARP_BUZZER_IOCTL_START) -#define SHARP_BUZZER_SETVOLUME (SHARP_BUZZER_IOCTL_START+1) -#define SHARP_BUZZER_GETVOLUME (SHARP_BUZZER_IOCTL_START+2) -#define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3) -#define SHARP_BUZZER_SETMUTE (SHARP_BUZZER_IOCTL_START+4) -#define SHARP_BUZZER_STOPSOUND (SHARP_BUZZER_IOCTL_START+5) -#define SHARP_BUZZER_SET_BUFFER (SHARP_BUZZER_IOCTL_START+6) - -typedef struct sharp_buzzer_status { /* this struct is used for setvolume/getvolume */ - int which; /* select which LED status is wanted. */ - int volume; /* set new buzzer volume if you call SHARP_BUZZER_SETVOLUME */ - int mute; /* set 1 to MUTE if you call SHARP_BUZZER_SETMUTE */ -} sharp_buzzer_status; - -#define SHARP_BUZ_WHICH_MAX 14 /* last number of buzzer */ - -#define SHARP_BUZ_ALL_SOUNDS -1 /* for setting volumes of ALL sounds at a time */ - -#define SHARP_BUZ_WRITESOUND 0 /* for sound datas through 'write' calls */ -#define SHARP_BUZ_TOUCHSOUND 1 /* touch panel sound */ -#define SHARP_BUZ_KEYSOUND 2 /* key sound */ -#define SHARP_PDA_ILLCLICKSOUND 3 /* illegal click */ -#define SHARP_PDA_WARNSOUND 4 /* warning occurred */ -#define SHARP_PDA_ERRORSOUND 5 /* error occurred */ -#define SHARP_PDA_CRITICALSOUND 6 /* critical error occurred */ -#define SHARP_PDA_SYSSTARTSOUND 7 /* system start */ -#define SHARP_PDA_SYSTEMENDSOUND 8 /* system shutdown */ -#define SHARP_PDA_APPSTART 9 /* application start */ -#define SHARP_PDA_APPQUIT 10 /* application ends */ -#define SHARP_BUZ_SCHEDULE_ALARM 11 /* schedule alarm */ -#define SHARP_BUZ_DAILY_ALARM 12 /* daily alarm */ -#define SHARP_BUZ_GOT_PHONE_CALL 13 /* phone call sound */ -#define SHARP_BUZ_GOT_MAIL 14 /* mail sound */ - -#define SHARP_BUZ_VOLUME_OFF 0 -#define SHARP_BUZ_VOLUME_LOW 33 -#define SHARP_BUZ_VOLUME_MEDIUM 67 -#define SHARP_BUZ_VOLUME_HIGH 100 /* currentry , this is the maximum ... */ -#define SHARP_BUZ_VOLUME_MAX (SHARP_BUZ_VOLUME_HIGH) - -/* --- for SHARP_GSM device --- */ -#define SHARP_GSM_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) -#define SHARP_GSM_GETEXTSTATUS (SHARP_GSM_IOCTL_START+16) -#define SHARP_GSM_INFO_TELL_MODE (SHARP_GSM_IOCTL_START+17) -#define SHARP_IRIS_GETSYNCSTATUS (SHARP_GSM_IOCTL_START+18) -#define SHARP_IRIS_RECHECKDEVICE (SHARP_GSM_IOCTL_START+19) - - -#define GSM_PHONE_NO_POWER 0 /* for SHARP_GSM_INFO_TELL_MODE */ -#define GSM_PHONE_NO_CONNECTION 1 /* for SHARP_GSM_INFO_TELL_MODE */ -#define GSM_PHONE_IN_ANALOG_MODE 2 /* for SHARP_GSM_INFO_TELL_MODE */ -#define GSM_PHONE_IN_DATA_MODE 3 /* for SHARP_GSM_INFO_TELL_MODE */ - -#define IRIS_AUDIO_EXT_IS_NONE 0 -#define IRIS_AUDIO_EXT_IS_HEADPHONEMIC 1 -#define IRIS_AUDIO_EXT_IS_EXTSPEAKER 2 - -typedef struct sharp_gsmext_status { - int carkit; /* be set as 1 , if car-kit is connected */ - int headphone_mic; /* be set as 1 , if head-phone-microphone is inserted */ - int external_sp; /* be set as 1 , if external-speaker is inserted */ -} sharp_gsmext_status; - -typedef struct sharp_irisext_status { /* for SHARP_IRIS_GETSYNCSTATUS */ - int usb; - int uart; - int carkit; -} sharp_irisext_status; - -/* --- for SHARP_AUDIOCTL device --- */ -#define SHARP_AUDIOCTL_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) -#define SHARP_AUDIOCTL_ARCH_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START+0x10) -#define SHARP_IRIS_AUFIL_GETVAL (SHARP_AUDIOCTL_ARCH_IOCTL_START+0) -#define SHARP_IRIS_AUFIL_SETVAL (SHARP_AUDIOCTL_ARCH_IOCTL_START+1) -#define SHARP_IRIS_AMP_EXT_ON (SHARP_AUDIOCTL_ARCH_IOCTL_START+2) -#define SHARP_IRIS_AMP_EXT_OFF (SHARP_AUDIOCTL_ARCH_IOCTL_START+3) - - -#define SHARP_IRIS_AUFIL_FILTERON 0x01 /* Iris AudioCtl Specific. Enable Audio Filter */ - -/* --- for SHARP_AUDIOCTL device --- */ -#define SHARP_KBDCTL_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) -#define SHARP_KBDCTL_GETMODIFSTAT (SHARP_KBDCTL_IOCTL_START+0) -#define SHARP_KBDCTL_TOGGLEMODIFSTAT (SHARP_KBDCTL_IOCTL_START+1) -#define SHARP_KBDCTL_SETHOLDTH (SHARP_KBDCTL_IOCTL_START+2) -#define SHARP_KBDCTL_SETHOLDTH_GR (SHARP_KBDCTL_IOCTL_START+3) -#define SHARP_KBDCTL_HOLDINFO_SETHD (SHARP_KBDCTL_IOCTL_START+4) -#define SHARP_KBDCTL_HOLDINFO_SETSL (SHARP_KBDCTL_IOCTL_START+5) -#define SHARP_KBDCTL_HOLDINFO_DELHD (SHARP_KBDCTL_IOCTL_START+6) -#define SHARP_KBDCTL_HOLDINFO_DELSL (SHARP_KBDCTL_IOCTL_START+7) -#define SHARP_KBDCTL_HOLDINFO_RESTHD (SHARP_KBDCTL_IOCTL_START+8) -#define SHARP_KBDCTL_HOLDINFO_RESTSL (SHARP_KBDCTL_IOCTL_START+9) -#define SHARP_KBDCTL_HOLDINFO_RESTFULL (SHARP_KBDCTL_IOCTL_START+10) -#define IRIS_KBDCTL_ENABLEKEYBOARD (SHARP_KBDCTL_IOCTL_START+16) -#define IRIS_KBDCTL_DISABLEKEYBOARD (SHARP_KBDCTL_IOCTL_START+17) -#define SHARP_KBDCTL_SENDKEY (SHARP_KBDCTL_IOCTL_START+18) - -typedef struct sharp_kbdctl_modifstat { - int which; - int stat; -} sharp_kbdctl_modifstat; - -typedef struct sharp_kbdctl_holdstat { - int group; - int timeout; -} sharp_kbdctl_holdstat; - -typedef struct sharp_kbdctl_holdcustom { - int normal_hardcode; - int normal_slcode; - int hold_slcode; -} sharp_kbdctl_holdcustom; - -#define SHARP_EXTMODIF_2ND 0x01 -#define SHARP_EXTMODIF_CAPS 0x02 -#define SHARP_EXTMODIF_NUMLOCK 0x03 - -#define HOLDKEY_GROUP_NORMAL 0 -#define HOLDKEY_GROUP_POWER 1 - - -/* --- for AUDIO & REMOCON device --- */ -#define HPJACK_STATE_UNDETECT (-1) -#define HPJACK_STATE_NONE (0) -#define HPJACK_STATE_HEADPHONE (1) -#define HPJACK_STATE_REMOCON (2) - - -#endif /* __ASM_SHARP_CHAR_H_INCLUDED */ - - -//#define EXTERNAL_IO_BASE01 0xF8000000 -//#define EXTEND_GPIO_RED_LED (1<<4) -//#define EXTEND_GPIO_GREEN_LED (1<<5) -//unsigned short * pwEGPIO1 ; -//unsigned short gwExtendGpio1; -// pwEGPIO1 = (unsigned short *) EXTERNAL_IO_BASE01; - - - - - - - - - diff --git a/qte/qte-2.3.7/simpad.patch b/qte/qte-2.3.7/simpad.patch deleted file mode 100644 index 9103adb7d6..0000000000 --- a/qte/qte-2.3.7/simpad.patch +++ /dev/null @@ -1,453 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~simpad.patch -+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp -@@ -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 - -+/* -+ * SIMpad switches handler -+ * (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> -+ */ -+ -+//TODO: guard this against inclusion with #ifdef QT_QWS_SIMPAD -+ -+#include <linux/switches.h> -+#define SIMPAD_SWITCHES_DEVICE "/dev/misc/switches" -+ -+// 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 -+ -+class QWSsimpadButtonsHandler : public QWSKeyboardHandler -+{ -+ Q_OBJECT -+ -+ public: -+ QWSsimpadButtonsHandler(); -+ virtual ~QWSsimpadButtonsHandler(); -+ -+ bool isOpen() { return fd > 0; } -+ -+ private slots: -+ void readSwitchesData(); -+ void autoRepeat(); -+ -+ private: -+ switches_mask_t switches; -+ -+ int fd; -+ int repeatdelay; -+ int repeatperiod; -+ -+ 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; -+}; -+ - #ifdef QT_QWS_SL5XXX - static const QWSServer::KeyMap keyM[] = { - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 00 -@@ -420,15 +474,15 @@ - - void doKey(uchar scancode); - -- -+ - #ifdef QT_QWS_AUTOREPEAT_MANUALLY -- void setAutoRepeat(int d, int p) { if ( d > 0 ) repeatdelay=d; -+ void setAutoRepeat(int d, int p) { if ( d > 0 ) repeatdelay=d; - if ( p > 0 ) repeatperiod=p;} -- void getAutoRepeat(int *d ,int *p ) { if (d) *d=repeatdelay; -+ void getAutoRepeat(int *d ,int *p ) { if (d) *d=repeatdelay; - if (p) *p=repeatperiod; } - #endif - void restoreLeds(); -- -+ - private slots: - void autoRepeat(); - private: -@@ -671,7 +725,7 @@ - int keypad = 0; - #if !defined(QT_QWS_SL5XXX) - if (code == 224 --#if defined(QT_QWS_IPAQ) -+#if defined(QT_QWS_IPAQ) - && !ipaq_return_pressed - #endif - ) { -@@ -759,7 +813,7 @@ - } - } else if ( extended == 2 ) { - switch (code) { -- case 0x1d: -+ case 0x1d: - return; - case 0x45: - keyCode = Qt::Key_Pause; -@@ -973,7 +1027,7 @@ - unicode = '`'; - } else - #endif -- -+ - if (bCtrl) - unicode = currentKey->ctrl_unicode; - else if (bCaps) -@@ -1479,7 +1533,11 @@ - } else { - type = spec; - } -- -+ if ( type == "SIMpad" ) -+ { -+ qDebug( "QWSKeyboardHandler: using SIMpad keyboard handler..." ); -+ handler = new QWSsimpadButtonsHandler(); -+ } - if ( type == "Buttons" ) { - #if defined(QT_QWS_YOPY) - handler = new QWSyopyButtonsHandler(); -@@ -1508,6 +1566,218 @@ - 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( 700 ), repeatperiod( 80 ), -+ lastCode( 0 ), lastPress( 0 ), -+ k( -1 ), shiftKeyPressed( 0 ), shiftUsed( false ) -+{ -+ qDebug( "SimpadButtonsHandler() - V4.1" ); -+ fd = ::open( SIMPAD_SWITCHES_DEVICE, O_RDWR | O_NDELAY, 0 ); -+ if ( fd < 0 ) -+ { -+ qWarning( "SimpadButtonsHandler(): can't open %s", SIMPAD_SWITCHES_DEVICE ); -+ return; -+ } -+ -+ notifier = new QSocketNotifier( fd, QSocketNotifier::Read, this ); -+ connect( notifier, SIGNAL( activated(int) ),this, SLOT( readSwitchesData() ) ); -+ -+ repeater = new QTimer(this); -+ connect(repeater, SIGNAL(timeout()), this, SLOT(autoRepeat())); -+ -+} -+ -+ -+QWSsimpadButtonsHandler::~QWSsimpadButtonsHandler() -+{ -+ qDebug( "~SimpadButtonsHandler()" ); -+ if ( fd > 0 ) -+ { -+ ::close( fd ); -+ fd = -1; -+ } -+} -+ -+ -+void QWSsimpadButtonsHandler::readSwitchesData() -+{ -+ qDebug( "SimpadButtonsHandler() - detected switches action" ); -+ -+ if ( ::read( fd, &switches, sizeof switches ) < 0 ) -+ { -+ qWarning( "SimpadButtonsHandler() - switches read error!" ); -+ return; -+ } -+ -+ 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]; -+ -+ //========================================================================= -+ -+ /** -+ * 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 -+ { -+ int interval = eventTimer.restart(); -+ qDebug( "event interval = %d", interval ); -+ if ( code == lastCode && interval < 10 ) -+ { -+ qDebug( "event interval too small - ignoring bogus event" ); -+ qDebug( "did I say i hate buggy kernel drivers? :-D" ); -+ return; -+ } -+ -+ lastPress = press; -+ lastCode = code; -+ } -+ -+ /** -+ * 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 -+ **/ -+ -+ //===================================================================== -+ -+ 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_POWER: k = Qt::Key_F34; break; // Power Button -+ -+ 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; -+ } -+ } -+ -+ 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 ) -+ { -+ qDebug( "SimpadButtonsHandler() - We are transformed! Correcting..." ); -+ int oldK = k; -+ k = xform_dirkey( k ); -+ qDebug( "SimpadButtonsHandler() - Old Key: %d - New Key %d", oldK, k ); -+ } -+ -+ if ( repeatable && press ) -+ repeater->start( repeatdelay, true ); -+ else -+ repeater->stop(); -+ -+ qwsServer->processKeyEvent( 0, k, 0, press, false ); -+} -+ -+ -+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); -+} - - -+#endif // QT_NO_QWS_KEYBOARD ---- qt-2.3.7/src/kernel/qsoundqss_qws.cpp~simpad.patch -+++ qt-2.3.7/src/kernel/qsoundqss_qws.cpp -@@ -47,8 +47,8 @@ - #include <sys/ioctl.h> - #include <sys/soundcard.h> - --#define QT_QWS_SOUND_16BIT 1 // or 0, or undefined for always 0 --#define QT_QWS_SOUND_STEREO 1 // or 0, or undefined for always 0 -+#define QT_QWS_SOUND_16BIT 0 // or 0, or undefined for always 0 -+#define QT_QWS_SOUND_STEREO 0 // or 0, or undefined for always 0 - - static int sound_speed = 44100; - #ifndef QT_NO_SOUNDSERVER ---- qt-2.3.7/src/kernel/qwsmouse_qws.cpp~simpad.patch -+++ qt-2.3.7/src/kernel/qwsmouse_qws.cpp -@@ -51,6 +51,7 @@ - #include <stdlib.h> - #include <stdio.h> - #include <sys/ioctl.h> -+#include <sys/time.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -@@ -74,6 +75,7 @@ - unsigned short x; - unsigned short y; - unsigned short pad; -+ struct timeval stamp; - } TS_EVENT; - #elif defined(QT_QWS_SL5XXX) - #define QT_QWS_SL5XXX_RAW -@@ -1472,29 +1474,13 @@ - : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0), - numSamples(0), skipCount(0) - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) --#if defined(QT_QWS_IPAQ) --# ifdef QT_QWS_IPAQ_RAW -- if ((mouseFD = open( "/dev/h3600_tsraw", O_RDONLY | O_NDELAY)) < 0) { --# else -- if ((mouseFD = open( "/dev/h3600_ts", O_RDONLY | O_NDELAY)) < 0) { --# endif -- qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno)); -- return; -- } --#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) --//# ifdef QT_QWS_SL5XXX_TSRAW --# if 0 -- if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) { -- qWarning( "Cannot open /dev/tsraw (%s)", strerror(errno)); -- return; -- } --# else -- if ((mouseFD = open( "/dev/ts", O_RDONLY | O_NDELAY)) < 0) { -- qWarning( "Cannot open /dev/ts (%s)", strerror(errno)); -+#ifdef QT_QWS_SIMPAD -+ if ((mouseFD = open( "/dev/touchscreen/ucb1x00", O_RDONLY | O_NONBLOCK )) -+< 0) { -+ qWarning( "Cannot open /dev/touchscreen/ucb1x00 (%s)", strerror(errno) -+); - return; - } --# endif - #endif - - QSocketNotifier *mouseNotifier; -@@ -1503,12 +1489,11 @@ - connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); - waspressed=FALSE; - mouseIdx = 0; --#endif - } - - QTPanelHandlerPrivate::~QTPanelHandlerPrivate() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) - if (mouseFD >= 0) - close(mouseFD); - #endif -@@ -1516,7 +1501,7 @@ - - void QTPanelHandlerPrivate::readMouseData() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) - if(!qt_screen) - return; - -@@ -1929,7 +1914,7 @@ - handler = new QCustomTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_YOPY) - handler = new QYopyTPanelHandlerPrivate( mouseProtocol, mouseDev ); --#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) -+#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) - handler = new QTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_CASSIOPEIA) - handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev ); diff --git a/qte/qte-2.3.7/switches.h b/qte/qte-2.3.7/switches.h deleted file mode 100644 index 37516b4c75..0000000000 --- a/qte/qte-2.3.7/switches.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * linux/include/linux/switches.h - * - * Copyright (C) 2000 John Dorsey - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 23 October 2000 - created. - */ - -#if !defined(_LINUX_SWITCHES_H) -#define _LINUX_SWITCHES_H - -#define SWITCHES_MASK_SIZE (128) - -typedef unsigned long switches_bitfield; - -#define SWITCHES_BITS (sizeof(switches_bitfield) * 8) -#define SWITCHES_NUM_FIELDS (SWITCHES_MASK_SIZE / SWITCHES_BITS) -#define SWITCHES_FIELD_SELECT(i) ((i) / SWITCHES_BITS) -#define SWITCHES_FIELD_MASK(i) ((switches_bitfield)(1 << (i) % \ - SWITCHES_BITS)) - -typedef struct switches_mask_t { - unsigned int count; - switches_bitfield events[SWITCHES_NUM_FIELDS]; - switches_bitfield states[SWITCHES_NUM_FIELDS]; -} switches_mask_t; - -#define SWITCHES_ZERO(m) \ -do { \ - unsigned int sz_i; \ - (m)->count = 0; \ - for(sz_i = 0; sz_i < SWITCHES_NUM_FIELDS; ++sz_i) \ - (m)->events[sz_i] = (m)->states[sz_i] = 0; \ -} while (0) - -/* `s' is the state of the switch, either 0 or non-zero: */ -#define SWITCHES_SET(m, i, s) \ -do { \ - ((m)->events[SWITCHES_FIELD_SELECT((i))] |= \ - SWITCHES_FIELD_MASK((i))); \ - if(s) \ - ((m)->states[SWITCHES_FIELD_SELECT((i))] |= \ - SWITCHES_FIELD_MASK((i))); \ - else \ - ((m)->states[SWITCHES_FIELD_SELECT((i))] &= \ - ~SWITCHES_FIELD_MASK((i))); \ - ++((m)->count); \ -} while (0) - -/* Should only use to clear an event set by SWITCHES_SET(): */ -#define SWITCHES_CLEAR(m, i) \ -do { \ - ((m)->events[SWITCHES_FIELD_SELECT((i))] &= \ - ~SWITCHES_FIELD_MASK((i))); \ - ((m)->states[SWITCHES_FIELD_SELECT((i))] &= \ - ~SWITCHES_FIELD_MASK((i))); \ - --((m)->count); \ -} - -#define SWITCHES_COUNT(m) ((m)->count) - -/* Returns 0 or non-zero: */ -#define SWITCHES_EVENT(m, i) \ -((m)->events[SWITCHES_FIELD_SELECT((i))] & SWITCHES_FIELD_MASK((i))) - -/* Returns 0 or non-zero: */ -#define SWITCHES_STATE(m, i) \ -((m)->states[SWITCHES_FIELD_SELECT((i))] & SWITCHES_FIELD_MASK((i))) - -#endif /* !defined(_LINUX_SWITCHES_H) */ diff --git a/qte/qte-2.3.7/tslib.patch b/qte/qte-2.3.7/tslib.patch deleted file mode 100644 index 0475d81052..0000000000 --- a/qte/qte-2.3.7/tslib.patch +++ /dev/null @@ -1,350 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.7/src/kernel/qwsmouse_qws.cpp~tslib.patch -+++ qt-2.3.7/src/kernel/qwsmouse_qws.cpp -@@ -7,6 +7,10 @@ - ** - ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. - ** -+** Portions Copyright (C) 2003 Texas Instruments, Inc. -+** Rights to said portions for use under the GPL and QPL licenses -+** are hereby granted to Trolltech AS. -+** - ** This file is part of the kernel module of the Qt GUI Toolkit. - ** - ** This file may be distributed and/or modified under the terms of the -@@ -59,6 +63,9 @@ - #ifdef QT_QWS_CASSIOPEIA - #include <linux/tpanel.h> - #endif -+#if QWS_TSLIB -+#include <tslib.h> -+#endif - - #if defined(QT_QWS_IPAQ) - #define QT_QWS_IPAQ_RAW -@@ -110,7 +117,7 @@ - - #ifndef QT_QWS_TP_JITTER_LIMIT - #define QT_QWS_TP_JITTER_LIMIT 2 --#endif -+#endif - - //#define QWS_CUSTOMTOUCHPANEL - -@@ -1093,6 +1100,221 @@ - return sent; - } - -+ -+class QTSLibHandler : public QCalibratedMouseHandler -+{ -+ Q_OBJECT -+public: -+ QTSLibHandler(); -+ ~QTSLibHandler(); -+ -+ virtual void clearCalibration(); -+ virtual void calibrate( QWSPointerCalibrationData * ); -+ -+ static int sortByX( const void*, const void* ); -+ static int sortByY( const void*, const void* ); -+private: -+ void openTs(); -+ void closeTs(); -+ void interpolateSample(); -+ -+private: -+ bool raw : 1; -+#ifdef QWS_TSLIB -+ struct tsdev *ts; -+#endif -+ QSocketNotifier *m_notify; -+ -+private slots: -+ void readMouseData(); -+}; -+ -+QTSLibHandler::QTSLibHandler() -+ : raw(false), m_notify(0l) -+{ -+ openTs(); -+} -+ -+QTSLibHandler::~QTSLibHandler() -+{ -+ closeTs(); -+} -+ -+void QTSLibHandler::openTs() -+{ -+#ifdef QWS_TSLIB -+ char *tsdevice; -+ -+ if( ( tsdevice = getenv( "TSLIB_TSDEVICE" ) ) != NULL ) { -+ ts = ts_open( tsdevice, 1 ); -+ } else { -+ ts = ts_open( "/dev/ts", 1 ); -+ } -+ -+ if (!ts) { -+ qWarning( "Cannot open touchscreen (%s)", strerror( errno ) ); -+ return; -+ } -+ -+ if (ts_config( ts )) { -+ qWarning( "Cannot configure touchscreen (%s)", strerror( errno ) ); -+ return; -+ } -+ -+ -+ m_notify = new QSocketNotifier( ts_fd(ts), QSocketNotifier::Read, this ); -+ connect( m_notify, SIGNAL( activated( int ) ), this, SLOT( readMouseData() ) ); -+#endif -+} -+ -+void QTSLibHandler::closeTs() -+{ -+#ifdef QWS_TSLIB -+ if (ts) -+ ts_close(ts); -+ -+ delete m_notify; -+ m_notify = 0; ts = 0; -+ raw = false; -+#endif -+ -+} -+ -+void QTSLibHandler::clearCalibration() -+{ -+ raw = true; -+} -+ -+ -+void QTSLibHandler::calibrate( QWSPointerCalibrationData *cd ) -+{ -+ QPoint dev_tl = cd->devPoints[ QWSPointerCalibrationData::TopLeft ]; -+ QPoint dev_br = cd->devPoints[ QWSPointerCalibrationData::BottomRight ]; -+ QPoint screen_tl = cd->screenPoints[ QWSPointerCalibrationData::TopLeft ]; -+ QPoint screen_br = cd->screenPoints[ QWSPointerCalibrationData::BottomRight ]; -+ int a, b, c, d, e, f, s; -+ -+ s = 1 << 16; -+ -+ a = s * (screen_tl.x() - screen_br.x() ) / (dev_tl.x() - dev_br.x()); -+ b = 0; -+ c = s * screen_tl.x() - a * dev_tl.x(); -+ -+ d = 0; -+ e = s * (screen_tl.y() - screen_br.y() ) / (dev_tl.y() - dev_br.y()); -+ f = s * screen_tl.y() - e * dev_tl.y(); -+ -+ QString calFile = "/etc/pointercal"; -+#ifndef QT_NO_TEXTSTREAM -+ QFile file( calFile ); -+ if ( file.open( IO_WriteOnly ) ) { -+ QTextStream t( &file ); -+ t << a << " " << b << " " << c << " "; -+ t << d << " " << e << " " << f << " " << s; -+ file.flush(); closeTs(); -+ openTs(); -+ } else -+#endif -+ { -+ qDebug( "Could not save calibration: %s", calFile.latin1() ); -+ } -+} -+ -+void QTSLibHandler::readMouseData() -+{ -+#ifdef QWS_TSLIB -+ if(!qt_screen) -+ return; -+ -+ /* -+ * After clear Calibration -+ * we're in raw mode and do some easy median -+ * search. -+ */ -+ if (raw ) -+ return interpolateSample(); -+ -+ static struct ts_sample sample; -+ static int ret; -+ -+ /* -+ * Ok. We need to see if we can read more than one event -+ * We do this not to lose an update. -+ */ -+ while ( true ) { -+ if ((ret = ts_read(ts, &sample, 1)) != 1 ) -+ return; -+ -+ -+ QPoint pos( sample.x, sample.y ); -+ emit mouseChanged( pos, sample.pressure != 0 ? 1 : 0 ); -+ } -+#endif -+} -+ -+ -+/* -+ * Lets take all down events and then sort them -+ * and take the event in the middle. -+ * -+ * inspired by testutils.c -+ */ -+void QTSLibHandler::interpolateSample() { -+ static struct ts_sample samples[25]; -+ int index = 0; -+ int ret; -+ -+ do { -+ /* fill only the last sample again */ -+ if ( index >= 25 ) -+ index = 24; -+ -+ /* we're opened non-blocking */ -+ if((ret= ts_read_raw(ts, &samples[index], 1 ) ) != 1 ) { -+ /* no event yet, so try again */ -+ if (ret==-1 ) { -+ index--; -+ continue; -+ } -+ } -+ }while (samples[index++].pressure != 0); -+ -+ /* -+ * index is maximal 25 and we at least one sample -+ */ -+ if( index >= 25 ) -+ index = 24; -+ int x, y; -+ -+ /* -+ * now let us use the median value -+ * even index does not have an item in the middle -+ * so let us take the average of n/2 and (n/2)-1 as the middle -+ */ -+ int m = index/2; -+ ::qsort(samples, index, sizeof(ts_sample), QTSLibHandler::sortByX); -+ x = (index % 2 ) ? samples[m].x : -+ ( samples[m-1].x + samples[m].x )/2; -+ -+ ::qsort(samples, index, sizeof(ts_sample), QTSLibHandler::sortByY); -+ y = (index % 2 ) ? samples[m].y : -+ ( samples[m-1].y + samples[m].y )/2; -+ -+ emit mouseChanged( QPoint(x, y), 1 ); -+ emit mouseChanged( QPoint(0, 0), 0 ); -+} -+ -+int QTSLibHandler::sortByX( const void* one, const void* two) { -+ return reinterpret_cast<const struct ts_sample*>(one)->x - -+ reinterpret_cast<const struct ts_sample*>(two)->x; -+} -+ -+int QTSLibHandler::sortByY( const void* one, const void* two) { -+ return reinterpret_cast<const struct ts_sample*>(one)->y - -+ reinterpret_cast<const struct ts_sample*>(two)->y; -+} -+ -+ - /* - * Handler for /dev/tpanel Linux kernel driver - */ -@@ -1235,7 +1457,7 @@ - - - QTPanelHandlerPrivate::QTPanelHandlerPrivate( MouseProtocol, QString dev ) -- : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0), -+ : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0), - numSamples(0), skipCount(0) - { - #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -@@ -1315,7 +1537,7 @@ - mousePos = QPoint( 0, 0 ); - QPoint totalMousePos = oldTotalMousePos; - totalMousePos += samples[currSample]; -- if(numSamples >= samples.count()) -+ if(numSamples >= samples.count()) - totalMousePos -= samples[lastSample]; - - mousePos = totalMousePos / (sampleCount - 1); -@@ -1345,7 +1567,7 @@ - - // save recuring information - currSample++; -- if (numSamples >= samples.count()) -+ if (numSamples >= samples.count()) - lastSample++; - oldTotalMousePos = totalMousePos; - } else { -@@ -1658,7 +1880,7 @@ - - if ( mouseProto == "USB" && mouseDev.isEmpty() ) - mouseDev = "/dev/input/mice"; -- -+ - MouseProtocol mouseProtocol = Unknown; - - int idx = 0; -@@ -1689,12 +1911,14 @@ - break; - - case TPanel: --#if defined(QWS_CUSTOMTOUCHPANEL) -- handler = new QCustomTPanelHandlerPrivate(mouseProtocol,mouseDev); -+#if defined(QWS_TSLIB) -+ handler = new QTSLibHandler( ); -+#elif defined(QWS_CUSTOMTOUCHPANEL) -+ handler = new QCustomTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_YOPY) -- handler = new QYopyTPanelHandlerPrivate(mouseProtocol,mouseDev); -+ handler = new QYopyTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -- handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev); -+ handler = new QTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_CASSIOPEIA) - handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #endif ---- qt-2.3.7/configure~tslib.patch -+++ qt-2.3.7/configure -@@ -399,6 +399,9 @@ - -kde) - KDE=yes - ;; -+ -tslib) -+ TSLIB=yes -+ ;; - -no-g++-exceptions) - GPLUSPLUS_EXCEPTIONS=no - ;; -@@ -1255,6 +1258,9 @@ - set to point to a KDE 2 installation. - See http://www.kde.org - -+ -tslib ............. Use the TSLib (touchscreen access library) mouse handler -+ by default, instead of the normal device default. -+ - -no-g++-exceptions . Disable exceptions on platforms using the GNU C++ - compiler by using the -fno-exceptions flag. - -@@ -1314,6 +1320,13 @@ - [ "x$SM" = "xno" ] && QT_CXX="${QT_CXX} -DQT_NO_SM_SUPPORT" - [ "x$XFT" = "xyes" ] && QT_CXX="${QT_CXX} -DQT_XFT" - [ "x$XFT" = "xno" ] && QT_CXX="${QT_CXX} -DQT_NO_XKB" -+ -+if [ "x$TSLIB" = "xyes" ] -+then -+ QT_CXX="${QT_CXX} -DQWS_TSLIB" -+ QT_LIBS="${QT_LIBS} -lts" -+fi -+ - if [ "x$THREAD" = "xyes" ] - then - cat >src-mt.mk <<EOF diff --git a/qte/qte-2.3.7/update-qtfontdir b/qte/qte-2.3.7/update-qtfontdir deleted file mode 100644 index 6df7b503af..0000000000 --- a/qte/qte-2.3.7/update-qtfontdir +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -usage() -{ - echo "usage: $0 [font directory, defaults to QTDIR/lib/fonts]" - exit 1 -} - -setVar() -{ - eval "$1='$2'" -} - -getVar() -{ - eval "echo \$$1" -} - -handleQPF() -{ - base=`basename $1` - family=`echo $base|cut -d_ -f1` - pt=`echo $base|cut -d_ -f2` - weight=`echo $base|cut -d_ -f3|sed -e 's,i$,,'` - if (echo $base|cut -d_ -f3|grep -q 'i$'); then - italic="y" - else - italic="n" - fi - echo "$family $base.qpf QPF $italic $weight $pt u" -} - -if [ -z "$1" ]; then - if [ -n "$QTDIR" ]; then - fontdir=$QTDIR/lib/fonts - else - fontdir=/opt/QtPalmtop/lib/fonts - fi -else - fontdir=$1 -fi - -if ! [ -d $fontdir ]; then - echo Error: $fontdir not a directory - exit 1 -fi - -if [ -e $fontdir/fontdir ]; then - cat $fontdir/fontdir | grep -v '\.qpf' > $fontdir/fontdir.new -fi - -( - for file in `ls $fontdir/*.qpf|sed -e's,\.qpf$,,; s,_t[^_]*$,,;'|sort -u`; do - handleQPF $file - done -) >> $fontdir/fontdir.new - -mv $fontdir/fontdir.new $fontdir/fontdir - -exit 0 - -# vim:ai:et:sts=4:sw=4:tw=0: diff --git a/qte/qte-2.3.7/vt-switch.patch b/qte/qte-2.3.7/vt-switch.patch deleted file mode 100644 index b7216dabc4..0000000000 --- a/qte/qte-2.3.7/vt-switch.patch +++ /dev/null @@ -1,178 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.7/src/kernel/qapplication_qws.cpp~vt-switch.patch -+++ qt-2.3.7/src/kernel/qapplication_qws.cpp -@@ -123,6 +123,12 @@ - static int qt_thread_pipe[2]; - #endif - -+#if defined(_OS_LINUX_) -+#include <sys/ioctl.h> -+#include <linux/vt.h> -+#include <linux/kd.h> -+#endif -+ - const int qwsSharedRamSize = 32 * 1024; //Small amount to fit on small devices. - - // These are in qapplication.cpp in qt/main -@@ -163,6 +169,8 @@ - bool qws_accel = TRUE; // ### never set - const char *qws_display_spec = ":0"; - int qws_display_id = 0; -+int qws_terminal_id = 0; -+int qws_terminal_old = 0; - int qws_client_id = 0; - QWidget *qt_pressGrab = 0; - QWidget *qt_mouseGrb = 0; -@@ -1628,6 +1636,15 @@ - type = QApplication::GuiServer; - } else if ( arg == "-interlaced" ) { - qws_screen_is_interlaced = TRUE; -+ } else if ( arg == "-terminal" ) { -+ if ( ++i < argc ) -+ { -+ if ( ( qws_terminal_id = atoi( argv[i] ) ) < 1 ) -+ { -+ qWarning( "Ignoring Invalid Terminal Specification." ); -+ qws_terminal_id = 0; -+ } -+ } - } else if ( arg == "-display" ) { - if ( ++i < argc ) - qws_display_spec = argv[i]; -@@ -1652,6 +1669,53 @@ - if ( type == QApplication::GuiServer ) { - qt_appType = type; - qws_single_process = TRUE; -+ -+ /* Allocate a dedicated virtual terminal -- (C) Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> -+ * Added a new command line option which only is relevant if the application is created as a GuiServer. -+ * The option is -terminal <num>, where <num> specifies the virtual terminal to be occupied by the server. -+ * As default in Linux, 0 means the current virtual terminal. -+ */ -+ #if defined(_OS_LINUX_) -+ if ( qws_terminal_id ) -+ { -+ qDebug( "qt_init() - terminal specification is '%d'.", qws_terminal_id ); -+ struct vt_stat console_stat; -+ int console_fd = ::open( QString().sprintf( "/dev/tty%d", qws_terminal_id ).latin1(), O_RDWR ); -+ if ( console_fd == -1) -+ { -+ qWarning( "qt_init() - can't open tty: %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( ioctl( console_fd, VT_GETSTATE, &console_stat ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(VT_GETSTATE): %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ qws_terminal_old = console_stat.v_active; -+ qDebug( "qt_init() - active vt is #%d, switching to #%d as requested...", qws_terminal_old, qws_terminal_id ); -+ -+ if ( ioctl( console_fd, VT_ACTIVATE, qws_terminal_id ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(VT_ACTIVATE): %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( ioctl( console_fd, VT_WAITACTIVE, qws_terminal_id ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(VT_WAITACTIVE): %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( ioctl( console_fd, KDSETMODE, KD_GRAPHICS ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(KDSETMODE:KD_GRAPHICS): %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ ::close( console_fd ); -+ } -+ else -+ { -+ qDebug( "QWSApplication::qt_init() - current terminal specified." ); -+ } -+ #endif - QWSServer::startup(flags); - setenv("QWS_DISPLAY", qws_display_spec, 0); - } -@@ -1702,7 +1766,36 @@ - QFontManager::cleanup(); - - if ( qws_single_process ) { -- QWSServer::closedown(); -+ qDebug( "qt_cleanup() - shutting down QWSServer..." ); -+#ifndef QT_NO_QWS_KEYBOARD -+ if ( qwsServer ) -+ qwsServer->closeKeyboard(); -+#endif -+ QWSServer::closedown(); -+#if defined(_OS_LINUX_) -+ if ( qws_terminal_old > 0 ) -+ { -+ qDebug( "qt_cleanup() - switching back to virtual terminal #%d", qws_terminal_old ); -+ -+ int console_fd = ::open( "/dev/tty0", O_RDWR ); -+ if ( console_fd == -1) -+ { -+ qWarning( "qt_init() - can't open tty: %s", strerror( errno ) ); -+ } -+ else -+ { -+ if ( ioctl( console_fd, KDSETMODE, KD_TEXT ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(KDSETMODE:KD_TEXT): %s", strerror( errno ) ); -+ } -+ if ( ioctl( console_fd, VT_ACTIVATE, qws_terminal_old ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(VT_ACTIVATE): %s", strerror( errno ) ); -+ } -+ ::close( console_fd ); -+ } -+ } -+#endif - } - if ( qt_is_gui_used ) { - delete qt_fbdpy; ---- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~vt-switch.patch -+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp -@@ -1068,6 +1068,24 @@ - { - if (kbdFD >= 0) - { -+ -+#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) -+ struct vt_mode vtMode; -+ ioctl(kbdFD, VT_GETMODE, &vtMode); -+ -+ /* Mickey says: "Better give up control of VT switching. -+ * Hey, I really hate that OS-will-reacquire-resources on process-death -+ * kind of thinking! -+ */ -+ vtMode.mode = VT_AUTO; -+ vtMode.relsig = 0; -+ vtMode.acqsig = 0; -+ ioctl(kbdFD, VT_SETMODE, &vtMode); -+ -+ signal(VTSWITCHSIG, 0); -+ qDebug( "~QWSTtyKeyboardHandler() - released VT." ); -+#endif -+ - #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) - ioctl(kbdFD, KDSKBMODE, K_XLATE); - #endif ---- qt-2.3.7/src/kernel/qgfxlinuxfb_qws.cpp~vt-switch.patch -+++ qt-2.3.7/src/kernel/qgfxlinuxfb_qws.cpp -@@ -251,9 +251,9 @@ - - bool QLinuxFbScreen::initDevice() - { -- // No blankin' screen, no blinkin' cursor!, no cursor! -+ /* Setting up the VT parameters is done in qapplication_qws.cpp - const char termctl[]="\033[9;0]\033[?33l\033[?25l"; -- writeTerm(termctl,sizeof(termctl)); -+ writeTerm(termctl,sizeof(termctl)); */ - - // Grab current mode so we can reset it - fb_var_screeninfo vinfo; diff --git a/qte/qte-2.3.8-snapshot/c700-hardware.patch b/qte/qte-2.3.8-snapshot/c700-hardware.patch deleted file mode 100644 index e061c80a1d..0000000000 --- a/qte/qte-2.3.8-snapshot/c700-hardware.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- qwsmouse_qws.cpp.~1~ 2004-09-13 09:17:07 +10:00 -+++ qt-2.3.9/src/kernel/qwsmouse_qws.cpp 2004-09-13 19:41:23 +10:00 -@@ -71,10 +71,10 @@ - #elif defined(QT_QWS_SL5XXX) - #define QT_QWS_SL5XXX_RAW - typedef struct { -- long y; -- long x; -- long pressure; -- long long millisecs; -+ unsigned short pressure; -+ unsigned short x; -+ unsigned short y; -+ unsigned short millisecs; - } TS_EVENT; - #define QT_QWS_TP_SAMPLE_SIZE 10 - #define QT_QWS_TP_MINIMUM_SAMPLES 4 diff --git a/qte/qte-2.3.8-snapshot/compile.patch b/qte/qte-2.3.8-snapshot/compile.patch deleted file mode 100644 index ce4ca82fcb..0000000000 --- a/qte/qte-2.3.8-snapshot/compile.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- configure 2002-09-06 20:04:34.000000000 -0400 -+++ configure.new 2002-09-06 20:04:16.000000000 -0400 -@@ -250,7 +250,7 @@ - PLATFORM= - XPLATFORM= - FROMMAKE= --QT_CXX="" -+QT_CXX=" \$(CXXFLAGS_EXTRA)" - - - # Parse the arguments, setting things to "yes" or "no". -@@ -1356,6 +1356,7 @@ - COMPILER=`echo $PLATFORM | cut -f 2- -d-` - if [ "$COMPILER" = "g++" ] - then -+ QT_CXX="$QT_CXX -fpermissive" - if [ "$GPLUSPLUS_EXCEPTIONS" = "no" ] - then - QT_C="$QT_C -fno-exceptions" diff --git a/qte/qte-2.3.8-snapshot/daemonize.patch b/qte/qte-2.3.8-snapshot/daemonize.patch deleted file mode 100644 index 1f83398988..0000000000 --- a/qte/qte-2.3.8-snapshot/daemonize.patch +++ /dev/null @@ -1,113 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- qt-2.3.7/src/kernel/qapplication_qws.cpp~daemonize 2004-07-17 22:47:54.840820000 +0200 -+++ qt-2.3.7/src/kernel/qapplication_qws.cpp 2004-07-17 23:34:32.407525912 +0200 -@@ -103,6 +103,7 @@ - #endif - - #include <sys/time.h> -+#include <syslog.h> - - #if defined(_OS_AIX_) && defined(_CC_GNU_) - #include <sys/select.h> -@@ -162,6 +163,7 @@ - //these used to be environment variables, they are initialized from - //environment variables in - -+bool qws_daemon = TRUE; - bool qws_savefonts = FALSE; - bool qws_screen_is_interlaced=FALSE; //### should be detected - bool qws_shared_memory = FALSE; -@@ -1614,6 +1616,10 @@ - mwGeometry = argv[i]; - } else if ( arg == "-shared" ) { - qws_shared_memory = TRUE; -+ } else if ( arg == "-daemon" ) { -+ qws_daemon = TRUE; -+ } else if ( arg == "-nodaemon" ) { -+ qws_daemon = FALSE; - } else if ( arg == "-noshared" ) { - qws_shared_memory = FALSE; - } else if ( arg == "-savefonts" ) { -@@ -1670,6 +1676,78 @@ - qt_appType = type; - qws_single_process = TRUE; - -+ /* Daemonize the server process -- (C) Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> -+ * Added a new command line option which only is relevant if the application is created as a GuiServer. -+ * The option is -daemon respectively -nodaemon. If in daemon mode (which is the default now), the -+ * server will detach from the controlling terminal and continue as a daemon. This is done via the standard -+ * UNIX double fork magic. -+ */ -+ if ( qws_daemon ) -+ { -+ qWarning( "qt_init() - starting in daemon mode..." ); -+ -+ int pid1 = fork(); -+ if ( pid1 == -1 ) -+ { -+ qWarning( "qt_init() - can't perform initial fork: %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( pid1 ) _exit( 0 ); // ok, first fork performed -+ -+ chdir( "/" ); -+ setsid(); -+ umask(0); -+ close(0); -+ close(1); -+ close(2); -+ -+ int fdnull = ::open( "/dev/null", O_RDWR ); -+ if ( fdnull == -1 ) -+ { -+ syslog( 3, "qt_init() - can't open /dev/null to redirect std{in|out|err}: %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ dup2( fdnull, 0 ); // stdin -+ dup2( fdnull, 1 ); // stdout -+ dup2( fdnull, 2 ); // stderr -+ -+ int pid2 = fork(); -+ if ( pid2 == -1 ) -+ { -+ syslog( 3, "qt_init() - can't perform initial fork: %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( pid2 ) -+ { -+ syslog( 4, "qt_init() [%d] - successfully entered daemon mode", pid2 ); -+ _exit( 0 ); // ok, second fork performed -+ } -+ } -+ -+ /* -+ * , , -+ * /( )` -+ * \ \___ / | B E W A R E ! -+ * /- _ `-/ ' We are a DAEMON now! -+ * (/\/ \ \ /\ -+ * / / | ` \ -+ * O O ) / | -+ * `-^--'`< ' -+ * (_.) _ ) / -+ * `.___/` / -+ * `-----' / -+ * <----. __ / __ \ -+ * <----|====O)))==) \) /==== -+ * <----' `--' `.__,' \ -+ * | | -+ * \ / -+ * ______( (_ / \______ -+ * (FL) ,' ,-----' | \ -+ * `--{__________) \/ -+ * -+ */ -+ -+ - /* Allocate a dedicated virtual terminal -- (C) Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> - * Added a new command line option which only is relevant if the application is created as a GuiServer. - * The option is -terminal <num>, where <num> specifies the virtual terminal to be occupied by the server. diff --git a/qte/qte-2.3.8-snapshot/devfs.patch b/qte/qte-2.3.8-snapshot/devfs.patch deleted file mode 100644 index 061f8970e2..0000000000 --- a/qte/qte-2.3.8-snapshot/devfs.patch +++ /dev/null @@ -1,157 +0,0 @@ ---- configure.~1~ 2004-09-09 19:22:25.000000000 +1000 -+++ qt-2.3.9/configure 2004-09-13 18:35:41.000000000 +1000 -@@ -406,6 +406,9 @@ - -kde) - KDE=yes - ;; -+ -devfs) -+ DEVFS=yes -+ ;; - -no-g++-exceptions) - GPLUSPLUS_EXCEPTIONS=no - ;; -@@ -1290,6 +1293,8 @@ - set to point to a KDE 2 installation. - See http://www.kde.org - -+ -devfs ............. Use devfs /dev paths. -+ - -no-g++-exceptions . Disable exceptions on platforms using the GNU C++ - compiler by using the -fno-exceptions flag. - -@@ -1353,6 +1358,10 @@ - [ "x$SM" = "xno" ] && QT_CXX="${QT_CXX} -DQT_NO_SM_SUPPORT" - [ "x$XFT" = "xyes" ] && QT_CXX="${QT_CXX} -DQT_XFT" - [ "x$XFT" = "xno" ] && QT_CXX="${QT_CXX} -DQT_NO_XKB" -+if [ "x$DEVFS" = "xyes" ] -+then -+ QT_CXX="${QT_CXX} -DQT_QWS_DEVFS" -+fi - if [ "x$THREAD" = "xyes" ] - then - cat >src-mt.mk <<EOF ---- qgfxlinuxfb_qws.cpp.~1~ 2004-09-13 09:17:07.000000000 +1000 -+++ qt-2.3.9/src/kernel/qgfxlinuxfb_qws.cpp 2004-09-13 18:43:41.000000000 +1000 -@@ -101,12 +101,19 @@ - bool QLinuxFbScreen::connect( const QString &displaySpec ) - { - // Check for explicitly specified device -+#ifdef QT_QWS_DEVFS -+ QRegExp r( "/dev/fb/[0-9]+" ); -+#else - QRegExp r( "/dev/fb[0-9]+" ); -+#endif - int len; - int m = r.match( displaySpec, 0, &len ); - -+#ifdef QT_QWS_DEVFS -+ QString dev = (m>=0) ? displaySpec.mid( m, len ) : QString("/dev/fb/0"); -+#else - QString dev = (m>=0) ? displaySpec.mid( m, len ) : QString("/dev/fb0"); -- -+#endif - fd=open( dev.latin1(), O_RDWR ); - if (fd<0) { - qWarning("Can't open framebuffer device %s",dev.latin1()); -@@ -121,14 +128,22 @@ - - /* Get fixed screen information */ - if (ioctl(fd, FBIOGET_FSCREENINFO, &finfo)) { -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else - perror("reading /dev/fb0"); -+#endif - qWarning("Error reading fixed information"); - return FALSE; - } - - /* Get variable screen information */ - if (ioctl(fd, FBIOGET_VSCREENINFO, &vinfo)) { -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else - perror("reading /dev/fb0"); -+#endif - qWarning("Error reading variable information"); - return FALSE; - } -@@ -165,7 +180,11 @@ - data += dataoffset; - - if ((int)data == -1) { -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else - perror("mapping /dev/fb0"); -+#endif - qWarning("Error: failed to map framebuffer device to memory."); - return FALSE; - } -@@ -229,7 +248,11 @@ - - static void writeTerm(const char* termctl, int sizeof_termctl) - { -+#ifdef QT_QWS_DEVFS -+ const char* tt[]={"/dev/vc/1","/dev/console","/dev/tty",0}; -+#else - const char* tt[]={"/dev/console","/dev/tty","/dev/tty0",0}; -+#endif - const char** dev=tt; - while (*dev) { - int tty=::open(*dev,O_WRONLY); -@@ -792,7 +815,11 @@ - fb_var_screeninfo vinfo; - - if (ioctl(fd, FBIOGET_FSCREENINFO, &finfo)) { -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else - perror("reading /dev/fb0"); -+#endif - qFatal("Error reading fixed information"); - } - ---- qkeyboard_qws.cpp.~1~ 2004-09-13 09:17:07.000000000 +1000 -+++ qt-2.3.9/src/kernel/qkeyboard_qws.cpp 2004-09-13 18:46:27.000000000 +1000 -@@ -1179,8 +1179,11 @@ - - QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device) - { -+#ifdef QT_QWS_DEVFS -+ kbdFD=open(device.isEmpty() ? "/dev/vc/1" : device.latin1(), O_RDWR | O_NDELAY, 0); -+#else - kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0); -- -+#endif - if ( kbdFD >= 0 ) { - QSocketNotifier *notifier; - notifier = new QSocketNotifier( kbdFD, QSocketNotifier::Read, this ); ---- qwindowsystem_qws.cpp.~1~ 2004-09-13 09:17:07.000000000 +1000 -+++ qt-2.3.9/src/kernel/qwindowsystem_qws.cpp 2004-09-13 18:49:16.000000000 +1000 -@@ -820,7 +820,11 @@ - void openDevice() - { - if ( !sn ) { -+#ifdef QT_QWS_DEVFS -+ int fd = ::open("/dev/sound/dsp",O_RDWR); -+#else - int fd = ::open("/dev/dsp",O_RDWR); -+#endif - if ( fd < 0 ) { - // For debugging purposes - defined QT_NO_SOUND if you - // don't have sound hardware! ---- qsoundqss_qws.cpp.~1~ 2004-09-13 09:17:07.000000000 +1000 -+++ qt-2.3.9/src/kernel/qsoundqss_qws.cpp 2004-09-13 18:52:37.000000000 +1000 -@@ -986,7 +986,11 @@ - // Don't block open right away. - // - bool openOkay = false; -+#ifdef QT_QWS_DEVFS -+ if ((fd = ::open("/dev/sound/dsp", O_WRONLY|O_NONBLOCK)) != -1) -+#else - if ((fd = ::open("/dev/dsp", O_WRONLY|O_NONBLOCK)) != -1) { -+#endif - int flags = fcntl(fd, F_GETFL); - flags &= ~O_NONBLOCK; - openOkay = (fcntl(fd, F_SETFL, flags) == 0); diff --git a/qte/qte-2.3.8-snapshot/encoding.patch b/qte/qte-2.3.8-snapshot/encoding.patch deleted file mode 100644 index 5ddb43c2f6..0000000000 --- a/qte/qte-2.3.8-snapshot/encoding.patch +++ /dev/null @@ -1,49 +0,0 @@ -German umlaute quite likely french, italian, spanish did -not work due QFile::[decode,encode]Name did call QString -local8Bit,fromLocal8Bit which plainly tried to use utf8 -encoding even if not useful. So a filename got changed -and QFileInfo recognized the file not beeing present anymore... -which lead to files not be shown. -Also with Year-Names problem exists as the base system sent -it encoded upstream. - -If you want to have UTF-8 encoding use LC_CTYPE as always and -QTextCodec::codecForLocale will use the right UTF-8 encoding. - -As fallback the old behaviour was preserved - - - - - - - ---- qt-2.3.8-old/src/tools/qstring.cpp 2004-07-23 14:33:02.000000000 +0200 -+++ qt-2.3.8/src/tools/qstring.cpp 2004-07-23 14:32:31.000000000 +0200 -@@ -14469,7 +14469,11 @@ - return qt_winQString2MB( *this ); - #endif - #ifdef _WS_QWS_ -- return utf8(); // ##### if there is ANY 8 bit format supported? -+ QTextCodec* codec = QTextCodec::codecForLocale(); -+ return codec -+ ? codec->fromUnicode(*this) -+ : utf8(); -+ //return latin1(); // ##### if there is ANY 8 bit format supported? - #endif - #endif - } -@@ -14515,7 +14519,12 @@ - return qt_winMB2QString( local8Bit ); - #endif - #ifdef _WS_QWS_ -- return fromUtf8(local8Bit,len); -+ QTextCodec* codec = QTextCodec::codecForLocale(); -+ if( len < 0) len = qstrlen(local8Bit); -+ return codec -+ ? codec->toUnicode(local8Bit, len) -+ : QString::fromUtf8(local8Bit,len); -+// return fromLatin1(local8Bit,len); - #endif - #endif // QT_NO_TEXTCODEC - } diff --git a/qte/qte-2.3.8-snapshot/fix-qgfxraster.patch b/qte/qte-2.3.8-snapshot/fix-qgfxraster.patch deleted file mode 100644 index 3c107e8eae..0000000000 --- a/qte/qte-2.3.8-snapshot/fix-qgfxraster.patch +++ /dev/null @@ -1,29 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~fix-qgfxraster -+++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp -@@ -3876,14 +3876,14 @@ - for( loopc2=0;loopc2<frontadd;loopc2++ ) - *(alphaptr++)=get_value_32(16,(unsigned char **)&temppos); - -- PackType temp2; -- unsigned char * cp; -+ volatile PackType temp2; -+ volatile unsigned short int * cp; - for( loopc2=0;loopc2<count;loopc2++ ) { -- temp2=*((PackType *)temppos); -- cp=(unsigned char *)&temp2; -- *(alphaptr++)=get_value_32(16,&cp); -- *(alphaptr++)=get_value_32(16,&cp); -- temppos += 2; -+ temp2=*reinterpret_cast<PackType *>(temppos); -+ cp=reinterpret_cast<volatile unsigned short int *>(&temp2); -+ *(alphaptr++)=qt_conv16ToRgb(*cp); -+ cp++; -+ *(alphaptr++)=qt_conv16ToRgb(*cp); - } - - for( loopc2=0;loopc2<backadd;loopc2++ ) diff --git a/qte/qte-2.3.8-snapshot/kernel-keymap.patch b/qte/qte-2.3.8-snapshot/kernel-keymap.patch deleted file mode 100644 index 0d1b704e99..0000000000 --- a/qte/qte-2.3.8-snapshot/kernel-keymap.patch +++ /dev/null @@ -1,305 +0,0 @@ ---- qkeyboard_qws.cpp.~1~ 2004-09-13 09:17:07.000000000 +1000 -+++ qt-2.3.9/src/kernel/qkeyboard_qws.cpp 2004-09-13 19:20:23.000000000 +1000 -@@ -30,6 +30,34 @@ - ** - **********************************************************************/ - -+/**************************************************************************** -+** -+** Keyboard Handling Redesign -+** Copyright 2003, Chris Larson <kergoth@handhelds.org> -+** -+** TODO: (key: . = in progress, x = completed) -+** -+** [.] Tty driver should load its initial keymap from the kernel, -+** thereby ensuring keymap consistency between X, console, and qt/e -+** [x] Read kernel keymappings. -+** [x] Read kernel keycode -> unicode map. -+** [x] Use them, along with the existing keyM, to push events up. -+** [ ] Create a new table, from transformed keycode -> qt keycode, rather -+** than the existing raw keycode -> qt keycode. -+** [ ] Adapt handleKey to deal with keys that have no unicode value, such as -+** keypresses that are mapped to strings in the string table. (e.g. F keys) -+** [ ] Cursor orientation change based on display rotation should not -+** be bound to Ipaq or 5xxx, but instead as a runtime choice based -+** on whether or not we're using a Transformed display driver. -+** [ ] Double check that VT handling, particularly with regard to switching, -+** is handled properly. -+** [ ] Add a generic means of dealing with additional (outside the realm of -+** ctrl, alt, shift, altgr) modifiers. Also ensure a means of binding -+** a keypress/combination to a 'lock' of said additional modifiers. -+** -+**********************************************************************/ -+ -+ - #include "qwindowsystem_qws.h" - #include "qwsutils_qws.h" - #include "qgfx_qws.h" -@@ -46,6 +74,7 @@ - #include <unistd.h> - #ifdef _OS_LINUX_ - #include <linux/kd.h> -+#include <linux/keyboard.h> - #endif - #include <sys/ioctl.h> - #include <sys/types.h> -@@ -53,7 +82,7 @@ - #include <fcntl.h> - #include <errno.h> - #include <signal.h> -- -+#include <termios.h> - #ifdef QT_QWS_TIP2 - #include <qcopchannel_qws.h> - #endif -@@ -80,13 +109,13 @@ - #include <sys/vt.h> - #endif - --#ifdef QT_QWS_SL5XXX --#include <asm/sharp_char.h> --#endif -+#ifdef QT_QWS_SL5XXX -+#include <asm/sharp_char.h> -+#endif - --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) - #define QT_QWS_AUTOREPEAT_MANUALLY --#endif -+#endif - - - -@@ -1251,6 +1280,222 @@ - doKey(buf[loop]); - } - -+/* KernelTTY */ -+class QWSKernelTtyKeyboardHandler : public QWSPC101KeyboardHandler -+{ -+ Q_OBJECT -+public: -+ QWSKernelTtyKeyboardHandler(const QString&); -+ virtual ~QWSKernelTtyKeyboardHandler(); -+ void readKeyboardMap(); -+ void readUnicodeMap(); -+ void handleKey(unsigned char code); -+ -+private slots: -+ void readKeyboardData(); -+ -+private: -+ struct termios origTermData; -+ unsigned short acm[E_TABSZ]; -+ unsigned char kernel_map[(1<<KG_CAPSSHIFT)][NR_KEYS]; -+ -+ int current_map; -+}; -+ -+/* Kernel TTY */ -+QWSKernelTtyKeyboardHandler::QWSKernelTtyKeyboardHandler(const QString& device) : current_map(0) -+{ -+ kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0); -+ -+ if ( kbdFD >= 0 ) { -+ QSocketNotifier *notifier; -+ notifier = new QSocketNotifier( kbdFD, QSocketNotifier::Read, this ); -+ connect( notifier, SIGNAL(activated(int)),this, -+ SLOT(readKeyboardData()) ); -+ -+ // save for restore. -+ tcgetattr( kbdFD, &origTermData ); -+ -+ struct termios termdata; -+ tcgetattr( kbdFD, &termdata ); -+ -+#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) -+//# ifdef QT_QWS_USE_KEYCODES -+ ioctl(kbdFD, KDSKBMODE, K_MEDIUMRAW); -+//# else -+// ioctl(kbdFD, KDSKBMODE, K_RAW); -+//# endif -+#endif -+ -+ termdata.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP); -+ termdata.c_oflag = 0; -+ termdata.c_cflag = CREAD | CS8; -+ termdata.c_lflag = 0; -+ termdata.c_cc[VTIME]=0; -+ termdata.c_cc[VMIN]=1; -+ cfsetispeed(&termdata, 9600); -+ cfsetospeed(&termdata, 9600); -+ tcsetattr(kbdFD, TCSANOW, &termdata); -+ -+ readUnicodeMap(); -+ readKeyboardMap(); -+ -+ signal(VTSWITCHSIG, vtSwitchHandler); -+ -+#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) -+ struct vt_mode vtMode; -+ ioctl(kbdFD, VT_GETMODE, &vtMode); -+ -+ // let us control VT switching -+ vtMode.mode = VT_PROCESS; -+ vtMode.relsig = VTSWITCHSIG; -+ vtMode.acqsig = VTSWITCHSIG; -+ ioctl(kbdFD, VT_SETMODE, &vtMode); -+ -+ struct vt_stat vtStat; -+ ioctl(kbdFD, VT_GETSTATE, &vtStat); -+ vtQws = vtStat.v_active; -+#endif -+ } -+} -+ -+QWSKernelTtyKeyboardHandler::~QWSKernelTtyKeyboardHandler() -+{ -+ if (kbdFD >= 0) -+ { -+#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) -+ ioctl(kbdFD, KDSKBMODE, K_XLATE); -+#endif -+ tcsetattr(kbdFD, TCSANOW, &origTermData); -+ ::close(kbdFD); -+ kbdFD = -1; -+ } -+} -+ -+void QWSKernelTtyKeyboardHandler::readUnicodeMap() -+{ -+ if (kbdFD < 0) -+ return; -+ -+ if (ioctl(kbdFD,GIO_UNISCRNMAP,acm) != 0) -+ return; -+} -+ -+void QWSKernelTtyKeyboardHandler::readKeyboardMap() -+{ -+ struct kbentry kbe; -+ -+ if (kbdFD < 0) -+ return; -+ -+ for (int map = 0; map < (1<<KG_CAPSSHIFT); ++map) { -+ unsigned short kval; -+ -+ kbe.kb_table = map; -+ -+ for (int key = 0; key < NR_KEYS; ++key) { -+ kbe.kb_index = key; -+ -+ if (ioctl(kbdFD, KDGKBENT, &kbe) != 0) -+ continue; -+ -+ if ((kbe.kb_value == K_HOLE) || -+ (kbe.kb_value == K_NOSUCHMAP)) -+ continue; -+ -+ kval = KVAL(kbe.kb_value); -+ switch (KTYP(kbe.kb_value)) { -+ case KT_LETTER: -+ case KT_LATIN: -+ case KT_ASCII: -+ case KT_PAD: -+ case KT_SHIFT: -+ kernel_map[map][key] = kbe.kb_value; -+// qWarning("keycode %d, map %d, type %d, val %d, acm %c\n", key, map, KTYP(kbe.kb_value), kval, acm[kval]); -+ break; -+ } -+ } -+ } -+} -+ -+void QWSKernelTtyKeyboardHandler::readKeyboardData() -+{ -+ unsigned char buf[81]; -+ int n = read(kbdFD, buf, 80 ); -+ for ( int loop = 0; loop < n; loop++ ) -+ handleKey(buf[loop]); -+} -+ -+static inline int map_to_modif(int current_map) -+{ -+ int modifiers = 0; -+ -+ if (current_map & KG_ALT) -+ modifiers |= Qt::ALT; -+ else if (current_map & KG_CTRL) -+ modifiers |= Qt::CTRL; -+ else if (current_map & KG_SHIFT) -+ modifiers |= Qt::SHIFT; -+ -+ return modifiers; -+} -+ -+ -+void QWSKernelTtyKeyboardHandler::handleKey(unsigned char code) -+{ -+ struct kbentry kbe; -+ -+ bool release = false; -+ if (code & 0x80) { -+ release = true; -+ code &= 0x7f; -+ } -+ -+ unsigned short mCode = KVAL(kernel_map[current_map][code]); -+ unsigned short unicode = acm[mCode]; -+ -+ const QWSServer::KeyMap *currentKey = 0; -+ int qtKeyCode = Qt::Key_unknown; -+ -+ currentKey = &QWSServer::keyMap()[code]; -+ if ( currentKey ) -+ qtKeyCode = currentKey->key_code; -+ -+ qDebug("code %d, mCode %d, uni %c, qtKeyCode %d\n", code, mCode, unicode, qtKeyCode); -+ -+ // Handle map changes based on press/release of modifiers -+ // hardcoded for now -+ int modif = -1; -+ switch (qtKeyCode) { -+ case Qt::Key_Alt: -+ case Qt::Key_F22: -+ modif = (1<<KG_ALT); -+ break; -+ case Qt::Key_Control: -+ modif = (1<<KG_CTRL); -+ break; -+ case Qt::Key_Shift: -+ modif = (1<<KG_SHIFT); -+ break; -+ case Qt::Key_Left: -+ case Qt::Key_Right: -+ case Qt::Key_Up: -+ case Qt::Key_Down: -+ if (qt_screen->isTransformed()) -+ qtKeyCode = xform_dirkey(qtKeyCode); -+ break; -+ } -+ -+ if (modif != -1) { -+ if (release) -+ current_map &= ~modif; -+ else -+ current_map |= modif; -+ } -+ unsigned int uni = unicode; -+ processKeyEvent(uni & 0xff, qtKeyCode, map_to_modif(current_map), !release, 0); -+} -+ - - /* USB driver */ - -@@ -1687,6 +1932,8 @@ - #elif defined(QT_QWS_CASSIOPEIA) - handler = new QWSVr41xxButtonsHandler(); - #endif -+ } else if ( type == "KernelTTY" ) { //set QWS_KEYBOARD=KernelTTY -+ handler = new QWSKernelTtyKeyboardHandler(device); - } else if ( type == "QVFbKeyboard" ) { - handler = new QWSVFbKeyboardHandler(); - } else if ( type == "USB" ) { diff --git a/qte/qte-2.3.8-snapshot/lefthand.patch b/qte/qte-2.3.8-snapshot/lefthand.patch deleted file mode 100644 index 0a0cccf210..0000000000 --- a/qte/qte-2.3.8-snapshot/lefthand.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -u qt-2.3.7_orig/src/widgets/qscrollview.cpp qt-2.3.7/src/widgets/qscrollview.cpp ---- qt-2.3.7_orig/src/widgets/qscrollview.cpp 2004-06-13 20:42:54.000000000 +0200 -+++ qt-2.3.7/src/widgets/qscrollview.cpp 2004-06-13 20:45:16.000000000 +0200 -@@ -526,15 +526,16 @@ - this, SLOT( doDragAutoScroll() ) ); - #endif - -- connect( &d->hbar, SIGNAL( valueChanged( int ) ), -- this, SLOT( hslide( int ) ) ); -- connect( &d->vbar, SIGNAL( valueChanged( int ) ), -- this, SLOT( vslide( int ) ) ); -+ connect( &d->hbar, SIGNAL( valueChanged(int) ), -+ this, SLOT( hslide(int) ) ); -+ connect( &d->vbar, SIGNAL( valueChanged(int) ), -+ this, SLOT( vslide(int) ) ); - d->viewport.installEventFilter( this ); - - setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); - setLineWidth( style().defaultFrameWidth() ); - setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); -+ - } - - -@@ -683,6 +684,11 @@ - h-tmarg-bmarg - (showh ? hsbExt : 0) ); - } - -+/* -+ The surrounding environment (or application, if there is no -+ environment, may set this. Requires Qt >= 2.3.8. -+*/ -+bool qt_left_hand_scrollbars = FALSE; - - /*! - Updates scrollbars - all possibilities considered. You should never -@@ -786,45 +792,50 @@ - - // Position the scrollbars, viewport, and corner widget. - int bottom; -+ int xoffset = ( qt_left_hand_scrollbars && ( showv || cornerWidget() ) ) ? vsbExt : 0; -+ int xpos = qt_left_hand_scrollbars ? 0 : w-vsbExt; -+ xpos = (style() == WindowsStyle) && qt_left_hand_scrollbars ? xpos + fw : xpos - fw; -+ int ypos = tmarg; -+ ypos = (style() == WindowsStyle) ? ypos +fw : 0; - if ( showh ) { - int right = ( showv || cornerWidget() ) ? w-vsbExt : w; - if ( style() == WindowsStyle ) -- setHBarGeometry(d->hbar, fw, h-hsbExt-fw, -+ setHBarGeometry(d->hbar, fw + xoffset , h-hsbExt-fw, - right-fw-fw, hsbExt ); - else -- setHBarGeometry(d->hbar, 0, h-hsbExt, right, -+ setHBarGeometry(d->hbar, 0+ xoffset, h-hsbExt, right, - hsbExt ); - bottom=h-hsbExt; - } else { - bottom=h; - } - if ( showv ) { -- clipper()->setGeometry( lmarg, tmarg, -+ clipper()->setGeometry( lmarg + xoffset, tmarg, - w-vsbExt-lmarg-rmarg, - bottom-tmarg-bmarg ); - d->viewportResized( w-vsbExt-lmarg-rmarg, bottom-tmarg-bmarg ); - if ( style() == WindowsStyle ) -- changeFrameRect(QRect(0, 0, w, h) ); -+ changeFrameRect(QRect(xoffset, 0, w, h) ); - else -- changeFrameRect(QRect(0, 0, w-vsbExt, bottom)); -+ changeFrameRect(QRect(xoffset, 0, w-vsbExt, bottom)); - if (cornerWidget()) { - if ( style() == WindowsStyle ) -- setVBarGeometry( d->vbar, w-vsbExt-fw, -- fw, vsbExt, -- h-hsbExt-fw-fw ); -+ setVBarGeometry( d->vbar, xpos, -+ ypos, vsbExt, -+ bottom-fw-ypos ); - else -- setVBarGeometry( d->vbar, w-vsbExt, 0, -+ setVBarGeometry( d->vbar, xpos, ypos, - vsbExt, -- h-hsbExt ); -+ bottom-ypos ); - } - else { - if ( style() == WindowsStyle ) -- setVBarGeometry( d->vbar, w-vsbExt-fw, -- fw, vsbExt, -- bottom-fw-fw ); -+ setVBarGeometry( d->vbar, xpos, -+ ypos, vsbExt, -+ bottom-fw-ypos ); - else -- setVBarGeometry( d->vbar, w-vsbExt, 0, -- vsbExt, bottom ); -+ setVBarGeometry( d->vbar, xpos, ypos, -+ vsbExt, bottom-ypos ); - } - } else { - if ( style() == WindowsStyle ) -@@ -837,12 +848,12 @@ - } - if ( d->corner ) { - if ( style() == WindowsStyle ) -- d->corner->setGeometry( w-vsbExt-fw, -+ d->corner->setGeometry( xpos, - h-hsbExt-fw, - vsbExt, - hsbExt ); - else -- d->corner->setGeometry( w-vsbExt, -+ d->corner->setGeometry( xpos, - h-hsbExt, - vsbExt, - hsbExt ); -@@ -1675,7 +1686,7 @@ - } - - /*! -- Scrolls the content by \a x to the left and \a y upwards. -+ Scrolls the content by \a dx to the left and \a dy upwards. - */ - void QScrollView::scrollBy( int dx, int dy ) - { diff --git a/qte/qte-2.3.8-snapshot/no-moc.patch b/qte/qte-2.3.8-snapshot/no-moc.patch deleted file mode 100644 index 441442f7d1..0000000000 --- a/qte/qte-2.3.8-snapshot/no-moc.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- Makefile~ 2004-09-02 06:19:35 +10:00 -+++ qt-2.3.8/Makefile 2004-09-02 06:20:38 +10:00 -@@ -8,7 +8,7 @@ - init: FORCE - @$(MAKE) QTDIR=`pwd` all - --all: symlinks src-moc src-mt sub-src sub-tools sub-tutorial sub-examples -+all: symlinks src-mt sub-src sub-tools sub-tutorial sub-examples - @echo - @echo "The Qt library is now built in ./lib" - @echo "The Qt examples are built in the directories in ./examples" -@@ -31,10 +31,10 @@ - symlinks: .buildopts - @cd include; rm -f q*.h; for i in ../src/*/q*.h ../src/3rdparty/*/q*.h ../extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h - --sub-src: src-moc src-mt .buildopts FORCE -+sub-src: src-mt .buildopts FORCE - cd src; $(MAKE) - --src-mt: src-moc .buildopts FORCE -+src-mt: .buildopts FORCE - $(MAKE) -f src-mt.mk - - sub-tutorial: sub-src FORCE -@@ -45,7 +45,6 @@ - - clean: - -rm .buildopts -- cd src/moc; $(MAKE) clean - cd src; $(MAKE) clean - -rm src/tmp/*.o src/tmp/*.a src/allmoc.cpp - -find src/3rdparty -name '*.o' | xargs rm diff --git a/qte/qte-2.3.8-snapshot/opie.patch b/qte/qte-2.3.8-snapshot/opie.patch deleted file mode 100644 index 7d71c05710..0000000000 --- a/qte/qte-2.3.8-snapshot/opie.patch +++ /dev/null @@ -1,418 +0,0 @@ -diff -ur qt-2.3.7_clean/include/qapplication.h qt-2.3.7/include/qapplication.h ---- qt-2.3.7_clean/include/qapplication.h 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/include/qapplication.h 2004-06-04 02:22:25.000000000 +0200 -@@ -61,6 +61,10 @@ - class QSemaphore; - #endif - -+#if !defined( QT_WEAK_SYMBOL ) -+#define QT_WEAK_SYMBOL -+#endif -+ - // REMOVE IN 3.0 (just here for moc source compatibility) - #define QNonBaseApplication QApplication - -@@ -85,7 +89,10 @@ - - #ifndef QT_NO_STYLE - static QStyle &style(); -- static void setStyle( QStyle* ); -+ static void setStyle( QStyle* ) QT_WEAK_SYMBOL; -+private: -+ static void setStyle_NonWeak( QStyle* ); -+public: - #endif - #if 1 /* OBSOLETE */ - enum ColorMode { NormalColors, CustomColors }; -@@ -106,11 +113,19 @@ - #ifndef QT_NO_PALETTE - static QPalette palette( const QWidget* = 0 ); - static void setPalette( const QPalette &, bool informWidgets=FALSE, -+ const char* className = 0 ) QT_WEAK_SYMBOL; -+private: -+ static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE, - const char* className = 0 ); -+public: - #endif - static QFont font( const QWidget* = 0 ); - static void setFont( const QFont &, bool informWidgets=FALSE, -+ const char* className = 0 ) QT_WEAK_SYMBOL; -+private: -+ static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE, - const char* className = 0 ); -+public: - static QFontMetrics fontMetrics(); - - QWidget *mainWidget() const; -@@ -207,7 +222,10 @@ - void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); - #ifndef QT_NO_QWS_MANAGER - static QWSDecoration &qwsDecoration(); -- static void qwsSetDecoration( QWSDecoration *); -+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; -+private: -+ static void qwsSetDecoration_NonWeak( QWSDecoration *); -+public: - #endif - #endif - -diff -ur qt-2.3.7_clean/include/qfontdatabase.h qt-2.3.7/include/qfontdatabase.h ---- qt-2.3.7_clean/include/qfontdatabase.h 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/include/qfontdatabase.h 2004-06-04 02:22:25.000000000 +0200 -@@ -59,6 +59,10 @@ - class QDiskFont; - #endif - -+#if !defined( QT_WEAK_SYMBOL ) -+#define QT_WEAK_SYMBOL -+#endif -+ - class QFontDatabasePrivate; - - class Q_EXPORT QFontDatabase -@@ -67,9 +71,16 @@ - QFontDatabase(); - - QStringList families( bool onlyForLocale = TRUE ) const; -+ -+ - QValueList<int> pointSizes( const QString &family, - const QString &style = QString::null, -- const QString &charSet = QString::null ); -+ const QString &charSet = QString::null ) QT_WEAK_SYMBOL; -+private: -+ QValueList<int> pointSizes_NonWeak( const QString &family, -+ const QString &style, -+ const QString &charSet ); -+public: - QStringList styles( const QString &family, - const QString &charSet = QString::null ) const; - QStringList charSets( const QString &familyName, -diff -ur qt-2.3.7_clean/src/kernel/qapplication.cpp qt-2.3.7/src/kernel/qapplication.cpp ---- qt-2.3.7_clean/src/kernel/qapplication.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qapplication.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -35,6 +35,8 @@ - ** - **********************************************************************/ - -+#define QT_WEAK_SYMBOL __attribute__(( weak )) -+ - #include "qobjectlist.h" - #include "qobjectdict.h" - #include "qapplication.h" -@@ -933,11 +935,16 @@ - #ifndef QT_NO_STYLE - void QApplication::setStyle( QStyle *style ) - { -+ setStyle_NonWeak ( style ); -+} -+ -+void QApplication::setStyle_NonWeak( QStyle *style ) -+{ - QStyle* old = app_style; -- app_style = style; - - if ( startingUp() ) { - delete old; -+ app_style = style; - return; - } - -@@ -958,6 +965,8 @@ - old->unPolish( qApp ); - } - -+ app_style = style; -+ - // take care of possible palette requirements of certain gui - // styles. Do it before polishing the application since the style - // might call QApplication::setStyle() itself -@@ -1184,13 +1193,30 @@ - \sa QWidget::setPalette(), palette(), QStyle::polish() - */ - --void QApplication::setPalette( const QPalette &palette, bool informWidgets, -+void QApplication::setPalette ( const QPalette &palette, bool informWidgets, -+ const char* className ) -+{ -+ setPalette_NonWeak ( palette, informWidgets, className ); -+} -+ -+void QApplication::setPalette_NonWeak ( const QPalette &palette, bool informWidgets, - const char* className ) - { - QPalette pal = palette; - #ifndef QT_NO_STYLE -- if ( !startingUp() ) -+ if ( !startingUp() ) { - qApp->style().polish( pal ); // NB: non-const reference -+ if ( className ) { -+ // if we just polished a class specific palette (this normally -+ // only called by qt_fix_tooltips - see below), we better re- -+ // polish the global palette. Some styles like liquid can get -+ // confused, because they can not detect if the polished palette -+ // is the global one or only a class specific one. -+ // (liquid uses this palette to calculate blending pixmaps) -+ QPalette p = qApp-> palette ( ); -+ qApp->style().polish ( p ); -+ } -+ } - #endif - bool all = FALSE; - if ( !className ) { -@@ -1275,6 +1301,12 @@ - void QApplication::setFont( const QFont &font, bool informWidgets, - const char* className ) - { -+ setFont_NonWeak ( font, informWidgets, className ); -+} -+ -+void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets, -+ const char* className ) -+{ - bool all = FALSE; - if ( !className ) { - if ( !app_font ) { -diff -ur qt-2.3.7_clean/src/kernel/qapplication.h qt-2.3.7/src/kernel/qapplication.h ---- qt-2.3.7_clean/src/kernel/qapplication.h 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qapplication.h 2004-06-04 02:22:25.000000000 +0200 -@@ -61,6 +61,10 @@ - class QSemaphore; - #endif - -+#if !defined( QT_WEAK_SYMBOL ) -+#define QT_WEAK_SYMBOL -+#endif -+ - // REMOVE IN 3.0 (just here for moc source compatibility) - #define QNonBaseApplication QApplication - -@@ -85,7 +89,10 @@ - - #ifndef QT_NO_STYLE - static QStyle &style(); -- static void setStyle( QStyle* ); -+ static void setStyle( QStyle* ) QT_WEAK_SYMBOL; -+private: -+ static void setStyle_NonWeak( QStyle* ); -+public: - #endif - #if 1 /* OBSOLETE */ - enum ColorMode { NormalColors, CustomColors }; -@@ -106,11 +113,19 @@ - #ifndef QT_NO_PALETTE - static QPalette palette( const QWidget* = 0 ); - static void setPalette( const QPalette &, bool informWidgets=FALSE, -+ const char* className = 0 ) QT_WEAK_SYMBOL; -+private: -+ static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE, - const char* className = 0 ); -+public: - #endif - static QFont font( const QWidget* = 0 ); - static void setFont( const QFont &, bool informWidgets=FALSE, -+ const char* className = 0 ) QT_WEAK_SYMBOL; -+private: -+ static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE, - const char* className = 0 ); -+public: - static QFontMetrics fontMetrics(); - - QWidget *mainWidget() const; -@@ -207,7 +222,10 @@ - void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); - #ifndef QT_NO_QWS_MANAGER - static QWSDecoration &qwsDecoration(); -- static void qwsSetDecoration( QWSDecoration *); -+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; -+private: -+ static void qwsSetDecoration_NonWeak( QWSDecoration *); -+public: - #endif - #endif - -diff -ur qt-2.3.7_clean/src/kernel/qapplication_qws.cpp qt-2.3.7/src/kernel/qapplication_qws.cpp ---- qt-2.3.7_clean/src/kernel/qapplication_qws.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qapplication_qws.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -2804,6 +2804,11 @@ - */ - void QApplication::qwsSetDecoration( QWSDecoration *d ) - { -+ qwsSetDecoration_NonWeak ( d ); -+} -+ -+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d ) -+{ - if ( d ) { - delete qws_decoration; - qws_decoration = d; -diff -ur qt-2.3.7_clean/src/kernel/qfontdatabase.cpp qt-2.3.7/src/kernel/qfontdatabase.cpp ---- qt-2.3.7_clean/src/kernel/qfontdatabase.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qfontdatabase.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -35,6 +35,8 @@ - ** - **********************************************************************/ - -+#define QT_WEAK_SYMBOL __attribute__(( weak )) -+ - #include "qfontdatabase.h" - - #ifndef QT_NO_FONTDATABASE -@@ -2424,6 +2426,13 @@ - const QString &style, - const QString &charSet ) - { -+ return pointSizes_NonWeak ( family, style, charSet ); -+} -+ -+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family, -+ const QString &style, -+ const QString &charSet ) -+{ - QString cs( charSet ); - if ( charSet.isEmpty() ) { - QStringList lst = charSets( family ); -diff -ur qt-2.3.7_clean/src/kernel/qfontdatabase.h qt-2.3.7/src/kernel/qfontdatabase.h ---- qt-2.3.7_clean/src/kernel/qfontdatabase.h 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qfontdatabase.h 2004-06-04 02:22:25.000000000 +0200 -@@ -59,6 +59,10 @@ - class QDiskFont; - #endif - -+#if !defined( QT_WEAK_SYMBOL ) -+#define QT_WEAK_SYMBOL -+#endif -+ - class QFontDatabasePrivate; - - class Q_EXPORT QFontDatabase -@@ -67,9 +71,16 @@ - QFontDatabase(); - - QStringList families( bool onlyForLocale = TRUE ) const; -+ -+ - QValueList<int> pointSizes( const QString &family, - const QString &style = QString::null, -- const QString &charSet = QString::null ); -+ const QString &charSet = QString::null ) QT_WEAK_SYMBOL; -+private: -+ QValueList<int> pointSizes_NonWeak( const QString &family, -+ const QString &style, -+ const QString &charSet ); -+public: - QStringList styles( const QString &family, - const QString &charSet = QString::null ) const; - QStringList charSets( const QString &familyName, -diff -ur qt-2.3.7_clean/src/kernel/qgfxraster_qws.cpp qt-2.3.7/src/kernel/qgfxraster_qws.cpp ---- qt-2.3.7_clean/src/kernel/qgfxraster_qws.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -4237,7 +4237,7 @@ - setAlphaType(IgnoreAlpha); - if ( w <= 0 || h <= 0 || !ncliprect ) return; - GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1)) --#ifdef QWS_EXPERIMENTAL_FASTPATH -+#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !! - // ### fix for 8bpp - // This seems to be reliable now, at least for 16bpp - -diff -ur qt-2.3.7_clean/src/kernel/qkeyboard_qws.cpp qt-2.3.7/src/kernel/qkeyboard_qws.cpp ---- qt-2.3.7_clean/src/kernel/qkeyboard_qws.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -238,7 +238,7 @@ - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 63 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 64 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 65 -- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 66 -+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 - { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 68 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 69 -diff -ur qt-2.3.7_clean/src/kernel/qwindowsystem_qws.cpp qt-2.3.7/src/kernel/qwindowsystem_qws.cpp ---- qt-2.3.7_clean/src/kernel/qwindowsystem_qws.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -844,6 +844,18 @@ - { - } - -+static void catchSegvSignal( int ) -+{ -+#ifndef QT_NO_QWS_KEYBOARD -+ if ( qwsServer ) -+ qwsServer->closeKeyboard(); -+#endif -+ QWSServer::closedown(); -+ fprintf(stderr, "Segmentation fault.\n"); -+ exit(1); -+} -+ -+ - /*! - \class QWSServer qwindowsystem_qws.h - \brief Server-specific functionality in Qt/Embedded -@@ -936,6 +948,7 @@ - } - - signal(SIGPIPE, ignoreSignal); //we get it when we read -+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash - #endif - focusw = 0; - mouseGrabber = 0; -diff -ur qt-2.3.7_clean/src/widgets/qcommonstyle.cpp qt-2.3.7/src/widgets/qcommonstyle.cpp ---- qt-2.3.7_clean/src/widgets/qcommonstyle.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/widgets/qcommonstyle.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -566,7 +566,7 @@ - bool enabled, bool active ) - { - #ifndef QT_NO_MENUBAR --#ifndef QT_NO_STYLE_SGI -+#if 1 // #ifndef QT_NO_STYLE_SGI - if (draw_menu_bar_impl != 0) { - QDrawMenuBarItemImpl impl = draw_menu_bar_impl; - (this->*impl)(p, x, y, w, h, mi, g, enabled, active); -diff -ur qt-2.3.7_clean/src/widgets/qlistview.cpp qt-2.3.7/src/widgets/qlistview.cpp ---- qt-2.3.7_clean/src/widgets/qlistview.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/widgets/qlistview.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -4968,9 +4968,9 @@ - l = l->childItem ? l->childItem : l->siblingItem; - - if ( l && l->height() ) -- s.setHeight( s.height() + 10 * l->height() ); -- else -- s.setHeight( s.height() + 140 ); -+ s.setHeight( s.height() + 4 /*10*/ * l->height() ); -+ else // ^v much too big for handhelds -+ s.setHeight( s.height() + 30 /*140*/ ); - - if ( s.width() > s.height() * 3 ) - s.setHeight( s.width() / 3 ); -diff -ur qt-2.3.7_clean/src/widgets/qtoolbutton.cpp qt-2.3.7/src/widgets/qtoolbutton.cpp ---- qt-2.3.7_clean/src/widgets/qtoolbutton.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/widgets/qtoolbutton.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -230,7 +230,7 @@ - else - QToolTip::add( this, textLabel ); - } --#endif -+#endif - } - - -@@ -324,12 +324,12 @@ - QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); - w = pm.width(); - h = pm.height(); -- if ( w < 32 ) -- w = 32; -- if ( h < 32 ) -- h = 32; -+ if ( w < 24 ) -+ w = 24; -+ if ( h < 24 ) -+ h = 24; - } else { -- w = h = 16; -+ w = h = 14; - QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); - w = pm.width(); - h = pm.height(); diff --git a/qte/qte-2.3.8-snapshot/qconfig-qpe.h b/qte/qte-2.3.8-snapshot/qconfig-qpe.h deleted file mode 100644 index 784283acca..0000000000 --- a/qte/qte-2.3.8-snapshot/qconfig-qpe.h +++ /dev/null @@ -1,124 +0,0 @@ -/********************************************************************** -** Copyright (C) 2000-2004 Trolltech AS. All rights reserved. -** -** This file is part of the Qtopia Environment. -** -** Licensees holding a valid license agreement from Trolltech or any of its -** authorized distributors may use this file in accordance with -** the License Agreement provided with the Licensed Software. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.trolltech.com/pricing.html or email sales.com for -** information about Trolltech's Commercial License Agreements. -** -** Contact info.com if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ -#ifndef QT_H -#endif // QT_H - -// Note that disabling more features will produce a libqte that is not -// compatible with other libqte builds. - -#ifndef QT_DLL -#define QT_DLL // Internal -#endif - -// Qtopia Phone -#if defined(QTOPIA_PHONE) -# if !defined(QT_KEYPAD_INPUT) -# define QT_KEYPAD_INPUT -# endif -#endif - -// Platforms where mouse cursor is never required. -#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX) || defined(QT_KEYPAD_MODE) -# define QT_NO_QWS_CURSOR -# define QT_NO_QWS_MOUSE_AUTO -#endif - -// No builtin codecs (Qtopia uses plugins to add codecs individually) -#ifndef QT_NO_CODECS -#define QT_NO_CODECS -#endif - -// No builtin font factories (Qtopia uses plugins) -#define QT_NO_FREETYPE -#define QT_NO_BDF - -// No builtin styles (Qtopia uses plugins) -#define QT_NO_STYLE_POCKETPC -#ifndef QT_NO_STYLE_AQUA -# define QT_NO_STYLE_AQUA -#endif -#define QT_NO_STYLE_MOTIF -#define QT_NO_STYLE_PLATINUM - -// No builtin WM styles (Qtopia uses plugins) -#define QT_NO_QWS_BEOS_WM_STYLE -#define QT_NO_QWS_KDE2_WM_STYLE -#define QT_NO_QWS_KDE_WM_STYLE -#define QT_NO_QWS_WINDOWS_WM_STYLE - -// Space savings: disable expensive features -#define QT_NO_UNICODETABLES -#ifndef QT_NO_IMAGEIO_MNG -# define QT_NO_IMAGEIO_MNG -#endif -#define QT_NO_PROPERTIES -#define QT_NO_COLORNAMES - -// Space savings: features insufficiently useful on handheld device -#define QT_NO_IMAGEIO_PPM -#define QT_NO_NETWORKPROTOCOL -#define QT_NO_PICTURE -#define QT_NO_PRINTER -#define QT_NO_QWS_SAVEFONTS - -// Space savings: features impractical on small display -#define QT_NO_COLORDIALOG -#define QT_NO_FILEDIALOG -#define QT_NO_FONTDIALOG - -// Space savings: features impractical on stylus device -#define QT_NO_DIAL -#define QT_NO_DRAGANDDROP -#define QT_NO_IMAGE_TEXT -#define QT_NO_INPUTDIALOG -#define QT_NO_PRINTDIALOG -#define QT_NO_PROGRESSDIALOG -#define QT_NO_SEMIMODAL -#define QT_NO_SIZEGRIP -#define QT_NO_SPLITTER -#define QT_NO_WORKSPACE - -// Speed savings: features that incur unacceptable performance penalty -#define QT_NO_DOM -#define QT_NO_EFFECTS -#define QT_NO_TRANSFORMATIONS - -// Qt 3 features (not relevant at this time) -#define QT_NO_TRANSLATION_BUILDER -#define QT_NO_COMPLEXTEXT - -// Features included directly in Qtopia -#if !(defined (_OS_WIN32_) || defined (_WS_WIN32_)) -#define QT_NO_WIZARD_IMPL -#endif - -// Features for Qtopia under Win32 SDK -#if defined (_OS_WIN32_) || defined (_WS_WIN32_) -#define QT_NO_PRINTER -#define QT_NO_QWS_LINUXFB -#define QT_NO_QWS_MACH64 -#define QT_NO_QWS_VOODOO3 -#define QT_NO_QWS_MATROX -#define QT_NO_QWS_VNC -#define QT_NO_QWS_TRANSFORMED -#define QT_NO_QWS_VGA_16 -#define QT_NO_QWS_SVGALIB -#endif -#define QT_NO_QMEMORYFILE diff --git a/qte/qte-2.3.8-snapshot/qpe.patch b/qte/qte-2.3.8-snapshot/qpe.patch deleted file mode 100644 index 4aa92180de..0000000000 --- a/qte/qte-2.3.8-snapshot/qpe.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- /dev/null -+++ qt-2.3.6/src/tools/qconfig-qpe.h -@@ -0,0 +1,97 @@ -+/********************************************************************** -+** Copyright (C) 2000 Trolltech AS. All rights reserved. -+** -+** This file is part of Qtopia Environment. -+** -+** This file may be distributed and/or modified under the terms of the -+** GNU General Public License version 2 as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL included in the -+** packaging of this file. -+** -+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+** -+** See http://www.trolltech.com/gpl/ for GPL licensing information. -+** -+** Contact info@trolltech.com if any conditions of this licensing are -+** not clear to you. -+** -+**********************************************************************/ -+#ifndef QT_H -+#endif // QT_H -+ -+// Empty leaves all features enabled. See doc/html/features.html for choices. -+ -+// Note that disabling some features will produce a libqt that is not -+// compatible with other libqt builds. Such modifications are only -+// supported on Qt/Embedded where reducing the library size is important -+// and where the application-suite is often a fixed set. -+ -+#ifndef QT_DLL -+#define QT_DLL // Internal -+#endif -+ -+#define QT_NO_QWS_CURSOR -+#define QT_NO_QWS_MOUSE_AUTO -+#ifndef QT_NO_CODECS -+#define QT_NO_CODECS -+#endif -+#define QT_NO_UNICODETABLES -+//#define QT_NO_IMAGEIO_BMP -+#define QT_NO_IMAGEIO_PPM -+//#define QT_NO_ASYNC_IO -+//#define QT_NO_ASYNC_IMAGE_IO -+#define QT_NO_FREETYPE -+#define QT_NO_BDF -+//#define QT_NO_FONTDATABASE -+#define QT_NO_DRAGANDDROP -+//#define QT_NO_CLIPBOARD -+#define QT_NO_PROPERTIES -+#define QT_NO_NETWORKPROTOCOL -+ -+#define QT_NO_IMAGE_TEXT -+ -+//#define QT_NO_TOOLTIP -+#define QT_NO_COLORNAMES -+#define QT_NO_TRANSFORMATIONS -+#define QT_NO_TRANSLATION_BUILDER -+#define QT_NO_COMPLEXTEXT -+#define QT_NO_PRINTER -+#define QT_NO_PICTURE -+//#define QT_NO_ICONVIEW -+#define QT_NO_DIAL -+#define QT_NO_SIZEGRIP -+#define QT_NO_WORKSPACE -+//#define QT_NO_TABLE -+//#define QT_NO_ACTION -+//#define QT_NO_SETTINGS -+#define QT_NO_STYLE_POCKETPC -+#ifndef QT_NO_STYLE_AQUA -+# define QT_NO_STYLE_AQUA -+#endif -+#define QT_NO_STYLE_MOTIF -+#define QT_NO_STYLE_PLATINUM -+#define QT_NO_FILEDIALOG -+#define QT_NO_FONTDIALOG -+#define QT_NO_PRINTDIALOG -+#define QT_NO_COLORDIALOG -+#define QT_NO_INPUTDIALOG -+//#define QT_NO_MESSAGEBOX -+#define QT_NO_PROGRESSDIALOG -+//#define QT_NO_TABDIALOG -+#define QT_NO_WIZARD -+#define QT_NO_EFFECTS -+//#define QT_NO_COMPONENT -+#define QT_NO_DOM -+#define QT_NO_SEMIMODAL -+//#define QT_NO_PROGRESSBAR -+#define QT_NO_SPLITTER -+ -+//#define QT_NO_QWS_SAVEFONTS -+//#define QT_NO_QWS_PROPERTIES -+ -+#define QT_NO_QWS_BEOS_WM_STYLE -+#define QT_NO_QWS_KDE2_WM_STYLE -+#define QT_NO_QWS_KDE_WM_STYLE -+#define QT_NO_QWS_WINDOWS_WM_STYLE -+ diff --git a/qte/qte-2.3.8-snapshot/qte238-iconviewspeed.patch b/qte/qte-2.3.8-snapshot/qte238-iconviewspeed.patch deleted file mode 100644 index 3351bbb8f3..0000000000 --- a/qte/qte-2.3.8-snapshot/qte238-iconviewspeed.patch +++ /dev/null @@ -1,145 +0,0 @@ -Speed up patches backported from - -http://robotics.dei.unipd.it/~koral/KDE/kflicker.html - -and - -http://lists.kde.org/?l=kde-optimize&m=105382164111363&w=2 (complete thread) - - - - - - - -diff -ur qt-2.3.8-old/src/iconview/qiconview.cpp qt-2.3.8/src/iconview/qiconview.cpp ---- qt-2.3.8-old/src/iconview/qiconview.cpp 2004-07-22 01:07:46.000000000 +0200 -+++ qt-2.3.8/src/iconview/qiconview.cpp 2004-07-23 19:13:09.000000000 +0200 -@@ -224,6 +224,7 @@ - QIconView::SelectionMode selectionMode; - QIconViewItem *currentItem, *tmpCurrentItem, *highlightedItem, *startDragItem, *pressedItem, *selectAnchor; - QRect *rubber; -+ QPixmap *backBuffer; - QTimer *scrollTimer, *adjustTimer, *updateTimer, *inputTimer, - *fullRedrawTimer; - int rastX, rastY, spacing; -@@ -2267,6 +2268,7 @@ - d->currentItem = 0; - d->highlightedItem = 0; - d->rubber = 0; -+ d->backBuffer = 0; - d->scrollTimer = 0; - d->startDragItem = 0; - d->tmpCurrentItem = 0; -@@ -2415,6 +2417,8 @@ - delete item; - item = tmp; - } -+ delete d->backBuffer; -+ d->backBuffer = 0; - delete d->fm; - d->fm = 0; - #ifndef QT_NO_TOOLTIP -@@ -2881,6 +2885,48 @@ - } - - /*! -+ This function grabs all paintevents that otherwise would have been -+ processed by the QScrollView::viewportPaintEvent(). Here we use a -+ doublebuffer to reduce 'on-paint' flickering on QIconView -+ (and of course its childs). -+ -+ \sa QScrollView::viewportPaintEvent(), QIconView::drawContents() -+*/ -+ -+void QIconView::bufferedPaintEvent( QPaintEvent* pe ) -+{ -+ QWidget* vp = viewport(); -+ QRect r = pe->rect() & vp->rect(); -+ int ex = r.x() + contentsX(); -+ int ey = r.y() + contentsY(); -+ int ew = r.width(); -+ int eh = r.height(); -+ -+ if ( !d->backBuffer ) -+ d->backBuffer = new QPixmap(vp->size()); -+ if ( d->backBuffer->size() != vp->size() ) { -+ //Resize function (with hysteesis). Uses a good compromise between memory -+ //consumption and speed (number) of resizes. -+ float newWidth = (float)vp->width(); -+ float newHeight = (float)vp->height(); -+ if ( newWidth > d->backBuffer->width() || newHeight > d->backBuffer->height() ) -+ { -+ newWidth *= 1.1892; -+ newHeight *= 1.1892; -+ d->backBuffer->resize( (int)newWidth, (int)newHeight ); -+ } else if ( 1.5*newWidth < d->backBuffer->width() || 1.5*newHeight < d->backBuffer->height() ) -+ d->backBuffer->resize( (int)newWidth, (int)newHeight ); -+ } -+ -+ QPainter p; -+ p.begin(d->backBuffer, vp); -+ drawContentsOffset(&p, contentsX(), contentsY(), ex, ey, ew, eh); -+ p.end(); -+ bitBlt(vp, r.x(), r.y(), d->backBuffer, r.x(), r.y(), ew, eh); -+} -+ -+/*! -+ - \reimp - */ - -@@ -4937,7 +4983,7 @@ - if ( !d->rubber ) - drawDragShapes( d->oldDragPos ); - } -- viewportPaintEvent( (QPaintEvent*)e ); -+ bufferedPaintEvent ((QPaintEvent*)e ); - if ( d->dragging ) { - if ( !d->rubber ) - drawDragShapes( d->oldDragPos ); -@@ -5374,11 +5420,19 @@ - return; - - if ( item->d->container1 && d->firstContainer ) { -- item->d->container1->items.removeRef( item ); -+ //Special-case checking of the last item, since this may be -+ //called a few times for the same item. -+ if (item->d->container1->items.last() == item) -+ item->d->container1->items.removeLast(); -+ else -+ item->d->container1->items.removeRef( item ); - } - item->d->container1 = 0; - if ( item->d->container2 && d->firstContainer ) { -- item->d->container2->items.removeRef( item ); -+ if (item->d->container2->items.last() == item) -+ item->d->container2->items.removeLast(); -+ else -+ item->d->container2->items.removeRef( item ); - } - item->d->container2 = 0; - -diff -ur qt-2.3.8-old/src/iconview/qiconview.h qt-2.3.8/src/iconview/qiconview.h ---- qt-2.3.8-old/src/iconview/qiconview.h 2004-07-22 01:07:46.000000000 +0200 -+++ qt-2.3.8/src/iconview/qiconview.h 2004-07-23 19:13:09.000000000 +0200 -@@ -444,6 +444,7 @@ - virtual void contentsDropEvent( QDropEvent *e ); - #endif - -+ void bufferedPaintEvent( QPaintEvent* ); - virtual void resizeEvent( QResizeEvent* e ); - virtual void keyPressEvent( QKeyEvent *e ); - virtual void focusInEvent( QFocusEvent *e ); ---- qt-2.3.8-old/src/widgets/qscrollview.cpp 2004-07-22 01:07:44.000000000 +0200 -+++ qt-2.3.8/src/widgets/qscrollview.cpp 2004-07-23 19:21:06.000000000 +0200 -@@ -1280,6 +1280,9 @@ - case QEvent::LayoutHint: - d->autoResizeHint(this); - break; -+ case QEvent::WindowActivate: -+ case QEvent::WindowDeactivate: -+ return TRUE; - default: - break; - } diff --git a/qte/qte-2.3.8-snapshot/qtopia.patch b/qte/qte-2.3.8-snapshot/qtopia.patch deleted file mode 100644 index 0361aaf915..0000000000 --- a/qte/qte-2.3.8-snapshot/qtopia.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- /dev/null 2003-01-10 02:39:01.000000000 +1000 -+++ qt-2.3.7/src/tools/qconfig-qpe.h 2003-11-09 18:32:29.000000000 +1000 -@@ -0,0 +1,117 @@ -+/********************************************************************** -+** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. -+** -+** This file is part of the Qtopia Environment. -+** -+** This file may be distributed and/or modified under the terms of the -+** GNU General Public License version 2 as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL included in the -+** packaging of this file. -+** -+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+** -+** See http://www.trolltech.com/gpl/ for GPL licensing information. -+** -+** Contact info@trolltech.com if any conditions of this licensing are -+** not clear to you. -+** -+**********************************************************************/ -+#ifndef QT_H -+#endif // QT_H -+ -+// Note that disabling more features will produce a libqte that is not -+// compatible with other libqte builds. -+ -+#ifndef QT_DLL -+#define QT_DLL // Internal -+#endif -+ -+// Platforms where mouse cursor is never required. -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX) -+# define QT_NO_QWS_CURSOR -+# define QT_NO_QWS_MOUSE_AUTO -+#endif -+ -+// No builtin codecs (Qtopia uses plugins to add codecs individually) -+#ifndef QT_NO_CODECS -+#define QT_NO_CODECS -+#endif -+ -+// No builtin font factories (Qtopia uses plugins) -+#define QT_NO_FREETYPE -+#define QT_NO_BDF -+ -+// No builtin styles (Qtopia uses plugins) -+#define QT_NO_STYLE_POCKETPC -+#ifndef QT_NO_STYLE_AQUA -+# define QT_NO_STYLE_AQUA -+#endif -+#define QT_NO_STYLE_MOTIF -+#define QT_NO_STYLE_PLATINUM -+ -+// No builtin WM styles (Qtopia uses plugins) -+#define QT_NO_QWS_BEOS_WM_STYLE -+#define QT_NO_QWS_KDE2_WM_STYLE -+#define QT_NO_QWS_KDE_WM_STYLE -+#define QT_NO_QWS_WINDOWS_WM_STYLE -+ -+// Space savings: disable expensive features -+#define QT_NO_UNICODETABLES -+#ifndef QT_NO_IMAGEIO_MNG -+# define QT_NO_IMAGEIO_MNG -+#endif -+#define QT_NO_PROPERTIES -+#define QT_NO_COLORNAMES -+ -+// Space savings: features insufficiently useful on handheld device -+#define QT_NO_IMAGEIO_PPM -+#define QT_NO_NETWORKPROTOCOL -+#define QT_NO_PICTURE -+#define QT_NO_PRINTER -+#define QT_NO_QWS_SAVEFONTS -+ -+// Space savings: features impractical on small display -+#define QT_NO_COLORDIALOG -+#define QT_NO_FILEDIALOG -+#define QT_NO_FONTDIALOG -+ -+// Space savings: features impractical on stylus device -+#define QT_NO_DIAL -+#define QT_NO_DRAGANDDROP -+#define QT_NO_IMAGE_TEXT -+#define QT_NO_INPUTDIALOG -+#define QT_NO_PRINTDIALOG -+#define QT_NO_PROGRESSDIALOG -+#define QT_NO_SEMIMODAL -+#define QT_NO_SIZEGRIP -+#define QT_NO_SPLITTER -+#define QT_NO_WORKSPACE -+ -+// Speed savings: features that incur unacceptable performance penalty -+#define QT_NO_DOM -+#define QT_NO_EFFECTS -+#define QT_NO_TRANSFORMATIONS -+ -+// Qt 3 features (not relevant at this time) -+#define QT_NO_TRANSLATION_BUILDER -+#define QT_NO_COMPLEXTEXT -+ -+// Features included directly in Qtopia -+#if !(defined (_OS_WIN32_) || defined (_WS_WIN32_)) -+#define QT_NO_WIZARD_IMPL -+#endif -+ -+// Features for Qtopia under Win32 SDK -+#if defined (_OS_WIN32_) || defined (_WS_WIN32_) -+#define QT_NO_PRINTER -+#define QT_NO_QWS_LINUXFB -+#define QT_NO_QWS_MACH64 -+#define QT_NO_QWS_VOODOO3 -+#define QT_NO_QWS_MATROX -+#define QT_NO_QWS_VNC -+#define QT_NO_QWS_TRANSFORMED -+#define QT_NO_QWS_VGA_16 -+#define QT_NO_QWS_SVGALIB -+#endif -+#define QT_NO_QMEMORYFILE diff --git a/qte/qte-2.3.8-snapshot/qwsmouse-tosa.diff b/qte/qte-2.3.8-snapshot/qwsmouse-tosa.diff deleted file mode 100644 index ac4a87b821..0000000000 --- a/qte/qte-2.3.8-snapshot/qwsmouse-tosa.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- qwsmouse_qws.cpp~qwsmouse-c700 2004-09-20 00:01:42.000000000 +1000 -+++ qt-2.3.9/src/kernel/qwsmouse_qws.cpp 2004-09-20 13:04:29.000000000 +1000 -@@ -71,14 +71,18 @@ - #elif defined(QT_QWS_SL5XXX) - #define QT_QWS_SL5XXX_RAW - typedef struct { -- long y; -- long x; -- long pressure; -- long long millisecs; -+ unsigned short pressure; -+ unsigned short x; -+ unsigned short y; -+ unsigned short pad; -+// long y; -+// long x; -+// long pressure; -+// long long millisecs; - } TS_EVENT; - #define QT_QWS_TP_SAMPLE_SIZE 10 - #define QT_QWS_TP_MINIMUM_SAMPLES 4 --#define QT_QWS_TP_PRESSURE_THRESHOLD 500 -+#define QT_QWS_TP_PRESSURE_THRESHOLD 1 - #define QT_QWS_TP_MOVE_LIMIT 50 - #define QT_QWS_TP_JITTER_LIMIT 2 - #endif - diff --git a/qte/qte-2.3.8-snapshot/sharp_char.h b/qte/qte-2.3.8-snapshot/sharp_char.h deleted file mode 100644 index a70f5f690e..0000000000 --- a/qte/qte-2.3.8-snapshot/sharp_char.h +++ /dev/null @@ -1,309 +0,0 @@ -/* - * linux/include/asm/sharp_char.h - * - * sharp drivers definitions (SHARP) - * - * Copyright (C) 2001 SHARP - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Change Log - * 12-Dec-2002 Sharp Corporation for Poodle and Corgi - */ - -#ifndef __ASM_SHARP_CHAR_H_INCLUDED -#define __ASM_SHARP_CHAR_H_INCLUDED - -/* - * If SHARPCHAR_USE_MISCDEV defined , misc driver architecture used instead of sharp_char - */ - -#define SHARPCHAR_USE_MISCDEV - -/* - * devices defines... - */ - -#ifndef SHARP_DEV_MAJOR -#define SHARP_DEV_MAJOR 11 -#endif - -#ifndef SHARP_DEV_MINOR_START -#define SHARP_DEV_MINOR_START 210 -#endif - -#define SHARP_DEV_MINOR_MAX 4 /* defines last minor number of SHARP device */ - -#define SHARP_LED_MINOR (SHARP_DEV_MINOR_START+0) -#define SHARP_BUZZER_MINOR (SHARP_DEV_MINOR_START+1) -#define SHARP_GSM_MINOR (SHARP_DEV_MINOR_START+2) -#define SHARP_AUDIOCTL_MINOR (SHARP_DEV_MINOR_START+3) -#define SHARP_KBDCTL_MINOR (SHARP_DEV_MINOR_START+4) - -/* - * ioctl defines... - */ - -#define SHARP_DEV_IOCTL_COMMAND_START 0x5680 - -/* --- for SHARP_LED device --- */ -#define SHARP_LED_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) -#define SHARP_LED_GETSTATUS (SHARP_LED_IOCTL_START) -#define SHARP_LED_SETSTATUS (SHARP_LED_IOCTL_START+1) -#define SHARP_LED_ISUPPORTED (SHARP_LED_IOCTL_START+2) - -typedef struct sharp_led_status { - int which; /* select which LED status is wanted. */ - int status; /* set new led status if you call SHARP_LED_SETSTATUS */ -} sharp_led_status; - -#define SHARP_LED_WHICH_MAX 15 /* last number of LED */ - -/* parameters for 'which' member */ -#define SHARP_LED_PDA 0 /* PDA status */ -#define SHARP_LED_DALARM 1 /* daily alarm */ -#define SHARP_LED_SALARM 2 /* schedule alarm */ -#define SHARP_LED_BATTERY 3 /* main battery status */ -#define SHARP_LED_ACSTATUS 4 /* AC line status */ -#define SHARP_LED_CHARGER 5 /* charger status */ -#define SHARP_LED_PHONE_RSSI 6 /* phone status (RSSI...) */ -#define SHARP_LED_PHONE_DIAL 7 /* phone status (dialing...) */ -#define SHARP_LED_PHONE_IN 8 /* phone status (incoming..) */ -#define SHARP_LED_MAIL_EXISTS 9 /* mail status (exists or not) */ -#define SHARP_LED_MAIL_SEND 10 /* mail status (sending...) */ -#define SHARP_LED_MAIL_QUEUE 11 /* mail to send is in queue */ -#define SHARP_LED_COLLIE_0 12 /* 1st pri. battery LED control */ -#define SHARP_LED_COLLIE_1 13 /* 1st pri. mail LED control */ -#define SHARP_LED_COMM 14 /* communication status */ -#define SHARP_LED_BROWSER 15 /* WWW browser status */ - -/* parameters for 'status' member */ -#define LED_PDA_RUNNING 0 /* for SHARP_LED_RUN */ -#define LED_PDA_SUSPENDED 1 /* for SHARP_LED_RUN */ -#define LED_PDA_OFF 2 /* for SHARP_LED_RUN */ -#define LED_PDA_ERROR 3 /* for SHARP_LED_RUN */ - -#define LED_DALARM_OFF 0 /* for SHARP_LED_DALARM */ -#define LED_DALARM_ON 1 /* for SHARP_LED_DALARM */ - -#define LED_SALARM_OFF 0 /* for SHARP_LED_SALARM */ -#define LED_SALARM_ON 1 /* for SHARP_LED_SALARM */ - -#define LED_BATTERY_GOOD 0 /* for SHARP_LED_BATTERY */ -#define LED_BATTERY_LOW 1 /* for SHARP_LED_BATTERY */ -#define LED_BATTERY_VERY_LOW 2 /* for SHARP_LED_BATTERY */ -#define LED_BATTERY_CRITICAL 3 /* for SHARP_LED_BATTERY */ - -#define LED_CHARGER_OFF 0 /* for SHARP_LED_CHARGER */ -#define LED_CHARGER_CHARGING 1 /* for SHARP_LED_CHARGER */ -#define LED_CHARGER_ERROR 2 /* for SHARP_LED_CHARGER */ -#define LED_CHARGER_FLASH 3 - -#define LED_AC_NOT_CONNECTED 0 /* for SHARP_LED_ACSTATUS */ -#define LED_AC_CONNECTED 1 /* for SHARP_LED_ACSTATUS */ - -#define LED_RSSI_OUT 0 /* for SHARP_LED_PHONE_RSSI */ -#define LED_RSSI_IN 1 /* for SHARP_LED_PHONE_RSSI */ - -#define LED_DIAL_OFF 0 /* for SHARP_LED_PHONE_DIAL */ -#define LED_DIAL_DIALING 1 /* for SHARP_LED_PHONE_DIAL */ -#define LED_DIAL_HOLDING 2 /* for SHARP_LED_PHONE_DIAL */ - -#define LED_PHONE_WAITING 0 /* for SHARP_LED_PHONE_IN */ -#define LED_PHONE_INCOMING 1 /* for SHARP_LED_PHONE_IN */ - -#define LED_MAIL_NO_UNREAD_MAIL 0 /* for SHARP_LED_MAIL_EXISTS */ -#define LED_MAIL_NEWMAIL_EXISTS 1 /* for SHARP_LED_MAIL_EXISTS */ -#define LED_MAIL_UNREAD_MAIL_EX 2 /* for SHARP_LED_MAIL_EXISTS */ - -#define LED_SENDMAIL_OFF 0 /* for SHARP_LED_MAIL_SEND */ -#define LED_SENDMAIL_SENDING 1 /* for SHARP_LED_MAIL_SEND */ -#define LED_SENDMAIL_ERROR 2 /* for SHARP_LED_MAIL_SEND */ - -#define LED_MAILQUEUE_NOUNREAD 0 /* for SHARP_LED_MAIL_QUEUE */ -#define LED_MAILQUEUE_NEWMAIL 1 /* for SHARP_LED_MAIL_QUEUE */ -#define LED_MAILQUEUE_UNREAD 2 /* for SHARP_LED_MAIL_QUEUE */ - -#define LED_COLLIE_0_DEFAULT 0 /* for SHARP_LED_COLLIE_0 */ -#define LED_COLLIE_0_OFF 1 /* for SHARP_LED_COLLIE_0 */ -#define LED_COLLIE_0_ON 2 /* for SHARP_LED_COLLIE_0 */ -#define LED_COLLIE_0_FASTBLINK 3 /* for SHARP_LED_COLLIE_0 */ -#define LED_COLLIE_0_SLOWBLINK 4 /* for SHARP_LED_COLLIE_0 */ - -#define LED_COLLIE_1_DEFAULT 0 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_OFF 1 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_ON 2 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_FLASHON 3 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_FLASHOFF 4 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_VFSTBLINK 5 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_FASTBLINK 6 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_NORMBLINK 7 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_SLOWBLINK 8 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_SOFTBLINK 9 /* for SHARP_LED_COLLIE_1 */ -#define LED_COLLIE_1_SOFTFLASH 10 /* for SHARP_LED_COLLIE_1 */ - -#define LED_COMM_OFFLINE 0 /* for SHARP_LED_COMM */ -#define LED_COMM_ONLINE 1 /* for SHARP_LED_COMM */ -#define LED_COMM_ERROR 2 /* for SHARP_LED_COMM */ - -#define LED_BROWSER_OFFLINE 0 /* for SHARP_LED_BROWSER */ -#define LED_BROWSER_ONLINE 1 /* for SHARP_LED_BROWSER */ -#define LED_BROWSER_ERROR 2 /* for SHARP_LED_BROWSER */ - - -/* --- for SHARP_BUZZER device --- */ -#define SHARP_BUZZER_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) -#define SHARP_BUZZER_MAKESOUND (SHARP_BUZZER_IOCTL_START) -#define SHARP_BUZZER_SETVOLUME (SHARP_BUZZER_IOCTL_START+1) -#define SHARP_BUZZER_GETVOLUME (SHARP_BUZZER_IOCTL_START+2) -#define SHARP_BUZZER_ISSUPPORTED (SHARP_BUZZER_IOCTL_START+3) -#define SHARP_BUZZER_SETMUTE (SHARP_BUZZER_IOCTL_START+4) -#define SHARP_BUZZER_STOPSOUND (SHARP_BUZZER_IOCTL_START+5) -#define SHARP_BUZZER_SET_BUFFER (SHARP_BUZZER_IOCTL_START+6) - -typedef struct sharp_buzzer_status { /* this struct is used for setvolume/getvolume */ - int which; /* select which LED status is wanted. */ - int volume; /* set new buzzer volume if you call SHARP_BUZZER_SETVOLUME */ - int mute; /* set 1 to MUTE if you call SHARP_BUZZER_SETMUTE */ -} sharp_buzzer_status; - -#define SHARP_BUZ_WHICH_MAX 14 /* last number of buzzer */ - -#define SHARP_BUZ_ALL_SOUNDS -1 /* for setting volumes of ALL sounds at a time */ - -#define SHARP_BUZ_WRITESOUND 0 /* for sound datas through 'write' calls */ -#define SHARP_BUZ_TOUCHSOUND 1 /* touch panel sound */ -#define SHARP_BUZ_KEYSOUND 2 /* key sound */ -#define SHARP_PDA_ILLCLICKSOUND 3 /* illegal click */ -#define SHARP_PDA_WARNSOUND 4 /* warning occurred */ -#define SHARP_PDA_ERRORSOUND 5 /* error occurred */ -#define SHARP_PDA_CRITICALSOUND 6 /* critical error occurred */ -#define SHARP_PDA_SYSSTARTSOUND 7 /* system start */ -#define SHARP_PDA_SYSTEMENDSOUND 8 /* system shutdown */ -#define SHARP_PDA_APPSTART 9 /* application start */ -#define SHARP_PDA_APPQUIT 10 /* application ends */ -#define SHARP_BUZ_SCHEDULE_ALARM 11 /* schedule alarm */ -#define SHARP_BUZ_DAILY_ALARM 12 /* daily alarm */ -#define SHARP_BUZ_GOT_PHONE_CALL 13 /* phone call sound */ -#define SHARP_BUZ_GOT_MAIL 14 /* mail sound */ - -#define SHARP_BUZ_VOLUME_OFF 0 -#define SHARP_BUZ_VOLUME_LOW 33 -#define SHARP_BUZ_VOLUME_MEDIUM 67 -#define SHARP_BUZ_VOLUME_HIGH 100 /* currentry , this is the maximum ... */ -#define SHARP_BUZ_VOLUME_MAX (SHARP_BUZ_VOLUME_HIGH) - -/* --- for SHARP_GSM device --- */ -#define SHARP_GSM_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) -#define SHARP_GSM_GETEXTSTATUS (SHARP_GSM_IOCTL_START+16) -#define SHARP_GSM_INFO_TELL_MODE (SHARP_GSM_IOCTL_START+17) -#define SHARP_IRIS_GETSYNCSTATUS (SHARP_GSM_IOCTL_START+18) -#define SHARP_IRIS_RECHECKDEVICE (SHARP_GSM_IOCTL_START+19) - - -#define GSM_PHONE_NO_POWER 0 /* for SHARP_GSM_INFO_TELL_MODE */ -#define GSM_PHONE_NO_CONNECTION 1 /* for SHARP_GSM_INFO_TELL_MODE */ -#define GSM_PHONE_IN_ANALOG_MODE 2 /* for SHARP_GSM_INFO_TELL_MODE */ -#define GSM_PHONE_IN_DATA_MODE 3 /* for SHARP_GSM_INFO_TELL_MODE */ - -#define IRIS_AUDIO_EXT_IS_NONE 0 -#define IRIS_AUDIO_EXT_IS_HEADPHONEMIC 1 -#define IRIS_AUDIO_EXT_IS_EXTSPEAKER 2 - -typedef struct sharp_gsmext_status { - int carkit; /* be set as 1 , if car-kit is connected */ - int headphone_mic; /* be set as 1 , if head-phone-microphone is inserted */ - int external_sp; /* be set as 1 , if external-speaker is inserted */ -} sharp_gsmext_status; - -typedef struct sharp_irisext_status { /* for SHARP_IRIS_GETSYNCSTATUS */ - int usb; - int uart; - int carkit; -} sharp_irisext_status; - -/* --- for SHARP_AUDIOCTL device --- */ -#define SHARP_AUDIOCTL_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) -#define SHARP_AUDIOCTL_ARCH_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START+0x10) -#define SHARP_IRIS_AUFIL_GETVAL (SHARP_AUDIOCTL_ARCH_IOCTL_START+0) -#define SHARP_IRIS_AUFIL_SETVAL (SHARP_AUDIOCTL_ARCH_IOCTL_START+1) -#define SHARP_IRIS_AMP_EXT_ON (SHARP_AUDIOCTL_ARCH_IOCTL_START+2) -#define SHARP_IRIS_AMP_EXT_OFF (SHARP_AUDIOCTL_ARCH_IOCTL_START+3) - - -#define SHARP_IRIS_AUFIL_FILTERON 0x01 /* Iris AudioCtl Specific. Enable Audio Filter */ - -/* --- for SHARP_AUDIOCTL device --- */ -#define SHARP_KBDCTL_IOCTL_START (SHARP_DEV_IOCTL_COMMAND_START) -#define SHARP_KBDCTL_GETMODIFSTAT (SHARP_KBDCTL_IOCTL_START+0) -#define SHARP_KBDCTL_TOGGLEMODIFSTAT (SHARP_KBDCTL_IOCTL_START+1) -#define SHARP_KBDCTL_SETHOLDTH (SHARP_KBDCTL_IOCTL_START+2) -#define SHARP_KBDCTL_SETHOLDTH_GR (SHARP_KBDCTL_IOCTL_START+3) -#define SHARP_KBDCTL_HOLDINFO_SETHD (SHARP_KBDCTL_IOCTL_START+4) -#define SHARP_KBDCTL_HOLDINFO_SETSL (SHARP_KBDCTL_IOCTL_START+5) -#define SHARP_KBDCTL_HOLDINFO_DELHD (SHARP_KBDCTL_IOCTL_START+6) -#define SHARP_KBDCTL_HOLDINFO_DELSL (SHARP_KBDCTL_IOCTL_START+7) -#define SHARP_KBDCTL_HOLDINFO_RESTHD (SHARP_KBDCTL_IOCTL_START+8) -#define SHARP_KBDCTL_HOLDINFO_RESTSL (SHARP_KBDCTL_IOCTL_START+9) -#define SHARP_KBDCTL_HOLDINFO_RESTFULL (SHARP_KBDCTL_IOCTL_START+10) -#define IRIS_KBDCTL_ENABLEKEYBOARD (SHARP_KBDCTL_IOCTL_START+16) -#define IRIS_KBDCTL_DISABLEKEYBOARD (SHARP_KBDCTL_IOCTL_START+17) -#define SHARP_KBDCTL_SENDKEY (SHARP_KBDCTL_IOCTL_START+18) - -typedef struct sharp_kbdctl_modifstat { - int which; - int stat; -} sharp_kbdctl_modifstat; - -typedef struct sharp_kbdctl_holdstat { - int group; - int timeout; -} sharp_kbdctl_holdstat; - -typedef struct sharp_kbdctl_holdcustom { - int normal_hardcode; - int normal_slcode; - int hold_slcode; -} sharp_kbdctl_holdcustom; - -#define SHARP_EXTMODIF_2ND 0x01 -#define SHARP_EXTMODIF_CAPS 0x02 -#define SHARP_EXTMODIF_NUMLOCK 0x03 - -#define HOLDKEY_GROUP_NORMAL 0 -#define HOLDKEY_GROUP_POWER 1 - - -/* --- for AUDIO & REMOCON device --- */ -#define HPJACK_STATE_UNDETECT (-1) -#define HPJACK_STATE_NONE (0) -#define HPJACK_STATE_HEADPHONE (1) -#define HPJACK_STATE_REMOCON (2) - - -#endif /* __ASM_SHARP_CHAR_H_INCLUDED */ - - -//#define EXTERNAL_IO_BASE01 0xF8000000 -//#define EXTEND_GPIO_RED_LED (1<<4) -//#define EXTEND_GPIO_GREEN_LED (1<<5) -//unsigned short * pwEGPIO1 ; -//unsigned short gwExtendGpio1; -// pwEGPIO1 = (unsigned short *) EXTERNAL_IO_BASE01; - - - - - - - - - diff --git a/qte/qte-2.3.8-snapshot/simpad.patch b/qte/qte-2.3.8-snapshot/simpad.patch deleted file mode 100644 index 4fdb5b1adf..0000000000 --- a/qte/qte-2.3.8-snapshot/simpad.patch +++ /dev/null @@ -1,403 +0,0 @@ -diff -u qt-2.3.7.orig/src/kernel/qkeyboard_qws.cpp qt-2.3.7/src/kernel/qkeyboard_qws.cpp ---- qt-2.3.7.orig/src/kernel/qkeyboard_qws.cpp 2004-07-06 23:02:40.000000000 +0200 -+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp 2004-07-06 23:03:00.000000000 +0200 -@@ -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 - -+/* -+ * SIMpad switches handler -+ * (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> -+ */ -+ -+//TODO: guard this against inclusion with #ifdef QT_QWS_SIMPAD -+ -+#include <linux/switches.h> -+#define SIMPAD_SWITCHES_DEVICE "/dev/misc/switches" -+ -+// 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 -+ -+class QWSsimpadButtonsHandler : public QWSKeyboardHandler -+{ -+ Q_OBJECT -+ -+ public: -+ QWSsimpadButtonsHandler(); -+ virtual ~QWSsimpadButtonsHandler(); -+ -+ bool isOpen() { return fd > 0; } -+ -+ private slots: -+ void readSwitchesData(); -+ void autoRepeat(); -+ -+ private: -+ switches_mask_t switches; -+ -+ int fd; -+ int repeatdelay; -+ int repeatperiod; -+ -+ 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; -+}; -+ - #ifdef QT_QWS_SL5XXX - static const QWSServer::KeyMap keyM[] = { - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 00 -@@ -1479,7 +1533,11 @@ - } else { - type = spec; - } -- -+ if ( type == "SIMpad" ) -+ { -+ qDebug( "QWSKeyboardHandler: using SIMpad keyboard handler..." ); -+ handler = new QWSsimpadButtonsHandler(); -+ } - if ( type == "Buttons" ) { - #if defined(QT_QWS_YOPY) - handler = new QWSyopyButtonsHandler(); -@@ -1508,6 +1566,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( 700 ), repeatperiod( 80 ), -+ lastCode( 0 ), lastPress( 0 ), -+ k( -1 ), shiftKeyPressed( 0 ), shiftUsed( false ) -+{ -+ qDebug( "SimpadButtonsHandler() - V4.1" ); -+ fd = ::open( SIMPAD_SWITCHES_DEVICE, O_RDWR | O_NDELAY, 0 ); -+ if ( fd < 0 ) -+ { -+ qWarning( "SimpadButtonsHandler(): can't open %s", SIMPAD_SWITCHES_DEVICE ); -+ return; -+ } -+ -+ notifier = new QSocketNotifier( fd, QSocketNotifier::Read, this ); -+ connect( notifier, SIGNAL( activated(int) ),this, SLOT( readSwitchesData() ) ); -+ -+ repeater = new QTimer(this); -+ connect(repeater, SIGNAL(timeout()), this, SLOT(autoRepeat())); -+ -+} -+ -+ -+QWSsimpadButtonsHandler::~QWSsimpadButtonsHandler() -+{ -+ qDebug( "~SimpadButtonsHandler()" ); -+ if ( fd > 0 ) -+ { -+ ::close( fd ); -+ fd = -1; -+ } -+} -+ -+ -+void QWSsimpadButtonsHandler::readSwitchesData() -+{ -+ qDebug( "SimpadButtonsHandler() - detected switches action" ); -+ -+ if ( ::read( fd, &switches, sizeof switches ) < 0 ) -+ { -+ qWarning( "SimpadButtonsHandler() - switches read error!" ); -+ return; -+ } -+ -+ 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]; -+ -+ //========================================================================= -+ -+ /** -+ * 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 -+ { -+ int interval = eventTimer.restart(); -+ qDebug( "event interval = %d", interval ); -+ if ( code == lastCode && interval < 10 ) -+ { -+ qDebug( "event interval too small - ignoring bogus event" ); -+ qDebug( "did I say i hate buggy kernel drivers? :-D" ); -+ return; -+ } -+ -+ lastPress = press; -+ lastCode = code; -+ } -+ -+ /** -+ * 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 -+ **/ -+ -+ //===================================================================== -+ -+ 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 = 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; -+ } -+ } -+ -+ 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 ) -+ { -+ qDebug( "SimpadButtonsHandler() - We are transformed! Correcting..." ); -+ int oldK = k; -+ k = xform_dirkey( k ); -+ qDebug( "SimpadButtonsHandler() - Old Key: %d - New Key %d", oldK, k ); -+ } -+ -+ if ( repeatable && press ) -+ repeater->start( repeatdelay, true ); -+ else -+ repeater->stop(); -+ -+ qwsServer->processKeyEvent( 0, k, 0, press, false ); -+} -+ -+ -+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); -+} -+ -+ -+#endif // QT_NO_QWS_KEYBOARD -diff -u qt-2.3.7.orig/src/kernel/qsoundqss_qws.cpp qt-2.3.7/src/kernel/qsoundqss_qws.cpp ---- qt-2.3.7.orig/src/kernel/qsoundqss_qws.cpp 2004-07-06 23:02:40.000000000 +0200 -+++ qt-2.3.7/src/kernel/qsoundqss_qws.cpp 2004-07-06 23:03:00.000000000 +0200 -@@ -47,8 +47,8 @@ - #include <sys/ioctl.h> - #include <sys/soundcard.h> - --#define QT_QWS_SOUND_16BIT 1 // or 0, or undefined for always 0 --#define QT_QWS_SOUND_STEREO 1 // or 0, or undefined for always 0 -+#define QT_QWS_SOUND_16BIT 0 // or 0, or undefined for always 0 -+#define QT_QWS_SOUND_STEREO 0 // or 0, or undefined for always 0 - - static int sound_speed = 44100; - #ifndef QT_NO_SOUNDSERVER -diff -u qt-2.3.7.orig/src/kernel/qwsmouse_qws.cpp qt-2.3.7/src/kernel/qwsmouse_qws.cpp ---- qt-2.3.7.orig/src/kernel/qwsmouse_qws.cpp 2004-07-06 23:02:39.000000000 +0200 -+++ qt-2.3.7/src/kernel/qwsmouse_qws.cpp 2004-07-06 22:57:44.000000000 +0200 -@@ -51,6 +51,7 @@ - #include <stdlib.h> - #include <stdio.h> - #include <sys/ioctl.h> -+#include <sys/time.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -@@ -74,6 +75,7 @@ - unsigned short x; - unsigned short y; - unsigned short pad; -+ struct timeval stamp; - } TS_EVENT; - #elif defined(QT_QWS_SL5XXX) - #define QT_QWS_SL5XXX_RAW -@@ -1472,29 +1474,13 @@ - : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0), - numSamples(0), skipCount(0) - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) --#if defined(QT_QWS_IPAQ) --# ifdef QT_QWS_IPAQ_RAW -- if ((mouseFD = open( "/dev/h3600_tsraw", O_RDONLY | O_NDELAY)) < 0) { --# else -- if ((mouseFD = open( "/dev/h3600_ts", O_RDONLY | O_NDELAY)) < 0) { --# endif -- qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno)); -- return; -- } --#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) --//# ifdef QT_QWS_SL5XXX_TSRAW --# if 0 -- if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) { -- qWarning( "Cannot open /dev/tsraw (%s)", strerror(errno)); -- return; -- } --# else -- if ((mouseFD = open( "/dev/ts", O_RDONLY | O_NDELAY)) < 0) { -- qWarning( "Cannot open /dev/ts (%s)", strerror(errno)); -+#ifdef QT_QWS_SIMPAD -+ if ((mouseFD = open( "/dev/touchscreen/ucb1x00", O_RDONLY | O_NONBLOCK )) -+< 0) { -+ qWarning( "Cannot open /dev/touchscreen/ucb1x00 (%s)", strerror(errno) -+); - return; - } --# endif - #endif - - QSocketNotifier *mouseNotifier; -@@ -1503,12 +1489,11 @@ - connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData())); - waspressed=FALSE; - mouseIdx = 0; --#endif - } - - QTPanelHandlerPrivate::~QTPanelHandlerPrivate() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) - if (mouseFD >= 0) - close(mouseFD); - #endif -@@ -1516,7 +1501,7 @@ - - void QTPanelHandlerPrivate::readMouseData() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) - if(!qt_screen) - return; - -@@ -1929,7 +1914,7 @@ - handler = new QCustomTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_YOPY) - handler = new QYopyTPanelHandlerPrivate( mouseProtocol, mouseDev ); --#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) -+#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) - handler = new QTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_CASSIOPEIA) - handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev ); diff --git a/qte/qte-2.3.8-snapshot/switches.h b/qte/qte-2.3.8-snapshot/switches.h deleted file mode 100644 index 37516b4c75..0000000000 --- a/qte/qte-2.3.8-snapshot/switches.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * linux/include/linux/switches.h - * - * Copyright (C) 2000 John Dorsey - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 23 October 2000 - created. - */ - -#if !defined(_LINUX_SWITCHES_H) -#define _LINUX_SWITCHES_H - -#define SWITCHES_MASK_SIZE (128) - -typedef unsigned long switches_bitfield; - -#define SWITCHES_BITS (sizeof(switches_bitfield) * 8) -#define SWITCHES_NUM_FIELDS (SWITCHES_MASK_SIZE / SWITCHES_BITS) -#define SWITCHES_FIELD_SELECT(i) ((i) / SWITCHES_BITS) -#define SWITCHES_FIELD_MASK(i) ((switches_bitfield)(1 << (i) % \ - SWITCHES_BITS)) - -typedef struct switches_mask_t { - unsigned int count; - switches_bitfield events[SWITCHES_NUM_FIELDS]; - switches_bitfield states[SWITCHES_NUM_FIELDS]; -} switches_mask_t; - -#define SWITCHES_ZERO(m) \ -do { \ - unsigned int sz_i; \ - (m)->count = 0; \ - for(sz_i = 0; sz_i < SWITCHES_NUM_FIELDS; ++sz_i) \ - (m)->events[sz_i] = (m)->states[sz_i] = 0; \ -} while (0) - -/* `s' is the state of the switch, either 0 or non-zero: */ -#define SWITCHES_SET(m, i, s) \ -do { \ - ((m)->events[SWITCHES_FIELD_SELECT((i))] |= \ - SWITCHES_FIELD_MASK((i))); \ - if(s) \ - ((m)->states[SWITCHES_FIELD_SELECT((i))] |= \ - SWITCHES_FIELD_MASK((i))); \ - else \ - ((m)->states[SWITCHES_FIELD_SELECT((i))] &= \ - ~SWITCHES_FIELD_MASK((i))); \ - ++((m)->count); \ -} while (0) - -/* Should only use to clear an event set by SWITCHES_SET(): */ -#define SWITCHES_CLEAR(m, i) \ -do { \ - ((m)->events[SWITCHES_FIELD_SELECT((i))] &= \ - ~SWITCHES_FIELD_MASK((i))); \ - ((m)->states[SWITCHES_FIELD_SELECT((i))] &= \ - ~SWITCHES_FIELD_MASK((i))); \ - --((m)->count); \ -} - -#define SWITCHES_COUNT(m) ((m)->count) - -/* Returns 0 or non-zero: */ -#define SWITCHES_EVENT(m, i) \ -((m)->events[SWITCHES_FIELD_SELECT((i))] & SWITCHES_FIELD_MASK((i))) - -/* Returns 0 or non-zero: */ -#define SWITCHES_STATE(m, i) \ -((m)->states[SWITCHES_FIELD_SELECT((i))] & SWITCHES_FIELD_MASK((i))) - -#endif /* !defined(_LINUX_SWITCHES_H) */ diff --git a/qte/qte-2.3.8-snapshot/tslib.patch b/qte/qte-2.3.8-snapshot/tslib.patch deleted file mode 100644 index 27f8cb05f4..0000000000 --- a/qte/qte-2.3.8-snapshot/tslib.patch +++ /dev/null @@ -1,349 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.7/src/kernel/qwsmouse_qws.cpp~tslib.patch -+++ qt-2.3.7/src/kernel/qwsmouse_qws.cpp -@@ -7,6 +7,10 @@ - ** - ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. - ** -+** Portions Copyright (C) 2003 Texas Instruments, Inc. -+** Rights to said portions for use under the GPL and QPL licenses -+** are hereby granted to Trolltech AS. -+** - ** This file is part of the kernel module of the Qt GUI Toolkit. - ** - ** This file may be distributed and/or modified under the terms of the -@@ -59,6 +63,9 @@ - #ifdef QT_QWS_CASSIOPEIA - #include <linux/tpanel.h> - #endif -+#if QWS_TSLIB -+#include <tslib.h> -+#endif - - #if defined(QT_QWS_IPAQ) - #define QT_QWS_IPAQ_RAW -@@ -110,7 +117,7 @@ - - #ifndef QT_QWS_TP_JITTER_LIMIT - #define QT_QWS_TP_JITTER_LIMIT 2 --#endif -+#endif - - //#define QWS_CUSTOMTOUCHPANEL - -@@ -1093,6 +1100,220 @@ - return sent; - } - -+ -+class QTSLibHandler : public QCalibratedMouseHandler -+{ -+ Q_OBJECT -+public: -+ QTSLibHandler(); -+ ~QTSLibHandler(); -+ -+ virtual void clearCalibration(); -+ virtual void calibrate( QWSPointerCalibrationData * ); -+ -+ static int sortByX( const void*, const void* ); -+ static int sortByY( const void*, const void* ); -+private: -+ void openTs(); -+ void closeTs(); -+ void interpolateSample(); -+ -+private: -+ bool raw; -+#ifdef QWS_TSLIB -+ struct tsdev *ts; -+#endif -+ QSocketNotifier *m_notify; -+ -+private slots: -+ void readMouseData(); -+}; -+ -+QTSLibHandler::QTSLibHandler() -+ : raw(false), m_notify(0l) -+{ -+ openTs(); -+} -+ -+QTSLibHandler::~QTSLibHandler() -+{ -+ closeTs(); -+} -+ -+void QTSLibHandler::openTs() -+{ -+#ifdef QWS_TSLIB -+ char *tsdevice; -+ -+ if( ( tsdevice = getenv( "TSLIB_TSDEVICE" ) ) != NULL ) { -+ ts = ts_open( tsdevice, 1 ); -+ } else { -+ ts = ts_open( "/dev/ts", 1 ); -+ } -+ -+ if (!ts) { -+ qWarning( "Cannot open touchscreen (%s)", strerror( errno ) ); -+ return; -+ } -+ -+ if (ts_config( ts )) { -+ qWarning( "Cannot configure touchscreen (%s)", strerror( errno ) ); -+ return; -+ } -+ -+ -+ m_notify = new QSocketNotifier( ts_fd(ts), QSocketNotifier::Read, this ); -+ connect( m_notify, SIGNAL( activated( int ) ), this, SLOT( readMouseData() ) ); -+#endif -+} -+ -+void QTSLibHandler::closeTs() -+{ -+#ifdef QWS_TSLIB -+ if (ts) -+ ts_close(ts); -+ -+ delete m_notify; -+ m_notify = 0; ts = 0; -+#endif -+ -+} -+ -+void QTSLibHandler::clearCalibration() -+{ -+ raw = true; -+} -+ -+ -+void QTSLibHandler::calibrate( QWSPointerCalibrationData *cd ) -+{ -+ QPoint dev_tl = cd->devPoints[ QWSPointerCalibrationData::TopLeft ]; -+ QPoint dev_br = cd->devPoints[ QWSPointerCalibrationData::BottomRight ]; -+ QPoint screen_tl = cd->screenPoints[ QWSPointerCalibrationData::TopLeft ]; -+ QPoint screen_br = cd->screenPoints[ QWSPointerCalibrationData::BottomRight ]; -+ int a, b, c, d, e, f, s; -+ -+ s = 1 << 16; -+ -+ a = s * (screen_tl.x() - screen_br.x() ) / (dev_tl.x() - dev_br.x()); -+ b = 0; -+ c = s * screen_tl.x() - a * dev_tl.x(); -+ -+ d = 0; -+ e = s * (screen_tl.y() - screen_br.y() ) / (dev_tl.y() - dev_br.y()); -+ f = s * screen_tl.y() - e * dev_tl.y(); -+ -+ QString calFile = "/etc/pointercal"; -+#ifndef QT_NO_TEXTSTREAM -+ QFile file( calFile ); -+ if ( file.open( IO_WriteOnly ) ) { -+ QTextStream t( &file ); -+ t << a << " " << b << " " << c << " "; -+ t << d << " " << e << " " << f << " " << s; -+ file.flush(); closeTs(); -+ openTs(); -+ } else -+#endif -+ { -+ qDebug( "Could not save calibration: %s", calFile.latin1() ); -+ } -+ raw = false; -+} -+ -+void QTSLibHandler::readMouseData() -+{ -+#ifdef QWS_TSLIB -+ if(!qt_screen) -+ return; -+ -+ /* -+ * After clear Calibration -+ * we're in raw mode and do some easy median -+ * search. -+ */ -+ if (raw ) -+ return interpolateSample(); -+ -+ static struct ts_sample sample; -+ static int ret; -+ -+ /* -+ * Ok. We need to see if we can read more than one event -+ * We do this not to lose an update. -+ */ -+ while ( true ) { -+ if ((ret = ts_read(ts, &sample, 1)) != 1 ) -+ return; -+ -+ -+ QPoint pos( sample.x, sample.y ); -+ emit mouseChanged( pos, sample.pressure != 0 ? 1 : 0 ); -+ } -+#endif -+} -+ -+ -+/* -+ * Lets take all down events and then sort them -+ * and take the event in the middle. -+ * -+ * inspired by testutils.c -+ */ -+void QTSLibHandler::interpolateSample() { -+ static struct ts_sample samples[25]; -+ int index = -1; -+ int ret; -+ -+ do { -+ index++; -+ /* fill only the last sample again */ -+ if ( index >= 25 ) -+ index = 24; -+ -+ /* we're opened non-blocking */ -+ if((ret= ts_read_raw(ts, &samples[index], 1 ) ) != 1 ) { -+ /* no event yet, so try again */ -+ if (ret==-1 ) { -+ index--; -+ continue; -+ } -+ } -+ }while (samples[index].pressure != 0); -+ -+ /* -+ * index is maximal 25 and we at least one sample -+ */ -+ int x, y; -+ -+ /* -+ * now let us use the median value -+ * even index does not have an item in the middle -+ * so let us take the average of n/2 and (n/2)-1 as the middle -+ */ -+ int m = index/2; -+ ::qsort(samples, index, sizeof(ts_sample), QTSLibHandler::sortByX); -+ x = (index % 2 ) ? samples[m].x : -+ ( samples[m-1].x + samples[m].x )/2; -+ -+ ::qsort(samples, index, sizeof(ts_sample), QTSLibHandler::sortByY); -+ y = (index % 2 ) ? samples[m].y : -+ ( samples[m-1].y + samples[m].y )/2; -+ -+ emit mouseChanged( QPoint(x, y), 1 ); -+ emit mouseChanged( QPoint(0, 0), 0 ); -+} -+ -+int QTSLibHandler::sortByX( const void* one, const void* two) { -+ return reinterpret_cast<const struct ts_sample*>(one)->x - -+ reinterpret_cast<const struct ts_sample*>(two)->x; -+} -+ -+int QTSLibHandler::sortByY( const void* one, const void* two) { -+ return reinterpret_cast<const struct ts_sample*>(one)->y - -+ reinterpret_cast<const struct ts_sample*>(two)->y; -+} -+ -+ - /* - * Handler for /dev/tpanel Linux kernel driver - */ -@@ -1235,7 +1456,7 @@ - - - QTPanelHandlerPrivate::QTPanelHandlerPrivate( MouseProtocol, QString dev ) -- : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0), -+ : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0), - numSamples(0), skipCount(0) - { - #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -@@ -1315,7 +1536,7 @@ - mousePos = QPoint( 0, 0 ); - QPoint totalMousePos = oldTotalMousePos; - totalMousePos += samples[currSample]; -- if(numSamples >= samples.count()) -+ if(numSamples >= samples.count()) - totalMousePos -= samples[lastSample]; - - mousePos = totalMousePos / (sampleCount - 1); -@@ -1345,7 +1566,7 @@ - - // save recuring information - currSample++; -- if (numSamples >= samples.count()) -+ if (numSamples >= samples.count()) - lastSample++; - oldTotalMousePos = totalMousePos; - } else { -@@ -1658,7 +1879,7 @@ - - if ( mouseProto == "USB" && mouseDev.isEmpty() ) - mouseDev = "/dev/input/mice"; -- -+ - MouseProtocol mouseProtocol = Unknown; - - int idx = 0; -@@ -1689,12 +1910,14 @@ - break; - - case TPanel: --#if defined(QWS_CUSTOMTOUCHPANEL) -- handler = new QCustomTPanelHandlerPrivate(mouseProtocol,mouseDev); -+#if defined(QWS_TSLIB) -+ handler = new QTSLibHandler( ); -+#elif defined(QWS_CUSTOMTOUCHPANEL) -+ handler = new QCustomTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_YOPY) -- handler = new QYopyTPanelHandlerPrivate(mouseProtocol,mouseDev); -+ handler = new QYopyTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -- handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev); -+ handler = new QTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_CASSIOPEIA) - handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #endif ---- qt-2.3.7/configure~tslib.patch -+++ qt-2.3.7/configure -@@ -399,6 +399,9 @@ - -kde) - KDE=yes - ;; -+ -tslib) -+ TSLIB=yes -+ ;; - -no-g++-exceptions) - GPLUSPLUS_EXCEPTIONS=no - ;; -@@ -1255,6 +1258,9 @@ - set to point to a KDE 2 installation. - See http://www.kde.org - -+ -tslib ............. Use the TSLib (touchscreen access library) mouse handler -+ by default, instead of the normal device default. -+ - -no-g++-exceptions . Disable exceptions on platforms using the GNU C++ - compiler by using the -fno-exceptions flag. - -@@ -1314,6 +1320,13 @@ - [ "x$SM" = "xno" ] && QT_CXX="${QT_CXX} -DQT_NO_SM_SUPPORT" - [ "x$XFT" = "xyes" ] && QT_CXX="${QT_CXX} -DQT_XFT" - [ "x$XFT" = "xno" ] && QT_CXX="${QT_CXX} -DQT_NO_XKB" -+ -+if [ "x$TSLIB" = "xyes" ] -+then -+ QT_CXX="${QT_CXX} -DQWS_TSLIB" -+ QT_LIBS="${QT_LIBS} -lts" -+fi -+ - if [ "x$THREAD" = "xyes" ] - then - cat >src-mt.mk <<EOF diff --git a/qte/qte-2.3.8-snapshot/update-qtfontdir b/qte/qte-2.3.8-snapshot/update-qtfontdir deleted file mode 100644 index 6df7b503af..0000000000 --- a/qte/qte-2.3.8-snapshot/update-qtfontdir +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -usage() -{ - echo "usage: $0 [font directory, defaults to QTDIR/lib/fonts]" - exit 1 -} - -setVar() -{ - eval "$1='$2'" -} - -getVar() -{ - eval "echo \$$1" -} - -handleQPF() -{ - base=`basename $1` - family=`echo $base|cut -d_ -f1` - pt=`echo $base|cut -d_ -f2` - weight=`echo $base|cut -d_ -f3|sed -e 's,i$,,'` - if (echo $base|cut -d_ -f3|grep -q 'i$'); then - italic="y" - else - italic="n" - fi - echo "$family $base.qpf QPF $italic $weight $pt u" -} - -if [ -z "$1" ]; then - if [ -n "$QTDIR" ]; then - fontdir=$QTDIR/lib/fonts - else - fontdir=/opt/QtPalmtop/lib/fonts - fi -else - fontdir=$1 -fi - -if ! [ -d $fontdir ]; then - echo Error: $fontdir not a directory - exit 1 -fi - -if [ -e $fontdir/fontdir ]; then - cat $fontdir/fontdir | grep -v '\.qpf' > $fontdir/fontdir.new -fi - -( - for file in `ls $fontdir/*.qpf|sed -e's,\.qpf$,,; s,_t[^_]*$,,;'|sort -u`; do - handleQPF $file - done -) >> $fontdir/fontdir.new - -mv $fontdir/fontdir.new $fontdir/fontdir - -exit 0 - -# vim:ai:et:sts=4:sw=4:tw=0: diff --git a/qte/qte-2.3.8-snapshot/vt-switch.patch b/qte/qte-2.3.8-snapshot/vt-switch.patch deleted file mode 100644 index be2745c986..0000000000 --- a/qte/qte-2.3.8-snapshot/vt-switch.patch +++ /dev/null @@ -1,205 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.7/src/kernel/qapplication_qws.cpp~vt-switch.patch -+++ qt-2.3.7/src/kernel/qapplication_qws.cpp -@@ -123,6 +123,12 @@ - static int qt_thread_pipe[2]; - #endif - -+#if defined(_OS_LINUX_) -+#include <sys/ioctl.h> -+#include <linux/vt.h> -+#include <linux/kd.h> -+#endif -+ - const int qwsSharedRamSize = 32 * 1024; //Small amount to fit on small devices. - - // These are in qapplication.cpp in qt/main -@@ -163,6 +169,8 @@ - bool qws_accel = TRUE; // ### never set - const char *qws_display_spec = ":0"; - int qws_display_id = 0; -+int qws_terminal_id = 0; -+int qws_terminal_old = 0; - int qws_client_id = 0; - QWidget *qt_pressGrab = 0; - QWidget *qt_mouseGrb = 0; -@@ -1628,6 +1636,15 @@ - type = QApplication::GuiServer; - } else if ( arg == "-interlaced" ) { - qws_screen_is_interlaced = TRUE; -+ } else if ( arg == "-terminal" ) { -+ if ( ++i < argc ) -+ { -+ if ( ( qws_terminal_id = atoi( argv[i] ) ) < 1 ) -+ { -+ qWarning( "Ignoring Invalid Terminal Specification." ); -+ qws_terminal_id = 0; -+ } -+ } - } else if ( arg == "-display" ) { - if ( ++i < argc ) - qws_display_spec = argv[i]; -@@ -1652,6 +1669,53 @@ - if ( type == QApplication::GuiServer ) { - qt_appType = type; - qws_single_process = TRUE; -+ -+ /* Allocate a dedicated virtual terminal -- (C) Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> -+ * Added a new command line option which only is relevant if the application is created as a GuiServer. -+ * The option is -terminal <num>, where <num> specifies the virtual terminal to be occupied by the server. -+ * As default in Linux, 0 means the current virtual terminal. -+ */ -+ #if defined(_OS_LINUX_) -+ if ( qws_terminal_id ) -+ { -+ qDebug( "qt_init() - terminal specification is '%d'.", qws_terminal_id ); -+ struct vt_stat console_stat; -+ int console_fd = ::open( QString().sprintf( "/dev/tty%d", qws_terminal_id ).latin1(), O_RDWR ); -+ if ( console_fd == -1) -+ { -+ qWarning( "qt_init() - can't open tty: %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( ioctl( console_fd, VT_GETSTATE, &console_stat ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(VT_GETSTATE): %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ qws_terminal_old = console_stat.v_active; -+ qDebug( "qt_init() - active vt is #%d, switching to #%d as requested...", qws_terminal_old, qws_terminal_id ); -+ -+ if ( ioctl( console_fd, VT_ACTIVATE, qws_terminal_id ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(VT_ACTIVATE): %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( ioctl( console_fd, VT_WAITACTIVE, qws_terminal_id ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(VT_WAITACTIVE): %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( ioctl( console_fd, KDSETMODE, KD_GRAPHICS ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(KDSETMODE:KD_GRAPHICS): %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ ::close( console_fd ); -+ } -+ else -+ { -+ qDebug( "QWSApplication::qt_init() - current terminal specified." ); -+ } -+ #endif - QWSServer::startup(flags); - setenv("QWS_DISPLAY", qws_display_spec, 0); - } -@@ -1702,7 +1766,36 @@ - QFontManager::cleanup(); - - if ( qws_single_process ) { -- QWSServer::closedown(); -+ qDebug( "qt_cleanup() - shutting down QWSServer..." ); -+#ifndef QT_NO_QWS_KEYBOARD -+ if ( qwsServer ) -+ qwsServer->closeKeyboard(); -+#endif -+ QWSServer::closedown(); -+#if defined(_OS_LINUX_) -+ if ( qws_terminal_old > 0 ) -+ { -+ qDebug( "qt_cleanup() - switching back to virtual terminal #%d", qws_terminal_old ); -+ -+ int console_fd = ::open( "/dev/tty0", O_RDWR ); -+ if ( console_fd == -1) -+ { -+ qWarning( "qt_init() - can't open tty: %s", strerror( errno ) ); -+ } -+ else -+ { -+ if ( ioctl( console_fd, KDSETMODE, KD_TEXT ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(KDSETMODE:KD_TEXT): %s", strerror( errno ) ); -+ } -+ if ( ioctl( console_fd, VT_ACTIVATE, qws_terminal_old ) == -1 ) -+ { -+ qWarning( "qt_init() - can't ioctl(VT_ACTIVATE): %s", strerror( errno ) ); -+ } -+ ::close( console_fd ); -+ } -+ } -+#endif - } - if ( qt_is_gui_used ) { - delete qt_fbdpy; -@@ -2584,7 +2677,7 @@ - if ( !widget ) { // don't know this window - if ( !QWidget::mouseGrabber() - #ifndef QT_NO_QWS_MANAGER -- && !QWSManager::grabbedMouse() -+ && !QWSManager::grabbedMouse() - #endif - ) { - qt_last_cursor = 0xffffffff; // cursor can be changed by another application -@@ -3394,7 +3487,7 @@ - #ifndef QT_NO_QWS_IM - if ( mouse.state&button && w != QInputContext::microFocusWidget() ) //button press - QInputContext::reset( oldFocus ); --#endif -+#endif - QFocusEvent::setReason( QFocusEvent::Mouse); - w->setFocus(); - QFocusEvent::resetReason(); -@@ -3540,7 +3633,7 @@ - QApplication::sendEvent( widget, &enter ); - (*mouseInWidget) = widget; - #ifndef QT_NO_QWS_IM -- if ( e.type() == QEvent::MouseButtonPress && -+ if ( e.type() == QEvent::MouseButtonPress && - !widget->testWFlags( Qt::WStyle_Tool ) && - !widget->topLevelWidget()->testWFlags( Qt::WStyle_Tool ) ) - QInputContext::reset( oldFocus ); ---- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~vt-switch.patch -+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp -@@ -1068,6 +1068,24 @@ - { - if (kbdFD >= 0) - { -+ -+#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) -+ struct vt_mode vtMode; -+ ioctl(kbdFD, VT_GETMODE, &vtMode); -+ -+ /* Mickey says: "Better give up control of VT switching. -+ * Hey, I really hate that OS-will-reacquire-resources on process-death -+ * kind of thinking! -+ */ -+ vtMode.mode = VT_AUTO; -+ vtMode.relsig = 0; -+ vtMode.acqsig = 0; -+ ioctl(kbdFD, VT_SETMODE, &vtMode); -+ -+ signal(VTSWITCHSIG, 0); -+ qDebug( "~QWSTtyKeyboardHandler() - released VT." ); -+#endif -+ - #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) - ioctl(kbdFD, KDSKBMODE, K_XLATE); - #endif ---- qt-2.3.7/src/kernel/qgfxlinuxfb_qws.cpp~vt-switch.patch -+++ qt-2.3.7/src/kernel/qgfxlinuxfb_qws.cpp -@@ -251,9 +251,9 @@ - - bool QLinuxFbScreen::initDevice() - { -- // No blankin' screen, no blinkin' cursor!, no cursor! -+ /* Setting up the VT parameters is done in qapplication_qws.cpp - const char termctl[]="\033[9;0]\033[?33l\033[?25l"; -- writeTerm(termctl,sizeof(termctl)); -+ writeTerm(termctl,sizeof(termctl)); */ - - // Grab current mode so we can reset it - fb_var_screeninfo vinfo; diff --git a/qte/qte-for-opie_2.3.7.bb b/qte/qte-for-opie_2.3.7.bb deleted file mode 100644 index 396f9e3dfd..0000000000 --- a/qte/qte-for-opie_2.3.7.bb +++ /dev/null @@ -1,10 +0,0 @@ -SECTION = "opie/base" -include qte_${PV}.bb - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-${PV}" - -DESCRIPTION = "Qt/Embedded w/ Opie Patches version ${PV}" - -SRC_URI_append = "file://opie.patch;patch=1 \ - file://lefthand.patch;patch=1 \ - file://qiconview-speed.patch;patch=1 " diff --git a/qte/qte-for-opie_2.3.8.bb b/qte/qte-for-opie_2.3.8.bb deleted file mode 100644 index b344336853..0000000000 --- a/qte/qte-for-opie_2.3.8.bb +++ /dev/null @@ -1,23 +0,0 @@ -SECTION = "opie/base" -include qte_${PV}-snapshot.bb -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-2.3.8-snapshot" - -DESCRIPTION = "Qt/Embedded w/ Opie Patches version ${PV}" - -SRC_URI_append = " file://opie.patch;patch=1 \ - file://qte238-iconviewspeed.patch;patch=1 \ - file://c700-hardware.patch;patch=1 \ - file://tslib.patch;patch=1 \ - file://qpe.patch;patch=1 \ - file://vt-switch.patch;patch=1 \ - file://daemonize.patch;patch=1 \ - file://no-moc.patch;patch=1 \ - file://encoding.patch;patch=1 \ - file://fix-qgfxraster.patch;patch=1 \ - file://update-qtfontdir \ - file://sharp_char.h \ - file://switches.h " - - - -# file://lefthand.patch;patch=1 \ diff --git a/qte/qte-for-qtopia_2.3.7.bb b/qte/qte-for-qtopia_2.3.7.bb deleted file mode 100644 index c497d86f3a..0000000000 --- a/qte/qte-for-qtopia_2.3.7.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "opie/base" -include qte_${PV}.bb - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-${PV}-r0" - -DESCRIPTION = "Qt/Embedded w/ Qtopia Patches version ${PV}" - -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \ - file://qtopia.patch;patch=1 \ - file://tslib.patch;patch=1 \ - file://devfs.patch;patch=1 \ - file://no-moc.patch;patch=1" - diff --git a/qte/qte-for-qtopia_2.3.8.bb b/qte/qte-for-qtopia_2.3.8.bb deleted file mode 100644 index d2d50f2bcb..0000000000 --- a/qte/qte-for-qtopia_2.3.8.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "opie/base" -include qte_${PV}-snapshot.bb - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-2.3.8-snapshot" - -DESCRIPTION = "Qt/Embedded for Qtopia version ${PV}" - -SRC_URI_append = " file://qtopia.patch;patch=1 \ - file://qconfig-qpe.h \ - file://sharp_char.h \ - file://switches.h " - -# file://devfs.patch;patch=1 \ diff --git a/qte/qte-for-qvfb_2.3.7.bb b/qte/qte-for-qvfb_2.3.7.bb deleted file mode 100644 index ab8dc7740c..0000000000 --- a/qte/qte-for-qvfb_2.3.7.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "opie/base" -include qte_${PV}.bb - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-${PV}" - -DESCRIPTION = "Qt/Embedded w/ Opie Patches version ${PV}" - -SRC_URI_append = "file://opie.patch;patch=1 \ - file://lefthand.patch;patch=1 \ - file://qiconview-speed.patch;patch=1 " - -EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -qvfb -no-xft -no-vnc -gif \ - -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG}" diff --git a/qte/qte_2.3.7.bb b/qte/qte_2.3.7.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/qte/qte_2.3.7.bb +++ /dev/null diff --git a/qte/qte_2.3.8-snapshot.bb b/qte/qte_2.3.8-snapshot.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/qte/qte_2.3.8-snapshot.bb +++ /dev/null |