geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL_SendEditingText() has int parameters, so use that type for parameter calculation 

We might want to use ssize_t as @Guldoman suggested, but that's a larger internal API change, and still requires casting of the SDL_utf8strnlen() result.

Fixes https://github.com/libsdl-org/SDL/pull/5821
main
Sam Lantinga 2022-06-18 12:57:27 -07:00
parent 00b95e989b
commit 5f6d0abebe
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/video/wayland/SDL_waylandevents.c
View File

@ -1560,9 +1560,9 @@ text_input_preedit_string(void *data,
text_input->has_preedit = SDL_TRUE; text_input->has_preedit = SDL_TRUE;
if (text) { if (text) {
if (SDL_GetHintBoolean(SDL_HINT_IME_SUPPORT_EXTENDED_TEXT, SDL_FALSE)) { if (SDL_GetHintBoolean(SDL_HINT_IME_SUPPORT_EXTENDED_TEXT, SDL_FALSE)) {
size_t cursor_begin_utf8 = cursor_begin >= 0 ? SDL_utf8strnlen(text, cursor_begin) : -1; int cursor_begin_utf8 = cursor_begin >= 0 ? (int)SDL_utf8strnlen(text, cursor_begin) : -1;
size_t cursor_end_utf8 = cursor_end >= 0 ? SDL_utf8strnlen(text, cursor_end) : -1; int cursor_end_utf8 = cursor_end >= 0 ? (int)SDL_utf8strnlen(text, cursor_end) : -1;
size_t cursor_size_utf8; int cursor_size_utf8;
if (cursor_end_utf8 >= 0) { if (cursor_end_utf8 >= 0) {
if (cursor_begin_utf8 >= 0) { if (cursor_begin_utf8 >= 0) {
cursor_size_utf8 = cursor_end_utf8 - cursor_begin_utf8; cursor_size_utf8 = cursor_end_utf8 - cursor_begin_utf8;
@ -1574,11 +1574,11 @@ text_input_preedit_string(void *data,
} }
SDL_SendEditingText(text, cursor_begin_utf8, cursor_size_utf8); SDL_SendEditingText(text, cursor_begin_utf8, cursor_size_utf8);
} else { } else {
size_t text_bytes = SDL_strlen(text), i = 0; int text_bytes = (int)SDL_strlen(text), i = 0;
size_t cursor = 0; int cursor = 0;
do { do {
const size_t sz = SDL_utf8strlcpy(buf, text+i, sizeof(buf)); const int sz = (int)SDL_utf8strlcpy(buf, text+i, sizeof(buf));
const size_t chars = SDL_utf8strlen(buf); const int chars = (int)SDL_utf8strlen(buf);
SDL_SendEditingText(buf, cursor, chars); SDL_SendEditingText(buf, cursor, chars);