whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix reporting writing systems for non-TrueType fonts 

According to EnumFontFamExProc docs:
> The ENUMLOGFONTEX structure includes the localized name
> of the script (character set).

lfCharSet ENUMLOGFONT's member must be used instead of comparing
these names to non-localized ones.

Also, when the font supports more than a single charset,
EnumFontFamExProc callback is called for it once per charset; thus,
we shouldn't "unsupport" writing systems in a subsequent call.

Task-number: QTBUG-30448

Change-Id: I58fcf32958490cf5a3e873db8335e71a39a9c518
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
bb10
Konstantin Ritt 2013-03-31 18:41:13 +03:00 committed by The Qt Project
parent 22cd698e39
commit 03875c0ba5
3 changed files with 87 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/text/qfontdatabase_qpa.cpp
View File

@ -68,11 +68,8 @@ Q_GUI_EXPORT void qt_registerFont(const QString &familyName, const QString &sty
f->fixedPitch = fixedPitch;
for (int i = 0; i < QFontDatabase::WritingSystemsCount; ++i) {
if (writingSystems.supported(QFontDatabase::WritingSystem(i))) {
if (writingSystems.supported(QFontDatabase::WritingSystem(i)))
f->writingSystems[i] = QtFontFamily::Supported;
} else {
f->writingSystems[i] = QtFontFamily::Unsupported;
}
}
QtFontFoundry *foundry = f->foundry(foundryname, true);

72
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
View File

@ -620,36 +620,43 @@ static inline QFont::Weight weightFromInteger(long weight)
return QFont::Black;
}
static inline QFontDatabase::WritingSystem writingSystemFromScript(const QString &scriptName)
static inline QFontDatabase::WritingSystem writingSystemFromCharSet(uchar charSet)
{
if (scriptName == QStringLiteral("Western")
|| scriptName == QStringLiteral("Baltic")
|| scriptName == QStringLiteral("Central European")
|| scriptName == QStringLiteral("Turkish")
|| scriptName == QStringLiteral("Vietnamese")
|| scriptName == QStringLiteral("OEM/Dos"))
switch (charSet) {
case ANSI_CHARSET:
case EASTEUROPE_CHARSET:
case BALTIC_CHARSET:
case TURKISH_CHARSET:
case OEM_CHARSET:
return QFontDatabase::Latin;
if (scriptName == QStringLiteral("Thai"))
return QFontDatabase::Thai;
if (scriptName == QStringLiteral("Symbol")
|| scriptName == QStringLiteral("Other"))
return QFontDatabase::Symbol;
if (scriptName == QStringLiteral("CHINESE_GB2312"))
return QFontDatabase::SimplifiedChinese;
if (scriptName == QStringLiteral("CHINESE_BIG5"))
return QFontDatabase::TraditionalChinese;
if (scriptName == QStringLiteral("Cyrillic"))
return QFontDatabase::Cyrillic;
if (scriptName == QStringLiteral("Hangul"))
return QFontDatabase::Korean;
if (scriptName == QStringLiteral("Hebrew"))
return QFontDatabase::Hebrew;
if (scriptName == QStringLiteral("Greek"))
case GREEK_CHARSET:
return QFontDatabase::Greek;
if (scriptName == QStringLiteral("Japanese"))
return QFontDatabase::Japanese;
if (scriptName == QStringLiteral("Arabic"))
case RUSSIAN_CHARSET:
return QFontDatabase::Cyrillic;
case HEBREW_CHARSET:
return QFontDatabase::Hebrew;
case ARABIC_CHARSET:
return QFontDatabase::Arabic;
case THAI_CHARSET:
return QFontDatabase::Thai;
case GB2312_CHARSET:
return QFontDatabase::SimplifiedChinese;
case CHINESEBIG5_CHARSET:
return QFontDatabase::TraditionalChinese;
case SHIFTJIS_CHARSET:
return QFontDatabase::Japanese;
case HANGUL_CHARSET:
case JOHAB_CHARSET:
return QFontDatabase::Korean;
case VIETNAMESE_CHARSET:
return QFontDatabase::Vietnamese;
case SYMBOL_CHARSET:
return QFontDatabase::Symbol;
// ### case MAC_CHARSET:
// ### case DEFAULT_CHARSET:
default:
break;
}
return QFontDatabase::Any;
}
@ -833,7 +840,7 @@ error:
Q_GUI_EXPORT void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias);
static bool addFontToDatabase(QString familyName, const QString &scriptName,
static bool addFontToDatabase(const QString &familyName, uchar charSet,
const TEXTMETRIC *textmetric,
const FONTSIGNATURE *signature,
int type)
@ -857,7 +864,7 @@ static bool addFontToDatabase(QString familyName, const QString &scriptName,
#ifndef QT_NO_DEBUG_OUTPUT
if (QWindowsContext::verboseFonts > 2) {
QDebug nospace = qDebug().nospace();
nospace << __FUNCTION__ << familyName << scriptName
nospace << __FUNCTION__ << familyName << charSet
<< "TTF=" << ttf;
if (type & DEVICE_FONTTYPE)
nospace << " DEVICE";
@ -877,6 +884,7 @@ static bool addFontToDatabase(QString familyName, const QString &scriptName,
QSupportedWritingSystems writingSystems;
if (type & TRUETYPE_FONTTYPE) {
Q_ASSERT(signature);
quint32 unicodeRange[4] = {
signature->fsUsb[0], signature->fsUsb[1],
signature->fsUsb[2], signature->fsUsb[3]
@ -905,7 +913,7 @@ static bool addFontToDatabase(QString familyName, const QString &scriptName,
familyName == QStringLiteral("Segoe UI"))
writingSystems.setSupported(QFontDatabase::Thai, false);
} else {
const QFontDatabase::WritingSystem ws = writingSystemFromScript(scriptName);
const QFontDatabase::WritingSystem ws = writingSystemFromCharSet(charSet);
if (ws != QFontDatabase::Any)
writingSystems.setSupported(ws);
}
@ -934,14 +942,14 @@ static int CALLBACK storeFont(ENUMLOGFONTEX* f, NEWTEXTMETRICEX *textmetric,
{
typedef QSet<QString> StringSet;
const QString familyName = QString::fromWCharArray(f->elfLogFont.lfFaceName);
const QString script = QString::fromWCharArray(f->elfScript);
const uchar charSet = f->elfLogFont.lfCharSet;
const FONTSIGNATURE signature = textmetric->ntmFontSig;
// NEWTEXTMETRICEX is a NEWTEXTMETRIC, which according to the documentation is
// identical to a TEXTMETRIC except for the last four members, which we don't use
// anyway
if (addFontToDatabase(familyName, script, (TEXTMETRIC *)textmetric, &signature, type))
if (addFontToDatabase(familyName, charSet, (TEXTMETRIC *)textmetric, &signature, type))
reinterpret_cast<StringSet *>(namesSetIn)->insert(familyName);
// keep on enumerating
@ -1313,7 +1321,7 @@ QStringList QWindowsFontDatabase::addApplicationFont(const QByteArray &fontData,
TEXTMETRIC textMetrics;
GetTextMetrics(hdc, &textMetrics);
addFontToDatabase(familyName, QString(), &textMetrics, &signatures.at(j),
addFontToDatabase(familyName, lf.lfCharSet, &textMetrics, &signatures.at(j),
TRUETYPE_FONTTYPE);
SelectObject(hdc, oldobj);

84
src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
View File

@ -57,39 +57,6 @@
QT_BEGIN_NAMESPACE
static inline QFontDatabase::WritingSystem writingSystemFromScript(const QString &scriptName)
{
if (scriptName == QStringLiteral("Western")
|| scriptName == QStringLiteral("Baltic")
|| scriptName == QStringLiteral("Central European")
|| scriptName == QStringLiteral("Turkish")
|| scriptName == QStringLiteral("Vietnamese")
|| scriptName == QStringLiteral("OEM/Dos"))
return QFontDatabase::Latin;
if (scriptName == QStringLiteral("Thai"))
return QFontDatabase::Thai;
if (scriptName == QStringLiteral("Symbol")
|| scriptName == QStringLiteral("Other"))
return QFontDatabase::Symbol;
if (scriptName == QStringLiteral("CHINESE_GB2312"))
return QFontDatabase::SimplifiedChinese;
if (scriptName == QStringLiteral("CHINESE_BIG5"))
return QFontDatabase::TraditionalChinese;
if (scriptName == QStringLiteral("Cyrillic"))
return QFontDatabase::Cyrillic;
if (scriptName == QStringLiteral("Hangul"))
return QFontDatabase::Korean;
if (scriptName == QStringLiteral("Hebrew"))
return QFontDatabase::Hebrew;
if (scriptName == QStringLiteral("Greek"))
return QFontDatabase::Greek;
if (scriptName == QStringLiteral("Japanese"))
return QFontDatabase::Japanese;
if (scriptName == QStringLiteral("Arabic"))
return QFontDatabase::Arabic;
return QFontDatabase::Any;
}
// convert 0 ~ 1000 integer to QFont::Weight
static inline QFont::Weight weightFromInteger(long weight)
{
@ -104,6 +71,46 @@ static inline QFont::Weight weightFromInteger(long weight)
return QFont::Black;
}
static inline QFontDatabase::WritingSystem writingSystemFromCharSet(uchar charSet)
{
switch (charSet) {
case ANSI_CHARSET:
case EASTEUROPE_CHARSET:
case BALTIC_CHARSET:
case TURKISH_CHARSET:
case OEM_CHARSET:
return QFontDatabase::Latin;
case GREEK_CHARSET:
return QFontDatabase::Greek;
case RUSSIAN_CHARSET:
return QFontDatabase::Cyrillic;
case HEBREW_CHARSET:
return QFontDatabase::Hebrew;
case ARABIC_CHARSET:
return QFontDatabase::Arabic;
case THAI_CHARSET:
return QFontDatabase::Thai;
case GB2312_CHARSET:
return QFontDatabase::SimplifiedChinese;
case CHINESEBIG5_CHARSET:
return QFontDatabase::TraditionalChinese;
case SHIFTJIS_CHARSET:
return QFontDatabase::Japanese;
case HANGUL_CHARSET:
case JOHAB_CHARSET:
return QFontDatabase::Korean;
case VIETNAMESE_CHARSET:
return QFontDatabase::Vietnamese;
case SYMBOL_CHARSET:
return QFontDatabase::Symbol;
// ### case MAC_CHARSET:
// ### case DEFAULT_CHARSET:
default:
break;
}
return QFontDatabase::Any;
}
static FontFile * createFontFile(const QString &fileName, int index)
{
FontFile *fontFile = new FontFile;
@ -117,7 +124,7 @@ extern QString getEnglishName(const QString &familyName);
Q_GUI_EXPORT void qt_registerAliasToFontFamily(const QString &familyName, const QString &alias);
static bool addFontToDatabase(QString familyName, const QString &scriptName,
static bool addFontToDatabase(const QString &familyName, uchar charSet,
const TEXTMETRIC *textmetric,
const FONTSIGNATURE *signature,
int type)
@ -148,7 +155,7 @@ static bool addFontToDatabase(QString familyName, const QString &scriptName,
#ifndef QT_NO_DEBUG_OUTPUT
if (QWindowsContext::verboseFonts > 2) {
QDebug nospace = qDebug().nospace();
nospace << __FUNCTION__ << faceName << fullName << scriptName
nospace << __FUNCTION__ << familyName << faceName << fullName << charSet
<< "TTF=" << ttf;
if (type & DEVICE_FONTTYPE)
nospace << " DEVICE";
@ -168,6 +175,7 @@ static bool addFontToDatabase(QString familyName, const QString &scriptName,
QSupportedWritingSystems writingSystems;
if (type & TRUETYPE_FONTTYPE) {
Q_ASSERT(signature);
quint32 unicodeRange[4] = {
signature->fsUsb[0], signature->fsUsb[1],
signature->fsUsb[2], signature->fsUsb[3]
@ -185,7 +193,7 @@ static bool addFontToDatabase(QString familyName, const QString &scriptName,
faceName == QStringLiteral("Segoe UI"))
writingSystems.setSupported(QFontDatabase::Thai, false);
} else {
const QFontDatabase::WritingSystem ws = writingSystemFromScript(scriptName);
const QFontDatabase::WritingSystem ws = writingSystemFromCharSet(charSet);
if (ws != QFontDatabase::Any)
writingSystems.setSupported(ws);
}
@ -308,14 +316,14 @@ static int CALLBACK storeFont(ENUMLOGFONTEX* f, NEWTEXTMETRICEX *textmetric,
const QString familyName = QString::fromWCharArray(f->elfLogFont.lfFaceName)
+ QStringLiteral("::")
+ QString::fromWCharArray(f->elfFullName);
const QString script = QString::fromWCharArray(f->elfScript);
const uchar charSet = f->elfLogFont.lfCharSet;
const FONTSIGNATURE signature = textmetric->ntmFontSig;
// NEWTEXTMETRICEX is a NEWTEXTMETRIC, which according to the documentation is
// identical to a TEXTMETRIC except for the last four members, which we don't use
// anyway
if (addFontToDatabase(familyName, script, (TEXTMETRIC *)textmetric, &signature, type))
if (addFontToDatabase(familyName, charSet, (TEXTMETRIC *)textmetric, &signature, type))
reinterpret_cast<StringSet *>(namesSetIn)->insert(familyName);
// keep on enumerating