9 files changed, 183 insertions, 129 deletions

diff --git a/library/custom-ipaq.h b/library/custom-ipaq.h
index 553b571..a9319fa 100644
--- a/library/custom-ipaq.h
+++ b/library/custom-ipaq.h
@@ -20 +20,2 @@
 
+#define QPE_NEED_CALIBRATION
\ No newline at end of file
diff --git a/library/custom-ramses.h b/library/custom-ramses.h
index b841a66..9104931 100644
--- a/library/custom-ramses.h
+++ b/library/custom-ramses.h
@@ -20,2 +20,3 @@
 
+#define QPE_NEED_CALIBRATION
 #define QPE_HAVE_TOGGLELIGHT
diff --git a/library/custom-sharp.h b/library/custom-sharp.h
index 3dab34f..3936875 100644
--- a/library/custom-sharp.h
+++ b/library/custom-sharp.h
@@ -20,2 +20,3 @@
 
+#define QPE_NEED_CALIBRATION
 #define QPE_OWNAPM
diff --git a/library/custom-simpad.h b/library/custom-simpad.h
new file mode 100644
index 0000000..3872dfd
--- a/dev/null
+++ b/library/custom-simpad.h
@@ -0,0 +1,7 @@
+/*
+ * GPLv2 only zecke@handhelds.org
+    hOlgAr
+ */
+
+
+#define QPE_NEED_CALIBRATION
\ No newline at end of file
diff --git a/library/global.cpp b/library/global.cpp
index 189b830..5c89430 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -678,58 +678,13 @@ void Global::execute( const QString &c, const QString& document )
 {
-    if ( qApp->type() != QApplication::GuiServer ) {
         // ask the server to do the work
 #if !defined(QT_NO_COP)
-        if ( document.isNull() ) {
-            QCopEnvelope e( "QPE/System", "execute(QString)" );
-            e << c;
-        } else {
-            QCopEnvelope e( "QPE/System", "execute(QString,QString)" );
-            e << c << document;
-        }
-#endif
-        return;
-    }
-
-    // Attempt to execute the app using a builtin class for the app first
-    // else try and find it in the bin directory
-    if (builtin) {
-        for (int i = 0; builtin[i].file; i++) {
-            if ( builtin[i].file == c ) {
-                if ( running[i] ) {
-                    if ( !document.isNull() && builtin[i].documentary )
-                        setDocument(running[i], document);
-                    running[i]->raise();
-                    running[i]->show();
-                    running[i]->setActiveWindow();
-                } else {
-                    running[i] = builtin[i].func( builtin[i].maximized );
-                }
-#ifndef QT_NO_COP
-                QCopEnvelope e("QPE/System", "notBusy(QString)" );
-                e << c; // that was quick ;-)
-#endif
-                return;
-            }
-        }
-    }
-
-    //Global::invoke(c, document);
-
-    // Convert the command line in to a list of arguments
-    QStringList list = QStringList::split(QRegExp("  *"),c);
-
-#if !defined(QT_NO_COP)
-    QString ap=list[0];
-
-    qDebug("executing %s", ap.latin1() );
-
-    /* if need be, sending a qcop message will result in an invoke, see
-       preceeding function */
-    invoke( ap );
-    //{ QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); }
-    if ( !document.isEmpty() ) {
-        QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "setDocument(QString)" );
-        env << document;
+    if ( document.isNull() ) {
+        QCopEnvelope e( "QPE/System", "execute(QString)" );
+        e << c;
+    } else {
+        QCopEnvelope e( "QPE/System", "execute(QString,QString)" );
+        e << c << document;
     }
 #endif
+    return;
 }
diff --git a/library/inputmethodinterface.h b/library/inputmethodinterface.h
index 88a121d..488f601 100644
--- a/library/inputmethodinterface.h
+++ b/library/inputmethodinterface.h
@@ -49,3 +49,3 @@ struct InputMethodInterface : public QUnknownInterface
 
-// {70F0991C-8282-4625-A279-BD9D7D959FF6} 
+// {70F0991C-8282-4625-A279-BD9D7D959FF6}
 #ifndef IID_ExtInputMethod
@@ -56,6 +56,17 @@ struct ExtInputMethodInterface : public QUnknownInterface
 {
-    virtual QWSInputMethod *inputMethod() = 0;
-    virtual QPixmap *icon() = 0;
+    //identifying functions.
     virtual QString name() = 0;
-    virtual QWidget *widget( QWidget *parent, Qt::WFlags f )= 0;
+    virtual QPixmap *icon() = 0;
+
+    // state managment.
+    virtual void resetState() = 0;
+
+    virtual QWidget *keyboardWidget( QWidget *parent, Qt::WFlags f ) = 0;
+    // filenames, not menu names.
+    virtual QStringList compatible() = 0;
+
+    virtual QWSInputMethod *inputMethod() = 0;
+    virtual QWidget *statusWidget( QWidget *parent, Qt::WFlags f )= 0;
+
+    virtual void qcopReceive( const QCString &msg, const QByteArray &data )= 0;
 };
