FCL/sf/mw/qt: comparison src/gui/text/qfontdatabase

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 #include "qx11info_x11.h"
 #include <qdebug.h>
 #include <qfile.h>
 #include <qtemporaryfile.h>
 #include <qabstractfileengine.h>
+#include <qmath.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <sys/types.h>
 static const char writingSystems_for_xlfd_encoding[sizeof(xlfd_encoding)][QFontDatabase::WritingSystemsCount] = {
 // iso8859-1
 { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // iso8859-2
 { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // iso8859-3
 { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // iso8859-4
 { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // iso8859-9
 { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // iso8859-10
 { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // iso8859-13
 { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // iso8859-14
 { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // iso8859-15
 { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // hp-roman8
 { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // iso8859-5
 { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // *-cp1251
 { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // koi8-ru
 { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // koi8-u
 { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // koi8-r
 { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // iso8859-7
 { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // iso8859-8
 { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // gb18030-0
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-0 },
+0, 0 },
 // gb18030.2000-0
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-0 },
+0, 0 },
 // gbk-0
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-0 },
+0, 0 },
 // gb2312.*-0
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,
-0 },
+0, 0 },
 // jisx0201*-0
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
-0 },
+0, 0 },
 // jisx0208*-0
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
-0 },
+0, 0 },
 // ksc5601*-*
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,
-0 },
+0, 0 },
 // big5hkscs-0
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-0 },
+0, 0 },
 // hkscs-1
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-0 },
+0, 0 },
 // big5*-*
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
-0 },
+0, 0 },
 // tscii-*
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // tis620*-*
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // iso8859-11
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // mulelao-1
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // ethiopic-unicode
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0 },
+0, 0 },
 // iso10646-1
 { 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
 1, 1, 0, 1, 0, 1, 1, 0, 0, 0,
-0 },
+0, 0 },
 // unicode-*
 { 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
 1, 1, 0, 1, 0, 1, 1, 0, 0, 0,
-0 },
+0, 0 },
 // *-symbol
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-1 },
+1, 0 },
 // *-fontspecific
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-1 },
+1, 0 },
 // fontspecific-*
 { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-1 }
+1, 0 }
 };
 // ----- end of generated code -----
 dpi = qt_defaultDpiY();
 }
 double size;
 if (FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &size) == FcResultMatch)
-fontDef.pixelSize = qRound(size);
+fontDef.pixelSize = size;
 else
 fontDef.pixelSize = 12;
 fontDef.pointSize = qt_pointSize(fontDef.pixelSize, qRound(dpi));
 "my", // Myanmar
 "ka", // Georgian
 "ko", // Hangul
 "", // Ogham
 "", // Runic
-"km" // Khmer
+"km", // Khmer
+"" // N'Ko
 };
 enum { SpecialLanguageCount = sizeof(specialLanguages) / sizeof(const char *) };
 static const ushort specialChars[] = {
 0, // English
 0x1000, // Myanmar
 0, // Georgian
 0, // Hangul
 0x1681, // Ogham
 0x16a0, // Runic
-0  // Khmer
+0,  // Khmer
+0x7ca // N'Ko
 };
 enum { SpecialCharCount = sizeof(specialChars) / sizeof(ushort) };
 // this could become a list of all languages used for each writing
 // system, instead of using the single most common language.
 "ja",  // Japanese
 "ko",  // Korean
 "vi",  // Vietnamese
 0, // Symbol
 0, // Ogham
-0 // Runic
+0, // Runic
+0 // N'Ko
 };
 enum { LanguageCount = sizeof(languageForWritingSystem) / sizeof(const char *) };
 // Unfortunately FontConfig doesn't know about some languages. We have to test these through the
 // charset. The lists below contain the systems where we need to do this.
 0,  // Japanese
 0,  // Korean
 0,  // Vietnamese
 0, // Symbol
 0x1681, // Ogham
-0x16a0 // Runic
+0x16a0, // Runic
+0x7ca // N'Ko
 };
 enum { SampleCharCount = sizeof(sampleCharForWritingSystem) / sizeof(ushort) };
 // Newer FontConfig let's us sort out fonts that contain certain glyphs, but no
 // open type tables for is directly. Do this so we don't pick some strange
 0,  // Japanese
 0,  // Korean
 0,  // Vietnamese
 0, // Symbol
 0, // Ogham
-0 // Runic
+0, // Runic
+"nko " // N'Ko
 };
 enum { OpenTypeCount = sizeof(openType) / sizeof(const char *) };
 static void loadFontConfig()
 slant_value = FC_SLANT_ITALIC;
 else if (request.style == QFont::StyleOblique)
 slant_value = FC_SLANT_OBLIQUE;
 FcPatternAddInteger(pattern, FC_SLANT, slant_value);
-double size_value = qMax(1, request.pixelSize);
+double size_value = qMax(qreal(1.), request.pixelSize);
 FcPatternAddDouble(pattern, FC_PIXEL_SIZE, size_value);
 int stretch = request.stretch;
 if (!stretch)
 stretch = 100;
 } else if (request.styleStrategy & (QFont::PreferAntialias|QFont::NoAntialias)) {
 FcPatternAddBool(pattern, FC_ANTIALIAS,
 !(request.styleStrategy & QFont::NoAntialias));
 }
-if (script != QUnicodeTables::Common) {
+if (script != QUnicodeTables::Common && *specialLanguages[script] != '\0') {
 Q_ASSERT(script < QUnicodeTables::ScriptCount);
 FcLangSet *ls = FcLangSetCreate();
 FcLangSetAdd(ls, (const FcChar8*)specialLanguages[script]);
 FcPatternAddLangSet(pattern, FC_LANG, ls);
 FcLangSetDestroy(ls);
 FcCharSet *cs;
 if (FcPatternGetCharSet(match, FC_CHARSET, 0, &cs) != FcResultMatch)
 goto done;
 if (!FcCharSetHasChar(cs, specialChars[script]))
 goto done;
-} else {
+} else if (*specialLanguages[script] != '\0'){
 FcLangSet *langSet = 0;
 if (FcPatternGetLangSet(match, FC_LANG, 0, &langSet) != FcResultMatch)
 goto done;
 if (FcLangSetHasLang(langSet, (const FcChar8*)specialLanguages[script]) != FcLangEqual)
 goto done;
 Q_ASSERT(script >= 0 && script < QUnicodeTables::ScriptCount);
 // normalize the request to get better caching
 QFontDef req = d->request;
 if (req.pixelSize <= 0)
-req.pixelSize = qRound(qt_pixelSize(req.pointSize, d->dpi));
+req.pixelSize = floor(qt_pixelSize(req.pointSize, d->dpi) * 100 + 0.5) / 100;
-req.pointSize = 0;
+if (req.pixelSize < 1)
+req.pixelSize = 1;
 if (req.weight == 0)
 req.weight = QFont::Normal;
 if (req.stretch == 0)
 req.stretch = 100;
 // 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 = qt_pointSize(req.pixelSize, d->dpi);
+if (req.pointSize < 0)
+req.pointSize = qt_pointSize(req.pixelSize, d->dpi);
 QFontEngine *fe = QFontCache::instance()->findEngine(key);
 if (!fe) {
 QMutexLocker locker(fontDatabaseMutex());

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7