Changeset 220 for trunk/src/gui/text/qfontdatabase.cpp

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

gui: Added enumeration of installed PM fonts.

File:

• trunk/src/gui/text/qfontdatabase.cpp (modified) (9 diffs)

trunk/src/gui/text/qfontdatabase.cpp

@@ -54 +54 @@
 #include <locale.h>
 #endif
+#ifdef Q_WS_PM
+#include "qt_os2.h"
+#endif
+
 #include <stdlib.h>
 #include <limits.h>
@@ -74 +78 @@
 #  define for if(0){}else for
 #endif
+
+#define SMOOTH_SCALABLE 0xffff
 
 QT_BEGIN_NAMESPACE
@@ -146 +152 @@
     int fileIndex;
 #endif
+#ifdef Q_WS_PM
+    unsigned short pointSize; // in deca-points
+    LONG lMatch;
+#endif
 };
 
@@ -209 +219 @@
         weightName = setwidthName = 0;
 #endif // Q_WS_X11
+#if defined(Q_WS_PM)
+        faceName[0] = 0;
+#endif
     }
 
@@ -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);
+#endif
 };
 
@@ -259 +280 @@
 }
 
+#ifdef Q_WS_PM
+QtFontSize *QtFontStyle::pixelSize(unsigned short size, bool add,
+                                   unsigned short pointSize)
+#else
 QtFontSize *QtFontStyle::pixelSize(unsigned short size, bool add)
+#endif
 {
     for (int i = 0; i < count; i++) {
+#ifdef Q_WS_PM
+        if (pixelSizes[i].pixelSize == size &&
+        (size == SMOOTH_SCALABLE || !pointSize ||
+         pixelSizes[i].pointSize == pointSize))
+        return pixelSizes + i;
+#else
         if (pixelSizes[i].pixelSize == size)
             return pixelSizes + i;
+#endif
     }
     if (!add)
@@ -280 +313 @@
     new (&pixelSizes[count].fileName) QByteArray;
     pixelSizes[count].fileIndex = 0;
+#endif
+#ifdef Q_WS_PM
+    pixelSizes[count].pointSize = pointSize;
+    pixelSizes[count].lMatch = 0;
 #endif
     return pixelSizes + (count++);
@@ -364 +401 @@
     {
         memset(writingSystems, 0, sizeof(writingSystems));
+#ifdef Q_WS_PM
+        // the concept of writing systems isn't used, let's support just Any
+        writingSystems[QFontDatabase::Any] = Supported;
+#endif
     }
     ~QtFontFamily() {
@@ -867 +908 @@
 }
 
-#define SMOOTH_SCALABLE 0xffff
-
 QT_BEGIN_INCLUDE_NAMESPACE
 #if defined(Q_WS_X11)