mirror of
https://github.com/brl/mutter.git
synced 2024-11-30 03:50:47 -05:00
x11: Avoid updating focus on wayland compositor
Reading upon the history of this code branch (commits6891ce95dc
and7a4c808e43
are most relevant), it seems this code is meant to synchronize Mutter focus state taking the Xserver state as true. That is, if Mutter tried to change the focus but something truncated that action, Mutter focus will be changed to be in sync with the Xserver again. This sounds backwards in a Wayland session. Mutter focus should be the canonical source, and not second-guessed from the current Xserver focus window. These race conditions might still apply between X11 clients, so make these paths only apply in that case. An example of this breaking can be reproduced with a Spotify and Firefox window, moving the focus from the first to the second by going to the GNOME Shell overview in between, and clicking the Firefox window from there. The Firefox window will be raised, but refuse to take focus. It's unclear what made this an issue recently, perhaps commit0e6395d932
since the now possibly ignored XI_FocusIn/Out events affect this accounting of the Xserver focused window. Anyhow it sounds better to ignore these paths for Wayland/native altogether. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2841>
This commit is contained in:
parent
ea373cb059
commit
81c0cf0834
@ -1955,6 +1955,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display,
|
||||
if (x11_display->focused_by_us &&
|
||||
event->xany.serial > x11_display->focus_serial &&
|
||||
display->focus_window &&
|
||||
display->focus_window->client_type == META_WINDOW_CLIENT_TYPE_X11 &&
|
||||
!window_has_xwindow (display->focus_window, x11_display->server_focus_window) &&
|
||||
meta_display_windows_are_interactable (display))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user