- LD_PRELOADing of libpreload.so in case the user selected [x] Force style

  settings in appearance
- Some code to NOT style some applications, based on the binary name (also
  selectable in appearance)

2 files changed, 70 insertions, 2 deletions

diff --git a/library/global.cpp b/library/global.cpp
index 9b3c51e..42c2729 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -351,456 +351,472 @@ void Global::addWords(const QString& dictname, const QStringList& wordlist)
   given \a filename. Returns QString::null if there was a problem creating
   the directory tree for \a appname.
   If \a filename contains "/", it is the caller's responsibility to
   ensure that those directories exist.
 */
 QString Global::applicationFileName(const QString& appname, const QString& filename)
 {
     QDir d;
     QString r = getenv("HOME");
     r += "/Applications/";
     if ( !QFile::exists( r ) )
 	if ( d.mkdir(r) == false )
 	    return QString::null;
     r += appname;
     if ( !QFile::exists( r ) )
 	if ( d.mkdir(r) == false )
 	    return QString::null;
     r += "/"; r += filename;
     return r;
 }
 
 /*!
   \internal
 */
 void Global::createDocDir()
 {
     if ( !docDirCreated ) {
 	docDirCreated = TRUE;
 	mkdir( QPEApplication::documentDir().latin1(), 0755 );
     }
 }
 
 
 /*!
   Displays a status \a message to the user. This usually appears
   in the taskbar for a short amount of time, then disappears.
 */
 void Global::statusMessage(const QString& message)
 {
 #if!defined(QT_NO_COP)
     QCopEnvelope e( "QPE/TaskBar", "message(QString)" );
     e << message;
 #endif
 }
 
 /*!
   \internal
 */
 void Global::applyStyle()
 {
 #if !defined(QT_NO_COP)
     QCopChannel::send( "QPE/System", "applyStyle()" );
 #else
     ((QPEApplication *)qApp)->applyStyle(); // apply without needing QCop for floppy version
 #endif
 }
 
 /*!
   \internal
 */
 QWidget *Global::shutdown( bool )
 {
 #if !defined(QT_NO_COP)
     QCopChannel::send( "QPE/System", "shutdown()" );
 #endif
     return 0;
 }
 
 /*!
   \internal
 */
 QWidget *Global::restart( bool )
 {
 #if !defined(QT_NO_COP)
     QCopChannel::send( "QPE/System", "restart()" );
 #endif
     return 0;
 }
 
 /*!
   Explicitly show the current input method.
 
   Input methods are indicated in the taskbar by a small icon. If the
   input method is activated (shown) then it takes up some proportion
   of the bottom of the screen, to allow the user to interact (input
   characters) with it.
 
   \sa hideInputMethod()
 */
 void Global::showInputMethod()
 {
 #if !defined(QT_NO_COP)
     QCopChannel::send( "QPE/TaskBar", "showInputMethod()" );
 #endif
 }
 
 /*!
   Explicitly hide the current input method.
 
   The current input method is still indicated in the taskbar, but no
   longer takes up screen space, and can no longer be interacted with.
 
   \sa showInputMethod()
 */
 void Global::hideInputMethod()
 {
 #if !defined(QT_NO_COP)
     QCopChannel::send( "QPE/TaskBar", "hideInputMethod()" );
 #endif
 }
 
 
 /*!
   \internal
 */
 bool Global::isBuiltinCommand( const QString &name )
 {
     if(!builtin)
 	return FALSE; // yes, it can happen
     for (int i = 0; builtin[i].file; i++) {
 	if ( builtin[i].file == name ) {
 	    return TRUE;
 	}
     }
     return FALSE;
 }
 
 Global::Command* Global::builtin=0;
 QGuardedPtr<QWidget> *Global::running=0;
 
 /*!
   \class Global::Command
   \brief The Global::Command class is internal.
   \internal
 */
 
 /*!
   \internal
 */
 void Global::setBuiltinCommands( Command* list )
 {
     if ( running )
 	delete [] running;
 
     builtin = list;
     int count = 0;
     if (!builtin)
 	return;
     while ( builtin[count].file )
 	count++;
 
     running = new QGuardedPtr<QWidget> [ count ];
 }
 
 /*!
   \internal
 */
 void Global::setDocument( QWidget* receiver, const QString& document )
 {
     Emitter emitter(receiver,document);
 }
 
 /*!
   \internal
 */
 bool Global::terminateBuiltin( const QString& n )
 {
     if (!builtin)
 	return FALSE;
     for (int i = 0; builtin[i].file; i++) {
 	if ( builtin[i].file == n ) {
 	    delete running[i];
 	    return TRUE;
 	}
     }
     return FALSE;
 }
 
 /*!
   \internal
 */
 void Global::terminate( const AppLnk* app )
 {
     //if ( terminateBuiltin(app->exec()) ) return; // maybe? haven't tried this
 
 #ifndef QT_NO_COP
     QCString channel = "QPE/Application/" + app->exec().utf8();
     if ( QCopChannel::isRegistered(channel) ) {
 	QCopEnvelope e(channel, "quit()");
     }
 #endif
 }
 
 /*!
   Low-level function to run command \a c.
 
   \warning Do not use this function. Use execute instead.
 
   \sa execute()
 */
 void Global::invoke(const QString &c)
 {
     // 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];
     // see if the application is already running
     // XXX should lock file /tmp/qcop-msg-ap
     if ( QCopChannel::isRegistered( ("QPE/Application/" + ap).latin1() ) ) {
 	// If the channel is already register, the app is already running, so show it.
 	{ QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); }
                 
 	QCopEnvelope e("QPE/System", "notBusy(QString)" );
 	e << ap;
 	return;
     }
     // XXX should unlock file /tmp/qcop-msg-ap
     //see if it is being started
     if ( StartingAppList::isStarting( ap ) ) {
 	QCopEnvelope e("QPE/System", "notBusy(QString)" );
 	e << ap;
 	return;
     }
 
 #endif
 
 #ifdef QT_NO_QWS_MULTIPROCESS
     QMessageBox::warning( 0, "Error", "Could not find the application " + c, "Ok", 0, 0, 0, 1 );
 #else
 
     QStrList slist;
     unsigned int j;
     for ( j = 0; j < list.count(); j++ )
 	slist.append( list[j].utf8() );
 
     const char **args = new (const char *)[slist.count() + 1];
     for ( j = 0; j < slist.count(); j++ )
 	args[j] = slist.at(j);
     args[j] = NULL;
 
 #if !defined(QT_NO_COP)
     // an attempt to show a wait...
     // more logic should be used, but this will be fine for the moment...
     QCopEnvelope ( "QPE/System", "busy()" );
 #endif
 
 #ifdef HAVE_QUICKEXEC
     QString libexe = qpeDir()+"/binlib/lib"+args[0] + ".so";
     qDebug("libfile = %s", libexe.latin1() );
     if ( QFile::exists( libexe ) ) {
 	qDebug("calling quickexec %s", libexe.latin1() );
 	quickexecv( libexe.utf8().data(), (const char **)args );
     } else
 #endif
     {
+	char *oldpre = ::getenv ( "LD_PRELOAD" );
+    	
+	extern bool opie_block_style;
+    
+	QString newpre = QPEApplication::qpeDir ( ) + "/lib/libpreload.so";
+	if ( opie_block_style && QFile::exists ( newpre )) {
+	    if ( oldpre && oldpre [0] )
+		newpre = newpre + ":" + oldpre;
+	    ::setenv ( "LD_PRELOAD", newpre. latin1( ), 1 );
+	    qDebug ( "\nPRELOADING\n" );
+	}
+	    
 	if ( !::vfork() ) {
 	    for ( int fd = 3; fd < 100; fd++ )
 		::close( fd );
 	    ::setpgid( ::getpid(), ::getppid() );
 	    // Try bindir first, so that foo/bar works too
 	    ::execv( qpeDir()+"/bin/"+args[0], (char * const *)args );
 	    ::execvp( args[0], (char * const *)args );
 	    _exit( -1 );
 	}
+	if ( oldpre )
+	    ::setenv ( "LD_PRELOAD", oldpre, 1 );
+	else
+	    ::unsetenv ( "LD_PRELOAD" );
     }
     StartingAppList::add( list[0] );
 #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;
     }
 #endif
 }
 
 /*!
   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;
 }
 
 /*!
   Returns the string \a s with the characters '\' and '"' quoted by a
   preceeding '\'.
 
   \sa shellQuote()
 */
 QString Global::stringQuote(const QString& s)
 {
     QString r="\"";
     for (int i=0; i<(int)s.length(); i++) {
 	char c = s[i].latin1();
 	switch (c) {
 	    case '\\': case '"':
 		r+="\\";
 	}
 	r += s[i];
     }
     r += "\"";
     return r;
 }
 
 /*!
   Finds all documents on the system's document directories which
   match the filter \a mimefilter, and appends the resulting DocLnk
   objects to \a folder.
 */
 void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
 {
     QString homedocs = QString(getenv("HOME")) + "/Documents";
     DocLnkSet d(homedocs,mimefilter);
     folder->appendFrom(d);
     /** let's do intellegint way of searching these files
      *  a) the user don't want to check mediums global
      *  b) the user wants to check but use the global options for it
      *  c) the user wants to check it but not this medium
      *  d) the user wants to check and this medium as well
      *
      *  In all cases we need to apply a different mimefilter to
      *  the medium.
      *  a) mimefilter.isEmpty() we need to apply the responding filter
      *     either the global or the one on the medium
      *
      *  b) mimefilter is set to an application we need to find out if the
      *     mimetypes are included in the mime mask of the medium
      */
     StorageInfo storage;
     const QList<FileSystem> &fs = storage.fileSystems();
     QListIterator<FileSystem> it ( fs );
     for ( ; it.current(); ++it ) {
       if ( (*it)->isRemovable() ) { // let's find out  if we should search on it
 	// this is a candidate look at the cf and see if we should search on it
 	QString path = (*it)->path();
 	if( !checkStorage((*it)->path() + "/.opiestorage.cf" ) )
 	  continue;
 	DocLnkSet ide( path, mimefilter );
 	folder->appendFrom(ide);
       } else if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) {
 	QString path = (*it)->path() + "/Documents";
 	DocLnkSet ide( path, mimefilter );
 	folder->appendFrom(ide);
       }
     }
 }
 
 QStringList Global::languageList()
 {
     QString lang = getenv("LANG");
     QStringList langs;
     langs.append(lang);
     int i  = lang.find(".");
     if ( i > 0 )
 	lang = lang.left( i );
     i = lang.find( "_" );
     if ( i > 0 )
 	langs.append(lang.left(i));
     return langs;
 }
 
 QStringList Global::helpPath()
 {
     QStringList path;
     QStringList langs = Global::languageList();
     for (QStringList::ConstIterator it = langs.fromLast(); it!=langs.end(); --it) {
 	QString lang = *it;
 	if ( !lang.isEmpty() )
 	    path += QPEApplication::qpeDir() + "/help/" + lang + "/html";
     }
     path += QPEApplication::qpeDir() + "/pics";
     path += QPEApplication::qpeDir() + "/help/html";
     path += QPEApplication::qpeDir() + "/docs";
 
 
     return path;
 }
 
 
 #include "global.moc"
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index efa65bc..a54fb20 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -645,938 +645,990 @@ void QPEApplication::setInputMethodHint( QWidget * w, InputMethodHint 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 ) {
 		if ( d->kbgrabber == 1 )
 			return TRUE;
 		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();
 				}
 			}
 		}
 
 #if QT_VERSION < 231
 		// Filter out the F4/Launcher key from apps
 		// ### The launcher key may not always be F4 on all devices
 		if ( ( ( QWSKeyEvent * ) e ) ->simpleData.keycode == Qt::Key_F4 )
 			return TRUE;
 #endif
 
 	}
 	if ( e->type == QWSEvent::Focus ) {
 		QWSFocusEvent * fe = ( QWSFocusEvent* ) e;
 		QWidget* nfw = QWidget::find( e->window() );
 		if ( !fe->simpleData.get_focus ) {
 			QWidget * active = activeWindow();
 			while ( active && active->isPopup() ) {
 				active->close();
 				active = activeWindow();
 			}
 			if ( !nfw && d->kbgrabber == 2 ) {
 				ungrabKeyboard();
 				d->kbregrab = TRUE; // want kb back when we're active
 			}
 		}
 		else {
 			// make sure our modal widget is ALWAYS on top
 			QWidget *topm = activeModalWidget();
 			if ( topm ) {
 				topm->raise();
 			}
 			if ( d->kbregrab ) {
 				grabKeyboard();
 				d->kbregrab = FALSE;
 			}
 		}
 		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( "Screen", getenv("QWS_DISPLAY") );
 	}
 	else {
 #ifndef QT_NO_COP
 		{ QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" );
 			e << r;
 		}
 #endif
 
 	}
 }
 