diff --git a/library/qcopenvelope_qws.cpp b/library/qcopenvelope_qws.cpp
index 81bb0f5..0aac32b 100644
--- a/library/qcopenvelope_qws.cpp
+++ b/library/qcopenvelope_qws.cpp
@@ -104,4 +104,5 @@ QCopEnvelope::~QCopEnvelope()
         if ( qcopfile.open(IO_WriteOnly | IO_Append) ) {
+#ifndef Q_OS_WIN32
             if(flock(qcopfile.handle(), LOCK_EX)) {
-                /* some error occured */
+                /* some error occurred */
                 qWarning(QString("Failed to obtain file lock on %1 (%2)")
@@ -109,48 +110,21 @@ QCopEnvelope::~QCopEnvelope()
             }
-            /* file locked, but might be stale (e.g. program for whatever
-               reason did not start).  I modified more than 1 minute ago,
-               truncate the file */
-            struct stat buf;
-            time_t t;
-            if (!fstat(qcopfile.handle(), &buf) &&  (time(&t) != (time_t)-1) ) {
-                // success on fstat, lets compare times
-                if (buf.st_ctime + 60 < t) {
-                    qWarning("stale file " + qcopfn + " found.  Truncating");
-                    ftruncate(qcopfile.handle(), 0);
-                    qcopfile.reset();
-                }
+#endif
+            {
+                QDataStream ds(&qcopfile);
+                ds << ch << msg << data;
+                qcopfile.flush();
+#ifndef Q_OS_WIN32
+                flock(qcopfile.handle(), LOCK_UN);
+#endif
+                qcopfile.close();
             }
 
-            if ( !QCopChannel::isRegistered(ch) ) {
-                int fsize = qcopfile.size();
-                {
-                    QDataStream ds(&qcopfile);
-                    ds << ch << msg << data;
-                    flock(qcopfile.handle(), LOCK_UN);
-                    qcopfile.close();
-                }
-
-                if (fsize == 0) {
-                    QString cmd = ch.mid(pref);
-                    Global::execute(cmd);
-                }
-
-                char c;
-                for (int i=0; (c=msg[i]); i++) {
-                    if ( c == ' ' ) {
-                        // Return-value required
-                        // ###### wait for it
-                        break;
-                    } else if ( c == '(' ) {
-                        // No return value
-                        break;
-                    }
-                }
-                goto end;
-            } // endif isRegisterd
-            flock(qcopfile.handle(), LOCK_UN);
-            qcopfile.close();
-            qcopfile.remove();
+            QByteArray b;
+            QDataStream stream(b, IO_WriteOnly);
+            stream << QString(ch.mid(pref));
+            QCopChannel::send("QPE/Server", "processQCop(QString)", b);
+            delete device();
+            return;
         } else {
-            qWarning(QString("Failed to obtain file lock on %1")
+            qWarning(QString("Failed to open file %1")
                         .arg(qcopfn));
@@ -162,3 +136,3 @@ QCopEnvelope::~QCopEnvelope()
       QString endpoint = ch.mid(9);
-      
+
       ch = "QPE/SOAP";
@@ -167,4 +141,4 @@ QCopEnvelope::~QCopEnvelope()
     }
+
     QCopChannel::send(ch,msg,data);
-end:
     delete device();
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index d1a7cd2..b1b7ed4 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -53,2 +53,5 @@
 #include <qmainwindow.h>
+
+#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
+#define QTOPIA_INTERNAL_INITAPP
 #include "qpeapplication.h"
@@ -307,2 +310,12 @@ private:
 
+static int& hack(int& i)
+{
+#if QT_VERSION <= 230 && defined(QT_NO_CODECS)
+    // These should be created, but aren't in Qt 2.3.0
+    (void)new QUtf8Codec;
+    (void)new QUtf16Codec;
+#endif
+    return i;
+}
+
 static int muted = 0;
@@ -488,2 +501,31 @@ static void setTreble( int t = 0, int percent = -1 )
 
+
+
+void QPEApplication::processQCopFile()
+{
+    QString qcopfn("/tmp/qcop-msg-");
+    qcopfn += d->appName; // append command name
+
+    QFile f(qcopfn);
+    if ( f.open(IO_ReadWrite) ) {
+#ifndef Q_OS_WIN32
+        flock(f.handle(), LOCK_EX);
+#endif
+        QDataStream ds(&f);
+        QCString channel, message;
+        QByteArray data;
+        while(!ds.atEnd()) {
+            ds >> channel >> message >> data;
+            d->enqueueQCop(channel,message,data);
+        }
+        ::ftruncate(f.handle(), 0);
+#ifndef Q_OS_WIN32
+        f.flush();
+        flock(f.handle(), LOCK_UN);
+#endif
+    }
+#endif
+}
+
+
 /*!
@@ -525,3 +567,3 @@ static void setTreble( int t = 0, int percent = -1 )
 QPEApplication::QPEApplication( int & argc, char **argv, Type t )
-                : QApplication( argc, argv, t )
+                : QApplication( hack(argc), argv, t ), pidChannel( 0 )
 {
@@ -553,2 +595,10 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
         connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) );
+
+
+        sysChannel = new QCopChannel( "QPE/System", this );
+        connect( sysChannel, SIGNAL( received( const QCString &, const QByteArray & ) ),
+                 this, SLOT( systemMessage( const QCString &, const QByteArray & ) ) );
+
+/* COde now in initapp */
+#if 0
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
@@ -563,5 +613,3 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
 
-        sysChannel = new QCopChannel( "QPE/System", this );
-        connect( sysChannel, SIGNAL( received( const QCString &, const QByteArray & ) ),
-                 this, SLOT( systemMessage( const QCString &, const QByteArray & ) ) );
+
 
@@ -610,3 +658,5 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
 #endif
-
+#else
+        initApp( argc, argv );
+#endif
         //  qwsSetDecoration( new QPEDecoration() );
@@ -627,9 +677,8 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
 
-                if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
-                        QFont fn = FontManager::unicodeFont( FontManager::Proportional );
-                        setFont( fn );
-                }
+                if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
+                    QFont fn = FontManager::unicodeFont( FontManager::Proportional );
+                    setFont( fn );
+                }
 #endif
-
-        }
+        }
 #endif
