Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r25675) -Fix: [Win32] Handle DBCS characters correctly in the non-Unicode build.

Browse Source
This commit is contained in:
michi_cc 2013-08-05 20:36:51 +00:00
parent 66d9ded71f
commit 8151f04e6d
1 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/video/win32_v.cpp
View File

@ -439,9 +439,39 @@ static void PaintWindowThread(void *)
static LRESULT HandleCharMsg(uint keycode, WChar charcode) static LRESULT HandleCharMsg(uint keycode, WChar charcode)
{ {
#if !defined(UNICODE) #if !defined(UNICODE)
wchar_t w; static char prev_char = 0;
int len = MultiByteToWideChar(_codepage, 0, (char*)&charcode, 1, &w, 1);
charcode = len == 1 ? w : 0; char input[2] = {(char)charcode, 0};
int input_len = 1;
if (prev_char != 0) {
/* We stored a lead byte previously, combine it with this byte. */
input[0] = prev_char;
input[1] = (char)charcode;
input_len = 2;
} else if (IsDBCSLeadByte(charcode)) {
/* We got a lead byte, store and exit. */
prev_char = charcode;
return 0;
}
prev_char = 0;
wchar_t w[2]; // Can get up to two code points as a result.
int len = MultiByteToWideChar(CP_ACP, 0, input, input_len, w, 2);
switch (len) {
case 1: // Normal unicode character.
charcode = w[0];
break;
case 2: // Got an UTF-16 surrogate pair back.
charcode = Utf16DecodeSurrogate(w[0], w[1]);
break;
default: // Some kind of error.
DEBUG(driver, 1, "Invalid DBCS character sequence encountered, dropping input");
charcode = 0;
break;
}
#else #else
static WChar prev_char = 0; static WChar prev_char = 0;
@ -602,6 +632,18 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
return 0; return 0;
} }
#if !defined(WINCE) || _WIN32_WCE >= 0x400
#if !defined(UNICODE)
case WM_IME_CHAR:
if (GB(wParam, 8, 8) != 0) {
/* DBCS character, send lead byte first. */
HandleCharMsg(0, GB(wParam, 8, 8));
}
HandleCharMsg(0, GB(wParam, 0, 8));
return 0;
#endif
#endif
case WM_DEADCHAR: case WM_DEADCHAR:
console = GB(lParam, 16, 8) == 41; console = GB(lParam, 16, 8) == 41;
return 0; return 0;