Changeset 124 for trunk/src/gui/text

Timestamp:

Aug 21, 2009, 3:34:10 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented QWidge::metric(). Added using of test (box) font engines on OS/2.

Location:

trunk/src/gui/text

Files:

• qfont.cpp (modified) (3 diffs)
• qfontdatabase.cpp (modified) (1 diff)
• qfontdatabase_pm.cpp (modified) (1 diff)
• qfontengine_p.h (modified) (1 diff)

trunk/src/gui/text/qfont.cpp

@@ -66 +66 @@
 #include <private/qt_x11_p.h>
 #endif
+#ifdef Q_WS_PM
+#include "qt_os2.h"
+#include "qwindowdefs_pm.h"
+#endif
 #ifdef Q_WS_QWS
 #include "qscreen_qws.h"
@@ -159 +163 @@
 #elif defined(Q_WS_WIN)
     dpi = GetDeviceCaps(shared_dc(),LOGPIXELSX);
+#elif defined(Q_WS_PM)
+    LONG ulDpi;
+    DevQueryCaps(GpiQueryDevice(qt_display_ps()),
+                 CAPS_HORIZONTAL_FONT_RES, 1, &ulDpi);
+    Q_ASSERT(ulDpi != 0);
+    dpi = ulDpi;
 #elif defined(Q_WS_MAC)
     extern float qt_mac_defaultDpi_x(); //qpaintdevice_mac.cpp
@@ -185 +195 @@
 #elif defined(Q_WS_WIN)
     dpi = GetDeviceCaps(shared_dc(),LOGPIXELSY);
+#elif defined(Q_WS_PM)
+    LONG ulDpi;
+    DevQueryCaps(GpiQueryDevice(qt_display_ps()),
+                 CAPS_VERTICAL_FONT_RES, 1, &ulDpi);
+    Q_ASSERT(ulDpi != 0);
+    dpi = ulDpi;
 #elif defined(Q_WS_MAC)
     extern float qt_mac_defaultDpi_y(); //qpaintdevice_mac.cpp

trunk/src/gui/text/qfontdatabase.cpp

@@ -815 +815 @@
 #endif
 
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_PM)
 static void getEngineData(const QFontPrivate *d, const QFontCache::Key &key)
 {

trunk/src/gui/text/qfontdatabase_pm.cpp

@@ -63 +63 @@
 void QFontDatabase::load(const QFontPrivate *d, int script)
 {
-    // @todo implement
+    Q_ASSERT(script >= 0 && script < QUnicodeTables::ScriptCount);
+
+    // normalize the request to get better caching
+    QFontDef req = d->request;
+    if (req.pixelSize <= 0)
+        req.pixelSize = qMax(1, qRound(req.pointSize * d->dpi / 72.));
+    req.pointSize = 0;
+    if (req.weight == 0)
+        req.weight = QFont::Normal;
+    if (req.stretch == 0)
+        req.stretch = 100;
+
+    QFontCache::Key key(req, d->rawMode ? QUnicodeTables::Common : script, d->screen);
+    if (!d->engineData)
+        getEngineData(d, key);
+
+    // the cached engineData could have already loaded the engine we want
+    if (d->engineData->engines[script])
+        return;
+
+    // set it to the actual pointsize, so QFontInfo will do the right thing
+    req.pointSize = req.pixelSize * 72. / d->dpi;
+
+    QFontEngine *fe = QFontCache::instance()->findEngine(key);
+
+    if (!fe) {
+        if (qt_enable_test_font && req.family == QLatin1String("__Qt__Box__Engine__")) {
+            fe = new QTestFontEngine(req.pixelSize);
+            fe->fontDef = req;
+        } else {
+            // @todo initializeDb() and stuff, get the engine
+        }
+        if (!fe) {
+            fe = new QFontEngineBox(req.pixelSize);
+            fe->fontDef = QFontDef();
+        }
+    }
+    if (fe->symbol || (d->request.styleStrategy & QFont::NoFontMerging)) {
+        for (int i = 0; i < QUnicodeTables::ScriptCount; ++i) {
+            if (!d->engineData->engines[i]) {
+                d->engineData->engines[i] = fe;
+                fe->ref.ref();
+            }
+        }
+    } else {
+        d->engineData->engines[script] = fe;
+        fe->ref.ref();
+    }
+    QFontCache::instance()->insertEngine(key, fe);
 }
 

trunk/src/gui/text/qfontengine_p.h

@@ -165 +165 @@
     virtual void doKerning(QGlyphLayout *, QTextEngine::ShaperFlags) const;
 
-#if !defined(Q_WS_X11) && !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
+#if !defined(Q_WS_X11) && !defined(Q_WS_WIN) && !defined(Q_WS_PM) && !defined(Q_WS_MAC)
     virtual void draw(QPaintEngine *p, qreal x, qreal y, const QTextItemInt &si) = 0;
 #endif