@@ -652,2 +701,47 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
 
+
+#ifdef QTOPIA_INTERNAL_INITAPP
+void QPEApplication::initApp( int argc, char **argv )
+{
+    delete pidChannel;
+    d->keep_running = TRUE;
+    d->preloaded = FALSE;
+    d->forceshow = FALSE;
+
+    QCString channel = QCString(argv[0]);
+
+    channel.replace(QRegExp(".*/"),"");
+    d->appName = channel;
+
+    qt_fbdpy->setIdentity( channel ); // In Qt/E 2.3.6
+
+    channel = "QPE/Application/" + channel;
+    pidChannel = new QCopChannel( channel, this);
+    connect( pidChannel, SIGNAL(received(const QCString &, const QByteArray &)),
+            this, SLOT(pidMessage(const QCString &, const QByteArray &)));
+
+    processQCopFile();
+    d->keep_running = d->qcopq.isEmpty();
+
+    for (int a=0; a<argc; a++) {
+        if ( qstrcmp(argv[a],"-preload")==0 ) {
+            argv[a] = argv[a+1];
+            a++;
+            d->preloaded = TRUE;
+            argc-=1;
+        } else if ( qstrcmp(argv[a],"-preload-show")==0 ) {
+            argv[a] = argv[a+1];
+            a++;
+            d->preloaded = TRUE;
+            d->forceshow = TRUE;
+            argc-=1;
+        }
+    }
+
+    /* overide stored arguments */
+    setArgs(argc, argv);
+}
+#endif
+
+
 static QPtrDict<void>* inputMethodDict = 0;
@@ -1126,16 +1220,2 @@ void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data
         }
-        else if ( msg == "execute(QString)" ) {
-                if ( type() == GuiServer ) {
-                        QString t;
-                        stream >> t;
-                        Global::execute( t );
-                }
-        }
-        else if ( msg == "execute(QString,QString)" ) {
-                if ( type() == GuiServer ) {
-                        QString t, d;
-                        stream >> t >> d;
-                        Global::execute( t, d );
-                }
-        }
         else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) {
@@ -1210,4 +1290,18 @@ void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data
                 setTreble();
+        } else if ( msg == "getMarkedText()" ) {
+        if ( type() == GuiServer ) {
+            const ushort unicode = 'C'-'@';
+            const int scan = Key_C;
+            qwsServer->processKeyEvent( unicode, scan, ControlButton, TRUE, FALSE );
+            qwsServer->processKeyEvent( unicode, scan, ControlButton, FALSE, FALSE );
+        }
+    } else if ( msg == "newChannel(QString)") {
+        QString myChannel = "QPE/Application/" + d->appName;
+        QString channel;
+        stream >> channel;
+        if (channel == myChannel) {
+            processQCopFile();
+            d->sendQCopQ();
         }
-
+    }
 
@@ -1308,3 +1402,7 @@ void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data)
                         Global::setDocument( mw, doc );
-        } else {
+        } else if ( msg == "QPEProcessQCop()" ) {
+            processQCopFile();
+            d->sendQCopQ();
+        }
+        {
             bool p = d->keep_running;
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 65a6d33..770ea23 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -84,2 +84,6 @@ public:
     static int execDialog( QDialog*, bool nomax=FALSE );
+    /* Merge setTempScreenSaverMode */
+#ifdef QTOPIA_INTERNAL_INITAPP
+    void initApp( int argv, char **argv );
+#endif
 
@@ -103,2 +107,3 @@ signals:
     void reload();
+    /* linkChanged signal */
 
@@ -128,2 +133,3 @@ private:
     void mapToDefaultAction( QWSKeyEvent *ke, int defKey );
+    void processQCopFile();