Changeset 8 for trunk/src/kernel/qfontdatabase.cpp

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/src/kernel/qfontdatabase.cpp (modified) (37 diffs)

trunk/src/kernel/qfontdatabase.cpp

@@ -71 +71 @@
 #endif
 
+#define SMOOTH_SCALABLE 0xffff
+
 static int ucstricmp( const QString &as, const QString &bs )
 {
@@ -138 +140 @@
     unsigned short pixelSize;
 
+#ifdef Q_WS_PM
+    unsigned short pointSize;                   // in deca-points
+    LONG lMatch;
+#endif
 #ifdef Q_WS_X11
     int count;
@@ -206 +212 @@
           fakeOblique( FALSE ), count( 0 ), pixelSizes( 0 )
     {
-#if defined(Q_WS_X11)
+#if defined(Q_WS_PM)
+        szFacename[0] = 0;
+#elif defined(Q_WS_X11)
         weightName = setwidthName = 0;
-#endif // Q_WS_X11
+#endif
     }
 
@@ -228 +236 @@
     QtFontSize *pixelSizes;
 
+#ifdef Q_WS_PM
+    CHAR szFacename [FACESIZE];
+#endif
 #ifdef Q_WS_X11
     const char *weightName;
@@ -233 +244 @@
 #endif // Q_WS_X11
 
+#ifdef Q_WS_PM
+    QtFontSize *pixelSize(
+        unsigned short size, bool = FALSE, unsigned short pointSize = 0 );
+#else    
     QtFontSize *pixelSize( unsigned short size, bool = FALSE );
+#endif    
 };
 
@@ -247 +263 @@
 }
 
+#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
+            )
+        )
+#else        
         if ( pixelSizes[i].pixelSize == size )
+#endif            
             return pixelSizes + i;
     }
@@ -261 +293 @@
                               (((count+8) >> 3 ) << 3) * sizeof(QtFontSize) );
     pixelSizes[count].pixelSize = size;
+#ifdef Q_WS_PM
+    pixelSizes[count].pointSize = pointSize;
+    pixelSizes[count].lMatch = 0;
+#endif
 #ifdef Q_WS_X11
     pixelSizes[count].count = 0;
@@ -336 +372 @@
           name( n ), count( 0 ), foundries( 0 ) {
         memset( scripts, 0, sizeof( scripts ) );
+#ifdef Q_WS_PM
+//@@TODO (dmik): temporary solution to let QFontDialog work:
+//  at least UnknownScript is supported.
+        scripts[QFont::UnknownScript] = Supported;
+#endif        
     }
     ~QtFontFamily() {
@@ -357 +398 @@
     bool fullyLoaded : 1;
     QString name;
+#ifndef Q_WS_X11
     QString rawName;
+#endif    
 #ifdef Q_WS_X11
     QCString fontFilename;
@@ -393 +436 @@
 class QFontDatabasePrivate {
 public:
-    QFontDatabasePrivate() : count( 0 ), families( 0 ) { }
+    QFontDatabasePrivate() : 
+        count( 0 ), families( 0 ) { }
     ~QFontDatabasePrivate() {
+#ifdef Q_WS_PM
+        cleanup();
+#else
         while ( count-- )
             delete families[count];
         free( families );
+#endif
     }
     QtFontFamily *family( const QString &f, bool = FALSE );
@@ -403 +451 @@
     int count;
     QtFontFamily **families;
+
+#ifdef Q_WS_PM
+    static QFontDatabasePrivate* instance();
+private:    
+    void cleanup() {
+        while ( count )
+            delete families[--count];
+        free( families );
+        families = 0;
+    }
+    void reload(); 
+#endif
 };
 
@@ -627 +687 @@
 
 static QSingleCleanupHandler<QFontDatabasePrivate> qfontdatabase_cleanup;
+#ifdef Q_WS_PM
+QFontDatabasePrivate* QFontDatabasePrivate::instance()
+{
+    static QFontDatabasePrivate *db = 0;
+    if ( !db ) {
+        db = new QFontDatabasePrivate;
+        qfontdatabase_cleanup.set(&db);
+        db->reload();
+    }
+    return db;
+}
+#else
 static QFontDatabasePrivate *db=0;
-#define SMOOTH_SCALABLE 0xffff
+#endif
 
 #if defined( Q_WS_X11 )
@@ -636 +708 @@
 #elif defined( Q_WS_WIN )
 #  include "qfontdatabase_win.cpp"
+#elif defined( Q_WS_PM )
+#  include "qfontdatabase_pm.cpp"
 #elif defined( Q_WS_QWS )
 #  include "qfontdatabase_qws.cpp"
@@ -643 +717 @@
 
 
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
+#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_PM)
 static
 unsigned int bestFoundry( QFont::Script script, unsigned int score, int styleStrategy,
@@ -650 +724 @@
                           QtFontFoundry **best_foundry, QtFontStyle **best_style,
                           QtFontSize **best_size
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11)
                           , QtFontEncoding **best_encoding, int force_encoding_id
+#elif defined(Q_WS_PM)
+                          , int pointSize
 #endif
                           )
