Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 517 insertions, 246 deletions

diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp
index e041945..222d906 100644
--- a/library/qpedecoration_qws.cpp
+++ b/library/qpedecoration_qws.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** 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
@@ -17,6 +17,7 @@
 ** not clear to you.
 **
 **********************************************************************/
+#ifdef QWS
 #define QTOPIA_INTERNAL_LANGLIST
 #include <qapplication.h>
 #include <qstyle.h>
@@ -32,6 +33,8 @@
 #include "qpeapplication.h"
 #include "resource.h"
 #include "global.h"
+#include "qlibrary.h"
+#include "windowdecorationinterface.h"
 #include <qfile.h>
 #include <qsignal.h>
 
@@ -39,9 +42,7 @@
 
 extern QRect qt_maxWindowRect; 
 
-//#define MINIMIZE_HELP_HACK  // use minimize button when not a dialog
-
-//#define WHATSTHIS_MODE
+#define WHATSTHIS_MODE
 
 #ifndef QT_NO_QWS_QPE_WM_STYLE
 
@@ -95,6 +96,24 @@ static const char * const qpe_accept_xpm[] = {
 
 #endif // QT_NO_IMAGEIO_XPM
 
+class HackWidget : public QWidget
+{
+public:
+    bool needsOk() {
+	return (getWState() & WState_Reserved1 ) ||
+		 (inherits( "QDialog" ) && !inherits( "QMessageBox" ) );
+    }
+};
+
+static QImage scaleButton( const QImage &img, int height )
+{
+    if ( img.height() != height ) {
+	return img.smoothScale( img.width()*height/img.height(), height );
+    } else {
+	return img;
+    }
+}
+
 class TLWidget : public QWidget
 {
 public:
@@ -107,10 +126,14 @@ public:
     {
 	return topData();
     }
+
+    void setWState( uint s ) { QWidget::setWState( s ); }
+    void clearWState( uint s ) { QWidget::clearWState( s ); }
 };
 
+
 QPEManager::QPEManager( QPEDecoration *d, QObject *parent )
-    : QObject( parent ), decoration( d ), helpState(0)
+    : QObject( parent ), decoration( d ), helpState(0), inWhatsThis(FALSE)
 {
     wtTimer = new QTimer( this );
     connect( wtTimer, SIGNAL(timeout()), this, SLOT(whatsThisTimeout()) );
@@ -120,26 +143,32 @@ QPEManager::QPEManager( QPEDecoration *d, QObject *parent )
 void QPEManager::updateActive()
 {
     QWidget *newActive = qApp->activeWindow();
-    if ( (QWidget*)active == newActive )
+    if ( newActive && (QWidget*)active == newActive )
 	return;
 
-    if ( active ) {
+    if ( active && (!newActive || ((TLWidget *)newActive)->manager()) ) {
 	((TLWidget *)(QWidget*)active)->manager()->removeEventFilter( this );
     }
 
     if ( newActive && ((TLWidget *)newActive)->manager() ) {
 	active = newActive;
 	((TLWidget *)(QWidget*)active)->manager()->installEventFilter( this );
-    } else {
+    } else if ( !newActive ) {
 	active = 0;
     }
 }
 
 int QPEManager::pointInQpeRegion( QWidget *w, const QPoint &p )
 {
-    if ( decoration->region( w, w->geometry(),
-	    (QWSDecoration::Region)QPEDecoration::Help ).contains(p) ) {
+    QRect rect(w->geometry());
+
+    if ( decoration->region( w, rect,
+		(QWSDecoration::Region)QPEDecoration::Help ).contains(p) )
 	return QPEDecoration::Help;
+
+    for (int i = QWSDecoration::LastRegion; i >= QWSDecoration::Title; i--) {
+	if (decoration->region(w, rect, (QWSDecoration::Region)i).contains(p))
+	    return (QWSDecoration::Region)i;
     }
 
     return QWSDecoration::None;
@@ -152,13 +181,41 @@ bool QPEManager::eventFilter( QObject *o, QEvent *e )
     switch ( e->type() ) {
 	case QEvent::MouseButtonPress:
 	    {
-		if ( QWhatsThis::inWhatsThisMode() ) {
-		    QWhatsThis::leaveWhatsThisMode();
-		    return true;
-		}
 		pressTime = QTime::currentTime();
 		QPoint p = ((QMouseEvent*)e)->globalPos();
-		if ( pointInQpeRegion( w, p ) == QPEDecoration::Help ) {
+		int inRegion = pointInQpeRegion( w, p );
+#ifdef WHATSTHIS_MODE
+		if ( !w->geometry().contains(p) && QWhatsThis::inWhatsThisMode() ) {
+		    QString text;
+		    switch ( inRegion ) {
+			case QWSDecoration::Close:
+			    if ( ((HackWidget*)w)->needsOk() )
+				text = tr("Click to close this window, discarding changes.");
+			    else
+				text = tr("Click to close this window.");
+			    break;
+			case QWSDecoration::Minimize:
+			    text = tr("Click to close this window and apply changes.");
+			    break;
+			case QWSDecoration::Maximize:
+			    if ( w->isMaximized() )
+				text = tr("Click to make this window moveable.");
+			    else
+				text = tr("Click to make this window use all available screen area.");
+			    break;
+			default:
+			    break;
+		    }
+		    QWhatsThis::leaveWhatsThisMode( text );
+		    whatsThisTimeout();
+		    helpState = 0;
+		    return true;
+		}
+#endif
+		if ( inRegion == QPEDecoration::Help ) {
+#ifdef WHATSTHIS_MODE
+		    wtTimer->start( 400, TRUE );
+#endif
 		    helpState = QWSButton::Clicked|QWSButton::MouseOver;
 		    drawButton( w, QPEDecoration::Help, helpState );
 		    return true;
@@ -167,20 +224,12 @@ bool QPEManager::eventFilter( QObject *o, QEvent *e )
 	    break;
 	case QEvent::MouseButtonRelease:
 	    if ( helpState & QWSButton::Clicked ) {
+		wtTimer->stop();
 		helpState = 0;
 		drawButton( w, QPEDecoration::Help, helpState );
 		QPoint p = ((QMouseEvent*)e)->globalPos();
 		if ( pointInQpeRegion( w, p ) == QPEDecoration::Help ) {
-#ifdef WHATSTHIS_MODE
-		    if ( pressTime.msecsTo( QTime::currentTime() ) > 250 ) {
-			decoration->help( w );
-		    } else {
-			QWhatsThis::enterWhatsThisMode();
-			wtTimer->start( 200 );
-		    }
-#else
 		    decoration->help( w );
-#endif
 		}
 		return true;
 	    }
@@ -189,10 +238,11 @@ bool QPEManager::eventFilter( QObject *o, QEvent *e )
 	    if ( helpState & QWSButton::Clicked ) {
 		int oldState = helpState;
 		QPoint p = ((QMouseEvent*)e)->globalPos();
-		if ( pointInQpeRegion( w, p ) == QPEDecoration::Help )
+		if ( pointInQpeRegion( w, p ) == QPEDecoration::Help ) {
 		    helpState = QWSButton::Clicked|QWSButton::MouseOver;
-		else
+		} else {
 		    helpState = 0;
+		}
 		if ( helpState != oldState )
 		    drawButton( w, QPEDecoration::Help, helpState );
 	    }
@@ -212,48 +262,277 @@ void QPEManager::drawButton( QWidget *w, QPEDecoration::QPERegion r, int state )
     decoration->paintButton( &painter, w, (QWSDecoration::Region)r, state );
 }
 
+void QPEManager::drawTitle( QWidget *w )
+{
+    QPainter painter(w);
+    QRegion rgn = ((TLWidget *)w)->topExtra()->decor_allocated_region;
+    painter.internalGfx()->setWidgetDeviceRegion( rgn );
+    painter.setClipRegion(decoration->region(w, w->rect(),QWSDecoration::All));
+    decoration->paint( &painter, w );
+    decoration->paintButton(&painter, w, QWSDecoration::Menu, 0);
+    decoration->paintButton(&painter, w, QWSDecoration::Close, 0);
+    decoration->paintButton(&painter, w, QWSDecoration::Minimize, 0);
+    decoration->paintButton(&painter, w, QWSDecoration::Maximize, 0);
+}
+
 void QPEManager::whatsThisTimeout()
 {
     if ( !QWhatsThis::inWhatsThisMode() ) {
-	wtTimer->stop();
-	if ( active )
-	    drawButton( active, QPEDecoration::Help, 0 );
-    } else if ( active ) {
-	static int state = 0;
-	if ( !state )
-	    state = QWSButton::Clicked|QWSButton::MouseOver;
+	if ( inWhatsThis ) {
+	    if ( whatsThis ) {
+		QWidget *w = whatsThis;
+		whatsThis = 0;
+		drawTitle( w );
+	    }
+	    wtTimer->stop();
+	} else {
+	    QWhatsThis::enterWhatsThisMode();
+	    helpState = 0;
+	    updateActive();
+	    if ( active ) {
+		whatsThis = active;
+		drawTitle( active );
+		// check periodically to see if we've left whats this mode
+		wtTimer->start( 250 );
+	    }
+	}
+	inWhatsThis = !inWhatsThis;
+    }
+}
+
+//===========================================================================
+
+static QImage *okImage( int th )
+{
+    static QImage *i = 0;
+    if ( !i || i->height() != th ) {
+	delete i;
+	i = new QImage(scaleButton(Resource::loadImage("OKButton"),th));
+    }
+    return i;
+}
+
+static QImage *closeImage( int th )
+{
+    static QImage *i = 0;
+    if ( !i || i->height() != th ) {
+	delete i;
+	i = new QImage(scaleButton(Resource::loadImage("CloseButton"),th));
+    }
+    return i;
+}
+
+static QImage *helpImage( int th )
+{
+    static QImage *i = 0;
+    if ( !i || i->height() != th ) {
+	delete i;
+	i = new QImage(scaleButton(Resource::loadImage("HelpButton"),th));
+    }
+    return i;
+}
+
+static QImage *maximizeImage( int th )
+{
+    static QImage *i = 0;
+    if ( !i || i->height() != th ) {
+	delete i;
+	i = new QImage(scaleButton(Resource::loadImage("MaximizeButton"),th));
+    }
+    return i;
+}
+
+int WindowDecorationInterface::metric( Metric m, const WindowData *wd ) const
+{
+    switch ( m ) {
+	case TitleHeight:
+	    if ( QApplication::desktop()->height() > 320 )
+		return 19;
+	    else
+		return 15;
+	case LeftBorder:
+	case RightBorder:
+	case TopBorder:
+	case BottomBorder:
+	    return 4;
+	case OKWidth:
+	    return okImage(metric(TitleHeight,wd))->width();
+	case CloseWidth:
+	    return closeImage(metric(TitleHeight,wd))->width();
+	case HelpWidth:
+	    return helpImage(metric(TitleHeight,wd))->width();
+	case MaximizeWidth:
+	    return maximizeImage(metric(TitleHeight,wd))->width();
+	case CornerGrabSize:
+	    return 16;
+    }
+
+    return 0;
+}
+
+void WindowDecorationInterface::drawArea( Area a, QPainter *p, const WindowData *wd ) const
+{
+    int th = metric( TitleHeight, wd );
+    QRect r = wd->rect;
+
+    switch ( a ) {
+	case Border:
+	    {
+		const QColorGroup &cg = wd->palette.active();
+		qDrawWinPanel(p, r.x()-metric(LeftBorder,wd),
+			r.y()-th-metric(TopBorder,wd),
+			r.width()+metric(LeftBorder,wd)+metric(RightBorder,wd),
+			r.height()+th+metric(TopBorder,wd)+metric(BottomBorder,wd),
+			cg, FALSE, &cg.brush(QColorGroup::Background));
+	    }
+	    break;
+	case Title:
+	    {
+		const QColorGroup &cg = wd->palette.active();
+		QBrush titleBrush;
+		QPen   titleLines;
+
+		if ( wd->flags & WindowData::Active ) {
+		    titleBrush = cg.brush(QColorGroup::Highlight);
+		    titleLines = titleBrush.color().dark();
+		} else {
+		    titleBrush = cg.brush(QColorGroup::Background);
+		    titleLines = titleBrush.color();
+		}
+
+		p->fillRect( r.x(), r.y()-th, r.width(), th, titleBrush);
+
+		p->setPen( titleLines );
+		for ( int i = r.y()-th; i < r.y(); i += 2 )
+		    p->drawLine( r.left(), i, r.right(), i );
+	    }
+	    break;
+	case TitleText:
+	    p->drawText( r.x()+3+metric(HelpWidth,wd), r.top()-th,
+		r.width()-metric(OKWidth,wd)-metric(CloseWidth,wd),
+		th, QPainter::AlignVCenter, wd->caption);
+	    break;
+    }
+}
+
+void WindowDecorationInterface::drawButton( Button b, QPainter *p, const WindowData *wd, int x, int y, int, int, QWSButton::State state ) const
+{
+    QImage *img = 0;
+    switch ( b ) {
+	case OK:
+	    img = okImage(metric(TitleHeight,wd));
+	    break;
+	case Close:
+	    img = closeImage(metric(TitleHeight,wd));
+	    break;
+	case Help:
+	    img = helpImage(metric(TitleHeight,wd));
+	    break;
+	case Maximize:
+	    img = maximizeImage(metric(TitleHeight,wd));
+	    break;
+    }
+
+    if ( img ) {
+	if ((state & QWSButton::MouseOver) && (state & QWSButton::Clicked))
+	    p->drawImage(x+2, y+2, *img);
 	else
-	    state = 0;
-	drawButton( active, QPEDecoration::Help, state );
+	    p->drawImage(x+1, y+1, *img);
     }
 }
 
-//=========
+QRegion WindowDecorationInterface::mask( const WindowData *wd ) const
+{
+    int th = metric(TitleHeight,wd);
+    QRect rect( wd->rect );
+    QRect r(rect.left() - metric(LeftBorder,wd),
+	    rect.top() - th - metric(TopBorder,wd),
+	    rect.width() + metric(LeftBorder,wd) + metric(RightBorder,wd),
+	    rect.height() + th + metric(TopBorder,wd) + metric(BottomBorder,wd));
+    return QRegion(r) - rect;
+}
 
-class HackWidget : public QWidget
+class DefaultWindowDecoration : public WindowDecorationInterface
 {
 public:
-    bool needsOk() { return (getWState() & WState_Reserved1 ); }
+    DefaultWindowDecoration() : ref(0) {}
+    QString name() const {
+	return "Default";
+    }
+    QPixmap icon() const {
+	return QPixmap();
+    }
+    QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
+	*iface = 0;
+	if ( uuid == IID_QUnknown )
+	    *iface = this;
+	else if ( uuid == IID_WindowDecoration )
+	    *iface = this;
+
+	if ( *iface )
+	    (*iface)->addRef();
+	return QS_OK;
+    }
+    Q_REFCOUNT
+
+private:
+    ulong ref;
 };
 
+static WindowDecorationInterface *wdiface = 0;
+static QLibrary *wdlib = 0;
+
 //===========================================================================
 
 QPEDecoration::QPEDecoration()
     : QWSDefaultDecoration()
 {
-    imageOk = Resource::loadImage( "OKButton" );
-    imageClose = Resource::loadImage( "CloseButton" );
-    imageHelp = Resource::loadImage( "HelpButton" );
+    if ( wdlib ) {
+	wdiface->release();
+	wdlib->unload();
+	delete wdlib;
+	wdlib = 0;
+    } else {
+	delete wdiface;
+    }
+    wdiface = new DefaultWindowDecoration;
+
     helpFile = QString(qApp->argv()[0]) + ".html";
-    QStringList path = Global::helpPath();
+    QStringList helpPath = Global::helpPath();
     helpExists = FALSE;
-    for (QStringList::ConstIterator it=path.begin(); it!=path.end() && !helpExists; ++it)
+    for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it)
+	helpExists = QFile::exists( *it + "/" + helpFile );
+    qpeManager = new QPEManager( this );
+}
+
+QPEDecoration::QPEDecoration( const QString &plugin )
+    : QWSDefaultDecoration()
+{
+    if ( wdlib ) {
+	wdiface->release();
+	wdlib->unload();
+	delete wdlib;
+	wdlib = 0;
+    } else {
+	delete wdiface;
+    }
+    WindowDecorationInterface *iface = 0;
+    QString path = QPEApplication::qpeDir() + "/plugins/decorations";
+    QLibrary *lib = new QLibrary( path + "/" + plugin );
+    if ( lib->queryInterface( IID_WindowDecoration, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
+	wdiface = iface;
+	wdlib = lib;
+    } else {
+	delete lib;
+	wdiface = new DefaultWindowDecoration;
+    }
+
+    helpFile = QString(qApp->argv()[0]) + ".html";
+    QStringList helpPath = Global::helpPath();
+    helpExists = FALSE;
+    for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it)
 	helpExists = QFile::exists( *it + "/" + helpFile );
-#ifndef MINIMIZE_HELP_HACK
     qpeManager = new QPEManager( this );
-#else
-    qpeManager = 0;
-#endif
 }
 
 QPEDecoration::~QPEDecoration()
@@ -286,9 +565,11 @@ const char **QPEDecoration::normalizePixmap()
     return (const char **)0;
 }
 
-int QPEDecoration::getTitleHeight(const QWidget *)
+int QPEDecoration::getTitleHeight( const QWidget *w )
 {
-    return 15;
+    WindowDecorationInterface::WindowData wd;
+    windowData( w, wd );
+    return wdiface->metric(WindowDecorationInterface::TitleHeight,&wd);
 }
 
 /*
@@ -296,101 +577,146 @@ int QPEDecoration::getTitleHeight(const QWidget *)
 */
 QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecoration::Region type)
 {
-    int titleHeight = getTitleHeight(widget);
-//    int titleWidth = getTitleWidth(widget);
-//    int bw = rect.isEmpty() ? 0 : BORDER_WIDTH;
-    QRegion region;
-
-#ifndef MINIMIZE_HELP_HACK
     qpeManager->updateActive();
-#endif
+
+    WindowDecorationInterface::WindowData wd;
+    windowData( widget, wd );
+    wd.rect = rect;
+
+    int titleHeight = wdiface->metric(WindowDecorationInterface::TitleHeight,&wd);
+    int okWidth = wdiface->metric(WindowDecorationInterface::OKWidth,&wd);
+    int closeWidth = wdiface->metric(WindowDecorationInterface::CloseWidth,&wd);
+    int helpWidth = wdiface->metric(WindowDecorationInterface::HelpWidth,&wd);
+    int grab = wdiface->metric(WindowDecorationInterface::CornerGrabSize,&wd);
+
+    QRegion region;
 
     switch ((int)type) {
 	case Menu:
-	case Maximize:
 	    break;
-	case Minimize: {
-	    if ( ((HackWidget *)widget)->needsOk() || 
-		 (widget->inherits( "QDialog" ) && !widget->inherits( "QMessageBox" ) ) ) {
-		QRect r(rect.right() - imageOk.width(),
-		    rect.top() - titleHeight - 2,
-		    imageOk.width(), titleHeight);
-		if (r.left() > rect.left() + titleHeight)
-		    region = r;
+	case Maximize:
+	    if ( !widget->inherits( "QDialog" ) && qApp->desktop()->width() > 350 ) {
+		int maximizeWidth = wdiface->metric(WindowDecorationInterface::MaximizeWidth,&wd);
+		int left = rect.right() - maximizeWidth - closeWidth;
+		if ( ((HackWidget *)widget)->needsOk() )
+		    left -= okWidth;
+		QRect r(left, rect.top() - titleHeight, closeWidth, titleHeight);
+		region = r;
 	    }
-#ifdef MINIMIZE_HELP_HACK
-	    else if ( helpExists ) {
-		QRect r;
-		r = QRect(rect.right() - imageClose.width() - imageHelp.width(),
-			  rect.top() - titleHeight - 2,
-			  imageHelp.width(), titleHeight);
+	    break;
+	case Minimize:
+	    if ( ((HackWidget *)widget)->needsOk() ) {
+		QRect r(rect.right() - okWidth,
+		    rect.top() - titleHeight, okWidth, titleHeight);
 		if (r.left() > rect.left() + titleHeight)
 		    region = r;
 	    }
-#endif
-	}
-	break;
-	case Close: {
-	    if ( ((HackWidget *)widget)->needsOk() || 
-		 (widget->inherits( "QDialog" ) && !widget->inherits( "QMessageBox" ) ) ) {
-		QRect r;
-		r = QRect(rect.right() - imageOk.width() - imageClose.width(),
-		    rect.top() - titleHeight - 2,
-		    imageClose.width(), titleHeight);
-		if (r.left() > rect.left() + titleHeight)
-		    region = r;
-	    } else {
-		QRect r(rect.right() - imageClose.width(),
-		    rect.top() - titleHeight - 2,
-		    imageClose.width(), titleHeight);
-		if (r.left() > rect.left() + titleHeight)
-		    region = r;
+	    break;
+	case Close:
+	    {
+		int left = rect.right() - closeWidth;
+		if ( ((HackWidget *)widget)->needsOk() )
+		    left -= okWidth;
+		QRect r(left, rect.top() - titleHeight, closeWidth, titleHeight);
+		region = r;
 	    }
 	    break;
-	}
-    	case Title: {
-	    if ( widget->isMaximized() ) {
-		region = QRegion();
-	    } else {
-		int btnWidth = imageClose.width();
-		if ( ((HackWidget *)widget)->needsOk() || 
-		     (widget->inherits( "QDialog" ) && !widget->inherits( "QMessageBox" ) ) )
-		    btnWidth += imageOk.width();
-		QRect r(rect.left() + 1, rect.top() - titleHeight,
-			rect.width() - btnWidth - 2, titleHeight);
+    	case Title:
+	    if ( !widget->isMaximized() ) {
+		int width = rect.width() - helpWidth - closeWidth;
+		if ( ((HackWidget *)widget)->needsOk() )
+		    width -= okWidth;
+		QRect r(rect.left()+helpWidth, rect.top() - titleHeight,
+			width, titleHeight);
 		if (r.width() > 0)
 		    region = r;
 	    }
 	    break;
-	}
-	case Help: {
-	    if ( helpExists ) {
-		QRect r;
-		int l = rect.right() - imageClose.width() - imageHelp.width();
-		if ( ((HackWidget *)widget)->needsOk() || 
-		     (widget->inherits( "QDialog" ) && !widget->inherits( "QMessageBox" ) ) )
-		    l -= imageOk.width();
-		r = QRect(l, rect.top() - titleHeight - 2,
-			  imageHelp.width(), titleHeight);
-		if (r.left() > rect.left() + titleHeight)
-		    region = r;
+	case Help:
+	    if ( helpExists || widget->testWFlags(Qt::WStyle_ContextHelp) ) {
+		QRect r(rect.left(), rect.top() - titleHeight,
+			  helpWidth, titleHeight);
+		region = r;
 	    }
 	    break;
-	}
 	case Top:
+	    if ( !widget->isMaximized() ) {
+		QRegion m = wdiface->mask(&wd);
+		QRect br = m.boundingRect();
+		int b = wdiface->metric(WindowDecorationInterface::TopBorder,&wd);
+		region = m & QRect( br.left()+grab, br.top(),
+				    br.width()-2*grab, b );
+	    }
+	    break; 
 	case Left:
+	    if ( !widget->isMaximized() ) {
+		QRegion m = wdiface->mask(&wd);
+		QRect br = m.boundingRect();
+		int b = wdiface->metric(WindowDecorationInterface::LeftBorder,&wd);
+		region = m & QRect( br.left(), br.top()+grab,
+				    b, br.height()-2*grab );
+	    }
+	    break; 
 	case Right:
+	    if ( !widget->isMaximized() ) {
+		QRegion m = wdiface->mask(&wd);
+		QRect br = m.boundingRect();
+		int b = wdiface->metric(WindowDecorationInterface::RightBorder,&wd);
+		region = m & QRect( rect.right(), br.top()+grab,
+				    b, br.height()-2*grab );
+	    }
+	    break; 
 	case Bottom:
+	    if ( !widget->isMaximized() ) {
+		QRegion m = wdiface->mask(&wd);
+		QRect br = m.boundingRect();
+		int b = wdiface->metric(WindowDecorationInterface::BottomBorder,&wd);
+		region = m & QRect( br.left()+grab, rect.bottom(),
+				    br.width()-2*grab, b );
+	    }
+	    break;
 	case TopLeft:
+	    if ( !widget->isMaximized() ) {
+		QRegion m = wdiface->mask(&wd);
+		QRect br = m.boundingRect();
+		int tb = wdiface->metric(WindowDecorationInterface::TopBorder,&wd);
+		int lb = wdiface->metric(WindowDecorationInterface::LeftBorder,&wd);
+		QRegion crgn( br.left(), br.top(), grab, tb );
+		crgn |= QRect( br.left(), br.top(), lb, grab );
+		region = m & crgn;
+	    }
+	    break; 
 	case TopRight:
+	    if ( !widget->isMaximized() ) {
+		QRegion m = wdiface->mask(&wd);
+		QRect br = m.boundingRect();
+		int tb = wdiface->metric(WindowDecorationInterface::TopBorder,&wd);
+		int rb = wdiface->metric(WindowDecorationInterface::RightBorder,&wd);
+		QRegion crgn( br.right()-grab, br.top(), grab, tb );
+		crgn |= QRect( br.right()-rb, br.top(), rb, grab );
+		region = m & crgn;
+	    }
+	    break;
 	case BottomLeft:
+	    if ( !widget->isMaximized() ) {
+		QRegion m = wdiface->mask(&wd);
+		QRect br = m.boundingRect();
+		region = m & QRect( br.left(), br.bottom()-grab, grab, grab );
+	    }
+	    break; 
 	case BottomRight:
-	    if ( widget->isMaximized() ) {
-		region = QRegion();
-		break;
+	    if ( !widget->isMaximized() ) {
+		QRegion m = wdiface->mask(&wd);
+		QRect br = m.boundingRect();
+		region = m & QRect( br.right()-grab, br.bottom()-grab, grab, grab );
 	    }
-	    //else fallthrough!!!
+	    break;
 	case All:
+	    if ( widget->isMaximized() )
+		region = QWSDefaultDecoration::region(widget, rect, type);
+	    else
+		region = wdiface->mask(&wd) - rect;
+	    break;
 	default:
 	    region = QWSDefaultDecoration::region(widget, rect, type);
 	    break;
@@ -401,46 +727,29 @@ QRegion QPEDecoration::region(const QWidget *widget, const QRect &rect, QWSDecor
 
 void QPEDecoration::paint(QPainter *painter, const QWidget *widget)
 {
-#ifndef QT_NO_STYLE
-//    QStyle &style = QApplication::style();
-#endif
+    WindowDecorationInterface::WindowData wd;
+    windowData( widget, wd );
 
     int titleWidth = getTitleWidth(widget);
-    int titleHeight = getTitleHeight(widget);
+    int titleHeight = wdiface->metric(WindowDecorationInterface::TitleHeight,&wd);
 
     QRect rect(widget->rect());
 
-    // Border rect
-    QRect br( rect.left() - BORDER_WIDTH,
-                rect.top() - BORDER_WIDTH - titleHeight,
-                rect.width() + 2 * BORDER_WIDTH,
-                rect.height() + BORDER_WIDTH + BOTTOM_BORDER_WIDTH + titleHeight );
-
     // title bar rect
-    QRect tr;
-
-    tr = QRect( rect.left(), rect.top() - titleHeight, rect.width(), titleHeight );
+    QRect tr( rect.left(), rect.top() - titleHeight, rect.width(), titleHeight );
 
+#ifndef QT_NO_PALETTE
     QRegion oldClip = painter->clipRegion();
     painter->setClipRegion( oldClip - QRegion( tr ) );	// reduce flicker
-
-#ifndef QT_NO_PALETTE
-    // const QColorGroup &cg = QApplication::palette().active();
-    const QColorGroup &cg = widget->palette().active();
-
-    qDrawWinPanel(painter, br.x(), br.y(), br.width(),
-		  br.height() - 4, cg, FALSE,
-		  &cg.brush(QColorGroup::Background));
-
+    wdiface->drawArea( WindowDecorationInterface::Border, painter, &wd );
     painter->setClipRegion( oldClip );
 
     if (titleWidth > 0) {
+	const QColorGroup &cg = widget->palette().active();
 	QBrush titleBrush;
 	QPen   titlePen;
-	QPen   titleLines;
-	int    titleLeft = titleHeight + 4;
 
-	if (widget == qApp->activeWindow()) {
+	if ( wd.flags & WindowDecorationInterface::WindowData::Active ) {
 	    titleBrush = cg.brush(QColorGroup::Highlight);
 	    titlePen   = cg.color(QColorGroup::HighlightedText);
 	} else {
@@ -448,127 +757,65 @@ void QPEDecoration::paint(QPainter *painter, const QWidget *widget)
 	    titlePen   = cg.color(QColorGroup::Text);
 	}
 
-	titleLines = titleBrush.color().dark(150);
-
-#define CLAMP(x, y)	    ( ((x) > (y)) ? (y) : (x) )
+	wdiface->drawArea( WindowDecorationInterface::Title, painter, &wd );
 
-	    titleLeft = rect.left() + 5;
-	    painter->setPen( cg.midlight() );
-	    painter->drawLine( rect.left() - BORDER_WIDTH + 2,
-				rect.bottom() + 1, rect.right() + BORDER_WIDTH - 2,
-				rect.bottom() + 1 );
-
-	    fillTitle( painter, widget, rect.left() - 2,
-			rect.top() - titleHeight - 2,
-			rect.width() + 3, titleHeight + 2 );
-/*
-	    painter->fillRect(rect.left() - 2,
-			    rect.top() - titleHeight - 2,
-			    rect.width() + 3, titleHeight + 2,
-			    titleBrush);
-
-	    painter->setPen( titleLines );
-	    for ( int i = rect.top() - titleHeight - 2; i < rect.top(); i += 2 )
-		painter->drawLine( rect.left() - 2, i, rect.left() + rect.width() + 2, i );
-*/
+	// Draw caption
 	painter->setPen(titlePen);
 	QFont f( QApplication::font() );
 	f.setWeight( QFont::Bold );
 	painter->setFont(f);
-	painter->drawText( titleLeft, -titleHeight,
-	 		rect.width() - titleHeight - 10, titleHeight-1,
-			QPainter::AlignVCenter, widget->caption());
+	wdiface->drawArea( WindowDecorationInterface::TitleText, painter, &wd );
     }
-
 #endif //QT_NO_PALETTE
 
-#ifndef MINIMIZE_HELP_HACK
     paintButton( painter, widget, (QWSDecoration::Region)Help, 0 );
-#endif
 }
 
 void QPEDecoration::paintButton(QPainter *painter, const QWidget *w,
 			QWSDecoration::Region type, int state)
 {
-#ifndef QT_NO_PALETTE
-#ifndef QT_NO_STYLE
-//    QStyle &style = QApplication::style();
-#endif
-    const QColorGroup &cg = w->palette().active();
-
-    QRect brect(region(w, w->rect(), type).boundingRect());
-
-//    int xoff=2;
-//    int yoff=2;
-
-//    const QPixmap *pm=pixmapFor(w,type,state & QWSButton::On, xoff, yoff);
-
-    const QImage *img = 0;
-
-	switch ((int)type) {
-	    case Close:
-		img = &imageClose;
-		break;
-	    case Minimize:
-		if ( ((HackWidget *)w)->needsOk() || 
-		     (w->inherits( "QDialog" ) && !w->inherits( "QMessageBox" ) ) )
-		    img = &imageOk;
-		else if ( helpExists )
-		    img = &imageHelp;
-		break;
-	    case Help:
-		img = &imageHelp;
-		break;
-	    default:
+    WindowDecorationInterface::Button b;
+    switch ((int)type) {
+	case Close:
+	    b = WindowDecorationInterface::Close;
+	    break;
+	case Minimize:
+	    if ( ((HackWidget *)w)->needsOk() )
+		b = WindowDecorationInterface::OK;
+	    else if ( helpExists )
+		b = WindowDecorationInterface::Help;
+	    else
 		return;
-	}
-
-	QBrush titleBrush;
-
-	if (w == qApp->activeWindow()) {
-	    titleBrush = cg.brush(QColorGroup::Highlight);
-	} else {
-	    titleBrush = cg.brush(QColorGroup::Background);
-	}
-
-	fillTitle( painter, w, brect.x(), brect.y(), brect.width()+1,
-		    brect.height()+1 );
-	if ((state & QWSButton::MouseOver) && (state & QWSButton::Clicked)) {
-	    if (img) painter->drawImage(brect.x()+1, brect.y()+3, *img);
-	} else {
-	    if (img) painter->drawImage(brect.x(), brect.y()+2, *img);
-	}
-
-#endif
-
-}
-
-void QPEDecoration::fillTitle( QPainter *p, const QWidget *widget,
-				int x, int y, int w, int h )
-{
-    QBrush titleBrush;
-    QPen   topLine;
-    QPen   titleLines;
+	    break;
+	case Help:
+	    b = WindowDecorationInterface::Help;
+	    break;
+	case Maximize:
+	    b = WindowDecorationInterface::Maximize;
+	    break;
+	default:
+	    return;
+    }
 
-    const QColorGroup &cg = widget->palette().active();
+    WindowDecorationInterface::WindowData wd;
+    windowData( w, wd );
 
-    if (widget == qApp->activeWindow()) {
-	titleBrush = cg.brush(QColorGroup::Highlight);
-	titleLines = titleBrush.color().dark();
-	topLine = titleBrush.color().light();
-    } else {
-	titleBrush = cg.brush(QColorGroup::Background);
-	titleLines = titleBrush.color();
-	topLine = titleBrush.color();
-    }
+    int titleHeight = wdiface->metric(WindowDecorationInterface::TitleHeight,&wd);
+    QRect rect(w->rect());
+    QRect tr( rect.left(), rect.top() - titleHeight, rect.width(), titleHeight );
+    QRect brect(region(w, w->rect(), type).boundingRect());
 
-    p->fillRect( x, y, w, h, titleBrush);
+    const QColorGroup &cg = w->palette().active();
+    if ( wd.flags & WindowDecorationInterface::WindowData::Active )
+	painter->setPen( cg.color(QColorGroup::HighlightedText) );
+    else
+	painter->setPen( cg.color(QColorGroup::Text) );
 
-    p->setPen( topLine );
-    p->drawLine( x, y+1, x+w-1, y+1 );
-    p->setPen( titleLines );
-    for ( int i = y; i < y+h; i += 2 )
-	p->drawLine( x, i, x+w-1, i );
+    QRegion oldClip = painter->clipRegion();
+    painter->setClipRegion( QRect(brect.x(), tr.y(), brect.width(), tr.height()) ); // reduce flicker
+    wdiface->drawArea( WindowDecorationInterface::Title, painter, &wd );
+    wdiface->drawButton( b, painter, &wd, brect.x(), brect.y(), brect.width(), brect.height(), (QWSButton::State)state );
+    painter->setClipRegion( oldClip );
 }
 
 //#define QPE_DONT_SHOW_TITLEBAR
@@ -617,13 +864,36 @@ void QPEDecoration::minimize( QWidget *widget )
     }
 }
 
-void QPEDecoration::help( QWidget * )
+void QPEDecoration::help( QWidget *w )
 {
     if ( helpExists ) {
 	Global::execute( "helpbrowser", helpFile );
+    } else if ( w && w->testWFlags(Qt::WStyle_ContextHelp) ) {
+	QWhatsThis::enterWhatsThisMode();
+	QWhatsThis::leaveWhatsThisMode( qApp->tr(
+	    "<Qt>Comprehensive help is not available for this application, "
+	    "however there is context-sensitive help.<p>To use context-sensitive help:<p>"
+	    "<ol><li>click and hold the help button."
+	    "<li>when the title bar shows <b>What's this...</b>, "
+	    "click on any control.</ol></Qt>" ) );
     }
 }
 
+void QPEDecoration::windowData( const QWidget *w, WindowDecorationInterface::WindowData &wd ) const
+{
+    wd.rect = w->rect();
+    if ( qpeManager->whatsThisWidget() == w )
+	wd.caption = qApp->tr("What's this..." );
+    else
+	wd.caption = w->caption();
+    wd.palette = qApp->palette();
+    wd.flags = 0;
+    wd.flags |= w->isMaximized() ? WindowDecorationInterface::WindowData::Maximized : 0;
+    wd.flags |= w->testWFlags(Qt::WStyle_Dialog) ? WindowDecorationInterface::WindowData::Dialog : 0;
+    const QWidget *active = qpeManager->activeWidget();
+    wd.flags |= w == active ? WindowDecorationInterface::WindowData::Active : 0;
+    wd.reserved = 1;
+}
 
 /*
 #ifndef QT_NO_POPUPMENU
@@ -638,3 +908,4 @@ QPopupMenu *QPEDecoration::menu(QWSManager*, const QWidget*, const QPoint&)
 
 
 #endif // QT_NO_QWS_QPE_WM_STYLE
+#endif