Query for FontFactories which implement the FontFactoryInterface on

QPEApplication creation.
Also update the comment in the API docu as now FontFactories are loaded

2 files changed, 5 insertions, 5 deletions

diff --git a/library/fontfactoryinterface.h b/library/fontfactoryinterface.h
index 68b0be5..36f430f 100644
--- a/library/fontfactoryinterface.h
+++ b/library/fontfactoryinterface.h
@@ -1,56 +1,54 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 #ifndef FONTFACTORYINTERFACE_H
 #define FONTFACTORYINTERFACE_H
 
 #include <qnamespace.h>
 #include <qstring.h>
 #include <qpe/qcom.h>
 
 class QFontFactory;
 
 #ifndef QT_NO_COMPONENT
 // {7F194DD6-FAA3-498F-8F30-9C297A570DFA}
 #ifndef IID_FontFactory
 #define IID_FontFactory QUuid( 0x7f194dd6, 0xfaa3, 0x498f, 0x8f, 0x30, 0x9c, 0x29, 0x7a, 0x57, 0x0d, 0xfa)
 #endif
 #endif
 
 
 /**
  * \brief Interface for additional Font Factories
  *
  * To add special types of fonts TrueTypes or your very own
  * format. If you implement this Interface you can add
  * custom font loading.
  *
  * The dynamic shared object goes to
  * OPIEDIR/plugins/fontfactories.
  *
- * As of version Opie 1.0.2 loading of the plugins is not
- * yet implemented
  *
  */
 struct FontFactoryInterface : public QUnknownInterface
 {
     virtual QFontFactory *fontFactory() = 0;
 };
 
 #endif
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index b686e2e..f4a7f74 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -19,128 +19,129 @@
 */
 #define QTOPIA_INTERNAL_LANGLIST
 #include <stdlib.h>
 #include <unistd.h>
 #ifndef Q_OS_MACX
 #include <linux/limits.h> // needed for some toolchains (PATH_MAX)
 #endif
 #include <qfile.h>
 #include <qqueue.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 <qtextcodec.h>
 #include <qevent.h>
 #include <qtooltip.h>
 #include <qsignal.h>
 #include <qmainwindow.h>
 #include <qwidgetlist.h>
 #include <qpixmapcache.h>
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 #define QTOPIA_INTERNAL_INITAPP
 #include "qpeapplication.h"
 #include "qpestyle.h"
 #include "styleinterface.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>
 #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"
 #ifdef QWS
 #include "fontmanager.h"
+#include "fontdatabase.h"
 #endif
 
 #include "alarmserver.h"
 #include "applnk.h"
 #include "qpemenubar.h"
 #include "textcodecinterface.h"
 #include "imagecodecinterface.h"
 
 #include <unistd.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #ifndef QT_NO_SOUND
 #include <sys/soundcard.h>
 #endif
 #include "qt_override_p.h"
 
 static bool useBigPixmaps = 0;
 
 class HackWidget : public QWidget
 {
 public:
     bool needsOk()
     { return (getWState() & WState_Reserved1 ); }
 
     QRect normalGeometry()
     { return topData()->normalGeometry; };
 };
 
 class QPEApplicationData
 {
 public:
     QPEApplicationData ( )
         : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ),
           notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ),
           keep_running( true ), qcopQok( false ),
           fontFamily( "Vera" ), fontSize( 10 ), smallIconSize( 14 ),
           bigIconSize( 32 ), qpe_main_widget( 0 )
     {
         Config cfg( "qpe" );
         cfg.setGroup( "Appearance" );
         useBigPixmaps = cfg.readBoolEntry( "useBigPixmaps", false );
         fontFamily = cfg.readEntry( "FontFamily", "Vera" );
         fontSize = cfg.readNumEntry( "FontSize", 10 );
         smallIconSize = cfg.readNumEntry( "SmallIconSize", 14 );
         bigIconSize = cfg.readNumEntry( "BigIconSize", 32 );
     }
 
     int presstimer;
     QWidget* presswidget;
     QPoint presspos;
 
     bool rightpressed : 1;
     bool kbgrabbed    : 1;
     bool notbusysent  : 1;
     bool preloaded    : 1;
     bool forceshow    : 1;
     bool nomaximize   : 1;
     bool keep_running : 1;
     bool qcopQok      : 1;
 
     QCString fontFamily;
     int fontSize;
     int smallIconSize;
     int bigIconSize;
