-instead of defining for an board we define now what this

 boards need
 QPE_NEED_CALIBRATE

-launcher is the only one executin application
-allow processing of QCOPfiles after start ( qpeapplication )
-qcopenvelope no longer calls Global::execute

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
@@ -1,20 +1,21 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** 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
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+#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
@@ -1,44 +1,45 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** 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
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+#define QPE_NEED_CALIBRATION
 #define QPE_HAVE_TOGGLELIGHT
 #define QPE_STARTMENU
 
 #include <unistd.h>
 #include <stdio.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
 #define QPE_HAVE_MEMALERTER
 
 #define QPE_MEMALERTER_IMPL \
 static void sig_handler(int sig) \
 { \
     switch (sig) { \
     case SIGHUP: \
   memstate = VeryLow; \
   break; \
     case SIGUSR1: \
   memstate = Normal; \
   break; \
     case SIGUSR2: \
   memstate = Low; \
   break; \
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
@@ -1,44 +1,45 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** 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
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+#define QPE_NEED_CALIBRATION
 #define QPE_OWNAPM
 #define QPE_HAVE_TOGGLELIGHT
 #define QPE_NOCIBAUD
 #define QPE_STARTMENU
 #include <asm/sharp_apm.h>
 #ifndef APM_IOC_BATTERY_BACK_CHK
 #define APM_IOC_BATTERY_BACK_CHK       _IO(APM_IOC_MAGIC, 32)
 #endif
 #ifndef APM_IOC_BATTERY_MAIN_CHK
 #define APM_IOC_BATTERY_MAIN_CHK       _IO(APM_IOC_MAGIC, 33)
 #endif
 
 #include <unistd.h>
 #include <stdio.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
 
 #include <sys/ioctl.h>
 #include <asm/sharp_char.h>
 
 #define QPE_HAVE_MEMALERTER
 
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
@@ -655,104 +655,59 @@ void Global::invoke(const QString &c)
 
                     break; // success
                 }
                 ::close ( pfd [0] );
             }
         }
         if ( success )
             StartingAppList::add( list[0] );
         else
             QMessageBox::warning( 0, "Error", "Could not start the application " + c, "Ok", 0, 0, 0, 1 );
     }
 #endif //QT_NO_QWS_MULTIPROCESS
 }
 
 
 /*!
   Executes the application identfied by \a c, passing \a
   document if it isn't null.
 
   Note that a better approach might be to send a QCop message to the
   application's QPE/Application/\e{appname} channel.
 */
 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;
 }
 
 /*!
   Returns the string \a s with the characters '\', '"', and '$' quoted
   by a preceeding '\'.
 
   \sa stringQuote()
 */
 QString Global::shellQuote(const QString& s)
 {
     QString r="\"";
     for (int i=0; i<(int)s.length(); i++) {
 	char c = s[i].latin1();
 	switch (c) {
 	    case '\\': case '"': case '$':
 		r+="\\";
 	}
 	r += s[i];
     }
     r += "\"";
     return r;
 }
 
 /*!
diff --git a/library/inputmethodinterface.h b/library/inputmethodinterface.h
index 88a121d..488f601 100644
--- a/library/inputmethodinterface.h
+++ b/library/inputmethodinterface.h
@@ -26,39 +26,50 @@
 #include <qnamespace.h>
 #include <qstring.h>
 
 #ifndef QT_NO_COMPONENT
 // {637A8A14-AF98-41DA-969A-2BD16ECDA8C7}
 # ifndef IID_InputMethod
 #  define IID_InputMethod QUuid( 0x637a8a14, 0xaf98, 0x41da, 0x96, 0x9a, 0x2b, 0xd1, 0x6e, 0xcd, 0xa8, 0xc7)
 # endif
 #endif
 
 class QWidget;
 class QPixmap;
 class QObject;
 class QWSInputMethod;
 
 struct InputMethodInterface : public QUnknownInterface
 {
     virtual QWidget *inputMethod( QWidget *parent, Qt::WFlags f ) = 0;
     virtual void resetState() = 0;
     virtual QPixmap *icon() = 0;
     virtual QString name() = 0;
     virtual void onKeyPress( QObject *receiver, const char *slot ) = 0;
 };
 
-// {70F0991C-8282-4625-A279-BD9D7D959FF6} 
+// {70F0991C-8282-4625-A279-BD9D7D959FF6}
 #ifndef IID_ExtInputMethod
 #define IID_ExtInputMethod QUuid( 0x70f0991c, 0x8282, 0x4625, 0xa2, 0x79, 0xbd, 0x9d, 0x7d, 0x95, 0x9f, 0xf6)
 #endif
 
 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;
 };
 
 
 #endif
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
@@ -81,93 +81,67 @@
   Constructs a QCopEnvelope that will write \a message to \a channel.
   If \a message has parameters, you must then use operator<<() to
   add these parameters to the envelope.
 */
 QCopEnvelope::QCopEnvelope( const QCString& channel, const QCString& message ) :
     QDataStream(new QBuffer),
     ch(channel), msg(message)
 {
     device()->open(IO_WriteOnly);
 }
 
 /*!
   Writes the message and then destroys the QCopEnvelope.
 */
 QCopEnvelope::~QCopEnvelope()
 {
     QByteArray data = ((QBuffer*)device())->buffer();
     const int pref=16;
     if ( qstrncmp(ch.data(),"QPE/Application/",pref)==0 ) {
 	QString qcopfn("/tmp/qcop-msg-");
 	qcopfn += ch.mid(pref);
 	QFile qcopfile(qcopfn);
 
 	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)")
 			.arg(qcopfn).arg( errno ));
 	    }
