Changeset 371 for trunk

Timestamp:

Dec 2, 2009, 2:27:41 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Improved font handling (patch by komh):

• Read national face names from font files instead of always taking the Latin name.
• Use the PM_AssociateFont registry key to select a fallback font for missing glyphs (important on DBCS systems).

Location:

trunk/src/gui

Files:

• kernel/qapplication_pm.cpp (modified) (1 diff)
• text/qfont_pm.cpp (modified) (3 diffs)
• text/qfontdatabase_pm.cpp (modified) (4 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -223 +223 @@
                     default: f.setStretch(QFont::Unstretched); break;
                 }
-                f.setFamily(fm.szFamilyname);
+                f.setFamily();
                 f.setPointSize(height);
             }

trunk/src/gui/text/qfont_pm.cpp

@@ -42 +42 @@
 ****************************************************************************/
 
+
 #include "qfont.h"
 #include "qfont_p.h"
@@ -69 +70 @@
         break;
     case QFont::AnyStyle:
-        if (request.fixedPitch)
+    default:
+        static char szFontName[FACESIZE + 1] = {0,};
+
+        // already queried ?
+        if (szFontName[0] != ';') {
+            szFontName[0] = ';';
+            // query the associated font
+            if (PrfQueryProfileString(HINI_USERPROFILE,
+                                      "PM_SystemFonts", "PM_AssociateFont", 0,
+                                      szFontName, sizeof(szFontName))) {
+                szFontName[FACESIZE] = '\0';
+
+                // the format of the associated font is face_name;point_size
+                // so remove ';' and later
+                for (PSZ pch = szFontName; *pch; pch++)
+                    if (*pch == ';') {
+                        *pch = '\0';
+                        break;
+                    }
+            }
+        }
+
+        // is the associated font available ?
+        if (szFontName[0] != '\0' && szFontName[0] != ';')
+            family = szFontName;
+        else if (request.fixedPitch)
             family = "Courier";
         else
@@ -103 +129 @@
 QString QFont::defaultFamily() const
 {
-    return QLatin1String(qt_fontFamilyFromStyleHint(d->request));
+    return Q(qt_fontFamilyFromStyleHint(d->request));
 }
 

trunk/src/gui/text/qfontdatabase_pm.cpp

@@ -42 +42 @@
 ****************************************************************************/
 
+
+
 #include "qabstractfileengine.h"
-
-#include "qfontengine_pm_p.h"
-
 #include "qsettings.h"
 #include "qfileinfo.h"
 #include "qdatetime.h"
 #include "qhash.h"
+
 
 #include <ft2build.h>
@@ -56 +56 @@
 #include FT_TRUETYPE_TABLES_H
 #include FT_LCD_FILTER_H
+
+
 
 QT_BEGIN_NAMESPACE
@@ -119 +121 @@
 static FontFileHash knownFontFiles;
 static bool knownFontFilesInitialized = false;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 static void populateDatabase(const QString& fam)
@@ -270 +437 @@
 
                 cached.index = idx;
-                cached.familyName = QString::fromLatin1(face->family_name);
+
+                if (!lookupFamilyName(face, cached.familyName))
+                    cached.familyName = QString::fromLocal8Bit(face->family_name);
 
                 // familyName may contain extra spaces (at least this is true for