brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Honor startup sequence workspace on .request_focus

Browse Source 
We handle this in backend specific code for x11, so do the wayland
bits here. We can only honor this on applications that request focus
on a surface after a startup request, as we do need an explicit
surface to apply the workspace on (and we don't have additional clues
like WMCLASS on X11). Notably, gtk_shell1.notify_startup doesn't suffice.

Another gotcha is that the .request_focus happens when the surface is
already "mapped". Due to the way x11 and the GDK api currently work (first
reply on the startup id, then map a window, then request focus on that
window). This means the surface will ignore at this point
window->initial_workspace, so it must be actively changed.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/544
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/674
This commit is contained in:
Carlos Garnacho 2019-04-18 12:28:24 +02:00 committed by Georges Basile Stavracas Neto
parent b3e19ee669
commit bbfaf8204b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wayland/meta-wayland-gtk-shell.c
View File

@ -172,13 +172,16 @@ gtk_surface_request_focus (struct wl_client *client,
if (sequence) if (sequence)
{ {
uint32_t timestamp; uint32_t timestamp, workspace_idx;
workspace_idx = meta_startup_sequence_get_workspace (sequence);
timestamp = meta_startup_sequence_get_timestamp (sequence); timestamp = meta_startup_sequence_get_timestamp (sequence);
meta_startup_sequence_complete (sequence); meta_startup_sequence_complete (sequence);
meta_startup_notification_remove_sequence (display->startup_notification, meta_startup_notification_remove_sequence (display->startup_notification,
sequence); sequence);
if (workspace_idx >= 0)
meta_window_change_workspace_by_index (window, workspace_idx, TRUE);
meta_window_activate_full (window, timestamp, meta_window_activate_full (window, timestamp,
META_CLIENT_TYPE_APPLICATION, NULL); META_CLIENT_TYPE_APPLICATION, NULL);