bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix assert under Wayland when IME text input completed without a window

Browse Source 
Remove null IME checks for to resolve an assertion and allow for the
window be set at any time before the event has been generated,
or generate the events even when there is no window.

Reported by Lukas Toenne who ran into this while debugging.
This commit is contained in:
Campbell Barton 2023-12-19 15:23:38 +11:00
parent 69d22a42d0
commit c9a298d60f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
intern/ghost/intern/GHOST_SystemWayland.cc
View File

@ -836,6 +836,13 @@ static void gwl_primary_selection_discard_source(GWL_PrimarySelection *primary)
#ifdef WITH_INPUT_IME
struct GWL_SeatIME {
/**
* The surface associated with this text input method.
*
* \note Even when null, IME callbacks run and events are generated to ensure
* the IME state remains consistent & allow for the compositor to assign the surface
* at any point in time which is then defines `window` IME events are associated with.
*/
wl_surface *surface_window = nullptr;
GHOST_TEventImeData event_ime_data = {
/*result_len*/ nullptr,
@ -5288,10 +5295,6 @@ static void text_input_handle_preedit_string(void *data,
cursor_end);
GWL_Seat *seat = static_cast<GWL_Seat *>(data);
if (UNLIKELY(seat->ime.surface_window == nullptr)) {
return;
}
if (seat->ime.has_preedit == false) {
/* Starting IME input. */
gwl_seat_ime_full_reset(seat);
@ -5318,10 +5321,6 @@ static void text_input_handle_commit_string(void *data,
CLOG_INFO(LOG, 2, "commit_string (text=\"%s\")", text ? text : "<null>");
GWL_Seat *seat = static_cast<GWL_Seat *>(data);
if (UNLIKELY(seat->ime.surface_window == nullptr)) {
return;
}
seat->ime.result_is_null = (text == nullptr);
if (seat->ime.result_is_null) {
seat->ime.result = "";
@ -5363,7 +5362,9 @@ static void text_input_handle_done(void *data,
CLOG_INFO(LOG, 2, "done");
GHOST_WindowWayland *win = ghost_wl_surface_user_data(seat->ime.surface_window);
GHOST_WindowWayland *win = seat->ime.surface_window ?
ghost_wl_surface_user_data(seat->ime.surface_window) :
nullptr;
if (seat->ime.has_commit_string_callback) {
if (seat->ime.has_preedit) {
const bool is_end = seat->ime.composite_is_null;