mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Change: Use std::vector for fallback font list.

pull/10352/head
Peter Nelson 2023-01-14 18:16:14 +00:00 committed by PeterN
parent 90f1768006
commit 5370e910d3
1 changed files with 12 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/os/windows/font_win32.cpp
View File

@ -233,46 +233,21 @@ err1:
} }
#endif /* WITH_FREETYPE */ #endif /* WITH_FREETYPE */
class FontList {
protected:
wchar_t **fonts;
uint items;
uint capacity;
public:
FontList() : fonts(nullptr), items(0), capacity(0) { };
~FontList() {
if (this->fonts == nullptr) return;
for (uint i = 0; i < this->items; i++) {
free(this->fonts[i]);
}
free(this->fonts);
}
bool Add(const wchar_t *font) {
for (uint i = 0; i < this->items; i++) {
if (wcscmp(this->fonts[i], font) == 0) return false;
}
if (this->items == this->capacity) {
this->capacity += 10;
this->fonts = ReallocT(this->fonts, this->capacity);
}
this->fonts[this->items++] = wcsdup(font);
return true;
}
};
struct EFCParam { struct EFCParam {
FontCacheSettings *settings; FontCacheSettings *settings;
LOCALESIGNATURE locale; LOCALESIGNATURE locale;
MissingGlyphSearcher *callback; MissingGlyphSearcher *callback;
FontList fonts; std::vector<std::wstring> fonts;
bool Add(const std::wstring_view &font) {
for (const auto &entry : this->fonts) {
if (font.compare(entry) == 0) return false;
}
this->fonts.emplace_back(font);
return true;
}
}; };
static int CALLBACK EnumFontCallback(const ENUMLOGFONTEX *logfont, const NEWTEXTMETRICEX *metric, DWORD type, LPARAM lParam) static int CALLBACK EnumFontCallback(const ENUMLOGFONTEX *logfont, const NEWTEXTMETRICEX *metric, DWORD type, LPARAM lParam)
@ -280,7 +255,7 @@ static int CALLBACK EnumFontCallback(const ENUMLOGFONTEX *logfont, const NEWTEXT
EFCParam *info = (EFCParam *)lParam; EFCParam *info = (EFCParam *)lParam;
/* Skip duplicates */ /* Skip duplicates */
if (!info->fonts.Add((const wchar_t *)logfont->elfFullName)) return 1; if (!info->Add(logfont->elfFullName)) return 1;
/* Only use TrueType fonts */ /* Only use TrueType fonts */
if (!(type & TRUETYPE_FONTTYPE)) return 1; if (!(type & TRUETYPE_FONTTYPE)) return 1;
/* Don't use SYMBOL fonts */ /* Don't use SYMBOL fonts */