-	    /* 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));
 	} // endif open
     }
     else if (qstrncmp(ch.data(), "QPE/SOAP/", 9) == 0) {
       // If this is a message that should go along the SOAP channel, we move the
       // endpoint URL to the data section.
       QString endpoint = ch.mid(9);
-      
+
       ch = "QPE/SOAP";
       // Since byte arrays are explicitly shared, this is appended to the data variable..
       *this << endpoint;
     }
+
     QCopChannel::send(ch,msg,data);
-end:
     delete device();
 }
 
 #endif
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index d1a7cd2..b1b7ed4 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -30,48 +30,51 @@
 #define private public
 #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>
+
+#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
@@ -284,48 +287,58 @@ public:
 		const QMimeSource * r = QMimeSourceFactory::data( abs_name );
 		if ( !r ) {
 			int sl = abs_name.length();
 			do {
 				sl = abs_name.findRev( '/', sl - 1 );
 				QString name = sl >= 0 ? abs_name.mid( sl + 1 ) : abs_name;
 				int dot = name.findRev( '.' );
 				if ( dot >= 0 )
 					name = name.left( dot );
 				QImage img = Resource::loadImage( name );
 				if ( !img.isNull() ) {
                                     delete resImage;
                                     resImage = new QImageDrag( img );
                                     r = resImage;
                                 }
 			}
 			while ( !r && sl > 0 );
 		}
 		return r;
 	}
 private:
     mutable QImageDrag *resImage;
 };
 
+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;
 static int micMuted = 0;
 
 static void setVolume( int t = 0, int percent = -1 )
 {
 	switch ( t ) {
 		case 0: {
 				Config cfg( "qpe" );
 				cfg.setGroup( "Volume" );
 				if ( percent < 0 )
 					percent = cfg.readNumEntry( "VolumePercent", 50 );
 				int fd = 0;
 				if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
 					int vol = muted ? 0 : percent;
 					// set both channels to same volume
 					vol |= vol << 8;
 					ioctl( fd, MIXER_WRITE( 0 ), &vol );
 					::close( fd );
 				}
 			}
 			break;
 	}
 }
 
@@ -465,212 +478,293 @@ static void setTreble( int t = 0, int percent = -1 )
 
     This signal is emitted if the week start day is changed. If \a
     startOnMonday is TRUE then the first day of the week is Monday; if
     \a startOnMonday is FALSE then the first day of the week is
     Sunday.
 */
 
 /*!
     \fn void QPEApplication::dateFormatChanged(DateFormat)
 
     This signal is emitted whenever the date format is changed.
 */
 
 /*!
     \fn void QPEApplication::flush()
 
     ###
 */
 
 /*!
   \fn void QPEApplication::reload()
 
 */
 