+// exported to libpreload.so
+bool opie_block_style = false;
+
 /*!
   \internal
 */
 void QPEApplication::applyStyle()
 {
 	Config config( "qpe" );
-
 	config.setGroup( "Appearance" );
 
+	// don't block ourselves ...
+	opie_block_style = false;
+	
+	
+	static QString appname;
+	
+	if ( appname. isNull ( )) {
+		char src [32];
+		char dst [PATH_MAX + 1];
+		::sprintf ( src, "/proc/%d/exe", ::getpid ( ));
+		int l = ::readlink ( src, dst, PATH_MAX );
+		if ( l > 0 ) {
+			dst [l] = 0;
+			const char *b = ::strrchr ( dst, '/' );
+			appname = ( b ? b + 1 : dst );
+		}
+		else
+			appname = "";
+	}
+	
+	
+	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;
+		}
+	}
+	                                                
 	// Widget style
 	QString style = config.readEntry( "Style", "Light" );
+	
+	// don't set a custom style
+	if ( nostyle & 0x01 )
+		style = "Light";
+	
 	internalSetStyle( style );
 
 	// Colors
 	QColor bgcolor( config.readEntry( "Background", "#E5E1D5" ) );
 	QColor btncolor( config.readEntry( "Button", "#D6CDBB" ) );
 	QPalette pal( btncolor, bgcolor );
 	QString color = config.readEntry( "Highlight", "#800000" );
 	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", "Qtopia" );
