otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

add a string to force glyph ranges

Browse source
This commit is contained in:
tildearrow 2024-05-31 17:13:20 -05:00
parent 13ca42ea39
commit 291e7f5d8b
3 changed files with 46 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/gui/gui.cpp
View file

@ -7049,6 +7049,35 @@ bool FurnaceGUI::init() {
ImGui::LocalizeRegisterEntries(guiLocalization,8); ImGui::LocalizeRegisterEntries(guiLocalization,8);
const char* localeSettings=_("LocaleSettings: ccjk");
if (strlen(localeSettings)<20) {
logE("the LocaleSettings string is incomplete!");
} else {
localeRequiresChinese=(localeSettings[16]=='C');
localeRequiresChineseTrad=(localeSettings[17]=='C');
localeRequiresJapanese=(localeSettings[18]=='J');
localeRequiresKorean=(localeSettings[19]=='K');
if (strlen(localeSettings)>21) {
if (localeSettings[20]==' ') {
ImWchar next=0;
for (const char* i=&localeSettings[21]; *i; i++) {
if (((*i)>='0' && (*i)<='9') || ((*i)>='A' && (*i)<='F')) {
next<<=4;
if ((*i)>='0' && (*i)<='9') {
next|=(*i)-'0';
} else {
next|=(*i)-'A'+10;
}
} else {
localeExtraRanges.push_back(next);
next=0;
}
}
localeExtraRanges.push_back(0);
}
}
}
loadUserPresets(true); loadUserPresets(true);
applyUISettings(); applyUISettings();
@ -7669,6 +7698,10 @@ FurnaceGUI::FurnaceGUI():
bigFont(NULL), bigFont(NULL),
headFont(NULL), headFont(NULL),
fontRange(NULL), fontRange(NULL),
localeRequiresJapanese(false),
localeRequiresChinese(false),
localeRequiresChineseTrad(false),
localeRequiresKorean(false),
prevInsData(NULL), prevInsData(NULL),
pendingLayoutImport(NULL), pendingLayoutImport(NULL),
pendingLayoutImportLen(0), pendingLayoutImportLen(0),

6
src/gui/gui.h
View file

@ -2228,6 +2228,12 @@ class FurnaceGUI {
char finalLayoutPath[4096]; char finalLayoutPath[4096];
bool localeRequiresJapanese;
bool localeRequiresChinese;
bool localeRequiresChineseTrad;
bool localeRequiresKorean;
std::vector<ImWchar> localeExtraRanges;
DivInstrument* prevInsData; DivInstrument* prevInsData;
unsigned char* pendingLayoutImport; unsigned char* pendingLayoutImport;

11
src/gui/settings.cpp
View file

@ -6411,18 +6411,21 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
//fontConfP.RasterizerMultiply=1.5; //fontConfP.RasterizerMultiply=1.5;
range.AddRanges(upTo800); range.AddRanges(upTo800);
if (settings.loadJapanese) { if (settings.loadJapanese || localeRequiresJapanese) {
range.AddRanges(ImGui::GetIO().Fonts->GetGlyphRangesJapanese()); range.AddRanges(ImGui::GetIO().Fonts->GetGlyphRangesJapanese());
} }
if (settings.loadChinese) { if (settings.loadChinese || localeRequiresChinese) {
range.AddRanges(ImGui::GetIO().Fonts->GetGlyphRangesChineseSimplifiedCommon()); range.AddRanges(ImGui::GetIO().Fonts->GetGlyphRangesChineseSimplifiedCommon());
} }
if (settings.loadChineseTraditional) { if (settings.loadChineseTraditional || localeRequiresChineseTrad) {
range.AddRanges(ImGui::GetIO().Fonts->GetGlyphRangesChineseFull()); range.AddRanges(ImGui::GetIO().Fonts->GetGlyphRangesChineseFull());
} }
if (settings.loadKorean) { if (settings.loadKorean || localeRequiresKorean) {
range.AddRanges(ImGui::GetIO().Fonts->GetGlyphRangesKorean()); range.AddRanges(ImGui::GetIO().Fonts->GetGlyphRangesKorean());
} }
if (!localeExtraRanges.empty()) {
range.AddRanges(localeExtraRanges.data());
}
// I'm terribly sorry // I'm terribly sorry
range.UsedChars[0x80>>5]=0; range.UsedChars[0x80>>5]=0;