+
+
+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
+}
+
+
 /*!
   \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data )
 
   This signal is emitted when a message is received on this
   application's QPE/Application/<i>appname</i> \link qcop.html
   QCop\endlink channel.
 
   The slot to which you connect this signal uses \a msg and \a data
   in the following way:
 
 \code
      void MyWidget::receive( const QCString& msg, const QByteArray& data )
      {
        QDataStream stream( data, IO_ReadOnly );
        if ( msg == "someMessage(int,int,int)" ) {
             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( argc, argv, t )
+		: QApplication( hack(argc), argv, t ), pidChannel( 0 )
 {
 	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 );
 
 	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)
 
 	QString qcopfn( "/tmp/qcop-msg-" );
 	qcopfn += QString( argv[ 0 ] ); // append command name
 
 	QFile f( qcopfn );
 	if ( f.open( IO_ReadOnly ) ) {
 		flock( f.handle(), LOCK_EX );
 	}
 
-	sysChannel = new QCopChannel( "QPE/System", this );
-	connect( sysChannel, SIGNAL( received( const QCString &, const QByteArray & ) ),
-	         this, SLOT( systemMessage( const QCString &, const QByteArray & ) ) );
+
 
 	QCString channel = QCString( argv[ 0 ] );
 	channel.replace( QRegExp( ".*/" ), "" );
 	d->appName = channel;
 	channel = "QPE/Application/" + channel;
 	pidChannel = new QCopChannel( channel, this );
 	connect( pidChannel, SIGNAL( received( const QCString &, const QByteArray & ) ),
 	         this, SLOT( pidMessage( const QCString &, const QByteArray & ) ) );
 
 	if ( f.isOpen() ) {
 		d->keep_running = FALSE;
 		QDataStream ds( &f );
 		QCString channel, message;
 		QByteArray data;
 		while ( !ds.atEnd() ) {
 			ds >> channel >> message >> data;
 			d->enqueueQCop( channel, message, data );
 		}
 
 		flock( f.handle(), LOCK_UN );
 		f.close();
 		f.remove();
 	}
 
 	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
-
+#else
+        initApp( argc, argv );
+#endif
 	//  qwsSetDecoration( new QPEDecoration() );
 
 #ifndef QT_NO_TRANSLATION
 
 	QStringList langs = Global::languageList();
 	for ( QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) {
 		QString lang = *it;
 
                 installTranslation( lang + "/libopie.qm");
 		installTranslation( lang + "/libqpe.qm" );
 		installTranslation( lang + "/" + d->appName + ".qm" );
 
 
 		//###language/font hack; should look it up somewhere
 #ifdef QWS
 
-		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
 
 	applyStyle();
 
 	if ( type() == GuiServer ) {
 		setVolume();
 	}
 
 	installEventFilter( this );
 
 	QPEMenuToolFocusManager::initialize();
 
 #ifdef QT_NO_QWS_CURSOR
 	// if we have no cursor, probably don't want tooltips
 	QToolTip::setEnabled( FALSE );
 #endif
 }
 
