merges of qcopQok

and QPIxmapCache 'calibration' for PDA needs

1 files changed, 13 insertions, 3 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 0e469ae..28fb13a 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -38,32 +38,33 @@
 #endif
 #include <qtextstream.h>
 #include <qpalette.h>
 #include <qbuffer.h>
 #include <qptrdict.h>
 #include <qregexp.h>
 #include <qdir.h>
 #include <qlabel.h>
 #include <qdialog.h>
 #include <qdragobject.h>
 #include <qtextcodec.h>
 #include <qevent.h>
 #include <qtooltip.h>
 #include <qsignal.h>
 #include <qmainwindow.h>
 #include <qwidgetlist.h>
+#include <qpixmapcache.h>
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 #define QTOPIA_INTERNAL_INITAPP
 #include "qpeapplication.h"
 #include "qpestyle.h"
 #include "styleinterface.h"
 #if QT_VERSION >= 300
 #include <qstylefactory.h>
 #else
 #include <qplatinumstyle.h>
 #include <qwindowsstyle.h>
 #include <qmotifstyle.h>
 #include <qmotifplusstyle.h>
 #include "lightstyle.h"
 
 #include <qpe/qlibrary.h>
@@ -86,48 +87,48 @@
 #include "imagecodecinterface.h"
 
 #include <unistd.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
 
 #include "qt_override_p.h"
 
 
 class QPEApplicationData
 {
 public:
         QPEApplicationData ( )
                 : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ),
                   notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ),
-                  keep_running( true ), qpe_main_widget( 0 ), qcopQok( false )
+                  keep_running( true ), qcopQok( false ), qpe_main_widget( 0 )
 
         {}
 
         int presstimer;
         QWidget* presswidget;
         QPoint presspos;
 
         bool rightpressed : 1;
         bool kbgrabbed    : 1;
         bool notbusysent  : 1;
         bool preloaded    : 1;
         bool forceshow    : 1;
         bool nomaximize   : 1;
-        bool qcopQok      : 1;
         bool keep_running : 1;
+        bool qcopQok      : 1;
 
 
         QStringList langs;
         QString appName;
         struct QCopRec
         {
                 QCopRec( const QCString &ch, const QCString &msg,
                          const QByteArray &d ) :
                                 channel( ch ), message( msg ), data( d )
                 { }
 
                 QCString channel;
                 QCString message;
                 QByteArray data;
         };
         QWidget* qpe_main_widget;
@@ -201,32 +202,33 @@ public:
                 for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) {
                   if ( (*it)->exec() == appName ) {
                 mw->setCaption( (*it)->name() );
                 return TRUE;
                   }
                 }
                 */
                 return FALSE;
         }
 
 
         void show(QWidget* mw, bool nomax)
         {
                 setWidgetCaptionFromAppName( mw, appName, QPEApplication::qpeDir() + "apps" );
                 nomaximize = nomax;
                 qpe_main_widget = mw;
+                qcopQok = TRUE;
 #ifndef QT_NO_COP
 
                 sendQCopQ();
 #endif
 
                 if ( preloaded ) {
                         if (forceshow)
                                 show_mx(mw, nomax);
                 }
                 else if ( keep_running ) {
                         show_mx(mw, nomax);
                 }
         }
 
         void loadTextCodecs()
         {
@@ -563,32 +565,34 @@ void QPEApplication::processQCopFile()
 
   \sa qcop.html
   Note that messages received here may be processed by qpe application
   and emitted as signals, such as flush() and reload().
 */
 
 /*!
   Constructs a QPEApplication just as you would construct
   a QApplication, passing \a argc, \a argv, and \a t.
 
   For applications, \a t should be the default, GuiClient. Only
   the Qtopia server passes GuiServer.
 */
 QPEApplication::QPEApplication( int & argc, char **argv, Type t )
                 : QApplication( hack(argc), argv, t ), pidChannel( 0 )
 {
+        QPixmapCache::setCacheLimit(256); // sensible default for smaller devices.
+
         d = new QPEApplicationData;
         d->loadTextCodecs();
         d->loadImageCodecs();
                int dw = desktop() ->width();
 
         if ( dw < 200 ) {
                 setFont( QFont( "vera", 8 ) );
                 AppLnk::setSmallIconSize( 10 );
                 AppLnk::setBigIconSize( 28 );
         }
 #ifndef QT_QWS_SIMPAD
         else if ( dw > 600 ) {
                                setFont( QFont( "vera", 16 ) );
                                 AppLnk::setSmallIconSize( 24 );
                 AppLnk::setBigIconSize( 48 );
         }
@@ -1763,41 +1767,45 @@ void QPEApplication::setStylusOperation( QWidget * w, StylusMode mode )
                 ( w );
                 w->removeEventFilter( qApp );
         }
         else {
                 stylusDict->insert( w, ( void* ) mode );
                 connect( w, SIGNAL( destroyed() ), qApp, SLOT( removeSenderFromStylusDict() ) );
                 w->installEventFilter( qApp );
         }
 }
 
 
 /*!
   \reimp
 */
 bool QPEApplication::eventFilter( QObject *o, QEvent *e )
 {
+        if ( !o->isWidgetType() )
+            return FALSE;
+
         if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) {
                 QMouseEvent * me = ( QMouseEvent* ) e;
                 StylusMode mode = (StylusMode)(int)stylusDict->find(o);
                 switch (mode) {
                         case RightOnHold:
                                 switch ( me->type() ) {
                                         case QEvent::MouseButtonPress:
                                                 if ( me->button() == LeftButton ) {
-                                                        d->presstimer = startTimer(500); // #### pref.
+                                                    if (!d->presstimer )
+                                                        d->presstimer = startTimer(500); // #### pref.
                                                         d->presswidget = (QWidget*)o;
                                                         d->presspos = me->pos();
                                                         d->rightpressed = FALSE;
                                                 }
                                                 break;
                                         case QEvent::MouseMove:
                                                 if (d->presstimer && (me->pos() - d->presspos).manhattanLength() > 8) {
                                                         killTimer(d->presstimer);
                                                         d->presstimer = 0;
                                                 }
                                                 break;
                                         case QEvent::MouseButtonRelease:
                                                 if ( me->button() == LeftButton ) {
                                                         if ( d->presstimer ) {
                                                                 killTimer(d->presstimer);
                                                                 d->presstimer = 0;
@@ -1891,32 +1899,34 @@ void QPEApplication::ungrabKeyboard()
 
   \sa ungrabKeyboard()
 */
 void QPEApplication::grabKeyboard()
 {
         ((QPEApplication *) qApp )-> d-> kbgrabbed = true;
 }
 
 /*!
   \reimp
 */
 int QPEApplication::exec()
 {
         d->qcopQok = true;
 #ifndef QT_NO_COP
         d->sendQCopQ();
+        if ( !d->keep_running )
+            processEvents(); // we may have received QCop messages in the meantime.
 #endif
 
         if ( d->keep_running )
                 //|| d->qpe_main_widget && d->qpe_main_widget->isVisible() )
                 return QApplication::exec();
 
 #ifndef QT_NO_COP
 
         {
                 QCopEnvelope e( "QPE/System", "closing(QString)" );
                 e << d->appName;
         }
 #endif
         processEvents();
         return 0;
 }