isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 15:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Send primary offer to all data devices from the same client

Browse Source 
Make the data device track the keyboard focus, and use that list to
forward the primary selection to all data devices from the same
client.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1253

(cherry picked from commit b45d5ef3f5)
This commit is contained in:
Carlos Garnacho 2020-05-13 16:39:44 +02:00 committed by Robert Mader
parent 1ec91cc8ee
commit d721750417
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,30 @@
static struct wl_resource * create_and_send_primary_offer (MetaWaylandDataDevicePrimary *data_device, static struct wl_resource * create_and_send_primary_offer (MetaWaylandDataDevicePrimary *data_device,
struct wl_resource *target); struct wl_resource *target);
static void
move_resources (struct wl_list *destination,
struct wl_list *source)
{
wl_list_insert_list (destination, source);
wl_list_init (source);
}
static void
move_resources_for_client (struct wl_list *destination,
struct wl_list *source,
struct wl_client *client)
{
struct wl_resource *resource, *tmp;
wl_resource_for_each_safe (resource, tmp, source)
{
if (wl_resource_get_client (resource) == client)
{
wl_list_remove (wl_resource_get_link (resource));
wl_list_insert (destination, wl_resource_get_link (resource));
}
}
}
static void static void
unbind_resource (struct wl_resource *resource) unbind_resource (struct wl_resource *resource)
{ {
@ -175,10 +199,7 @@ owner_changed_cb (MetaSelection *selection,
if (selection_type == META_SELECTION_PRIMARY) if (selection_type == META_SELECTION_PRIMARY)
{ {
data_device_resource = wl_resource_for_each (data_device_resource, &data_device->focus_resource_list)
wl_resource_find_for_client (&data_device->resource_list,
focus_client);
if (data_device_resource)
{ {
struct wl_resource *offer = NULL; struct wl_resource *offer = NULL;
@ -270,6 +291,7 @@ void
meta_wayland_data_device_primary_init (MetaWaylandDataDevicePrimary *data_device) meta_wayland_data_device_primary_init (MetaWaylandDataDevicePrimary *data_device)
{ {
wl_list_init (&data_device->resource_list); wl_list_init (&data_device->resource_list);
wl_list_init (&data_device->focus_resource_list);
} }
static struct wl_resource * static struct wl_resource *
@ -312,12 +334,17 @@ meta_wayland_data_device_primary_set_keyboard_focus (MetaWaylandDataDevicePrimar
return; return;
data_device->focus_client = focus_client; data_device->focus_client = focus_client;
move_resources (&data_device->resource_list,
&data_device->focus_resource_list);
if (!focus_client) if (!focus_client)
return; return;
data_device_resource = wl_resource_find_for_client (&data_device->resource_list, focus_client); move_resources_for_client (&data_device->focus_resource_list,
if (data_device_resource) &data_device->resource_list,
focus_client);
wl_resource_for_each (data_device_resource, &data_device->focus_resource_list)
{ {
struct wl_resource *offer; struct wl_resource *offer;
offer = create_and_send_primary_offer (data_device, data_device_resource); offer = create_and_send_primary_offer (data_device, data_device_resource);

1
src/wayland/meta-wayland-data-device-primary.h
View File

@ -38,6 +38,7 @@ struct _MetaWaylandDataDevicePrimary
uint32_t serial; uint32_t serial;
MetaWaylandDataSource *data_source; MetaWaylandDataSource *data_source;
struct wl_list resource_list; struct wl_list resource_list;
struct wl_list focus_resource_list;
struct wl_client *focus_client; struct wl_client *focus_client;
guint selection_owner_signal_id; guint selection_owner_signal_id;