@@ -711 +787 @@
         // 1. see if we have an exact matching size
         if (! (styleStrategy & QFont::ForceOutline)) {
+#if defined(Q_WS_PM)
+            size = style->pixelSize(pixelSize, FALSE, pointSize);
+#else            
             size = style->pixelSize(pixelSize);
+#endif            
             if (size) px = size->pixelSize;
         }
@@ -843 +923 @@
 #endif
 
+#ifdef Q_WS_PM
+    QFontDatabasePrivate *db = QFontDatabasePrivate::instance();
+#else    
     if ( !db )
         initializeDb();
+#endif
 
     QFontEngine *fe = 0;
     if ( fp ) {
+#ifndef Q_WS_PM
         if ( fp->rawMode ) {
             fe = loadEngine( script, fp, request, 0, 0, 0
@@ -859 +944 @@
             return fe;
         }
+#endif // !Q_WS_PM
 
         QFontCache::Key key( request, script,
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
                              (int)fp->paintdevice
 #else
@@ -880 +966 @@
     parseFontName( request.family, foundry_name, family_name );
 
+#ifdef Q_WS_PM
+    // the "System VIO" PM font is broken in such way that its real pixel
+    // sizes do not correspond to their nominal point sizes specified in the
+    // font header (i.e. pixelSize is not equal to (pointSize * dpi) / 720).
+    // therefore we use the special table to convert pointSize to pixelSize
+    // in order to let bestFoundry() select the proper font with its nominal
+    // point size corresponding to the requested one.
+    // NOTE: this will produce incorrect results if "System VIO" is NOT
+    // an OS/2 standatd supplied bitmap font.
+    if( !ucstricmp( family_name, "System VIO") ) {
+        // possible sizes of the "System VIO" font ("pixel, point" pairs),
+        // sorted by point size
+        static const short SystemVIO_sz[] = {
+            12, 20,         16, 30,
+            8,  40,         13, 50,
+            15, 60,         24, 70,
+            8,  80,         10, 90,
+            12, 100,        14, 110,
+            16, 120,        18, 130,
+            16, 140,        12, 150,
+            20, 160,        21, 170,
+            29, 180,
+        };
+        const int SystemVIO_sz_len = sizeof(SystemVIO_sz) / sizeof(SystemVIO_sz[0]);
+        int pt = request.pointSize;
+        pt = QMAX( pt, SystemVIO_sz [1] );                      // min limit 
+        pt = QMIN( pt, SystemVIO_sz [SystemVIO_sz_len - 1] );   // max limit
+        int i = 1;
+        while ( SystemVIO_sz[i] < pt ) i += 2;
+        if ( SystemVIO_sz[i] > pt ) {
+            int prev = SystemVIO_sz[i-2];
+            int mid = prev + (SystemVIO_sz[i] - prev + 1) / 2;
+            if ( pt < mid ) i -= 2; 
+        }
+        ((QFontDef&)request).pixelSize = SystemVIO_sz[i-1];
+        ((QFontDef&)request).pointSize = SystemVIO_sz[i];
+    }
+#endif
+    
 #ifdef Q_WS_X11
     if (family_name.isEmpty() && script == QFont::Han) {
@@ -905 +1030 @@
               "    stretch: %d\n"
               "    pixelSize: %d\n"
+              "    pointSize: %d\n"
               "    pitch: %c",
               family_name.isEmpty() ? "-- first in script --" : family_name.latin1(),
               foundry_name.isEmpty() ? "-- any --" : foundry_name.latin1(),
               script, scriptName( script ).latin1(),
-              request.weight, request.italic, request.stretch, request.pixelSize, pitch );
+              request.weight, request.italic, request.stretch,
+              request.pixelSize, request.pointSize,
+              pitch );
 
 #ifdef QT_XFT2
@@ -944 +1072 @@
             uint score_adjust = 0;
             QFont::Script override_script = script;
+#ifndef Q_WS_PM
             if ( ! ( try_family->scripts[script] & QtFontFamily::Supported )
                  && script != QFont::Unicode) {
@@ -978 +1107 @@
                 }
             }
+#endif // !Q_WS_PM
 
             QtFontFoundry *try_foundry = 0;
@@ -992 +1122 @@
                              try_family, foundry_name, styleKey, request.pixelSize, pitch,
                              &try_foundry, &try_style, &try_size
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11)
                              , &try_encoding, force_encoding_id
