asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[X11] Prevent IME activation from entering infinite loop.

Browse source
This commit is contained in:
bruvzg 2023-01-25 10:21:27 +02:00
parent a3a42159e3
commit b713cfdccd
No known key found for this signature in database
GPG key ID: 7960FCF39844EC38
1 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
platform/linuxbsd/x11/display_server_x11.cpp
View file

@ -2496,6 +2496,9 @@ void DisplayServerX11::window_set_ime_active(const bool p_active, WindowID p_win
return; return;
} }
if (!wd.focused) { if (!wd.focused) {
wd.ime_active = false;
im_text = String();
im_selection = Vector2i();
return; return;
} }
@ -2524,7 +2527,6 @@ void DisplayServerX11::window_set_ime_active(const bool p_active, WindowID p_win
im_text = String(); im_text = String();
im_selection = Vector2i(); im_selection = Vector2i();
} }
OS_Unix::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE);
} }
void DisplayServerX11::window_set_ime_position(const Point2i &p_pos, WindowID p_window) { void DisplayServerX11::window_set_ime_position(const Point2i &p_pos, WindowID p_window) {
@ -3316,6 +3318,7 @@ void DisplayServerX11::_xim_preedit_draw_callback(::XIM xim, ::XPointer client_d
WindowData &wd = ds->windows[window_id]; WindowData &wd = ds->windows[window_id];
XIMText *xim_text = call_data->text; XIMText *xim_text = call_data->text;
if (wd.ime_active) {
if (xim_text != nullptr) { if (xim_text != nullptr) {
String changed_text; String changed_text;
if (xim_text->encoding_is_wchar) { if (xim_text->encoding_is_wchar) {
@ -3351,7 +3354,7 @@ void DisplayServerX11::_xim_preedit_draw_callback(::XIM xim, ::XPointer client_d
ds->im_text = String(); ds->im_text = String();
ds->im_selection = Point2i(); ds->im_selection = Point2i();
} }
if (wd.ime_active) {
OS_Unix::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE); OS_Unix::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE);
} }
} }