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
@@ -30,112 +30,113 @@
 #define sendLocally processEvent
 #include "qcopenvelope_qws.h"
 #undef private
 #else
 #include "qcopenvelope_qws.h"
 #endif
 #endif
 #include <qwindowsystem_qws.h>
 #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>
 #endif
 #include "global.h"
 #include "resource.h"
 #if QT_VERSION <= 230 && defined(QT_NO_CODECS)
 #include "qutfcodec.h"
 #endif
 #include "config.h"
 #include "network.h"
 #ifdef QWS
 #include "fontmanager.h"
 #endif
 
 #include "alarmserver.h"
 #include "applnk.h"
 #include "qpemenubar.h"
 #include "textcodecinterface.h"
 #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;
         QGuardedPtr<QWidget> lastraised;
 	QQueue<QCopRec> qcopq;
         QString styleName;
 	QString decorationName;
 
 	void enqueueQCop( const QCString &ch, const QCString &msg,
 	                  const QByteArray &data )
 	{
@@ -193,48 +194,49 @@ public:
 		// the applnk that has the corresponding argv[0] as this program
 		// then it uses the name stored in the .desktop file as the caption
 		// for the main widget. This saves duplicating translations for
 		// the app name in the program and in the .desktop files.
 
 		AppLnkSet apps( appsPath );
 
 		QList<AppLnk> appsList = apps.children();
 		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()
 	{
 		QString path = QPEApplication::qpeDir() + "/plugins/textcodecs";
 		QDir dir( path, "lib*.so" );
 		QStringList list;
 		if ( dir. exists ( ))
 		    list = dir.entryList();
 		QStringList::Iterator it;
 		for ( it = list.begin(); it != list.end(); ++it ) {
 			TextCodecInterface *iface = 0;
@@ -555,48 +557,50 @@ void QPEApplication::processQCopFile()
             int a,b,c;
             stream >> a >> b >> c;
             ...
        } else if ( msg == "otherMessage(QString)" ) {
            ...
        }
     }
 \endcode
 
   \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 );
 	}
 #endif
 	else if ( dw > 200 ) {
 		setFont( QFont( "vera", 10 ) );
 		AppLnk::setSmallIconSize( 14 );
 		AppLnk::setBigIconSize( 32 );
 	}
 
 	QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory );
@@ -1755,57 +1759,61 @@ QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w )
 
   \sa stylusOperation() StylusMode
 */
 void QPEApplication::setStylusOperation( QWidget * w, StylusMode mode )
 {
 	createDict();
 	if ( mode == LeftOnly ) {
 		stylusDict->remove
 		( 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;
 							}
 							if ( d->rightpressed && d->presswidget ) {
 								// Right released
 								postEvent( d->presswidget,
 								           new QMouseEvent( QEvent::MouseButtonRelease, me->pos(),
 								                            RightButton, LeftButton + RightButton ) );
 								// Left released, off-widget
 								postEvent( d->presswidget,
@@ -1883,48 +1891,50 @@ void QPEApplication::ungrabKeyboard()
 }
 
 /*!
   Grabs the physical keyboard keys, e.g. the application's launching
   keys. Instead of launching applications when these keys are pressed
   the signals emitted are sent to this application instead. Some games
   programs take over the launch keys in this way to make interaction
   easier.
 
   \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;
 }
 
 /*!
   \internal
   External request for application to quit.  Quits if possible without
   loosing state.
 */
 void QPEApplication::tryQuit()
 {