gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The text input state has been changed to be window-specific.

Browse Source 
SDL_StartTextInput(), SDL_StopTextInput(), SDL_TextInputActive(), SDL_ClearComposition(), and SDL_SetTextInputRect() all now take a window parameter.

This change also fixes IME candidate positioning when SDL_SetTextInputRect() is called before SDL_StartTextInput(), as is recommended in the documentation.
This commit is contained in:
Sam Lantinga
2024-06-22 06:16:19 -07:00
parent 258ee05655
commit 76631a0978
48 changed files with 361 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/testime.c
View File

@@ -440,12 +440,12 @@ static void InitInput(void)
markedRect = textRect;
markedText[0] = 0;
SDL_StartTextInput();
SDL_StartTextInput(state->windows[0]);
}
static void CleanupVideo(void)
{
SDL_StopTextInput();
SDL_StopTextInput(state->windows[0]);
#ifdef HAVE_SDL_TTF
TTF_CloseFont(font);
TTF_Quit();
@@ -507,10 +507,10 @@ static void _Redraw(int rendererID)
markedRect.w = textRect.w - drawnTextRect.w;
if (markedRect.w < 0) {
/* Stop text input because we cannot hold any more characters */
SDL_StopTextInput();
SDL_StopTextInput(state->windows[0]);
return;
} else {
SDL_StartTextInput();
SDL_StartTextInput(state->windows[0]);
}
cursorRect = drawnTextRect;
@@ -602,7 +602,7 @@ static void _Redraw(int rendererID)
inputrect.y = (int)markedRect.y;
inputrect.w = (int)markedRect.w;
inputrect.h = (int)markedRect.h;
SDL_SetTextInputRect(&inputrect);
SDL_SetTextInputRect(state->windows[0], &inputrect);
}
}