summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp16
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
@@ -51,6 +51,7 @@
51#include <qsignal.h> 51#include <qsignal.h>
52#include <qmainwindow.h> 52#include <qmainwindow.h>
53#include <qwidgetlist.h> 53#include <qwidgetlist.h>
54#include <qpixmapcache.h>
54 55
55#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 56#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
56#define QTOPIA_INTERNAL_INITAPP 57#define QTOPIA_INTERNAL_INITAPP
@@ -99,7 +100,7 @@ public:
99 QPEApplicationData ( ) 100 QPEApplicationData ( )
100 : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ), 101 : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ),
101 notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), 102 notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ),
102 keep_running( true ), qpe_main_widget( 0 ), qcopQok( false ) 103 keep_running( true ), qcopQok( false ), qpe_main_widget( 0 )
103 104
104 {} 105 {}
105 106
@@ -113,8 +114,8 @@ public:
113 bool preloaded : 1; 114 bool preloaded : 1;
114 bool forceshow : 1; 115 bool forceshow : 1;
115 bool nomaximize : 1; 116 bool nomaximize : 1;
116 bool qcopQok : 1;
117 bool keep_running : 1; 117 bool keep_running : 1;
118 bool qcopQok : 1;
118 119
119 120
120 QStringList langs; 121 QStringList langs;
@@ -214,6 +215,7 @@ public:
214 setWidgetCaptionFromAppName( mw, appName, QPEApplication::qpeDir() + "apps" ); 215 setWidgetCaptionFromAppName( mw, appName, QPEApplication::qpeDir() + "apps" );
215 nomaximize = nomax; 216 nomaximize = nomax;
216 qpe_main_widget = mw; 217 qpe_main_widget = mw;
218 qcopQok = TRUE;
217#ifndef QT_NO_COP 219#ifndef QT_NO_COP
218 220
219 sendQCopQ(); 221 sendQCopQ();
@@ -576,6 +578,8 @@ void QPEApplication::processQCopFile()
576QPEApplication::QPEApplication( int & argc, char **argv, Type t ) 578QPEApplication::QPEApplication( int & argc, char **argv, Type t )
577 : QApplication( hack(argc), argv, t ), pidChannel( 0 ) 579 : QApplication( hack(argc), argv, t ), pidChannel( 0 )
578{ 580{
581 QPixmapCache::setCacheLimit(256); // sensible default for smaller devices.
582
579 d = new QPEApplicationData; 583 d = new QPEApplicationData;
580 d->loadTextCodecs(); 584 d->loadTextCodecs();
581 d->loadImageCodecs(); 585 d->loadImageCodecs();
@@ -1776,6 +1780,9 @@ void QPEApplication::setStylusOperation( QWidget * w, StylusMode mode )
1776*/ 1780*/
1777bool QPEApplication::eventFilter( QObject *o, QEvent *e ) 1781bool QPEApplication::eventFilter( QObject *o, QEvent *e )
1778{ 1782{
1783 if ( !o->isWidgetType() )
1784 return FALSE;
1785
1779 if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) { 1786 if ( stylusDict && e->type() >= QEvent::MouseButtonPress && e->type() <= QEvent::MouseMove ) {
1780 QMouseEvent * me = ( QMouseEvent* ) e; 1787 QMouseEvent * me = ( QMouseEvent* ) e;
1781 StylusMode mode = (StylusMode)(int)stylusDict->find(o); 1788 StylusMode mode = (StylusMode)(int)stylusDict->find(o);
@@ -1784,7 +1791,8 @@ bool QPEApplication::eventFilter( QObject *o, QEvent *e )
1784 switch ( me->type() ) { 1791 switch ( me->type() ) {
1785 case QEvent::MouseButtonPress: 1792 case QEvent::MouseButtonPress:
1786 if ( me->button() == LeftButton ) { 1793 if ( me->button() == LeftButton ) {
1787 d->presstimer = startTimer(500); // #### pref. 1794 if (!d->presstimer )
1795 d->presstimer = startTimer(500); // #### pref.
1788 d->presswidget = (QWidget*)o; 1796 d->presswidget = (QWidget*)o;
1789 d->presspos = me->pos(); 1797 d->presspos = me->pos();
1790 d->rightpressed = FALSE; 1798 d->rightpressed = FALSE;
@@ -1904,6 +1912,8 @@ int QPEApplication::exec()
1904 d->qcopQok = true; 1912 d->qcopQok = true;
1905#ifndef QT_NO_COP 1913#ifndef QT_NO_COP
1906 d->sendQCopQ(); 1914 d->sendQCopQ();
1915 if ( !d->keep_running )
1916 processEvents(); // we may have received QCop messages in the meantime.
1907#endif 1917#endif
1908 1918
1909 if ( d->keep_running ) 1919 if ( d->keep_running )