+	
+	// don't set a custom deco
+	if ( nostyle & 0x04 )
+		dec = "";
+	
 	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 & 0x02 ) {
+		ff = "Helvetica";
+		fs = 10;
+	}
+	
 	setFont( QFont(ff, fs) );
+	
+	// revert to global blocking policy ...
+	opie_block_style = config. readBoolEntry ( "ForceStyle", false );
 }
 
 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 == "setDefaultRotation(int)" ) {
 		if ( type() == GuiServer ) {
 			int r;
 			stream >> r;
 			setDefaultRotation( 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 == "grabKeyboard(QString)" ) {
 		QString who;
 		stream >> who;
 		if ( who.isEmpty() )
 			d->kbgrabber = 0;
 		else if ( who != d->appName )
 			d->kbgrabber = 1;
 		else
 			d->kbgrabber = 2;
 	}
 	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)" ) {
 		int tmp;
 		stream >> tmp;
 		emit weekChanged( tmp );
 	}
 	else if ( msg == "setDateFormat(DateFormat)" ) {
 		DateFormat tmp;
 		stream >> tmp;
 		emit dateFormatChanged( tmp );
 	}
 	else if ( msg == "setVolume(int,int)" ) {
 		int t, v;
 		stream >> t >> v;
 		setVolume( t, v );
 		emit volumeChanged( muted );
 	}
 	else if ( msg == "volumeChange(bool)" ) {
 		stream >> muted;
 		setVolume();
 		emit volumeChanged( muted );
 	}
 	else if ( msg == "setMic(int,int)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
 		int t, v;
 		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 );
 	}
 #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;
 		}
 
 		d->show_mx(top, d->nomaximize);
 		top->raise();
 		top->setActiveWindow();
 	}
 	QWidget *topm = activeModalWidget();
 	if ( topm && topm != top ) {
 		topm->show();
 		topm->raise();
 		topm->setActiveWindow();
 		// If we haven't already handled the fastAppShowing message
 		if (!top && d->preloaded) {
 			QCopEnvelope e("QPE/System", "fastAppShowing(QString)");
 			e << d->appName;
 		}
 		r = FALSE;
 	}
 	return r;
 }
 
 void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data)
 {
 #ifdef Q_WS_QWS
 
 	if ( msg == "quit()" ) {
 		tryQuit();
 	}
 	else if ( msg == "quitIfInvisible()" ) {
 		if ( d->qpe_main_widget && !d->qpe_main_widget->isVisible() )
 			quit();
 	}
 	else if ( msg == "close()" ) {
 		hideOrQuit();
 	}
 	else if ( msg == "disablePreload()" ) {
 		d->preloaded = FALSE;
 		d->keep_running = TRUE;
 		/* so that quit will quit */
 	}
 	else if ( msg == "enablePreload()" ) {
 		if (d->qpe_main_widget)
 			d->preloaded = TRUE;
 		d->keep_running = TRUE;
 		/* so next quit won't quit */
 	}
 	else if ( msg == "raise()" ) {
 		d->keep_running = TRUE;
 		d->notbusysent = FALSE;
 		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 if ( msg == "nextView()" ) {
 		qDebug("got nextView()");
 		/*
 		  if ( raiseAppropriateWindow() )
 		*/
 		emit appMessage( msg, data);
 	}
 	else {
 		emit appMessage( msg, data);
 	}
 
 #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.
  
   \sa showMainDocumentWidget()
 */
 void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
 {
 	d->show(mw, nomaximize );
 }
 
 /*!
   Sets widget \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
  
   This calls designates the application as
   a \link docwidget.html document-oriented\endlink application.
  
   The \a mw widget \e must have this slot: setDocument(const QString&).
  
   \sa showMainWidget()
 */
 void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
 {
 	if ( mw && argc() == 2 )
 		Global::setDocument( mw, QString::fromUtf8(argv()[1]) );
 
 	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/";
 
 		if ( style. find ( ".so" ) > 0 )
 			path += style;
 		else
 			path = path + "lib" + style. lower ( ) + ".so"; // compatibility
 
 		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 QPEStyle ( ));
+			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 ( 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.
 							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->kbgrabber;
 }
 
 
 /*!
   Reverses the effect of grabKeyboard(). This is called automatically
   on program exit.
 */
 void QPEApplication::ungrabKeyboard()
 {
 	QPEApplicationData * d = ( ( QPEApplication* ) qApp ) ->d;
 	if ( d->kbgrabber == 2 ) {
 #ifndef QT_NO_COP
 		QCopEnvelope e( "QPE/System", "grabKeyboard(QString)" );
 		e << QString::null;
 #endif
 
 		d->kbregrab = FALSE;
 		d->kbgrabber = 0;
 	}
 }
 
 /*!
   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()
 {
 	QPEApplicationData * d = ( ( QPEApplication* ) qApp ) ->d;
 	if ( qApp->type() == QApplication::GuiServer )
 		d->kbgrabber = 0;
 	else {
 #ifndef QT_NO_COP
 		QCopEnvelope e( "QPE/System", "grabKeyboard(QString)" );
 		e << d->appName;
 #endif
 
 		d->kbgrabber = 2; // me
 	}
 }
 
 /*!
   \reimp
 */
 int QPEApplication::exec()
 {
 #ifndef QT_NO_COP
 	d->sendQCopQ();
 #endif
 
 	if ( d->keep_running )
 		//|| d->qpe_main_widget && d->qpe_main_widget->isVisible() )
 		return QApplication::exec();