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

remove unused header inclusions and format qfontengine_x11 source file

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-12-26 12:18:30 +02:00
parent b08bf6d2a1
commit 41bfaa6244
1 changed files with 40 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
src/gui/text/qfontengine_x11.cpp
View file

@ -19,64 +19,18 @@
**
****************************************************************************/
#include "qbitmap.h"
// #define FONTENGINE_DEBUG
#include "qapplication.h"
#include "qbytearray.h"
#include "qdebug.h"
#include "qtextcodec.h"
#include "qthread.h"
#include "qfontdatabase.h"
#include "qpaintdevice.h"
#include "qpainter.h"
#include "qwidget.h"
#include "qsettings.h"
#include "qfile.h"
#include "qpaintengine_x11_p.h"
#include "qfont.h"
#include "qfont_p.h"
#include "qfontengine_p.h"
#include "qhash.h"
#include "qpainter_p.h"
#include "qunicodetables_p.h"
#include "qt_x11_p.h"
#include "qpixmap_x11_p.h"
#include "qx11info_x11.h"
#include "qfontengine_x11_p.h"
#include <limits.h>
#include "qt_x11_p.h"
#include <ft2build.h>
#if defined(FT_LCD_FILTER_H)
#include FT_LCD_FILTER_H
#endif
#if defined(FC_LCD_FILTER)
#ifndef FC_LCD_FILTER_NONE
#define FC_LCD_FILTER_NONE FC_LCD_NONE
#endif
#ifndef FC_LCD_FILTER_DEFAULT
#define FC_LCD_FILTER_DEFAULT FC_LCD_DEFAULT
#endif
#ifndef FC_LCD_FILTER_LIGHT
#define FC_LCD_FILTER_LIGHT FC_LCD_LIGHT
#endif
#ifndef FC_LCD_FILTER_LEGACY
#define FC_LCD_FILTER_LEGACY FC_LCD_LEGACY
#endif
#endif
QT_BEGIN_NAMESPACE
#ifndef QT_NO_FONTCONFIG
@ -87,50 +41,59 @@ QT_BEGIN_NAMESPACE
QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd)
: QFontEngineFT(fd)
{
// FcPatternPrint(pattern);
// FcPatternPrint(pattern);
QFontEngine::FaceId face_id;
FcChar8 *fileName;
FcPatternGetString(pattern, FC_FILE, 0, &fileName);
face_id.filename = (const char *)fileName;
if (!FcPatternGetInteger(pattern, FC_INDEX, 0, &face_id.index))
if (!FcPatternGetInteger(pattern, FC_INDEX, 0, &face_id.index)) {
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;
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)
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;
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
@ -138,13 +101,13 @@ QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd)
#if defined(FC_AUTOHINT) && defined(FT_LOAD_FORCE_AUTOHINT)
{
bool autohint = false;
FcBool b;
if (FcPatternGetBool(pattern, FC_AUTOHINT, 0, &b) == FcResultMatch)
if (FcPatternGetBool(pattern, FC_AUTOHINT, 0, &b) == FcResultMatch) {
autohint = b;
if (autohint)
}
if (autohint) {
default_load_flags |= FT_LOAD_FORCE_AUTOHINT;
}
}
#endif