encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimizing the implementation.

This commit is contained in:
Henry G. Stratmann III 2021-08-07 20:51:49 -05:00 committed by Sam Lantinga
parent 712e0d1f06
commit 3470112969
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/video/windows/SDL_windowsevents.c
View File

@ -386,6 +386,14 @@ WIN_ConvertUTF32toUTF8(UINT32 codepoint, char * text)
return SDL_TRUE; return SDL_TRUE;
} }
static BOOL
WIN_ConvertUTF16toUTF8(UINT32 high_surrogate, UINT32 low_surrogate, char * text)
{
const UINT32 SURROGATE_OFFSET = 0x10000 - (0xD800 << 10) - 0xDC00;
const UINT32 codepoint = (high_surrogate << 10) + low_surrogate + SURROGATE_OFFSET;
return WIN_ConvertUTF32toUTF8(codepoint, text);
}
static SDL_bool static SDL_bool
ShouldGenerateWindowCloseOnAltF4(void) ShouldGenerateWindowCloseOnAltF4(void)
{ {
@ -884,19 +892,17 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
} else if (IS_SURROGATE_PAIR(data->high_surrogate, wParam)) { } else if (IS_SURROGATE_PAIR(data->high_surrogate, wParam)) {
/* The code point is in a Supplementary Plane. /* The code point is in a Supplementary Plane.
Here wParam is the Low Surrogate. */ Here wParam is the Low Surrogate. */
const WCHAR surrogate_pair[] = {data->high_surrogate, (WCHAR)wParam, 0}; char text[5];
char *s; if (WIN_ConvertUTF16toUTF8((UINT32)data->high_surrogate, (UINT32)wParam, text)) {
s = SDL_iconv_string("UTF-8", "UTF-16LE", (const char *)surrogate_pair, sizeof(surrogate_pair)); SDL_SendKeyboardText(text);
SDL_SendKeyboardText(s); }
SDL_free(s);
data->high_surrogate = 0; data->high_surrogate = 0;
} else { } else {
/* The code point is in the Basic Multilingual Plane */ /* The code point is in the Basic Multilingual Plane */
const WCHAR wchar[] = {(WCHAR)wParam, 0}; char text[5];
char *s; if (WIN_ConvertUTF32toUTF8((UINT32)wParam, text)) {
s = SDL_iconv_string("UTF-8", "UTF-16LE", (const char *)wchar, sizeof(wchar)); SDL_SendKeyboardText(text);
SDL_SendKeyboardText(s); }
SDL_free(s);
} }
returnCode = 0; returnCode = 0;
break; break;