Modified my "liquid only hack" - appearance now scans plugins/styles for

external styles and qpeapplication tries to load them

1 files changed, 45 insertions, 16 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 76d62ef..6e2db7c 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1,232 +1,234 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 ** $Id$
 **
 **********************************************************************/
 #define QTOPIA_INTERNAL_LANGLIST
 #include <stdlib.h>
 #include <unistd.h>
 #include <qfile.h>
 #ifdef Q_WS_QWS
 #ifndef QT_NO_COP
 #if QT_VERSION <= 231
 #define private public
 #define sendLocally processEvent
 #include "qcopenvelope_qws.h"
 #undef private
 #else
 #include "qcopenvelope_qws.h"
 #endif
 #endif
 #include <qwindowsystem_qws.h>
 #endif
 #include <qtextstream.h>
 #include <qpalette.h>
 #include <qbuffer.h>
 #include <qptrdict.h>
 #include <qregexp.h>
 #include <qdir.h>
 #include <qlabel.h>
 #include <qdialog.h>
 #include <qdragobject.h>
 #include <qevent.h>
 #include <qtooltip.h>
 #include <qsignal.h>
 
 
 //#include <linux/fb.h> better not rely on kernel headers in userspace ...
 
 /* VESA Blanking Levels */
 #define VESA_NO_BLANKING      0
 #define VESA_VSYNC_SUSPEND    1
 #define VESA_HSYNC_SUSPEND    2
 #define VESA_POWERDOWN        3
 
 #define FBIOBLANK             0x4611 
 
 
 #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"
 #include "alarmserver.h"
 #include "applnk.h"
 #include "qpemenubar.h"
 
 #include <unistd.h>
 #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;
     QWidget* presswidget;
     QPoint presspos;
     bool rightpressed;
     int kbgrabber;
     bool kbregrab;
     bool notbusysent;
     QString appName;
     struct QCopRec {
   QCopRec(const QCString &ch, const QCString &msg,
                                const QByteArray &d) :
       channel(ch), message(msg), data(d) { }
 
   QCString channel;
   QCString message;
   QByteArray data;
     };
     bool preloaded;
     bool forceshow;
     bool nomaximize;
     QWidget* qpe_main_widget;
     bool keep_running;
     QList<QCopRec> qcopq;
 
     void enqueueQCop(const QCString &ch, const QCString &msg,
                                const QByteArray &data)
     {
   qcopq.append(new QCopRec(ch,msg,data));
     }
     void sendQCopQ()
     {
   QCopRec* r;
   for (QListIterator<QCopRec> it(qcopq); (r=it.current()); ++it)
       QCopChannel::sendLocally(r->channel,r->message,r->data);
   qcopq.clear();
     }
 };
 
 class ResourceMimeFactory : public QMimeSourceFactory {
 public:
     ResourceMimeFactory()
     {
   setFilePath( Global::helpPath() );
   setExtensionType("html","text/html;charset=UTF-8");
     }
 
     const QMimeSource* data(const QString& abs_name) const
     {
   const QMimeSource* r = QMimeSourceFactory::data(abs_name);
   if ( !r ) {
       int sl = abs_name.length();
       do {
     sl = abs_name.findRev('/',sl-1);
     QString name = sl>=0 ? abs_name.mid(sl+1) : abs_name;
     int dot = name.findRev('.');
     if ( dot >= 0 )
         name = name.left(dot);
     QImage img = Resource::loadImage(name);
     if ( !img.isNull() )
         r = new QImageDrag(img);
       } while (!r && sl>0);
   }
   return r;
     }
 };
 
 static int muted=0;
 static int micMuted=0;
 
 static void setVolume(int t=0, int percent=-1)
 {
   switch (t) {
   case 0: {
   Config cfg("qpe");
   cfg.setGroup("Volume");
   if ( percent < 0 )
     percent = cfg.readNumEntry("VolumePercent",50);
   int fd = 0;
   if ((fd = open("/dev/mixer", O_RDWR))>=0) {
     int vol = muted ? 0 : percent;
     // set both channels to same volume
     vol |= vol << 8;
     ioctl(fd, MIXER_WRITE(0), &vol);
     ::close(fd);
   }
   } break;
   }
 }
 
 static void setMic(int t=0, int percent=-1)
 {
   switch (t) {
   case 0: {
   Config cfg("qpe");
   cfg.setGroup("Volume");
   if ( percent < 0 )
     percent = cfg.readNumEntry("Mic",50);
   
   int fd = 0;
   int mic = micMuted ? 0 : percent;
   if ((fd = open("/dev/mixer", O_RDWR))>=0) {
     ioctl(fd, MIXER_WRITE(SOUND_MIXER_MIC), &mic);
     ::close(fd);
   }
   } break;
   }
 }
 
 int qpe_sysBrightnessSteps()
 {
 #if defined(QT_QWS_IPAQ)
     return 255;
 #elif defined(QT_QWS_EBX)
     return 4;
 #else
     return 255; // ?
 #endif
@@ -1203,273 +1205,300 @@ void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
 
     d->nomaximize = nomaximize;
     d->qpe_main_widget = mw;
     d->sendQCopQ();
     if ( d->preloaded ) {
   if(d->forceshow) {
 #ifdef Q_WS_QWS
       if ( !nomaximize )
     mw->showMaximized();
       else
 #endif
       mw->show();
   }
     } else if ( d->keep_running ) {
 #ifdef Q_WS_QWS
   if ( !nomaximize )
       mw->showMaximized();
   else
 #endif
   mw->show();
     }
 }
 
 /*!
   Sets \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 must have a slot: setDocument(const QString&).
 
   \sa showMainWidget()
 */
 void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
 {
     setWidgetCaptionFromAppName( mw, d->appName, qpeDir() + "apps" );
 
     if ( mw && argc() == 2 )
   Global::setDocument( mw, QString::fromUtf8(argv()[1]) );
     d->nomaximize = nomaximize;
     d->qpe_main_widget = mw;
     d->sendQCopQ();
     if ( d->preloaded ) {
   if(d->forceshow) {
 #ifdef Q_WS_QWS
       if ( !nomaximize )
     mw->showMaximized();
       else
 #endif
       mw->show();
   }
     } else if ( d->keep_running ) {
 #ifdef Q_WS_QWS
   if ( !nomaximize )
       mw->showMaximized();
   else
 #endif
   mw->show();
     }
 }
 
 
 /*!
   Sets that the application should continue running after processing
   qcop messages.  Normally if an application is started via a qcop message,
   the application will process the qcop message and then quit.  If while
   processing the qcop message it calls this function, then the application
   will show and start proper once it has finished processing qcop messages.
 
   \sa keepRunning()
 */
 void QPEApplication::setKeepRunning()
 {
     if ( qApp && qApp->inherits( "QPEApplication" ) ) {
   QPEApplication *qpeApp = (QPEApplication*)qApp;
   qpeApp->d->keep_running = TRUE;
     }
 }
 
 /*!
   Returns whether the application will quit after processing the current
   list of qcop messages.  
 
   \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
 
         // 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 ( !lib ) {
-                                QString path = QPEApplication::qpeDir() + "/plugins/styles/" + "libliquid.so";  
-                        lib = ::dlopen ( path. local8Bit ( ), RTLD_NOW | RTLD_GLOBAL );
-                }
-                if ( lib ) {
-                        void *sym = ::dlsym ( lib, "allocate" );
+                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";
                 
-                        if ( sym )
-                                sty = ((QStyle * (*) ( )) sym ) ( );
-                }
-                if ( sty )
-                        setStyle ( sty );
+                // 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 ) {
+                                        //QStyle * (*fpa) ( ) = (QStyle * (*) ( )) lib-> resolve ( "allocate" );
+                                QStyle * (*fpa) ( ) = (QStyle * (*) ( )) ::dlsym ( lib, "allocate" );
+
+                                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
 //  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 \a w.
 
   \sa setStylusOperation()
 */
 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.
 
     See setStylusOperation().
 */
 
 /*!
   Causes \a w to receive mouse events according to \a mode.
 
   \sa stylusOperation()
 */
 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;
   if ( me->button() == LeftButton ) {
       StylusMode mode = (StylusMode)(int)stylusDict->find(o);
       switch (mode) {
         case RightOnHold:
     switch ( me->type() ) {
       case QEvent::MouseButtonPress:
         d->presstimer = startTimer(500); // #### pref.
         d->presswidget = (QWidget*)o;
         d->presspos = me->pos();
         d->rightpressed = FALSE;
         break;
       case QEvent::MouseButtonRelease:
         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,