Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[X11] Don't re-set input focus if the given window already has it (fixes Godot stealing input focus on i3) #86671

Merged
merged 1 commit into from
Jan 18, 2024
Merged

[X11] Don't re-set input focus if the given window already has it (fixes Godot stealing input focus on i3) #86671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions platform/linuxbsd/x11/display_server_x11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2011,7 +2011,7 @@ void DisplayServerX11::window_set_transient(WindowID p_window, WindowID p_parent
// a subwindow and its parent are both destroyed.
if (!wd_window.no_focus && !wd_window.is_popup && wd_window.focused) {
if ((xwa.map_state == IsViewable) && !wd_parent.no_focus && !wd_window.is_popup && _window_focus_check()) {
XSetInputFocus(x11_display, wd_parent.x11_window, RevertToPointerRoot, CurrentTime);
_set_input_focus(wd_parent.x11_window, RevertToPointerRoot);
}
}
} else {
Expand Down Expand Up @@ -2951,7 +2951,7 @@ void DisplayServerX11::window_set_ime_active(const bool p_active, WindowID p_win
XSync(x11_display, False);
XGetWindowAttributes(x11_display, wd.x11_xim_window, &xwa);
if (xwa.map_state == IsViewable && _window_focus_check()) {
XSetInputFocus(x11_display, wd.x11_xim_window, RevertToParent, CurrentTime);
_set_input_focus(wd.x11_xim_window, RevertToParent);
}
XSetICFocus(wd.xic);
} else {
Expand Down Expand Up @@ -4024,6 +4024,18 @@ void DisplayServerX11::_send_window_event(const WindowData &wd, WindowEvent p_ev
}
}

void DisplayServerX11::_set_input_focus(Window p_window, int p_revert_to) {
Window focused_window;
int focus_ret_state;
XGetInputFocus(x11_display, &focused_window, &focus_ret_state);

// Only attempt to change focus if the window isn't already focused, in order to
// prevent issues with Godot stealing input focus with alternative window managers.
if (p_window != focused_window) {
XSetInputFocus(x11_display, p_window, p_revert_to, CurrentTime);
}
}

void DisplayServerX11::_poll_events_thread(void *ud) {
DisplayServerX11 *display_server = static_cast<DisplayServerX11 *>(ud);
display_server->_poll_events();
Expand Down Expand Up @@ -4521,7 +4533,7 @@ void DisplayServerX11::process_events() {
// RevertToPointerRoot is used to make sure we don't lose all focus in case
// a subwindow and its parent are both destroyed.
if ((xwa.map_state == IsViewable) && !wd.no_focus && !wd.is_popup && _window_focus_check()) {
XSetInputFocus(x11_display, wd.x11_window, RevertToPointerRoot, CurrentTime);
_set_input_focus(wd.x11_window, RevertToPointerRoot);
}

// Have we failed to set fullscreen while the window was unmapped?
Expand Down Expand Up @@ -4697,7 +4709,7 @@ void DisplayServerX11::process_events() {
// RevertToPointerRoot is used to make sure we don't lose all focus in case
// a subwindow and its parent are both destroyed.
if ((xwa.map_state == IsViewable) && !wd.no_focus && !wd.is_popup && _window_focus_check()) {
XSetInputFocus(x11_display, wd.x11_window, RevertToPointerRoot, CurrentTime);
_set_input_focus(wd.x11_window, RevertToPointerRoot);
}

_window_changed(&event);
Expand Down Expand Up @@ -4741,7 +4753,7 @@ void DisplayServerX11::process_events() {
// RevertToPointerRoot is used to make sure we don't lose all focus in case
// a subwindow and its parent are both destroyed.
if (!wd.no_focus && !wd.is_popup) {
XSetInputFocus(x11_display, wd.x11_window, RevertToPointerRoot, CurrentTime);
_set_input_focus(wd.x11_window, RevertToPointerRoot);
}

uint64_t diff = OS::get_singleton()->get_ticks_usec() / 1000 - last_click_ms;
Expand Down
1 change: 1 addition & 0 deletions platform/linuxbsd/x11/display_server_x11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ class DisplayServerX11 : public DisplayServer {
void _send_window_event(const WindowData &wd, WindowEvent p_event);
static void _dispatch_input_events(const Ref<InputEvent> &p_event);
void _dispatch_input_event(const Ref<InputEvent> &p_event);
void _set_input_focus(Window p_window, int p_revert_to);

mutable Mutex events_mutex;
Thread events_thread;
Expand Down
Loading