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

IME input support in SDL2

Browse Source
This commit is contained in:
Kobayashi Takashi
2021-08-20 12:22:52 +09:00
parent a49ca28e20
commit efb21fbeba
6 changed files with 210 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vs2015/sdl2/src/video/windows/SDL_windowskeyboard.c
View File

@@ -370,7 +370,8 @@ IME_Init(SDL_VideoData *videodata, HWND hwnd)
videodata->ime_available = SDL_TRUE;
IME_UpdateInputLocale(videodata);
IME_SetupAPI(videodata);
videodata->ime_uiless = UILess_SetupSinks(videodata);
// Disabled because the candidate window will not be displayed.
//videodata->ime_uiless = UILess_SetupSinks(videodata);
IME_UpdateInputLocale(videodata);
IME_Disable(videodata, hwnd);
}
@@ -878,14 +879,18 @@ IME_HandleMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM *lParam, SDL_VideoD
case WM_INPUTLANGCHANGE:
IME_InputLangChanged(videodata);
break;
case WM_IME_CHAR:
trap = SDL_TRUE;
break;
case WM_IME_SETCONTEXT:
*lParam = 0;
// Disabled because the string being converted will not be displayed.
//*lParam = 0;
break;
case WM_IME_STARTCOMPOSITION:
trap = SDL_TRUE;
//trap = SDL_TRUE;
break;
case WM_IME_COMPOSITION:
trap = SDL_TRUE;
//trap = SDL_TRUE;
himc = ImmGetContext(hwnd);
if (*lParam & GCS_RESULTSTR) {
IME_GetCompositionString(videodata, himc, GCS_RESULTSTR);