remove embeddedkonsole hack

1 files changed, 1 insertions, 4 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 10c6c40..c875ff2 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -745,771 +745,768 @@ void QPEApplication::processQCopFile()
 
   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( 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 );
 	}
 #if defined(OPIE_HIGH_RES_SMALL_PHY)
 	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 );
 	}
 
 
 
 	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
 
 	d->langs = Global::languageList();
 	for ( QStringList::ConstIterator it = d->langs.begin(); it != d->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 );
                 }
 #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;
 
     #if QT_VERSION > 235
     qt_fbdpy->setIdentity( channel ); // In Qt/E 2.3.6
     #endif
 
     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);
 
     /* install translation here */
     for ( QStringList::ConstIterator it = d->langs.begin(); it != d->langs.end(); ++it )
         installTranslation( (*it) + "/" + d->appName + ".qm" );
 }
 #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
 
   \value Normal the application sometimes needs text input (the default).
   \value AlwaysOff the application never needs text input.
   \value AlwaysOn the application always needs text input.
 */
 
 /*!
   Hints to the system that widget \a w has use for text input methods
   as specified by \a mode.
 
   \sa inputMethodHint() InputMethodHint
 */
 void QPEApplication::setInputMethodHint( QWidget * w, InputMethodHint mode )
 {
 	createInputMethodDict();
 	if ( mode == Normal ) {
 		inputMethodDict->remove
 		( w );
 	}
 	else {
 		inputMethodDict->insert( w, ( void* ) mode );
 	}
 }
 
 class HackDialog : public QDialog
 {
 public:
 	void acceptIt()
 	{
 		accept();
 	}
 	void rejectIt()
 	{
 		reject();
 	}
 };
 
 
 void QPEApplication::mapToDefaultAction( QWSKeyEvent * ke, int key )
 {
 	// specialised actions for certain widgets. May want to
 	// add more stuff here.
 	if ( activePopupWidget() && activePopupWidget() ->inherits( "QListBox" )
 	        && activePopupWidget() ->parentWidget()
 	        && activePopupWidget() ->parentWidget() ->inherits( "QComboBox" ) )
 		key = Qt::Key_Return;
 
 	if ( activePopupWidget() && activePopupWidget() ->inherits( "QPopupMenu" ) )
 		key = Qt::Key_Return;
 
 #ifdef QWS
 
 	ke->simpleData.keycode = key;
 #endif
 }
 
 // class HackWidget : public QWidget
 // {
 // public:
 // 	bool needsOk()
 // 	{
 // 		return ( getWState() & WState_Reserved1 );
 // 	}
 // };
 
 /*!
   \internal
 */
 
 #ifdef QWS
 bool QPEApplication::qwsEventFilter( QWSEvent * e )
 {
 	if ( !d->notbusysent && e->type == QWSEvent::Focus ) {
 		if ( qApp->type() != QApplication::GuiServer ) {
 			QCopEnvelope e( "QPE/System", "notBusy(QString)" );
 			e << d->appName;
 		}
 		d->notbusysent = TRUE;
 	}
 	if ( type() == GuiServer ) {
 		switch ( e->type ) {
 			case QWSEvent::Mouse:
 				if ( e->asMouse() ->simpleData.state && !QWidget::find( e->window() ) )
 					emit clientMoused();
 				break;
 			default:
 				break;
 		}
 	}
 	if ( e->type == QWSEvent::Key ) {
 		QWSKeyEvent *ke = ( QWSKeyEvent * ) e;
 		if ( ke->simpleData.keycode == Qt::Key_F33 ) {
 			// Use special "OK" key to press "OK" on top level widgets
 			QWidget * active = activeWindow();
 			QWidget *popup = 0;
 			if ( active && active->isPopup() ) {
 				popup = active;
 				active = active->parentWidget();
 			}
 			if ( active && ( int ) active->winId() == ke->simpleData.window &&
 			        !active->testWFlags( WStyle_Customize | WType_Popup | WType_Desktop ) ) {
 				if ( ke->simpleData.is_press ) {
 					if ( popup )
 						popup->close();
 					if ( active->inherits( "QDialog" ) ) {
 						HackDialog * d = ( HackDialog * ) active;
 						d->acceptIt();
 						return TRUE;
 					}
 					else if ( ( ( HackWidget * ) active ) ->needsOk() ) {
 						QSignal s;
 						s.connect( active, SLOT( accept() ) );
 						s.activate();
 					}
 					else {
 						// do the same as with the select key: Map to the default action of the widget:
 						mapToDefaultAction( ke, Qt::Key_Return );
 					}
 				}
 			}
 		}
 		else if ( ke->simpleData.keycode == Qt::Key_F30 ) {
 			// Use special "select" key to do whatever default action a widget has
 			mapToDefaultAction( ke, Qt::Key_Space );
 		}
 		else if ( ke->simpleData.keycode == Qt::Key_Escape &&
 		          ke->simpleData.is_press ) {
 			// Escape key closes app if focus on toplevel
 			QWidget * active = activeWindow();
 			if ( active && active->testWFlags( WType_TopLevel ) &&
 			        ( int ) active->winId() == ke->simpleData.window &&
 			        !active->testWFlags( WStyle_Dialog | WStyle_Customize | WType_Popup | WType_Desktop ) ) {
 				if ( active->inherits( "QDialog" ) ) {
 					HackDialog * d = ( HackDialog * ) active;
 					d->rejectIt();
 					return TRUE;
 				}
-				else if ( strcmp( argv() [ 0 ], "embeddedkonsole" ) != 0 ) {
-					active->close();
-				}
 			}
 		}
 		else if ( ke->simpleData.keycode >= Qt::Key_F1 && ke->simpleData.keycode <= Qt::Key_F29 ) {
 			// this should be if ( ODevice::inst ( )-> buttonForKeycode ( ... ))
 			// but we cannot access libopie function within libqpe :(
 
 			QWidget * active = activeWindow ( );
 			if ( active && ((int) active-> winId ( ) == ke-> simpleData.window )) {
 				if ( d-> kbgrabbed ) { // we grabbed the keyboard
 					QChar ch ( ke-> simpleData.unicode );
 					QKeyEvent qke ( ke-> simpleData. is_press ? QEvent::KeyPress : QEvent::KeyRelease,
 					                ke-> simpleData.keycode,
 					                ch. latin1 ( ),
 					                ke-> simpleData.modifiers,
 					                QString ( ch ),
 					                ke-> simpleData.is_auto_repeat, 1 );
 
 					QObject *which = QWidget::keyboardGrabber ( );
 					if ( !which )
 						which = QApplication::focusWidget ( );
 					if ( !which )
 						which = QApplication::activeWindow ( );
 					if ( !which )
 						which = qApp;
 
 					QApplication::sendEvent ( which, &qke );
 				}
 				else { // we didn't grab the keyboard, so send the event to the launcher
 					QCopEnvelope e ( "QPE/Launcher", "deviceButton(int,int,int)" );
 					e << int( ke-> simpleData.keycode ) << int( ke-> simpleData. is_press ) << int( ke-> simpleData.is_auto_repeat );
 				}
 			}
 			return true;
 		}
 	}
 	if ( e->type == QWSEvent::Focus ) {
 		QWSFocusEvent * fe = ( QWSFocusEvent* ) e;
 		if ( !fe->simpleData.get_focus ) {
 			QWidget * active = activeWindow();
 			while ( active && active->isPopup() ) {
 				active->close();
 				active = activeWindow();
 			}
 		}
 		else {
 			// make sure our modal widget is ALWAYS on top
 			QWidget *topm = activeModalWidget();
 			if ( topm && static_cast<int>( topm->winId() ) != fe->simpleData.window) {
 				topm->raise();
 			}
 		}
 		if ( fe->simpleData.get_focus && inputMethodDict ) {
 			InputMethodHint m = inputMethodHint( QWidget::find( e->window() ) );
 			if ( m == AlwaysOff )
 				Global::hideInputMethod();
 			if ( m == AlwaysOn )
 				Global::showInputMethod();
 		}
 	}
 
 
 	return QApplication::qwsEventFilter( e );
 }
 #endif
 
 /*!
   Destroys the QPEApplication.
 */
 QPEApplication::~QPEApplication()
 {
 	ungrabKeyboard();
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 	// Need to delete QCopChannels early, since the display will
 	// be gone by the time we get to ~QObject().
 	delete sysChannel;
 	delete pidChannel;
 #endif
 
 	delete d;
 }
 
 /*!
   Returns <tt>$OPIEDIR/</tt>.
 */
 QString QPEApplication::qpeDir()
 {
 	const char * base = getenv( "OPIEDIR" );
 	if ( base )
 		return QString( base ) + "/";
 
 	return QString( "../" );
 }
 
 /*!
   Returns the user's current Document directory. There is a trailing "/".
   .. well, it does now,, and there's no trailing '/'
 */
 QString QPEApplication::documentDir()
 {
 	const char* base = getenv( "HOME");
 	if ( base )
 		return QString( base ) + "/Documents";
 
 	return QString( "../Documents" );
 }
 
 static int deforient = -1;
 
 /*!
   \internal
 */
 int QPEApplication::defaultRotation()
 {
 	if ( deforient < 0 ) {
 		QString d = getenv( "QWS_DISPLAY" );
 		if ( d.contains( "Rot90" ) ) {
 			deforient = 90;
 		}
 		else if ( d.contains( "Rot180" ) ) {
 			deforient = 180;
 		}
 		else if ( d.contains( "Rot270" ) ) {
 			deforient = 270;
 		}
 		else {
 			deforient = 0;
 		}
 	}
 	return deforient;
 }
 
 /*!
   \internal
 */
 void QPEApplication::setDefaultRotation( int r )
 {
 	if ( qApp->type() == GuiServer ) {
 		deforient = r;
 		setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 );
 		Config config("qpe");
 		config.setGroup( "Rotation" );
 		config.writeEntry( "Rot", r );
 	}
 	else {
 #ifndef QT_NO_COP
 		{ QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" );
 			e << r;
 		}
 #endif
 
 	}
 }
 
 #include <qgfx_qws.h>
 #include <qwindowsystem_qws.h>
 
 extern void qws_clearLoadedFonts();
 
 void QPEApplication::setCurrentMode( int x, int y, int depth )
 {
     // Reset the caches
     qws_clearLoadedFonts();
     QPixmapCache::clear();
 
     // Change the screen mode
     qt_screen->setMode(x, y, depth);
 
     if ( qApp->type() == GuiServer ) {
         // Reconfigure the GuiServer
         qwsServer->beginDisplayReconfigure();
         qwsServer->endDisplayReconfigure();
 
         // Get all the running apps to reset
         QCopEnvelope env( "QPE/System", "reset()" );
     }
 }
 
 void QPEApplication::reset() {
     // Reconnect to the screen
     qt_screen->disconnect();
     qt_screen->connect( QString::null );
 
     // Redraw everything
     applyStyle();
 }
 
 /*!
   \internal
 */
 void QPEApplication::applyStyle()
 {
 	Config config( "qpe" );
 	config.setGroup( "Appearance" );
 
 #if QT_VERSION > 233
 #if !defined(OPIE_NO_OVERRIDE_QT)
 	// don't block ourselves ...
 	Opie::force_appearance = 0;
 
 	static QString appname = Opie::binaryName ( );
 
 	QStringList ex = config. readListEntry ( "NoStyle", ';' );
 	int nostyle = 0;
 	for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) {
 		if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) {
 			nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 );
 			break;
 		}
 	}
 #else
         int nostyle = 0;
 #endif
 
 	// Widget style
 	QString style = config.readEntry( "Style", "FlatStyle" );
 
 	// don't set a custom style
 	if ( nostyle & Opie::Force_Style )
 		style = "FlatStyle";
 
 	internalSetStyle ( style );
 
 	// Colors - from /etc/colors/Liquid.scheme
 	QColor bgcolor( config.readEntry( "Background", "#E0E0E0" ) );
 	QColor btncolor( config.readEntry( "Button", "#96c8fa" ) );
 	QPalette pal( btncolor, bgcolor );
 	QString color = config.readEntry( "Highlight", "#73adef" );
 	pal.setColor( QColorGroup::Highlight, QColor( color ) );
 	color = config.readEntry( "HighlightedText", "#FFFFFF" );
 	pal.setColor( QColorGroup::HighlightedText, QColor( color ) );
 	color = config.readEntry( "Text", "#000000" );
 	pal.setColor( QColorGroup::Text, QColor( color ) );
 	color = config.readEntry( "ButtonText", "#000000" );
 	pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor( color ) );
 	color = config.readEntry( "Base", "#FFFFFF" );
 	pal.setColor( QColorGroup::Base, QColor( color ) );
 
 	pal.setColor( QPalette::Disabled, QColorGroup::Text,
 	              pal.color( QPalette::Active, QColorGroup::Background ).dark() );
 
 	setPalette( pal, TRUE );
 
 	// Window Decoration
 	QString dec = config.readEntry( "Decoration", "Flat" );
 
 	// don't set a custom deco
 	if ( nostyle & Opie::Force_Decoration )
 		dec = "";
 
 	//qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle);
 
 	if ( dec != d->decorationName ) {
 		qwsSetDecoration( new QPEDecoration( dec ) );
 		d->decorationName = dec;
 	}
 
 	// Font
 	QString ff = config.readEntry( "FontFamily", font().family() );
 	int fs = config.readNumEntry( "FontSize", font().pointSize() );
 
 	// don't set a custom font
 	if ( nostyle & Opie::Force_Font ) {
 		ff = "Vera";
 		fs = 10;
 	}
 
 	setFont ( QFont ( ff, fs ), true );
 
 #if !defined(OPIE_NO_OVERRIDE_QT)
 	// revert to global blocking policy ...
 	Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None;
 	Opie::force_appearance &= ~nostyle;
 #endif
 #endif
 }
 
 void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data )
 {
 #ifdef Q_WS_QWS
 	QDataStream stream( data, IO_ReadOnly );
 	if ( msg == "applyStyle()" ) {
 		applyStyle();
 	}
 	else if ( msg == "toggleApplicationMenu()" ) {
 		QWidget *active = activeWindow ( );
 
 		if ( active ) {
 			QPEMenuToolFocusManager *man = QPEMenuToolFocusManager::manager ( );
 			bool oldactive = man-> isActive ( );
 
 			man-> setActive( !man-> isActive() );
 
 			if ( !oldactive && !man-> isActive ( )) { // no menubar to toggle -> try O-Menu
 				QCopEnvelope e ( "QPE/TaskBar", "toggleStartMenu()" );
 			}
 		}
 	}
 	else if ( msg == "setDefaultRotation(int)" ) {
 		if ( type() == GuiServer ) {
 			int r;
 			stream >> r;
 			setDefaultRotation( r );
 		}
 	}
 	else if ( msg == "setCurrentMode(int,int,int)" ) { // Added: 2003-06-11 by Tim Ansell <mithro@mithis.net>
             if ( type() == GuiServer ) {
 		int x, y, depth;
 		stream >> x;
 		stream >> y;
 		stream >> depth;
 		setCurrentMode( x, y, depth );
             }
  	}
 	else if ( msg == "reset()" ) {
             if ( type() != GuiServer )
                 reset();
 	}
 	else if ( msg == "setCurrentRotation(int)" ) {
 		int r;
 		stream >> r;
 		setCurrentRotation( r );
  	}
 	else if ( msg == "shutdown()" ) {
 		if ( type() == GuiServer )
 			shutdown();
 	}
 	else if ( msg == "quit()" ) {
 		if ( type() != GuiServer )
 			tryQuit();
 	}
 	else if ( msg == "forceQuit()" ) {
 		if ( type() != GuiServer )
 			quit();
 	}
 	else if ( msg == "restart()" ) {
 		if ( type() == GuiServer )
 			restart();
 	}
 	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 == "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 );
@@ -1770,516 +1767,516 @@ void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
 {
 	if ( mw && argc() == 2 )
 		Global::setDocument( mw, QString::fromUtf8(argv()[1]) );
 
 
 //	setMainWidget(mw); see above
 	d->show(mw, nomaximize );
 }
 
 
 /*!
   If an application is started via a \link qcop.html QCop\endlink
   message, the application will process the \link qcop.html
   QCop\endlink message and then quit. If the application calls this
   function while processing a \link qcop.html QCop\endlink message,
   after processing its outstanding \link qcop.html QCop\endlink
   messages the application will start 'properly' and show itself.
 
   \sa keepRunning()
 */
 void QPEApplication::setKeepRunning()
 {
 	if ( qApp && qApp->inherits( "QPEApplication" ) ) {
 		QPEApplication * qpeApp = ( QPEApplication* ) qApp;
 		qpeApp->d->keep_running = TRUE;
 	}
 }
 
 /*!
   Returns TRUE if the application will quit after processing the
   current list of qcop messages; otherwise returns FALSE.
 
   \sa setKeepRunning()
 */
 bool QPEApplication::keepRunning() const
 {
 	return d->keep_running;
 }
 
 /*!
   \internal
 */
 void QPEApplication::internalSetStyle( const QString &style )
 {
 #if QT_VERSION >= 300
 	if ( style == "QPE" ) {
 		setStyle( new QPEStyle );
 	}
 	else {
 		QStyle *s = QStyleFactory::create( style );
 		if ( s )
 			setStyle( s );
 	}
 #else
 	if ( style == "Windows" ) {
 		setStyle( new QWindowsStyle );
 	}
 	else if ( style == "QPE" ) {
 		setStyle( new QPEStyle );
 	}
 	else if ( style == "Light" ) {
 		setStyle( new LightStyle );
 	}
 #ifndef QT_NO_STYLE_PLATINUM
 	else if ( style == "Platinum" ) {
 		setStyle( new QPlatinumStyle );
 	}
 #endif
 #ifndef QT_NO_STYLE_MOTIF
 	else if ( style == "Motif" ) {
 		setStyle( new QMotifStyle );
 	}
 #endif
 #ifndef QT_NO_STYLE_MOTIFPLUS
 	else if ( style == "MotifPlus" ) {
 		setStyle( new QMotifPlusStyle );
 	}
 #endif
 
 	else {
 		QStyle *sty = 0;
 		QString path = QPEApplication::qpeDir ( ) + "/plugins/styles/";
 
 #ifdef Q_OS_MACX
 		if ( style. find ( ".dylib" ) > 0 )
 			path += style;
 		else
 			path = path + "lib" + style. lower ( ) + ".dylib"; // compatibility
 #else
 		if ( style. find ( ".so" ) > 0 )
 			path += style;
 		else
 			path = path + "lib" + style. lower ( ) + ".so"; // compatibility
 #endif
 		static QLibrary *lastlib = 0;
 		static StyleInterface *lastiface = 0;
 
 		QLibrary *lib = new QLibrary ( path );
 		StyleInterface *iface = 0;
 
 		if (( lib-> queryInterface ( IID_Style, ( QUnknownInterface ** ) &iface ) == QS_OK ) && iface )
 			sty = iface-> style ( );
 
 		if ( sty ) {
 			setStyle ( sty );
 
 			if ( lastiface )
 				lastiface-> release ( );
 			lastiface = iface;
 
 			if ( lastlib ) {
 				lastlib-> unload ( );
 				delete lastlib;
 			}
 			lastlib = lib;
 		}
 		else {
 			if ( iface )
 				iface-> release ( );
 			delete lib;
 
 			setStyle ( new LightStyle ( ));
 		}
 	}
 #endif
 }
 
 /*!
   \internal
 */
 void QPEApplication::prepareForTermination( bool willrestart )
 {
 	if ( willrestart ) {
 		// Draw a big wait icon, the image can be altered in later revisions
 		//  QWidget *d = QApplication::desktop();
 		QImage img = Resource::loadImage( "launcher/new_wait" );
 		QPixmap pix;
 		pix.convertFromImage( img.smoothScale( 1 * img.width(), 1 * img.height() ) );
 		QLabel *lblWait = new QLabel( 0, "wait hack!", QWidget::WStyle_Customize |
 		                              QWidget::WStyle_NoBorder | QWidget::WStyle_Tool );
 		lblWait->setPixmap( pix );
 		lblWait->setAlignment( QWidget::AlignCenter );
 		lblWait->show();
 		lblWait->showMaximized();
 	}
 #ifndef SINGLE_APP
 	{ QCopEnvelope envelope( "QPE/System", "forceQuit()" );
 	}
 	processEvents(); // ensure the message goes out.
 	sleep( 1 ); // You have 1 second to comply.
 #endif
 }
 
 /*!
   \internal
 */
 void QPEApplication::shutdown()
 {
 	// Implement in server's QPEApplication subclass
 }
 
 /*!
   \internal
 */
 void QPEApplication::restart()
 {
 	// Implement in server's QPEApplication subclass
 }
 
 static QPtrDict<void>* stylusDict = 0;
 static void createDict()
 {
 	if ( !stylusDict )
 		stylusDict = new QPtrDict<void>;
 }
 
 /*!
   Returns the current StylusMode for widget \a w.
 
   \sa setStylusOperation() StylusMode
 */
 QPEApplication::StylusMode QPEApplication::stylusOperation( QWidget* w )
 {
 	if ( stylusDict )
 		return ( StylusMode ) ( int ) stylusDict->find( w );
 	return LeftOnly;
 }
 
 /*!
     \enum QPEApplication::StylusMode
 
     \value LeftOnly the stylus only generates LeftButton
                        events (the default).
     \value RightOnHold the stylus generates RightButton events
                        if the user uses the press-and-hold gesture.
 
     \sa setStylusOperation() stylusOperation()
 */
 
 /*!
   Causes widget \a w to receive mouse events according to the stylus
   \a mode.
 
   \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 ) {
                                                     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,
 								           new QMouseEvent( QEvent::MouseMove, QPoint( -1, -1),
 								                            LeftButton, LeftButton ) );
 								postEvent( d->presswidget,
 								           new QMouseEvent( QEvent::MouseButtonRelease, QPoint( -1, -1),
 								                            LeftButton, LeftButton ) );
 								d->rightpressed = FALSE;
 								return TRUE; // don't send the real Left release
 							}
 						}
 						break;
 					default:
 						break;
 				}
 				break;
 			default:
 				;
 		}
 	}
 	else if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
 		QKeyEvent *ke = (QKeyEvent *)e;
 		if ( ke->key() == Key_Enter ) {
 			if ( o->isA( "QRadioButton" ) || o->isA( "QCheckBox" ) ) {
 				postEvent( o, new QKeyEvent( e->type(), Key_Space, ' ',
 				                             ke->state(), " ", ke->isAutoRepeat(), ke->count() ) );
 				return TRUE;
 			}
 		}
 	}
 	return FALSE;
 }
 
 /*!
   \reimp
 */
 void QPEApplication::timerEvent( QTimerEvent *e )
 {
 	if ( e->timerId() == d->presstimer && d->presswidget ) {
 		// Right pressed
 		postEvent( d->presswidget,
 		           new QMouseEvent( QEvent::MouseButtonPress, d->presspos,
 		                            RightButton, LeftButton ) );
 		killTimer( d->presstimer );
 		d->presstimer = 0;
 		d->rightpressed = TRUE;
 	}
 }
 
 void QPEApplication::removeSenderFromStylusDict()
 {
 	stylusDict->remove
 	( ( void* ) sender() );
 	if ( d->presswidget == sender() )
 		d->presswidget = 0;
 }
 
 /*!
   \internal
 */
 bool QPEApplication::keyboardGrabbed() const
 {
 	return d->kbgrabbed;
 }
 
 
 /*!
   Reverses the effect of grabKeyboard(). This is called automatically
   on program exit.
 */
 void QPEApplication::ungrabKeyboard()
 {
 	((QPEApplication *) qApp )-> d-> kbgrabbed = false;
 }
 
 /*!
   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()
 {
-	if ( activeModalWidget() || strcmp( argv() [ 0 ], "embeddedkonsole" ) == 0 )
+	if ( activeModalWidget() )
 		return ; // Inside modal loop or konsole. Too hard to save state.
 #ifndef QT_NO_COP
 
 	{
 		QCopEnvelope e( "QPE/System", "closing(QString)" );
 		e << d->appName;
 	}
 #endif
     if ( d->keep_running )
 	d->store_widget_rect(d->qpe_main_widget, d->appName);
 	processEvents();
 
 	quit();
 }
 
 /*!
   \internal
 */
 void QPEApplication::installTranslation( const QString& baseName ) {
     QTranslator* trans = new QTranslator(this);
     QString tfn = qpeDir() + "/i18n/"+baseName;
     if ( trans->load( tfn ) )
         installTranslator( trans );
     else
         delete trans;
 }
 
 /*!
   \internal
   User initiated quit.  Makes the window 'Go Away'.  If preloaded this means
   hiding the window.  If not it means quitting the application.
   As this is user initiated we don't need to check state.
 */
 void QPEApplication::hideOrQuit()
 {
     if ( d->keep_running )
 	d->store_widget_rect(d->qpe_main_widget, d->appName);
 	processEvents();
 
 	// If we are a preloaded application we don't actually quit, so emit
 	// a System message indicating we're quasi-closing.
 	if ( d->preloaded && d->qpe_main_widget )
 #ifndef QT_NO_COP
 
 	{
 		QCopEnvelope e("QPE/System", "fastAppHiding(QString)" );
 		e << d->appName;
 		d->qpe_main_widget->hide();
 	}
 #endif
 	else
 		quit();
 }
 
 #if (__GNUC__ > 2 )
 extern "C" void __cxa_pure_virtual();
 
 void __cxa_pure_virtual()
 {
     fprintf( stderr, "Pure virtual called\n");
     abort();
 
 }
 
 #endif
 
 
 #if defined(OPIE_NEW_MALLOC)
 
 // The libraries with the skiff package (and possibly others) have
 // completely useless implementations of builtin new and delete that
 // use about 50% of your CPU. Here we revert to the simple libc
 // functions.
 
 void* operator new[]( size_t size )
 {
 	return malloc( size );
 }
 
 void* operator new( size_t size )
 {
 	return malloc( size );
 }
 
 void operator delete[]( void* p )
 {
 	free( p );
 }
 
 void operator delete[]( void* p, size_t /*size*/ )
 {
 	free( p );
 }
 
 
 void operator delete( void* p )
 {
 	free( p );
 }
 
 void operator delete( void* p, size_t /*size*/ )
 {
 	free( p );
 }
 
 #endif
 
 #if ( QT_VERSION <= 230 ) && !defined(SINGLE_APP)
 #include <qwidgetlist.h>
 #ifdef QWS
 #include <qgfx_qws.h>
 extern QRect qt_maxWindowRect;
 void qt_setMaxWindowRect(const QRect& r )
 {
 	qt_maxWindowRect = qt_screen->mapFromDevice( r,
 	                   qt_screen->mapToDevice( QSize( qt_screen->width(), qt_screen->height() ) ) );
 	// Re-resize any maximized windows
 	QWidgetList* l = QApplication::topLevelWidgets();
 	if ( l ) {
 		QWidget * w = l->first();
 		while ( w ) {
 			if ( w->isVisible() && w->isMaximized() ) {
 				w->showMaximized();
 			}
 			w = l->next();
 		}
 		delete l;
 	}
 }
 #endif
 #endif