mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

data-device: add a function to send the selection to a client 

This commit adds a new exported function, weston_seat_send_selection(),
which sends the current selection to a specified client. This is
useful e.g. to implement a clipboard manager as a special client.

Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Giulio Camuffo 2015-05-01 12:59:35 +03:00 committed by Daniel Stone
parent 6a94a99f39
commit dddf9e67b7
2 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/compositor.h
View File

@ -436,6 +436,9 @@ wl_data_device_manager_init(struct wl_display *display);
void
weston_seat_set_selection(struct weston_seat *seat,
struct weston_data_source *source, uint32_t serial);
void
weston_seat_send_selection(struct weston_seat *seat, struct wl_client *client);
int
weston_pointer_start_drag(struct weston_pointer *pointer,
struct weston_data_source *source,

54
src/data-device.c
View File

@ -724,11 +724,40 @@ destroy_selection_data_source(struct wl_listener *listener, void *data)
wl_signal_emit(&seat->selection_signal, seat);
}
/** \brief Send the selection to the specified client
*
* This function creates a new wl_data_offer if there is a wl_data_source
* currently set as the selection and sends it to the specified client,
* followed by the wl_data_device.selection() event.
* If there is no current selection the wl_data_device.selection() event
* will carry a NULL wl_data_offer.
*
* If the client does not have a wl_data_device for the specified seat
* nothing will be done.
*
* \param seat The seat owning the wl_data_device used to send the events.
* \param client The client to which to send the selection.
*/
WL_EXPORT void
weston_seat_send_selection(struct weston_seat *seat, struct wl_client *client)
{
struct wl_resource *data_device, *offer;
data_device = wl_resource_find_for_client(&seat->drag_resource_list,
client);
if (data_device && seat->selection_data_source) {
offer = weston_data_source_send_offer(seat->selection_data_source,
data_device);
wl_data_device_send_selection(data_device, offer);
} else if (data_device) {
wl_data_device_send_selection(data_device, NULL);
}
}
WL_EXPORT void
weston_seat_set_selection(struct weston_seat *seat,
struct weston_data_source *source, uint32_t serial)
{
struct wl_resource *data_device, *offer;
struct weston_surface *focus = NULL;
if (seat->selection_data_source &&
@ -747,15 +776,7 @@ weston_seat_set_selection(struct weston_seat *seat,
if (seat->keyboard)
focus = seat->keyboard->focus;
if (focus && focus->resource) {
data_device = wl_resource_find_for_client(&seat->drag_resource_list,
wl_resource_get_client(focus->resource));
if (data_device && source) {
offer = weston_data_source_send_offer(seat->selection_data_source,
data_device);
wl_data_device_send_selection(data_device, offer);
} else if (data_device) {
wl_data_device_send_selection(data_device, NULL);
}
weston_seat_send_selection(seat, wl_resource_get_client(focus->resource));
}
wl_signal_emit(&seat->selection_signal, seat);
@ -910,8 +931,6 @@ bind_manager(struct wl_client *client,
WL_EXPORT void
wl_data_device_set_keyboard_focus(struct weston_seat *seat)
{
struct wl_resource *data_device, *offer;
struct weston_data_source *source;
struct weston_surface *focus;
if (!seat->keyboard)
@ -921,16 +940,7 @@ wl_data_device_set_keyboard_focus(struct weston_seat *seat)
if (!focus || !focus->resource)
return;
data_device = wl_resource_find_for_client(&seat->drag_resource_list,
wl_resource_get_client(focus->resource));
if (!data_device)
return;
source = seat->selection_data_source;
if (source) {
offer = weston_data_source_send_offer(source, data_device);
wl_data_device_send_selection(data_device, offer);
}
weston_seat_send_selection(seat, wl_resource_get_client(focus->resource));
}
WL_EXPORT int