Merge pull request #72785 from bruvzg/x11_ime_sw_focus

[X11] Fix IME window focus events.
This commit is contained in:
Yuri Sizov 2023-02-06 14:11:34 +03:00 committed by GitHub
commit e08aa36516
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -4109,7 +4109,7 @@ void DisplayServerX11::process_events() {
case FocusIn: {
DEBUG_LOG_X11("[%u] FocusIn window=%lu (%u), mode='%u' \n", frame, event.xfocus.window, window_id, event.xfocus.mode);
if (ime_window_event) {
if (ime_window_event || (event.xfocus.detail == NotifyInferior)) {
break;
}
@ -4157,7 +4157,7 @@ void DisplayServerX11::process_events() {
case FocusOut: {
DEBUG_LOG_X11("[%u] FocusOut window=%lu (%u), mode='%u' \n", frame, event.xfocus.window, window_id, event.xfocus.mode);
WindowData &wd = windows[window_id];
if (wd.ime_active && event.xfocus.detail == NotifyInferior) {
if (ime_window_event || (event.xfocus.detail == NotifyInferior)) {
break;
}
if (wd.ime_active) {