- 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
@@ -604,6 +604,18 @@ void Global::invoke(const QString &c)
     } 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 );
@@ -613,6 +625,10 @@ void Global::invoke(const QString &c)
             ::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
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index efa65bc..a54fb20 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -898,17 +898,54 @@ void QPEApplication::setDefaultRotation( int r )
         }
 }
 
+// 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
@@ -933,6 +970,11 @@ void QPEApplication::applyStyle()
 
         // 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;
@@ -941,7 +983,17 @@ void QPEApplication::applyStyle()
         // 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 )
@@ -1323,7 +1375,7 @@ void QPEApplication::internalSetStyle( const QString &style )
                                 iface-> release ( );
                         delete lib;
 
-                        setStyle ( new QPEStyle ( ));
+                        setStyle ( new LightStyle ( ));
                 }
         }
 #endif