author | sandman <sandman> | 2002-06-29 00:25:26 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-06-29 00:25:26 (UTC) |
commit | 971f94ceb114149efbf8d90b607d25dcbd358435 (patch) (side-by-side diff) | |
tree | df106209331f0e8a8c79c839ccfb4a8a8c7ac97c /library/qpeapplication.cpp | |
parent | 0552cd7f5762939ccdf05b9bf4fdae9b3e79b0a5 (diff) | |
download | opie-971f94ceb114149efbf8d90b607d25dcbd358435.zip opie-971f94ceb114149efbf8d90b607d25dcbd358435.tar.gz opie-971f94ceb114149efbf8d90b607d25dcbd358435.tar.bz2 |
Modified my "liquid only hack" - appearance now scans plugins/styles for
external styles and qpeapplication tries to load them
-rw-r--r-- | library/qpeapplication.cpp | 55 |
1 files changed, 42 insertions, 13 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 76d62ef..6e2db7c 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -63,24 +63,27 @@ #include <qsignal.h> #include "qpeapplication.h" #include "qpestyle.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> +#include <dlfcn.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" #include "fontmanager.h" #include "fontdatabase.h" #include "power.h" @@ -92,25 +95,24 @@ #include <sys/file.h> #include <sys/ioctl.h> #include <sys/soundcard.h> // for setBacklight() #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX) #include <linux/fb.h> #include <sys/types.h> #include <sys/stat.h> #endif #include <stdlib.h> -#include <dlfcn.h> // for Liquid HACK class QPEApplicationData { public: QPEApplicationData() : presstimer(0), presswidget(0), rightpressed(FALSE), kbgrabber(0), kbregrab(FALSE), notbusysent(FALSE), preloaded(FALSE), forceshow(FALSE), nomaximize(FALSE), qpe_main_widget(0), keep_running(TRUE) { qcopq.setAutoDelete(TRUE); } int presstimer; @@ -1319,41 +1321,68 @@ void QPEApplication::internalSetStyle( const QString &style ) #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 // HACK for Qt2 only - else if ( style == "Liquid" ) { - static void *lib = 0; - QStyle *sty = 0; + else { + // style == "Liquid Style (libliquid.so)" (or "Windows XP (libxp.so)" + int p2 = style. findRev ( ']' ); + int p1 = style. findRev ( '[' ); + QString style2; + + if (( p1 > 0 ) && ( p2 > 0 ) && (( p1 + 1 ) < p2 )) + style2 = "lib" + style. mid ( p1 + 1, p2 - p1 - 1 ). lower ( ) + ".so"; + else + style2 = "lib" + style. lower ( ) + ".so"; + + // static QLibrary *currentlib = 0; + static void *currentlib = 0; + + QString path = QPEApplication::qpeDir ( ) + "/plugins/styles/" + style2; + + do { // try/catch simulation + // QLibrary *lib = new QLibrary ( path, QLibrary::Immediately ); + void *lib = ::dlopen ( path. local8Bit ( ), RTLD_NOW | RTLD_GLOBAL ); - if ( !lib ) { - QString path = QPEApplication::qpeDir() + "/plugins/styles/" + "libliquid.so"; - lib = ::dlopen ( path. local8Bit ( ), RTLD_NOW | RTLD_GLOBAL ); - } if ( lib ) { - void *sym = ::dlsym ( lib, "allocate" ); + //QStyle * (*fpa) ( ) = (QStyle * (*) ( )) lib-> resolve ( "allocate" ); + QStyle * (*fpa) ( ) = (QStyle * (*) ( )) ::dlsym ( lib, "allocate" ); - if ( sym ) - sty = ((QStyle * (*) ( )) sym ) ( ); - } - if ( sty ) + if ( fpa ) { + QStyle *sty = ( *fpa ) ( ); + + if ( sty ) { setStyle ( sty ); + + if ( currentlib ) { + //delete currentlib; + ::dlclose ( currentlib ); + } + currentlib = lib; + + break; + } + } + //delete lib; + ::dlclose ( lib ); + } + } while ( false ); } // HACK for Qt2 only #endif } /*! \internal */ void QPEApplication::prepareForTermination(bool willrestart) { if ( willrestart ) { // Draw a big wait icon, the image can be altered in later revisions |