claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of Windows LCIDs as numeric language IDs

Browse Source
This commit is contained in:
Alexander Babikov
2025-04-17 21:52:32 +05:00
parent de35961bb4
commit e1007d2377
8 changed files with 106 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/86box.c
View File

@@ -160,6 +160,7 @@ int window_remember;
int vid_resize; /* (C) allow resizing */ int vid_resize; /* (C) allow resizing */
int invert_display = 0; /* (C) invert the display */ int invert_display = 0; /* (C) invert the display */
int suppress_overscan = 0; /* (C) suppress overscans */ int suppress_overscan = 0; /* (C) suppress overscans */
int lang_id = 0; /* (C) language id */
int scale = 0; /* (C) screen scale factor */ int scale = 0; /* (C) screen scale factor */
int dpi_scale = 0; /* (C) DPI scaling of the emulated int dpi_scale = 0; /* (C) DPI scaling of the emulated
screen */ screen */
@@ -584,7 +585,7 @@ pc_init(int argc, char *argv[])
uint32_t *uid; uint32_t *uid;
uint32_t *shwnd; uint32_t *shwnd;
#endif #endif
uint32_t lang_init = 0; int lang_init = 0;
/* Grab the executable's full path. */ /* Grab the executable's full path. */
plat_get_exe_name(exe_path, sizeof(exe_path) - 1); plat_get_exe_name(exe_path, sizeof(exe_path) - 1);

6
src/config.c
View File

