isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Cancel selection data sources that are set while unfocused

Browse Source 
If a client is naive enough to assume that it can set the selection while
it has got no surfaces, mutter will simply ignore the request and leave
the selection unchanged.

This is good and the expected behavior, however the poor client that did
this will enter in an inconsistent state where it "claimed" the selection,
but nobody told it that the wl_data_source is not current.

So, when the client is focused the next time, it will receive wl_data_offers
as usual, but it will still think all the time that it is owning the
selection. In the case of GTK, that takes client-side shortcuts, so any
attempted paste will still bring back the client-side aborted selection.

To fix this, cancel the selection right away if it happened while unfocused,
the client will be able to undo its own failed selection, and not assume
that future offers are its own.

Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1469
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1772>
This commit is contained in:
Carlos Garnacho 2021-03-11 11:16:52 +01:00 committed by Marge Bot
parent 3555f65b75
commit 4bee25d8e6
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wayland/meta-wayland-data-device-primary-legacy.c
View File

@ -172,7 +172,11 @@ primary_device_set_selection (struct wl_client *client,
if (wl_resource_get_client (resource) !=
meta_wayland_keyboard_get_focus_client (seat->keyboard))
return;
{
if (source)
meta_wayland_data_source_cancel (source);
return;
}
meta_wayland_data_device_primary_legacy_set_selection (data_device, source, serial);
}

6
src/wayland/meta-wayland-data-device-primary.c
View File

@ -172,7 +172,11 @@ primary_device_set_selection (struct wl_client *client,
if (wl_resource_get_client (resource) !=
meta_wayland_keyboard_get_focus_client (seat->keyboard))
return;
{
if (source)
meta_wayland_data_source_cancel (source);
return;
}
meta_wayland_data_device_primary_set_selection (data_device, source, serial);
}

6
src/wayland/meta-wayland-data-device.c
View File

@ -938,7 +938,11 @@ data_device_set_selection (struct wl_client *client,
if (wl_resource_get_client (resource) !=
meta_wayland_keyboard_get_focus_client (seat->keyboard))
return;
{
if (source)
meta_wayland_data_source_cancel (source);
return;
}
/* FIXME: Store serial and check against incoming serial here. */
meta_wayland_data_device_set_selection (data_device, source, serial);