Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

decouple fonts hinting from fontconfig

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-01-01 22:27:06 +02:00
parent ff3b339842
commit 61cad2da54
3 changed files with 49 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gui/text/qfontdatabase_x11_p.h
View file

@ -58,6 +58,32 @@ QFontDef qt_FcPatternToQFontDef(FcPattern *pattern, const QFontDef &request)
fontDef.styleStrategy = request.styleStrategy;
fontDef.hintingPreference = request.hintingPreference;
#ifdef FC_HINT_STYLE
if (fontDef.hintingPreference == QFont::PreferDefaultHinting) {
int hint_style = 0;
if (FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &hint_style) == FcResultNoMatch
&& qt_x11Data->fc_hint_style > -1) {
hint_style = qt_x11Data->fc_hint_style;
}
switch (hint_style) {
case FC_HINT_NONE: {
fontDef.hintingPreference = QFont::PreferNoHinting;
break;
}
case FC_HINT_SLIGHT: {
fontDef.hintingPreference = QFont::PreferVerticalHinting;
break;
}
// no enum for FC_HINT_MEDIUM
default: {
fontDef.hintingPreference = QFont::PreferFullHinting;
break;
}
}
}
#endif
FcChar8 *value = 0;
if (FcPatternGetString(pattern, FC_FAMILY, 0, &value) == FcResultMatch) {
fontDef.family = QString::fromUtf8(reinterpret_cast<const char *>(value));

101
src/gui/text/qfontengine_ft.cpp
View file

@ -257,52 +257,6 @@ QFontEngineFT::QFontEngineFT(const QFontDef &fd, FcPattern *pattern)
face_id.index = 0;
}
if (fd.hintingPreference != QFont::PreferDefaultHinting) {
switch (fd.hintingPreference) {
case QFont::PreferNoHinting: {
default_hint_style = HintNone;
break;
}
case QFont::PreferVerticalHinting: {
default_hint_style = HintLight;
break;
}
case QFont::PreferFullHinting:
default: {
default_hint_style = HintFull;
break;
}
}
}
#ifdef FC_HINT_STYLE
else {
int hint_style = 0;
if (FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &hint_style) == FcResultNoMatch
&& qt_x11Data->fc_hint_style > -1) {
hint_style = qt_x11Data->fc_hint_style;
}
switch (hint_style) {
case FC_HINT_NONE: {
default_hint_style = HintNone;
break;
}
case FC_HINT_SLIGHT: {
default_hint_style = HintLight;
break;
}
case FC_HINT_MEDIUM: {
default_hint_style = HintMedium;
break;
}
default: {
default_hint_style = HintFull;
break;
}
}
}
#endif
#if defined(FC_AUTOHINT) && defined(FT_LOAD_FORCE_AUTOHINT)
{
bool autohint = false;
@ -316,39 +270,7 @@ QFontEngineFT::QFontEngineFT(const QFontDef &fd, FcPattern *pattern)
}
#endif
freetype = new QFreetypeFace(face_id);
if (!freetype->face) {
return;
} else if (!FT_IS_SCALABLE(freetype->face)) {
return;
}
lbearing = rbearing = SHRT_MIN;
ysize = qRound(fontDef.pixelSize * 64);
xsize = (ysize * fontDef.stretch / 100);
setFace(QFontEngineFT::Scaled);
FT_Face face = getFace();
// fake italic/oblique
if ((fontDef.style != QFont::StyleNormal) && !(face->style_flags & FT_STYLE_FLAG_ITALIC)) {
oblique = true;
}
// fake bold
if ((fontDef.weight == QFont::Bold) && !(face->style_flags & FT_STYLE_FLAG_BOLD) && !FT_IS_FIXED_WIDTH(face)) {
embolden = true;
}
// underline metrics
line_thickness = QFixed::fromFixed(FT_MulFix(face->underline_thickness, face->size->metrics.y_scale));
underline_position = QFixed::fromFixed(-FT_MulFix(face->underline_position, face->size->metrics.y_scale));
if (line_thickness < 1) {
line_thickness = 1;
}
metrics = face->size->metrics;
fontDef.styleName = QString::fromUtf8(face->style_name);
fsType = freetype->fsType();
init();
}
#endif // QT_NO_FONTCONFIG
@ -370,6 +292,11 @@ QFontEngineFT::QFontEngineFT(const QFontDef &fd)
face_id.filename = fd.family.toUtf8();
face_id.index = 0;
init();
}
void QFontEngineFT::init()
{
freetype = new QFreetypeFace(face_id);
if (!freetype->face) {
return;
@ -403,6 +330,22 @@ QFontEngineFT::QFontEngineFT(const QFontDef &fd)
fontDef.styleName = QString::fromUtf8(face->style_name);
fsType = freetype->fsType();
switch (fontDef.hintingPreference) {
case QFont::PreferNoHinting: {
default_hint_style = HintNone;
break;
}
case QFont::PreferVerticalHinting: {
default_hint_style = HintLight;
break;
}
case QFont::PreferFullHinting:
default: {
default_hint_style = HintFull;
break;
}
}
}
QFontEngineFT::~QFontEngineFT()

1
src/gui/text/qfontengine_ft_p.h
View file

@ -158,6 +158,7 @@ protected:
HintStyle default_hint_style;
private:
void init();
int loadFlags(int flags) const;
bool loadGlyph(glyph_t glyph, int load_flags) const;