@@ -742,205 +743,206 @@ void QPEApplication::processQCopFile()
 #ifndef Q_OS_WIN32
     flock(f.handle(), LOCK_EX);
 #endif
     QDataStream ds(&f);
     QCString channel, message;
     QByteArray data;
     while(!ds.atEnd()) {
         ds >> channel >> message >> data;
         d->enqueueQCop(channel,message,data);
     }
     ::ftruncate(f.handle(), 0);
 #ifndef Q_OS_WIN32
     f.flush();
     flock(f.handle(), LOCK_UN);
 #endif
     }
 #endif
 }
 
 
 /*!
   \fn void QPEApplication::appMessage( const QCString& msg, const QByteArray& data )
 
   This signal is emitted when a message is received on this
   application's QPE/Application/<i>appname</i> \link qcop.html
   QCop\endlink channel.
 
   The slot to which you connect this signal uses \a msg and \a data
   in the following way:
 
 \code
      void MyWidget::receive( const QCString& msg, const QByteArray& data )
      {
        QDataStream stream( data, IO_ReadOnly );
        if ( msg == "someMessage(int,int,int)" ) {
             int a,b,c;
             stream >> a >> b >> c;
             ...
        } else if ( msg == "otherMessage(QString)" ) {
            ...
        }
     }
 \endcode
 
   \sa qcop.html
   Note that messages received here may be processed by qpe application
   and emitted as signals, such as flush() and reload().
 */
 
 /*!
   Constructs a QPEApplication just as you would construct
   a QApplication, passing \a argc, \a argv, and \a t.
 
   For applications, \a t should be the default, GuiClient. Only
   the Qtopia server passes GuiServer.
 */
 QPEApplication::QPEApplication( int & argc, char **argv, Type t )
         : QApplication( hack(argc), argv, t ), pidChannel( 0 )
 {
     QPixmapCache::setCacheLimit(256); // sensible default for smaller devices.
 
     d = new QPEApplicationData;
     d->loadTextCodecs();
     d->loadImageCodecs();
-    int dw = desktop() ->width();
 
     setFont( QFont( d->fontFamily, d->fontSize ) );
     AppLnk::setSmallIconSize( d->smallIconSize );
     AppLnk::setBigIconSize( d->bigIconSize );
 
     QMimeSourceFactory::setDefaultFactory( new ResourceMimeFactory );
 
     connect( this, SIGNAL( lastWindowClosed() ), this, SLOT( hideOrQuit() ) );
 
 
     sysChannel = new QCopChannel( "QPE/System", this );
     connect( sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
              this, SLOT( systemMessage(const QCString&,const QByteArray&) ) );
 
 /* COde now in initapp */
 #if 0
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 
     QString qcopfn( "/tmp/qcop-msg-" );
     qcopfn += QString( argv[ 0 ] ); // append command name
 
     QFile f( qcopfn );
     if ( f.open( IO_ReadOnly ) ) {
         flock( f.handle(), LOCK_EX );
     }
 
 
 
     QCString channel = QCString( argv[ 0 ] );
     channel.replace( QRegExp( ".*/" ), "" );
     d->appName = channel;
     channel = "QPE/Application/" + channel;
     pidChannel = new QCopChannel( channel, this );
     connect( pidChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
              this, SLOT( pidMessage(const QCString&,const QByteArray&) ) );
 
     if ( f.isOpen() ) {
         d->keep_running = FALSE;
         QDataStream ds( &f );
         QCString channel, message;
         QByteArray data;
         while ( !ds.atEnd() ) {
             ds >> channel >> message >> data;
             d->enqueueQCop( channel, message, data );
         }
 
         flock( f.handle(), LOCK_UN );
         f.close();
         f.remove();
     }
 
     for ( int a = 0; a < argc; a++ ) {
         if ( qstrcmp( argv[ a ], "-preload" ) == 0 ) {
             argv[ a ] = argv[ a + 1 ];
             a++;
             d->preloaded = TRUE;
             argc -= 1;
         }
         else if ( qstrcmp( argv[ a ], "-preload-show" ) == 0 ) {
             argv[ a ] = argv[ a + 1 ];
             a++;
             d->preloaded = TRUE;
             d->forceshow = TRUE;
             argc -= 1;
         }
     }
 
     /* overide stored arguments */
     setArgs( argc, argv );
 
 #endif
 #else
         initApp( argc, argv );
 #endif
-    //  qwsSetDecoration( new QPEDecoration() );
-
+#ifdef Q_WS_QWS
+    /* load the font renderer factories */
+    FontDatabase::loadRenderers();
+#endif
 #ifndef QT_NO_TRANSLATION
 
     d->langs = Global::languageList();
     for ( QStringList::ConstIterator it = d->langs.begin(); it != d->langs.end(); ++it ) {
         QString lang = *it;
 
                 installTranslation( lang + "/libopie.qm");
         installTranslation( lang + "/libqpe.qm" );
         installTranslation( lang + "/" + d->appName + ".qm" );
 
 
         //###language/font hack; should look it up somewhere
 #ifdef QWS
 
                 if ( lang == "ja" || lang == "zh_CN" || lang == "zh_TW" || lang == "ko" ) {
                     QFont fn = FontManager::unicodeFont( FontManager::Proportional );
                     setFont( fn );
                 }
 #endif
         }
 #endif
 
     applyStyle();
 
     if ( type() == GuiServer ) {
         setVolume();
     }
 
     installEventFilter( this );
 
     QPEMenuToolFocusManager::initialize();
 
 #ifdef QT_NO_QWS_CURSOR
     // if we have no cursor, probably don't want tooltips
     QToolTip::setEnabled( FALSE );
 #endif
 }
 
 
 #ifdef QTOPIA_INTERNAL_INITAPP
 void QPEApplication::initApp( int argc, char **argv )
 {
     delete pidChannel;
     d->keep_running = TRUE;
     d->preloaded = FALSE;
     d->forceshow = FALSE;
 
     QCString channel = QCString(argv[0]);
 
     channel.replace(QRegExp(".*/"),"");
     d->appName = channel;
 
     #if QT_VERSION > 235
     qt_fbdpy->setIdentity( channel ); // In Qt/E 2.3.6
     #endif
 
     channel = "QPE/Application/" + channel;
     pidChannel = new QCopChannel( channel, this);
     connect( pidChannel, SIGNAL(received(const QCString&,const QByteArray&)),
         this, SLOT(pidMessage(const QCString&,const QByteArray&)));
 
 
 
     processQCopFile();