@@ -186,7 +186,7 @@ load_general(void)
if (p != NULL) if (p != NULL)
lang_id = plat_language_code(p); lang_id = plat_language_code(p);
else else
lang_id = 0xffff; lang_id = plat_language_code(DEFAULT_LANGUAGE);
mouse_sensitivity = ini_section_get_double(cat, "mouse_sensitivity", 1.0); mouse_sensitivity = ini_section_get_double(cat, "mouse_sensitivity", 1.0);
if (mouse_sensitivity < 0.1) if (mouse_sensitivity < 0.1)
@@ -1842,7 +1842,7 @@ config_load(void)
cassette_pcm = 0; cassette_pcm = 0;
cassette_ui_writeprot = 0; cassette_ui_writeprot = 0;
lang_id = DEFAULT_LANGUAGE; lang_id = plat_language_code(DEFAULT_LANGUAGE);
config_log("Config file not present or invalid!\n"); config_log("Config file not present or invalid!\n");
} else { } else {
@@ -2029,7 +2029,7 @@ save_general(void)
else else
ini_section_delete_var(cat, "mouse_sensitivity"); ini_section_delete_var(cat, "mouse_sensitivity");
if (lang_id == DEFAULT_LANGUAGE) if (lang_id == plat_language_code(DEFAULT_LANGUAGE))
ini_section_delete_var(cat, "language"); ini_section_delete_var(cat, "language");
else { else {
plat_language_code_r(lang_id, buffer, 511); plat_language_code_r(lang_id, buffer, 511);

8
src/include/86box/86box.h
View File

@@ -44,8 +44,8 @@
/* Max UUID Length */ /* Max UUID Length */
#define MAX_UUID_LEN 64 #define MAX_UUID_LEN 64
/* Default language 0xFFFF = from system, 0x409 = en-US */ /* Default language code */
#define DEFAULT_LANGUAGE 0xffff #define DEFAULT_LANGUAGE "system"
#define POSTCARDS_NUM 4 #define POSTCARDS_NUM 4
#define POSTCARD_MASK (POSTCARDS_NUM - 1) #define POSTCARD_MASK (POSTCARDS_NUM - 1)
@@ -84,8 +84,6 @@ extern "C" {
#endif #endif
/* Global variables. */ /* Global variables. */
extern uint32_t lang_sys; /* (-) system language code */
extern int dump_on_exit; /* (O) dump regs on exit*/ extern int dump_on_exit; /* (O) dump regs on exit*/
extern int start_in_fullscreen; /* (O) start in fullscreen */ extern int start_in_fullscreen; /* (O) start in fullscreen */
#ifdef _WIN32 #ifdef _WIN32
@@ -117,7 +115,7 @@ extern int window_remember;
extern int vid_resize; /* (C) allow resizing */ extern int vid_resize; /* (C) allow resizing */
extern int invert_display; /* (C) invert the display */ extern int invert_display; /* (C) invert the display */
extern int suppress_overscan; /* (C) suppress overscans */ extern int suppress_overscan; /* (C) suppress overscans */
extern uint32_t lang_id; /* (C) language code identifier */ extern int lang_id; /* (C) language id */
extern int scale; /* (C) screen scale factor */ extern int scale; /* (C) screen scale factor */
extern int dpi_scale; /* (C) DPI scaling of the emulated screen */ extern int dpi_scale; /* (C) DPI scaling of the emulated screen */
extern int vid_api; /* (C) video renderer */ extern int vid_api; /* (C) video renderer */

4
src/include/86box/plat.h
View File

@@ -160,8 +160,8 @@ extern int plat_vidapi(const char *name);
extern char *plat_vidapi_name(int api); extern char *plat_vidapi_name(int api);
extern void plat_resize(int x, int y, int monitor_index); extern void plat_resize(int x, int y, int monitor_index);
extern void plat_resize_request(int x, int y, int monitor_index); extern void plat_resize_request(int x, int y, int monitor_index);
extern uint32_t plat_language_code(char *langcode); extern int plat_language_code(char *langcode);
extern void plat_language_code_r(uint32_t lcid, char *outbuf, int len); extern void plat_language_code_r(int id, char *outbuf, int len);
extern void plat_get_cpu_string(char *outbuf, uint8_t len); extern void plat_get_cpu_string(char *outbuf, uint8_t len);
extern void plat_set_thread_name(void *thread, const char *name); extern void plat_set_thread_name(void *thread, const char *name);
extern void plat_break(void); extern void plat_break(void);

53
src/qt/qt_platform.cpp
View File

@@ -140,7 +140,6 @@ int update_icons = 1;
int kbd_req_capture = 0; int kbd_req_capture = 0;
int hide_status_bar = 0; int hide_status_bar = 0;
int hide_tool_bar = 0; int hide_tool_bar = 0;
uint32_t lang_id = 0x0409, lang_sys = 0x0409; // Multilangual UI variables, for now all set to LCID of en-US
int int
stricmp(const char *s1, const char *s2) stricmp(const char *s1, const char *s2)
@@ -461,58 +460,18 @@ plat_power_off(void)
QTimer::singleShot(0, (const QWidget *) main_window, &QMainWindow::close); QTimer::singleShot(0, (const QWidget *) main_window, &QMainWindow::close);
} }
extern "C++" { /* Converts the language code string to a numeric language ID */
QMap<uint32_t, QPair<QString, QString>> ProgSettings::lcid_langcode = { int
{ 0x0403, { "ca-ES", "Catalan (Spain)" } },
{ 0x0804, { "zh-CN", "Chinese (Simplified)" } },
{ 0x0404, { "zh-TW", "Chinese (Traditional)" } },
{ 0x041A, { "hr-HR", "Croatian (Croatia)" } },
{ 0x0405, { "cs-CZ", "Czech (Czech Republic)" } },
{ 0x0407, { "de-DE", "German (Germany)" } },
{ 0x0809, { "en-GB", "English (United Kingdom)" }},
{ 0x0409, { "en-US", "English (United States)" } },
{ 0x040B, { "fi-FI", "Finnish (Finland)" } },
{ 0x040C, { "fr-FR", "French (France)" } },
{ 0x040E, { "hu-HU", "Hungarian (Hungary)" } },
{ 0x0410, { "it-IT", "Italian (Italy)" } },
{ 0x0411, { "ja-JP", "Japanese (Japan)" } },
{ 0x0412, { "ko-KR", "Korean (Korea)" } },
{ 0x0413, { "nl-NL", "Dutch (Netherlands)" } },
{ 0x0415, { "pl-PL", "Polish (Poland)" } },
{ 0x0416, { "pt-BR", "Portuguese (Brazil)" } },
{ 0x0816, { "pt-PT", "Portuguese (Portugal)" } },
{ 0x0419, { "ru-RU", "Russian (Russia)" } },
{ 0x041B, { "sk-SK", "Slovak (Slovakia)" } },
{ 0x0424, { "sl-SI", "Slovenian (Slovenia)" } },
{ 0x0C0A, { "es-ES", "Spanish (Spain, Modern Sort)" } },
{ 0x041F, { "tr-TR", "Turkish (Turkey)" } },
{ 0x0422, { "uk-UA", "Ukrainian (Ukraine)" } },
{ 0x042A, { "vi-VN", "Vietnamese (Vietnam)" } },
{ 0xFFFF, { "system", "(System Default)" } },
};
}
/* Sets up the program language before initialization. */
uint32_t
plat_language_code(char *langcode) plat_language_code(char *langcode)
{ {
for (auto &curKey : ProgSettings::lcid_langcode.keys()) { return ProgSettings::languageCodeToId(QString(langcode));
if (ProgSettings::lcid_langcode[curKey].first == langcode) {
return curKey;
}
}
return 0xFFFF;
} }
/* Converts back the language code to LCID */ /* Converts the numeric language ID to a language code string */
void void
plat_language_code_r(uint32_t lcid, char *outbuf, int len) plat_language_code_r(int id, char *outbuf, int len)
{ {
if (!ProgSettings::lcid_langcode.contains(lcid)) { qstrncpy(outbuf, ProgSettings::languageIdToCode(id).toUtf8().constData(), len);
qstrncpy(outbuf, "system", len);
return;
}
qstrncpy(outbuf, ProgSettings::lcid_langcode[lcid].first.toUtf8().constData(), len);
return; return;
} }

92
src/qt/qt_progsettings.cpp
View File

@@ -45,18 +45,45 @@ extern MainWindow *main_window;
ProgSettings::CustomTranslator *ProgSettings::translator = nullptr; ProgSettings::CustomTranslator *ProgSettings::translator = nullptr;
QTranslator *ProgSettings::qtTranslator = nullptr; QTranslator *ProgSettings::qtTranslator = nullptr;
QVector<QPair<QString, QString>> ProgSettings::languages = {
{ "system", "(System Default)" },
{ "ca-ES", "Catalan (Spain)" },
{ "zh-CN", "Chinese (Simplified)" },
{ "zh-TW", "Chinese (Traditional)" },
{ "hr-HR", "Croatian (Croatia)" },
{ "cs-CZ", "Czech (Czech Republic)" },
{ "de-DE", "German (Germany)" },
{ "en-GB", "English (United Kingdom)" },
{ "en-US", "English (United States)" },
{ "fi-FI", "Finnish (Finland)" },
{ "fr-FR", "French (France)" },
{ "hu-HU", "Hungarian (Hungary)" },
{ "it-IT", "Italian (Italy)" },
{ "ja-JP", "Japanese (Japan)" },
{ "ko-KR", "Korean (Korea)" },
{ "nl-NL", "Dutch (Netherlands)" },
{ "pl-PL", "Polish (Poland)" },
{ "pt-BR", "Portuguese (Brazil)" },
{ "pt-PT", "Portuguese (Portugal)" },
{ "ru-RU", "Russian (Russia)" },
{ "sk-SK", "Slovak (Slovakia)" },
{ "sl-SI", "Slovenian (Slovenia)" },
{ "es-ES", "Spanish (Spain)" },
{ "tr-TR", "Turkish (Turkey)" },
{ "uk-UA", "Ukrainian (Ukraine)" },
{ "vi-VN", "Vietnamese (Vietnam)" },
};
ProgSettings::ProgSettings(QWidget *parent) ProgSettings::ProgSettings(QWidget *parent)
: QDialog(parent) : QDialog(parent)
, ui(new Ui::ProgSettings) , ui(new Ui::ProgSettings)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->comboBoxLanguage->setItemData(0, 0xFFFF); ui->comboBoxLanguage->setItemData(0, 0);
for (auto i = lcid_langcode.begin(); i != lcid_langcode.end(); i++) { for (int i = 1; i < languages.length(); i++) {
if (i.key() == 0xFFFF) ui->comboBoxLanguage->addItem(languages[i].second, i);
continue; if (i == lang_id) {
ui->comboBoxLanguage->addItem(lcid_langcode[i.key()].second, i.key()); ui->comboBoxLanguage->setCurrentIndex(ui->comboBoxLanguage->findData(i));
if (i.key() == lang_id) {
ui->comboBoxLanguage->setCurrentIndex(ui->comboBoxLanguage->findData(i.key()));
} }
} }
ui->comboBoxLanguage->model()->sort(Qt::AscendingOrder); ui->comboBoxLanguage->model()->sort(Qt::AscendingOrder);
@@ -78,7 +105,7 @@ ProgSettings::ProgSettings(QWidget *parent)
void void
ProgSettings::accept() ProgSettings::accept()
{ {
lang_id = ui->comboBoxLanguage->currentData().toUInt(); lang_id = ui->comboBoxLanguage->currentData().toInt();
open_dir_usr_path = ui->openDirUsrPath->isChecked() ? 1 : 0; open_dir_usr_path = ui->openDirUsrPath->isChecked() ? 1 : 0;
confirm_exit = ui->checkBoxConfirmExit->isChecked() ? 1 : 0; confirm_exit = ui->checkBoxConfirmExit->isChecked() ? 1 : 0;
confirm_save = ui->checkBoxConfirmSave->isChecked() ? 1 : 0; confirm_save = ui->checkBoxConfirmSave->isChecked() ? 1 : 0;
@@ -113,27 +140,46 @@ ProgSettings::~ProgSettings()
/* Return the standard font name on Windows, which is overridden per-language /* Return the standard font name on Windows, which is overridden per-language
to prevent CJK fonts with embedded bitmaps being chosen as a fallback. */ to prevent CJK fonts with embedded bitmaps being chosen as a fallback. */
QString QString
ProgSettings::getFontName(uint32_t lcid) ProgSettings::getFontName(int langId)
{ {
switch (lcid) { QString langCode = languageIdToCode(lang_id);
case 0x0404: /* zh-TW */ if (langCode == "ja-JP") {
return "Microsoft JhengHei";
case 0x0411: /* ja-JP */
/* Check for Windows 10 or later to choose the appropriate system font */ /* Check for Windows 10 or later to choose the appropriate system font */
if (QVersionNumber::fromString(QSysInfo::kernelVersion()).majorVersion() >= 10) if (QVersionNumber::fromString(QSysInfo::kernelVersion()).majorVersion() >= 10)
return "Yu Gothic UI"; return "Yu Gothic UI";
else else
return "Meiryo UI"; return "Meiryo UI";
case 0x0412: /* ko-KR */ } else if (langCode == "ko-KR")
return "Malgun Gothic"; return "Malgun Gothic";
case 0x0804: /* zh-CN */ else if (langCode == "zh-CN")
return "Microsoft YaHei"; return "Microsoft YaHei";
default: else if (langCode == "zh-TW")
return "Microsoft JhengHei";
else
return "Segoe UI"; return "Segoe UI";
}
} }
#endif #endif
int
ProgSettings::languageCodeToId(QString langCode)
{
for (int i = 0; i < languages.length(); i++) {
if (languages[i].first == langCode) {
return i;
}
}
return 0;
}
QString
ProgSettings::languageIdToCode(int id)
{
if ((id == 0) || (id >= languages.length())) {
return "system";
}
return languages[id].first;
}
void void
ProgSettings::loadTranslators(QObject *parent) ProgSettings::loadTranslators(QObject *parent)
{ {
@@ -148,7 +194,7 @@ ProgSettings::loadTranslators(QObject *parent)
qtTranslator = new QTranslator(parent); qtTranslator = new QTranslator(parent);
translator = new CustomTranslator(parent); translator = new CustomTranslator(parent);
QString localetofilename = ""; QString localetofilename = "";
if (lang_id == 0xFFFF || lcid_langcode.contains(lang_id) == false) { if (lang_id == 0 || lang_id >= languages.length()) {
for (int i = 0; i < QLocale::system().uiLanguages().size(); i++) { for (int i = 0; i < QLocale::system().uiLanguages().size(); i++) {
localetofilename = QLocale::system().uiLanguages()[i]; localetofilename = QLocale::system().uiLanguages()[i];
if (translator->load(QLatin1String("86box_") + localetofilename, QLatin1String(":/"))) { if (translator->load(QLatin1String("86box_") + localetofilename, QLatin1String(":/"))) {
@@ -166,12 +212,12 @@ ProgSettings::loadTranslators(QObject *parent)
} }
} }
} else { } else {
translator->load(QLatin1String("86box_") + lcid_langcode[lang_id].first, QLatin1String(":/")); translator->load(QLatin1String("86box_") + languages[lang_id].first, QLatin1String(":/"));
QCoreApplication::installTranslator(translator); QCoreApplication::installTranslator(translator);
if (!qtTranslator->load(QLatin1String("qtbase_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) if (!qtTranslator->load(QLatin1String("qtbase_") + QString(languages[lang_id].first).replace('-', '_'), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
if (!qtTranslator->load(QLatin1String("qtbase_") + QString(lcid_langcode[lang_id].first).left(QString(lcid_langcode[lang_id].first).indexOf('-')), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) if (!qtTranslator->load(QLatin1String("qtbase_") + QString(languages[lang_id].first).left(QString(languages[lang_id].first).indexOf('-')), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
if(!qtTranslator->load(QLatin1String("qt_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QApplication::applicationDirPath() + "/./translations/")) if(!qtTranslator->load(QLatin1String("qt_") + QString(languages[lang_id].first).replace('-', '_'), QApplication::applicationDirPath() + "/./translations/"))
qtTranslator->load(QLatin1String("qt_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QLatin1String(":/")); qtTranslator->load(QLatin1String("qt_") + QString(languages[lang_id].first).replace('-', '_'), QLatin1String(":/"));
QCoreApplication::installTranslator(qtTranslator); QCoreApplication::installTranslator(qtTranslator);
} }

6
src/qt/qt_progsettings.hpp
View File

@@ -15,8 +15,10 @@ public:
explicit ProgSettings(QWidget *parent = nullptr); explicit ProgSettings(QWidget *parent = nullptr);
~ProgSettings(); ~ProgSettings();
#ifdef Q_OS_WINDOWS #ifdef Q_OS_WINDOWS
static QString getFontName(uint32_t lcid); static QString getFontName(int langId);
#endif #endif
static int languageCodeToId(QString langCode);
static QString languageIdToCode(int id);
static void loadTranslators(QObject *parent = nullptr); static void loadTranslators(QObject *parent = nullptr);
static void reloadStrings(); static void reloadStrings();
class CustomTranslator : public QTranslator { class CustomTranslator : public QTranslator {
@@ -33,7 +35,7 @@ public:
}; };
static CustomTranslator *translator; static CustomTranslator *translator;
static QTranslator *qtTranslator; static QTranslator *qtTranslator;
static QMap<uint32_t, QPair<QString, QString>> lcid_langcode; static QVector<QPair<QString, QString>> languages;
static QMap<int, std::wstring> translatedstrings; static QMap<int, std::wstring> translatedstrings;
protected slots: protected slots:

10
src/unix/unix.c
View File

@@ -71,8 +71,6 @@ SDL_mutex *blitmtx;
SDL_threadID eventthread; SDL_threadID eventthread;
static int exit_event = 0; static int exit_event = 0;
static int fullscreen_pending = 0; static int fullscreen_pending = 0;
uint32_t lang_id = 0x0409; // Multilangual UI variables, for now all set to LCID of en-US
uint32_t lang_sys = 0x0409; // Multilangual UI variables, for now all set to LCID of en-US
static const uint16_t sdl_to_xt[0x200] = { static const uint16_t sdl_to_xt[0x200] = {
[SDL_SCANCODE_ESCAPE] = 0x01, [SDL_SCANCODE_ESCAPE] = 0x01,
@@ -1378,8 +1376,8 @@ plat_vidapi_name(UNUSED(int i))
return "default"; return "default";
} }
/* Sets up the program language before initialization. */ /* Converts the language code string to a numeric language ID */
uint32_t int
plat_language_code(UNUSED(char *langcode)) plat_language_code(UNUSED(char *langcode))
{ {
/* or maybe not */ /* or maybe not */
@@ -1419,9 +1417,9 @@ plat_set_thread_name(void *thread, const char *name)
#endif #endif
} }
/* Converts back the language code to LCID */ /* Converts the numeric language ID to a language code string */
void void
plat_language_code_r(UNUSED(uint32_t lcid), UNUSED(char *outbuf), UNUSED(int len)) plat_language_code_r(UNUSED(int id), UNUSED(char *outbuf), UNUSED(int len))
{ {
/* or maybe not */ /* or maybe not */
return; return;