- 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, 72 insertions, 4 deletions

diff --git a/library/global.cpp b/library/global.cpp
index 9b3c51e..42c2729 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -595,33 +595,49 @@ void Global::invoke(const QString &c)
     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.
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index efa65bc..a54fb20 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -889,68 +889,120 @@ void QPEApplication::setDefaultRotation( int r )
                 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" );
-        internalSetStyle( style );
+        
+        // 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;
@@ -1314,25 +1366,25 @@ void QPEApplication::internalSetStyle( const QString &style )
 
                         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