mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-07-31 04:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

x11: Register the input context destroyed callback

Browse Source 
Register the destroyed callback to handle cases where the IC is suddenly no longer valid (e.g. if ibus or fcitx dies).

(cherry picked from commit 63bf4c1c79)
This commit is contained in:
Frank Praznik
2026-07-28 15:22:52 -04:00
parent b0e329b322
commit 105ad5e875
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/video/x11/SDL_x11keyboard.c
View File

@@ -712,6 +712,12 @@ static void preedit_caret_callback(XIC xic, XPointer client_data, XIMPreeditCare
}
}
static void ic_destroyed_handler(XIC ic, XPointer clientData, XPointer callData)
{
SDL_WindowData *data = (SDL_WindowData *)clientData;
data->ic = NULL;
}
void X11_CreateInputContext(SDL_WindowData *data)
{
#ifdef X_HAVE_UTF8_STRING
@@ -719,6 +725,11 @@ void X11_CreateInputContext(SDL_WindowData *data)
if (SDL_X11_HAVE_UTF8 && videodata->im) {
const char *hint = SDL_GetHint(SDL_HINT_IME_IMPLEMENTED_UI);
XIMCallback destroyed_callback;
destroyed_callback.client_data = (XPointer)data;
destroyed_callback.callback = (XIMProc)ic_destroyed_handler;
if (hint && SDL_strstr(hint, "composition")) {
XIMCallback draw_callback;
draw_callback.client_data = (XPointer)data;
@@ -747,6 +758,7 @@ void X11_CreateInputContext(SDL_WindowData *data)
XNInputStyle, XIMPreeditCallbacks | XIMStatusCallbacks,
XNPreeditAttributes, attr,
XNClientWindow, data->xwindow,
XNDestroyCallback, &destroyed_callback,
NULL);
X11_XFree(attr);
}
@@ -755,6 +767,7 @@ void X11_CreateInputContext(SDL_WindowData *data)
data->ic = X11_XCreateIC(videodata->im,
XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
XNClientWindow, data->xwindow,
XNDestroyCallback, &destroyed_callback,
NULL);
}
data->xim_spot.x = -1;