rediffed against qte-2.3.9-snapshot-20041101

low level qgfx stuff no longer applies, need to check if it's still needed

1 files changed, 510 insertions, 0 deletions

diff --git a/qt/qt-2.3.9.patch/qte239-all.patch b/qt/qt-2.3.9.patch/qte239-all.patch
new file mode 100644
index 0000000..533652d
--- a/dev/null
+++ b/qt/qt-2.3.9.patch/qte239-all.patch
@@ -0,0 +1,510 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-2.3.9-snapshot-20041102/src/iconview/qiconview.cpp~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/iconview/qiconview.cpp
+@@ -225,6 +225,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;
+@@ -2268,6 +2269,7 @@
+     d->currentItem = 0;
+     d->highlightedItem = 0;
+     d->rubber = 0;
++    d->backBuffer = 0;
+     d->scrollTimer = 0;
+     d->startDragItem = 0;
+     d->tmpCurrentItem = 0;
+@@ -2416,6 +2418,8 @@
+         delete item;
+         item = tmp;
+     }
++    delete d->backBuffer;
++    d->backBuffer = 0;
+     delete d->fm;
+     d->fm = 0;
+ #ifndef QT_NO_TOOLTIP
+@@ -2882,6 +2886,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
+ */
+ 
+@@ -4939,7 +4985,7 @@
+                if ( !d->rubber )
+                    drawDragShapes( d->oldDragPos );
+             }
+        -    viewportPaintEvent( (QPaintEvent*)e );
++            bufferedPaintEvent ((QPaintEvent*)e );
+             if ( d->dragging ) {
+                if ( !d->rubber )
+                    drawDragShapes( d->oldDragPos );
+@@ -5377,11 +5423,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;
+ 
+--- qt-2.3.9-snapshot-20041102/src/iconview/qiconview.h~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/iconview/qiconview.h
+@@ -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.9-snapshot-20041102/src/kernel/qapplication.cpp~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/kernel/qapplication.cpp
+@@ -35,6 +35,8 @@
+ **
+ **********************************************************************/
+ 
+        +#define QT_WEAK_SYMBOL__attribute__(( weak ))
++
+ #include "qobjectlist.h"
+ #include "qobjectdict.h"
+ #include "qapplication.h"
+@@ -937,11 +939,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;
+     }
+ 
+@@ -962,6 +969,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
+@@ -1188,13 +1197,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 ) {
+@@ -1279,6 +1305,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 ) {
+--- qt-2.3.9-snapshot-20041102/src/kernel/qapplication.h~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/kernel/qapplication.h
+@@ -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
+ 
+--- qt-2.3.9-snapshot-20041102/src/kernel/qapplication_qws.cpp~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/kernel/qapplication_qws.cpp
+@@ -2905,6 +2905,11 @@
+ */
+ void QApplication::qwsSetDecoration( QWSDecoration *d )
+ {
+        +qwsSetDecoration_NonWeak ( d );
++}
++
++void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d )
++{
+     if ( d ) {
+         delete qws_decoration;
+         qws_decoration = d;
+--- qt-2.3.9-snapshot-20041102/src/kernel/qfontdatabase.cpp~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/kernel/qfontdatabase.cpp
+@@ -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 );
+--- qt-2.3.9-snapshot-20041102/src/kernel/qfontdatabase.h~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/kernel/qfontdatabase.h
+@@ -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,
+--- qt-2.3.9-snapshot-20041102/src/kernel/qgfxraster_qws.cpp~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/kernel/qgfxraster_qws.cpp
+@@ -4408,7 +4408,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.9-snapshot-20041102/src/kernel/qkeyboard_qws.cpp~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/kernel/qkeyboard_qws.cpp
+@@ -314,7 +314,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
+--- qt-2.3.9-snapshot-20041102/src/kernel/qwindowsystem_qws.cpp~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/kernel/qwindowsystem_qws.cpp
+@@ -913,6 +913,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
+@@ -1038,6 +1050,7 @@
+     }
+ 
+     signal(SIGPIPE, ignoreSignal); //we get it when we read
++    signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash
+ #endif
+     focusw = 0;
+     mouseGrabber = 0;
+--- qt-2.3.9-snapshot-20041102/src/tools/qcstring.h~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/tools/qcstring.h
+@@ -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
+ 
+         #undefstrlen
+ #define strlen qstrlen
+--- qt-2.3.9-snapshot-20041102/src/tools/qglobal.h~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/tools/qglobal.h
+@@ -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_
+--- qt-2.3.9-snapshot-20041102/src/tools/qstring.cpp~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/tools/qstring.cpp
+@@ -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
+ }
+--- qt-2.3.9-snapshot-20041102/src/widgets/qcommonstyle.cpp~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/widgets/qcommonstyle.cpp
+@@ -572,7 +572,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);
+--- qt-2.3.9-snapshot-20041102/src/widgets/qlistview.cpp~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/widgets/qlistview.cpp
+@@ -5051,9 +5051,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 );
+--- qt-2.3.9-snapshot-20041102/src/widgets/qscrollview.cpp~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/widgets/qscrollview.cpp
+@@ -1285,6 +1285,9 @@
+         case QEvent::LayoutHint:
+             d->autoResizeHint(this);
+             break;
+        +case QEvent::WindowActivate:
+        +case QEvent::WindowDeactivate:
+        +    return TRUE;
+         default:
+             break;
+         }
+--- qt-2.3.9-snapshot-20041102/src/widgets/qtoolbutton.cpp~qte239-all
++++ qt-2.3.9-snapshot-20041102/src/widgets/qtoolbutton.cpp
+@@ -238,7 +238,7 @@
+         else
+             QToolTip::add( this, textLabel );
+     }
+        -#endif
++#endif
+ }
+ 
+ 
+@@ -332,12 +332,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();