mirror of
https://github.com/brl/mutter.git
synced 2024-11-12 17:27:03 -05:00
wayland/data-device: Clear existing data device resource from list
Compositor behaviour when calling `wl_data_device_manager_get_data_device` for the same seat multiple times is not very clearly defined in the spec and both Mutter and Weston currently don't handle the DnD case properly. While Weston handles DnD only for the last created data device, Mutter, because of some internal reshuffling, ends up toggling between two devices. Properly handling this case requires some bigger changes. So in order to behave predictable and in line with Weston, only take the last created data device into account while still keeping the previous created ones around. The main affect client here is Firefox, which gets very confused by the toggling behaviour and becomes more stable with this patch. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1841>
This commit is contained in:
parent
8989c42d40
commit
96f2da9fb0
@ -1016,9 +1016,19 @@ get_data_device (struct wl_client *client,
|
||||
{
|
||||
MetaWaylandSeat *seat = wl_resource_get_user_data (seat_resource);
|
||||
struct wl_resource *cr;
|
||||
struct wl_resource *data_device_resource;
|
||||
|
||||
cr = wl_resource_create (client, &wl_data_device_interface, wl_resource_get_version (manager_resource), id);
|
||||
wl_resource_set_implementation (cr, &data_device_interface, &seat->data_device, unbind_resource);
|
||||
|
||||
data_device_resource =
|
||||
wl_resource_find_for_client (&seat->data_device.resource_list, client);
|
||||
if (data_device_resource)
|
||||
{
|
||||
wl_list_remove (wl_resource_get_link (data_device_resource));
|
||||
wl_list_init (wl_resource_get_link (data_device_resource));
|
||||
}
|
||||
|
||||
wl_list_insert (&seat->data_device.resource_list, wl_resource_get_link (cr));
|
||||
|
||||
ensure_owners_changed_handler_connected (&seat->data_device);
|
||||
|
Loading…
Reference in New Issue
Block a user