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

ime: wayland: Make use of `SDL_TEXTEDITING_EXT` 

Because we were sending multiple chunks of preedit strings,
`SDL_SendEditingText` was using the old `SDL_TEXTEDITING` event only.

Now if `SDL_HINT_IME_SUPPORT_EXTENDED_TEXT` is enabled, we send the full
string and correctly set the cursor position and selection size.
main
Guldoman 2022-05-05 02:34:16 +02:00 committed by Sam Lantinga
parent 74bcc5a0a3
commit d11702ce29
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@
#include "SDL_stdinc.h" #include "SDL_stdinc.h"
#include "SDL_timer.h" #include "SDL_timer.h"
#include "SDL_hints.h"
#include "../../core/unix/SDL_poll.h" #include "../../core/unix/SDL_poll.h"
#include "../../events/SDL_sysevents.h" #include "../../events/SDL_sysevents.h"
@ -1554,9 +1555,23 @@ text_input_preedit_string(void *data,
char buf[SDL_TEXTEDITINGEVENT_TEXT_SIZE]; char buf[SDL_TEXTEDITINGEVENT_TEXT_SIZE];
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)) {
size_t cursor_begin_utf8 = cursor_begin >= 0 ? SDL_utf8strnlen(text, cursor_begin) : -1;
size_t cursor_end_utf8 = cursor_end >= 0 ? SDL_utf8strnlen(text, cursor_end) : -1;
size_t cursor_size_utf8;
if (cursor_end_utf8 >= 0) {
if (cursor_begin_utf8 >= 0) {
cursor_size_utf8 = cursor_end_utf8 - cursor_begin_utf8;
} else {
cursor_size_utf8 = cursor_end_utf8;
}
} else {
cursor_size_utf8 = -1;
}
SDL_SendEditingText(text, cursor_begin_utf8, cursor_size_utf8);
} else {
size_t text_bytes = SDL_strlen(text), i = 0; size_t text_bytes = SDL_strlen(text), i = 0;
size_t cursor = 0; size_t cursor = 0;
do { do {
const size_t sz = SDL_utf8strlcpy(buf, text+i, sizeof(buf)); const size_t sz = SDL_utf8strlcpy(buf, text+i, sizeof(buf));
const size_t chars = SDL_utf8strlen(buf); const size_t chars = SDL_utf8strlen(buf);
@ -1566,6 +1581,7 @@ text_input_preedit_string(void *data,
i += sz; i += sz;
cursor += chars; cursor += chars;
} while (i < text_bytes); } while (i < text_bytes);
}
} else { } else {
buf[0] = '\0'; buf[0] = '\0';
SDL_SendEditingText(buf, 0, 0); SDL_SendEditingText(buf, 0, 0);