Made loading of custom styles much faster, since symbols are now resolved

"on-the-fly" (This only makes it harder for new styles to be debugged)

1 files changed, 1 insertions, 1 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 6e2db7c..dff8235 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -968,749 +968,749 @@ void QPEApplication::systemMessage( const QCString &msg, const QByteArray &data)
       stream >> bright;
       setBacklight(bright);
     }
     } 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 );
     } else if ( msg == "setScreenSaverMode(int)" ) {
     if ( type() == GuiServer ) {
     int old = disable_suspend;
     stream >> disable_suspend;
     //qDebug("setScreenSaverMode(%d)", disable_suspend );
     if ( disable_suspend > old )
       setScreenSaverInterval( -1 );
     }
   }
 #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;
 #ifdef Q_WS_QWS
   if ( !d->nomaximize )
       top->showMaximized();
   else
 #endif
       top->show();
   top->raise();
   top->setActiveWindow();
     }
     QWidget *topm = activeModalWidget();
     if ( topm && topm != top ) {
   topm->show();
   topm->raise();
   topm->setActiveWindow();
   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()" ) {
   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();
     } 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()" ) {
   if ( raiseAppropriateWindow() )
       emit appMessage( msg, data);
     } else {
   emit appMessage( msg, data);
     }
 #endif
 }
 
 
 static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ )
 {
 /*
     // This works but disable it for now until it is safe to apply
     // What is does is scan the .desktop files of all the apps for
     // the applnk that has the corresponding argv[0] as this program
     // then it uses the name stored in the .desktop file as the caption
     // for the main widget. This saves duplicating translations for
     // the app name in the program and in the .desktop files.
 
     AppLnkSet apps( appsPath );
 
     QList<AppLnk> appsList = apps.children();
     for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) {
   if ( (*it)->exec() == appName ) {
       mw->setCaption( (*it)->name() );
       return TRUE;
   }
     }
 */
     return FALSE;
 }
 
 
 /*!
   Sets \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 )
 {
     setWidgetCaptionFromAppName( mw, d->appName, qpeDir() + "apps" );
 
     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 {
 		// 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 );
+			void *lib = ::dlopen ( path. local8Bit ( ), RTLD_LAZY | 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,
           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 ) {
   QCopEnvelope e("QPE/System", "grabKeyboard(QString)" );
   e << QString::null;
   d->kbregrab = FALSE;
   d->kbgrabber = 0;
     }
 }
 
 /*!
   Grabs the keyboard such that the system's application launching
   keys no longer work, and instead they are receivable by this
   application.
 
   \sa ungrabKeyboard()
 */
 void QPEApplication::grabKeyboard()
 {
     QPEApplicationData* d = ((QPEApplication*)qApp)->d;
     if ( qApp->type() == QApplication::GuiServer )
   d->kbgrabber = 0;
     else {
   QCopEnvelope e("QPE/System", "grabKeyboard(QString)" );
   e << d->appName;
   d->kbgrabber = 2; // me
     }
 }
 
 /*!
   \reimp
 */
 int QPEApplication::exec()
 {
     d->sendQCopQ();
     if ( d->keep_running)
   //|| d->qpe_main_widget && d->qpe_main_widget->isVisible() )
   return QApplication::exec();
 
     {
     QCopEnvelope e("QPE/System", "closing(QString)" );
     e << d->appName;
     }
     processEvents();
     return 0;
 }
 
 /*!
   \internal
   External request for application to quit.  Quits if possible without
   loosing state.
 */
 void QPEApplication::tryQuit()
 {
     if ( activeModalWidget() || strcmp( argv()[0], "embeddedkonsole") == 0 )
   return; // Inside modal loop or konsole. Too hard to save state.
     {
        QCopEnvelope e("QPE/System", "closing(QString)" );
        e << d->appName;
     }
     processEvents();
 
     quit();
 }
 
 /*!
   \internal
   User initiated quit.  Makes the window 'Go Away'.  If preloaded this means
   hiding the window.  If not it means quitting the application.
   As this is user initiated we don't need to check state.
 */
 void QPEApplication::hideOrQuit()
 {
     // notify of our demise :)
     {
        QCopEnvelope e("QPE/System", "closing(QString)" );
        e << d->appName;
     }
     processEvents();
     if ( d->preloaded && d->qpe_main_widget )
   d->qpe_main_widget->hide();
     else
   quit();
 }
 
 #if defined(QT_QWS_IPAQ) || defined(QT_QWS_EBX)
 
 // The libraries with the skiff package (and possibly others) have
 // completely useless implementations of builtin new and delete that
 // use about 50% of your CPU. Here we revert to the simple libc
 // functions.
 
 void* operator new[](size_t size)
 {
     return malloc(size);
 }
 
 void* operator new(size_t size)
 {
     return malloc(size);
 }
 
 void operator delete[](void* p)
 {
     free(p);
 }
 
 void operator delete[](void* p, size_t /*size*/)
 {
     free(p);
 }
 
 void operator delete(void* p)
 {
     free(p);
 }
 
 void operator delete(void* p, size_t /*size*/)
 {
     free(p);
 }
 
 #endif
 
 #if ( QT_VERSION <= 230 ) && !defined(SINGLE_APP)
 #include <qwidgetlist.h>
 #include <qgfx_qws.h>
 extern QRect qt_maxWindowRect;
 void qt_setMaxWindowRect(const QRect& r)
 {
     qt_maxWindowRect = qt_screen->mapFromDevice(r,
   qt_screen->mapToDevice(QSize(qt_screen->width(),qt_screen->height())));
     // Re-resize any maximized windows
     QWidgetList* l = QApplication::topLevelWidgets();
     if ( l ) {
         QWidget *w = l->first();
         while ( w ) {
             if ( w->isVisible() && w->isMaximized() )
             {
                 w->showMaximized();
             }
             w = l->next();
         }
         delete l;
     }
 }
 #endif