+
+#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;
 static void createInputMethodDict()
 {
 	if ( !inputMethodDict )
 		inputMethodDict = new QPtrDict<void>;
 }
 
 /*!
   Returns the currently set hint to the system as to whether
   widget \a w has any use for text input methods.
 
 
   \sa setInputMethodHint() InputMethodHint
 */
 QPEApplication::InputMethodHint QPEApplication::inputMethodHint( QWidget * w )
 {
 	if ( inputMethodDict && w )
 		return ( InputMethodHint ) ( int ) inputMethodDict->find( w );
 	return Normal;
 }
 
 /*!
   \enum QPEApplication::InputMethodHint
 
@@ -1103,62 +1197,48 @@ void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data
 	else if ( msg == "language(QString)" ) {
 		if ( type() == GuiServer ) {
 			QString l;
 			stream >> l;
 			QString cl = getenv( "LANG" );
 			if ( cl != l ) {
 				if ( l.isNull() )
 					unsetenv( "LANG" );
 				else
 					setenv( "LANG", l.latin1(), 1 );
 				restart();
 			}
 		}
 	}
 	else if ( msg == "timeChange(QString)" ) {
 		QString t;
 		stream >> t;
 		if ( t.isNull() )
 			unsetenv( "TZ" );
 		else
 			setenv( "TZ", t.latin1(), 1 );
 		// emit the signal so everyone else knows...
 		emit timeChanged();
 	}
-	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)" ) {
 		if ( type() == GuiServer ) {
 			QDateTime when;
 			QCString channel, message;
 			int data;
 			stream >> when >> channel >> message >> data;
 			AlarmServer::addAlarm( when, channel, message, data );
 		}
 	}
 	else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) {
 		if ( type() == GuiServer ) {
 			QDateTime when;
 			QCString channel, message;
 			int data;
 			stream >> when >> channel >> message >> data;
 			AlarmServer::deleteAlarm( when, channel, message, data );
 		}
 	}
 	else if ( msg == "clockChange(bool)" ) {
 		int tmp;
 		stream >> tmp;
 		emit clockChanged( tmp );
 	}
 	else if ( msg == "weekChange(bool)" ) {
@@ -1187,50 +1267,64 @@ void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data
 		stream >> t >> v;
 		setMic( t, v );
 		emit micChanged( micMuted );
 	}
 	else if ( msg == "micChange(bool)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
 		stream >> micMuted;
 		setMic();
 		emit micChanged( micMuted );
 	}
 	else if ( msg == "setBass(int,int)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
 		int t, v;
 		stream >> t >> v;
 		setBass( t, v );
 	}
 	else if ( msg == "bassChange(bool)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
 	        setBass();
 	}
     	else if ( msg == "setTreble(int,int)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
 		int t, v;
 		stream >> t >> v;
 		setTreble( t, v );
 	}
 	else if ( msg == "trebleChange(bool)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
 	        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();
 	}
-
+    }
 
 
 #endif
 }
 
 /*!
   \internal
 */
 bool QPEApplication::raiseAppropriateWindow()
 {
 	bool r = FALSE;
 	// ########## raise()ing main window should raise and set active
 	// ########## it and then all childen. This belongs in Qt/Embedded
 	QWidget *top = d->qpe_main_widget;
 	if ( !top )
 		top = mainWidget();
 	if ( top && d->keep_running ) {
 		if ( top->isVisible() )
 			r = TRUE;
 		else if (d->preloaded) {
 			// We are preloaded and not visible.. pretend we just started..
 			QCopEnvelope e("QPE/System", "fastAppShowing(QString)");
 			e << d->appName;
 		}
@@ -1285,49 +1379,53 @@ void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data)
 		raiseAppropriateWindow();
 		// Tell the system we're still chugging along...
 		QCopEnvelope e("QPE/System", "appRaised(QString)");
 		e << d->appName;
 	}
 	else if ( msg == "flush()" ) {
 		emit flush();
 		// we need to tell the desktop
 		QCopEnvelope e( "QPE/Desktop", "flushDone(QString)" );
 		e << d->appName;
 	}
 	else if ( msg == "reload()" ) {
 		emit reload();
 	}
 	else if ( msg == "setDocument(QString)" ) {
 		d->keep_running = TRUE;
 		QDataStream stream( data, IO_ReadOnly );
 		QString doc;
 		stream >> doc;
 		QWidget *mw = mainWidget();
 		if ( !mw )
 			mw = d->qpe_main_widget;
 		if ( mw )
 			Global::setDocument( mw, doc );
-	} else {
+	} else if ( msg == "QPEProcessQCop()" ) {
+            processQCopFile();
+            d->sendQCopQ();
+        }
+        {
             bool p = d->keep_running;
             d->keep_running = FALSE;
             emit appMessage( msg, data);
             if ( d->keep_running ) {
                 d->notbusysent = FALSE;
                 raiseAppropriateWindow();
                 if ( !p ) {
                     // Tell the system we're still chugging along...
 #ifndef QT_NO_COP
                     QCopEnvelope e("QPE/System", "appRaised(QString)");
                     e << d->appName;
 #endif
                 }
             }
             if ( p )
                 d->keep_running = p;
 	}
 #endif
 }
 
 
 /*!
   Sets widget \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 65a6d33..770ea23 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -61,92 +61,98 @@ public:
     };
     static void setStylusOperation( QWidget*, StylusMode );
     static StylusMode stylusOperation( QWidget* );
 
     enum InputMethodHint {
         Normal,
         AlwaysOff,
         AlwaysOn
     };
 
     enum screenSaverHint {
         Disable = 0,
         DisableLightOff = 1,
         DisableSuspend = 2,
         Enable = 100
     };
 
     static void setInputMethodHint( QWidget *, InputMethodHint );
     static InputMethodHint inputMethodHint( QWidget * );
 
     void showMainWidget( QWidget*, bool nomax=FALSE );
     void showMainDocumentWidget( QWidget*, bool nomax=FALSE );
     static void showDialog( QDialog*, bool nomax=FALSE );
     static int execDialog( QDialog*, bool nomax=FALSE );
+    /* Merge setTempScreenSaverMode */
+#ifdef QTOPIA_INTERNAL_INITAPP
+    void initApp( int argv, char **argv );
+#endif
 
     static void setKeepRunning();
     bool keepRunning() const;
 
     bool keyboardGrabbed() const;
 
     int exec();
 
 signals:
     void clientMoused();
     void timeChanged();
     void clockChanged( bool pm );
     void micChanged( bool muted );
     void volumeChanged( bool muted );
     void appMessage( const QCString& msg, const QByteArray& data);
     void weekChanged( bool startOnMonday );
     void dateFormatChanged( DateFormat );
     void flush();
     void reload();
