gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-06-18 19:19:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: Replace C-casts for FontConfig with helper functions. (#14349)

Browse Source 
Add `ToFcString()` and `FromFcString()` to remove C-style casts and make reinterpret_casts safer and clearer.
This commit is contained in:
Peter Nelson 2025-06-10 17:11:22 +01:00 committed by GitHub
parent 8f5ac84a3d
commit c702e05517
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/os/unix/font_unix.cpp
View File

@ -8,6 +8,7 @@
/** @file font_unix.cpp Functions related to font handling on Unix/Fontconfig. */
#include "../../stdafx.h"
#include "../../debug.h"
#include "../../fontdetection.h"
#include "../../string_func.h"
@ -22,6 +23,26 @@
extern FT_Library _ft_library;
/**
* Get a FontConfig-style string from a std::string.
* @param str String to be passed to FontConfig.
* @return FontConfig-style string.
*/
static const FcChar8 *ToFcString(const std::string &str)
{
return reinterpret_cast<const FcChar8 *>(str.c_str());
}
/**
* Get a C-style string from a FontConfig-style string.
* @param str String from FontConfig.
* @return C-style string.
*/
static const char *FromFcString(const FcChar8 *str)
{
return reinterpret_cast<const char *>(str);
}
/**
* Split the font name into the font family and style. These fields are separated by a comma,
* but the style does not necessarily need to exist.
@ -56,8 +77,8 @@ FT_Error GetFontByFaceName(std::string_view font_name, FT_Face *face)
/* Resolve the name and populate the information structure */
FcPattern *pat = FcPatternCreate();
if (!font_family.empty()) FcPatternAddString(pat, FC_FAMILY, reinterpret_cast<const FcChar8 *>(font_family.c_str()));
if (!font_style.empty()) FcPatternAddString(pat, FC_STYLE, reinterpret_cast<const FcChar8 *>(font_style.c_str()));
if (!font_family.empty()) FcPatternAddString(pat, FC_FAMILY, ToFcString(font_family));
if (!font_style.empty()) FcPatternAddString(pat, FC_STYLE, ToFcString(font_style));
FcConfigSubstitute(nullptr, pat, FcMatchPattern);
FcDefaultSubstitute(pat);
FcFontSet *fs = FcFontSetCreate();
@ -79,13 +100,13 @@ FT_Error GetFontByFaceName(std::string_view font_name, FT_Face *face)
FcPatternGetInteger(fs->fonts[i], FC_INDEX, 0, &index) == FcResultMatch) {
/* The correct style? */
if (!font_style.empty() && !StrEqualsIgnoreCase(font_style, (char *)style)) continue;
if (!font_style.empty() && !StrEqualsIgnoreCase(font_style, FromFcString(style))) continue;
/* Font config takes the best shot, which, if the family name is spelled
* wrongly a 'random' font, so check whether the family name is the
* same as the supplied name */
if (StrEqualsIgnoreCase(font_family, (char *)family)) {
err = FT_New_Face(_ft_library, (char *)file, index, face);
if (StrEqualsIgnoreCase(font_family, FromFcString(family))) {
err = FT_New_Face(_ft_library, FromFcString(file), index, face);
}
}
}
@ -113,7 +134,7 @@ bool SetFallbackFont(FontCacheSettings *settings, const std::string &language_is
std::string lang = fmt::format(":lang={}", language_isocode.substr(0, language_isocode.find('_')));
/* First create a pattern to match the wanted language. */
FcPattern *pat = FcNameParse((const FcChar8 *)lang.c_str());
FcPattern *pat = FcNameParse(ToFcString(lang));
/* We only want to know these attributes. */
FcObjectSet *os = FcObjectSetBuild(FC_FILE, FC_INDEX, FC_SPACING, FC_SLANT, FC_WEIGHT, nullptr);
/* Get the list of filenames matching the wanted language. */
@ -155,14 +176,14 @@ bool SetFallbackFont(FontCacheSettings *settings, const std::string &language_is
res = FcPatternGetInteger(font, FC_INDEX, 0, &index);
if (res != FcResultMatch) continue;
callback->SetFontNames(settings, (const char *)file, &index);
callback->SetFontNames(settings, FromFcString(file), &index);
bool missing = callback->FindMissingGlyphs();
Debug(fontcache, 1, "Font \"{}\" misses{} glyphs", (char *)file, missing ? "" : " no");
Debug(fontcache, 1, "Font \"{}\" misses{} glyphs", FromFcString(file), missing ? "" : " no");
if (!missing) {
best_weight = value;
best_font = (const char *)file;
best_font = FromFcString(file);
best_index = index;
}
}