sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

wayland: Fix possibly out of sync clipboard selections

Browse source 
Replace the sync_focus() calls with a set_focus() do-it function taking
a surface. This is in line with the rest of the things that happen at
the default MetaWaylandEventInterface.focus implementation, and will
make these correctly observe the presence of grabs, since
meta_wayland_seat_get_input_focus() will return the would-be focus
in these cases.

This change makes the "focused" client selection truly
in sync with the keyboard focus.

Fixes: 5ca10c31d1 ("wayland: Follow seat's input focus client for clipboard selections")
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3490
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3789>
This commit is contained in:
Carlos Garnacho 2024-05-30 13:30:52 +02:00 committed by Marge Bot
parent 9dab806a18
commit b968796f1f
3 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/wayland/meta-wayland-data-device.c
View file

@ -1061,8 +1061,7 @@ data_device_set_selection (struct wl_client *client,
}
}
if (wl_resource_get_client (resource) !=
meta_wayland_seat_get_input_focus_client (seat))
if (wl_resource_get_client (resource) != data_device->focus_client)
{
if (source)
meta_wayland_data_source_cancel (source);
@ -1098,16 +1097,9 @@ owner_changed_cb (MetaSelection *selection,
MetaSelectionSource *new_owner,
MetaWaylandDataDevice *data_device)
{
MetaDisplay *display = meta_selection_get_display (selection);
MetaContext *context = meta_display_get_context (display);
MetaWaylandCompositor *compositor =
meta_context_get_wayland_compositor (context);
MetaWaylandSeat *seat = compositor->seat;
struct wl_resource *data_device_resource;
struct wl_client *focus_client;
focus_client = meta_wayland_seat_get_input_focus_client (seat);
if (!focus_client)
if (!data_device->focus_client)
return;
if (selection_type == META_SELECTION_CLIPBOARD)
@ -1249,13 +1241,15 @@ create_and_send_clipboard_offer (MetaWaylandDataDevice *data_device,
}
void
meta_wayland_data_device_sync_focus (MetaWaylandDataDevice *data_device)
meta_wayland_data_device_set_focus (MetaWaylandDataDevice *data_device,
MetaWaylandSurface *surface)
{
MetaWaylandSeat *seat = wl_container_of (data_device, seat, data_device);
struct wl_client *focus_client;
struct wl_client *focus_client = NULL;
struct wl_resource *data_device_resource;
focus_client = meta_wayland_seat_get_input_focus_client (seat);
if (surface)
focus_client = wl_resource_get_client (surface->resource);
if (focus_client == data_device->focus_client)
return;

3
src/wayland/meta-wayland-data-device.h
View file

@ -59,7 +59,8 @@ void meta_wayland_data_device_init (MetaWaylandDataDevice *data_device,
MetaWaylandSeat * meta_wayland_data_device_get_seat (MetaWaylandDataDevice *data_device);
void meta_wayland_data_device_sync_focus (MetaWaylandDataDevice *data_device);
void meta_wayland_data_device_set_focus (MetaWaylandDataDevice *data_device,
MetaWaylandSurface *surface);
MetaWaylandDragGrab *
meta_wayland_data_device_get_current_grab (MetaWaylandDataDevice *data_device);

2
src/wayland/meta-wayland-seat.c
View file

@ -224,7 +224,7 @@ default_focus (MetaWaylandEventHandler *handler,
if (meta_wayland_seat_has_keyboard (seat))
meta_wayland_keyboard_set_focus (seat->keyboard, surface);
meta_wayland_data_device_sync_focus (&seat->data_device);
meta_wayland_data_device_set_focus (&seat->data_device, surface);
meta_wayland_data_device_primary_set_focus (&seat->primary_data_device,
surface);
meta_wayland_tablet_seat_set_pad_focus (seat->tablet_seat, surface);