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

(svn r25672) -Fix: [Win32] Handle Unicode characters from outside the BMP correctly.

release/1.4
michi_cc 2013-08-05 20:36:40 +00:00
parent 019984a14f
commit fdc436b531
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/video/win32_v.cpp
View File

@ -439,12 +439,31 @@ static void PaintWindowThread(void *)
} }
/** Forward key presses to the window system. */ /** Forward key presses to the window system. */
static LRESULT HandleCharMsg(uint keycode, uint charcode) static LRESULT HandleCharMsg(uint keycode, WChar charcode)
{ {
#if !defined(UNICODE) #if !defined(UNICODE)
wchar_t w; wchar_t w;
int len = MultiByteToWideChar(_codepage, 0, (char*)&charcode, 1, &w, 1); int len = MultiByteToWideChar(_codepage, 0, (char*)&charcode, 1, &w, 1);
charcode = len == 1 ? w : 0; charcode = len == 1 ? w : 0;
#else
static WChar prev_char = 0;
/* Did we get a lead surrogate? If yes, store and exit. */
if (Utf16IsLeadSurrogate(charcode)) {
if (prev_char != 0) DEBUG(driver, 1, "Got two UTF-16 lead surrogates, dropping the first one");
prev_char = charcode;
return 0;
}
/* Stored lead surrogate and incoming trail surrogate? Combine and forward to input handling. */
if (prev_char != 0) {
if (Utf16IsTrailSurrogate(charcode)) {
charcode = Utf16DecodeSurrogate(prev_char, charcode);
} else {
DEBUG(driver, 1, "Got an UTF-16 lead surrogate without a trail surrogate, dropping the lead surrogate");
}
}
prev_char = 0;
#endif /* UNICODE */ #endif /* UNICODE */
HandleKeypress(keycode, charcode); HandleKeypress(keycode, charcode);