+    /* linkChanged signal */
 
 private slots:
     void systemMessage( const QCString &msg, const QByteArray &data );
     void pidMessage( const QCString &msg, const QByteArray &data );
     void removeSenderFromStylusDict();
     void hideOrQuit();
 
 protected:
     bool qwsEventFilter( QWSEvent * );
     void internalSetStyle( const QString &style );
     void prepareForTermination(bool willrestart);
     virtual void restart();
     virtual void shutdown();
     bool eventFilter( QObject *, QEvent * );
     void timerEvent( QTimerEvent * );
     bool raiseAppropriateWindow();
     virtual void tryQuit();
 #if QT_VERSION > 233
     virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!)
 #endif
 private:
 #ifndef QT_NO_TRANSLATION
     void installTranslation( const QString& baseName );
 #endif
     void mapToDefaultAction( QWSKeyEvent *ke, int defKey );
+    void processQCopFile();
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QCopChannel *sysChannel;
     QCopChannel *pidChannel;
 #endif
     QPEApplicationData *d;
 
     bool reserved_sh;
 
 
 
 };
 
 inline void QPEApplication::showDialog( QDialog* d, bool nomax )
 {
     QSize sh = d->sizeHint();
     int w = QMAX(sh.width(),d->width());
     int h = QMAX(sh.height(),d->height());
     if ( !nomax
             && ( w > qApp->desktop()->width()*3/4
                  || h > qApp->desktop()->height()*3/4 ) )
     {
         d->showMaximized();
     } else {