joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-19 02:17:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Wengier
2022-06-30 13:29:38 -04:00
parent 29d83d8d74
commit da56cc290c
8 changed files with 91 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/misc/messages.cpp
View File

@@ -34,11 +34,11 @@
#include <string>
using namespace std;
extern bool dos_kernel_disabled, force_conversion, showdbcs, dbcs_sbcs;
extern bool dos_kernel_disabled, force_conversion, showdbcs, dbcs_sbcs, enableime, tonoime;
int msgcodepage = 0, FileDirExistUTF8(std::string &localname, const char *name);
bool morelen = false, inmsg = false, loadlang = false, systemmessagebox(char const * aTitle, char const * aMessage, char const * aDialogType, char const * aIconType, int aDefaultButton);
bool isSupportedCP(int newCP), CodePageHostToGuestUTF8(char *d/*CROSS_LEN*/,const char *s/*CROSS_LEN*/), CodePageGuestToHostUTF8(char *d/*CROSS_LEN*/,const char *s/*CROSS_LEN*/);
void InitFontHandle(void), ShutFontHandle(void), menu_update_dynamic(void), menu_update_autocycle(void), update_bindbutton_text(void), set_eventbutton_text(const char *eventname, const char *buttonname), JFONT_Init();
void InitFontHandle(void), ShutFontHandle(void), SetIME(void), menu_update_dynamic(void), menu_update_autocycle(void), update_bindbutton_text(void), set_eventbutton_text(const char *eventname, const char *buttonname), JFONT_Init();
std::string langname = "", langnote = "", GetDOSBoxXPath(bool withexe=false);
#define LINE_IN_MAXLEN 2048
@@ -421,8 +421,21 @@ void MSG_Init() {
if (strlen(countrystr)>10) countrystr[0] = 0;
sprintf(cstr, "%s,%d", countrystr, msgcodepage);
SetVal("config", "country", cstr);
const char *imestr = section->Get_string("ime");
if (tonoime && !strcasecmp(imestr, "auto") && (msgcodepage == 932 || msgcodepage == 936 || msgcodepage == 949 || msgcodepage == 950 || msgcodepage == 951)) {
tonoime = false;
enableime = true;
SetIME();
}
}
}
if (tonoime) {
tonoime = enableime = false;
#if defined(WIN32) && !defined(HX_DOS)
ImmDisableIME((DWORD)(-1));
#endif
SetIME();
}
}
else {
Prop_path* pathprop = section->Get_path("language");