+#elif defined(Q_WS_PM)
+                             , request.pointSize
 #endif
                     );
@@ -1002 +1134 @@
                                         QString::null, styleKey, request.pixelSize,
                                         pitch, &try_foundry, &try_style, &try_size
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11)
                                         , &try_encoding, force_encoding_id
+#elif defined(Q_WS_PM)
+                                        , request.pointSize
 #endif
                     );
@@ -1047 +1181 @@
 
             fe = loadEngine( script, fp, request, best_family, best_foundry, best_style
-#ifdef Q_WS_X11
+#if defined(Q_WS_PM)
+                             , best_size
+#elif defined(Q_WS_X11)
                              , best_size, best_encoding, ( force_encoding_id >= 0 )
 #endif
@@ -1060 +1196 @@
             }
 
+#ifdef Q_WS_PM
+            // On OS/2, fontDef.pixelSize and fontDef.pointSize are filled
+            // by QFontEnginePM constructor
+#else             
             if ( best_style->smoothScalable )
                 fe->fontDef.pixelSize = request.pixelSize;
@@ -1082 +1222 @@
                 fe->fontDef.pointSize = request.pointSize;
             }
+#endif            
             fe->fontDef.styleHint     = request.styleHint;
             fe->fontDef.styleStrategy = request.styleStrategy;
@@ -1094 +1235 @@
 
     if ( fe ) {
+#ifdef Q_WS_PM
+///@@TODO (dmik): should do something here?
+#else
         if ( script != QFont::Unicode && !canRender( fe, script ) ) {
             FM_DEBUG( "  WARN: font loaded cannot render sample 0x%04x",
@@ -1117 +1261 @@
             return fe;
         }
+#endif // !Q_WS_PM
 
         if ( fp ) {
             QFontCache::Key key( request, script,
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM)
                                  (int)fp->paintdevice
 #else
@@ -1128 +1273 @@
             QFontCache::instance->insertEngine( key, fe );
 
+#ifndef Q_WS_PM
             for ( int i = 0; i < QFont::NScripts; ++i ) {
                 if ( i == script ) continue;
@@ -1137 +1283 @@
                 QFontCache::instance->insertEngine( key, fe );
             }
+#endif // !Q_WS_PM
         }
     } else {
         if ( request.family.isEmpty() ) {
+#ifdef Q_WS_PM
+//@@TODO (dmik): what to return in such case?
+            qFatal( "QFontDatabase::findFont: request.family is empty and nothing is found, should it ever happen?" );
+#else
             FM_DEBUG( "returning box engine" );
 
@@ -1146 +1297 @@
             if ( fp ) {
                 QFontCache::Key key( request, script,
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_PM) 
                                      (int)fp->paintdevice
 #else
@@ -1154 +1305 @@
                 QFontCache::instance->insertEngine( key, fe );
             }
+#endif // Q_WS_PM
         }
     }
@@ -1159 +1311 @@
     return fe;
 }
-#endif // Q_WS_X11 || Q_WS_WIN
+#endif // Q_WS_X11 || Q_WS_WIN || Q_WS_PM
 
 
@@ -1355 +1507 @@
 QFontDatabase::QFontDatabase()
 {
+#ifdef Q_WS_PM
+    d = QFontDatabasePrivate::instance();    
+#else    
     createDatabase();
 
     d = db;
+#endif
 }
 
@@ -1635 +1791 @@
 
                 if (size->pixelSize != 0 && size->pixelSize != USHRT_MAX) {
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11)
                     const uint pointSize = qRound(qt_pointSize(size->pixelSize, 0, -1));
+#elif defined(Q_WS_PM)
+//@@TODO (dmik): some bitmap fonts (i.e. System VIO) have point sizes
+//  that do not really correlate with their actual pixel sizes (i.e.
+//  their pointsize != pixelsizde * DPI / 72), What to return in that case?  
+                    const uint pointSize = size->pointSize / 10;
 #else
                     const uint pointSize = size->pixelSize; // embedded uses 72dpi
@@ -1740 +1901 @@
 
                 if ( size->pixelSize != 0 && size->pixelSize != USHRT_MAX ) {
-#ifdef Q_WS_X11
+#if defined(Q_WS_X11)
                     const uint pointSize = qRound(qt_pointSize(size->pixelSize, 0, -1));
+#elif defined(Q_WS_PM)
+//@@TODO (dmik): some bitmap fonts (i.e. System VIO) have point sizes
+//  that do not really correlate with their actual pixel sizes (i.e.
+//  their pointsize != pixelsizde * DPI / 72), What to return in that case?  
+                    const uint pointSize = size->pointSize / 10;
 #else
                     const uint pointSize = size->pixelSize; // embedded uses 72dpi