Changeset 220

Timestamp:

Oct 12, 2009, 11:37:39 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Added enumeration of installed PM fonts.

Location:

trunk/src/gui/text

Files:

• qfontdatabase.cpp (modified) (9 diffs)
• qfontdatabase_pm.cpp (modified) (2 diffs)
• text.pri (modified) (1 diff)

trunk/src/gui/text/qfontdatabase.cpp

@@ -54 +54 @@
 #include <locale.h>
 #endif
+
+
+
+
 #include <stdlib.h>
 #include <limits.h>
@@ -74 +78 @@
 #  define for if(0){}else for
 #endif
+
+
 
 QT_BEGIN_NAMESPACE
@@ -146 +152 @@
     int fileIndex;
 #endif
+
+
+
+
 };
 
@@ -209 +219 @@
         weightName = setwidthName = 0;
 #endif // Q_WS_X11
+
+
+
     }
 
@@ -242 +255 @@
     bool antialiased;
 #endif
-
+#ifdef Q_WS_PM
+    CHAR faceName[FACESIZE];
+#endif
+
+#ifdef Q_WS_PM
+    QtFontSize *pixelSize(unsigned short size, bool = false,
+                          unsigned short pointSize = 0);
+#else
     QtFontSize *pixelSize(unsigned short size, bool = false);
+
 };
 
@@ -259 +280 @@
 }
 
+
+
+
+
 QtFontSize *QtFontStyle::pixelSize(unsigned short size, bool add)
+
 {
     for (int i = 0; i < count; i++) {
+
+
+
+
+
+
         if (pixelSizes[i].pixelSize == size)
             return pixelSizes + i;
+
     }
     if (!add)
@@ -280 +313 @@
     new (&pixelSizes[count].fileName) QByteArray;
     pixelSizes[count].fileIndex = 0;
+
+
+
+
 #endif
     return pixelSizes + (count++);
@@ -364 +401 @@
     {
         memset(writingSystems, 0, sizeof(writingSystems));
+
+
+
+
     }
     ~QtFontFamily() {
@@ -867 +908 @@
 }
 
-#define SMOOTH_SCALABLE 0xffff
-
 QT_BEGIN_INCLUDE_NAMESPACE
 #if defined(Q_WS_X11)

trunk/src/gui/text/qfontdatabase_pm.cpp

@@ -48 +48 @@
 QT_BEGIN_NAMESPACE
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 static void initializeDb()
 {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     // @todo implement
 }
 
-static inline void load(const QString &family = QString(), int = -1)
-{
-    // @todo implement
-}
-
-static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt)
-{
-    // @todo implement
+static QFontEngine *loadPM(const QFontPrivate *d, int script, const QFontDef &req)
+{
+    // @todo initializeDb() and stuff, get the engine
+    QFontDef fd = req;
+    QFontEngine *fe = new QFontEnginePMFT(fd);
+    return fe;
 }
 
@@ -95 +260 @@
             fe->fontDef = req;
         } else {
-            // @todo initializeDb() and stuff, get the engine
-            QFontDef fd = req;
-            fe = new QFontEnginePMFT(fd);
+            QMutexLocker locker(fontDatabaseMutex());
+            if (!privateDb()->count)
+                initializeDb();
+            fe = loadPM(d, script, req);
         }
         if (!fe) {

trunk/src/gui/text/text.pri

@@ -189 +189 @@
 contains(QT_CONFIG, fontconfig) {
     CONFIG += opentype
+
+
 }