From f237b5c7a702a6641de6d49e9b0bd754246283c9 Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 29 Dec 2017 22:51:33 +0100 Subject: Make wlr_data_source abstract. This removes some fields specific to sources coming from clients. This adds some drag'n'drop-related callbacks. --- include/wlr/types/wlr_data_device.h | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/wlr/types/wlr_data_device.h b/include/wlr/types/wlr_data_device.h index 92d15972..54514b4c 100644 --- a/include/wlr/types/wlr_data_device.h +++ b/include/wlr/types/wlr_data_device.h @@ -23,33 +23,39 @@ struct wlr_data_offer { struct wl_resource *resource; struct wlr_data_source *source; - uint32_t dnd_actions; - enum wl_data_device_manager_dnd_action preferred_dnd_action; + uint32_t actions; + enum wl_data_device_manager_dnd_action preferred_action; bool in_ask; struct wl_listener source_destroy; }; struct wlr_data_source { - struct wl_resource *resource; - struct wlr_data_offer *offer; - struct wlr_seat_client *seat_client; - + // source metadata struct wl_array mime_types; + int32_t actions; + + // source implementation + void (*send)(struct wlr_data_source *source, const char *mime_type, + int32_t fd); + void (*accept)(struct wlr_data_source *source, uint32_t serial, + const char *mime_type); + void (*cancel)(struct wlr_data_source *source); + // drag'n'drop implementation + void (*dnd_drop)(struct wlr_data_source *source); + void (*dnd_finish)(struct wlr_data_source *source); + void (*dnd_action)(struct wlr_data_source *source, + enum wl_data_device_manager_dnd_action action); + + // source status bool accepted; + struct wlr_data_offer *offer; + struct wlr_seat_client *seat_client; - // drag and drop + // drag'n'drop status enum wl_data_device_manager_dnd_action current_dnd_action; - uint32_t dnd_actions; uint32_t compositor_action; - bool actions_set; - - void (*accept)(struct wlr_data_source *source, uint32_t serial, - const char *mime_type); - void (*send)(struct wlr_data_source *source, const char *mime_type, - int32_t fd); - void (*cancel)(struct wlr_data_source *source); struct { struct wl_signal destroy; -- cgit v1.2.3 From b20aed66d6f7556b13c2f22df9fcfb31c37dbc90 Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 29 Dec 2017 23:23:00 +0100 Subject: Abstract wlr_primary_selection_source --- include/wlr/types/wlr_primary_selection.h | 10 ++- types/wlr_data_device.c | 145 +++++++++++++++--------------- types/wlr_primary_selection.c | 67 ++++++++------ 3 files changed, 121 insertions(+), 101 deletions(-) (limited to 'include') diff --git a/include/wlr/types/wlr_primary_selection.h b/include/wlr/types/wlr_primary_selection.h index b4eceb78..da3c096a 100644 --- a/include/wlr/types/wlr_primary_selection.h +++ b/include/wlr/types/wlr_primary_selection.h @@ -15,16 +15,18 @@ struct wlr_primary_selection_device_manager { struct wlr_primary_selection_offer; struct wlr_primary_selection_source { - struct wl_resource *resource; - struct wlr_primary_selection_offer *offer; - struct wlr_seat_client *seat_client; - + // source metadata struct wl_array mime_types; + // source implementation void (*send)(struct wlr_primary_selection_source *source, const char *mime_type, int32_t fd); void (*cancel)(struct wlr_primary_selection_source *source); + // source status + struct wlr_primary_selection_offer *offer; + struct wlr_seat_client *seat_client; + struct { struct wl_signal destroy; } events; diff --git a/types/wlr_data_device.c b/types/wlr_data_device.c index 26cf0a87..804718f9 100644 --- a/types/wlr_data_device.c +++ b/types/wlr_data_device.c @@ -75,58 +75,6 @@ static void data_offer_update_action(struct wlr_data_offer *offer) { } } -struct client_data_source { - struct wlr_data_source source; - struct wl_resource *resource; -}; - -static void client_data_source_accept(struct wlr_data_source *wlr_source, - uint32_t serial, const char *mime_type) { - struct client_data_source *source = (struct client_data_source *)wlr_source; - wl_data_source_send_target(source->resource, mime_type); -} - -static void client_data_source_send(struct wlr_data_source *wlr_source, - const char *mime_type, int32_t fd) { - struct client_data_source *source = (struct client_data_source *)wlr_source; - wl_data_source_send_send(source->resource, mime_type, fd); - close(fd); -} - -static void client_data_source_cancel(struct wlr_data_source *wlr_source) { - struct client_data_source *source = (struct client_data_source *)wlr_source; - wl_data_source_send_cancelled(source->resource); -} - -static void client_data_source_dnd_drop(struct wlr_data_source *wlr_source) { - struct client_data_source *source = (struct client_data_source *)wlr_source; - assert(wl_resource_get_version(source->resource) >= - WL_DATA_SOURCE_DND_DROP_PERFORMED_SINCE_VERSION); - wl_data_source_send_dnd_drop_performed(source->resource); -} - -static void client_data_source_dnd_finish(struct wlr_data_source *wlr_source) { - struct client_data_source *source = (struct client_data_source *)wlr_source; - assert(wl_resource_get_version(source->resource) >= - WL_DATA_SOURCE_DND_FINISHED_SINCE_VERSION); - wl_data_source_send_dnd_finished(source->resource); -} - -static void client_data_source_dnd_action(struct wlr_data_source *wlr_source, - enum wl_data_device_manager_dnd_action action) { - struct client_data_source *source = (struct client_data_source *)wlr_source; - assert(wl_resource_get_version(source->resource) >= - WL_DATA_SOURCE_ACTION_SINCE_VERSION); - wl_data_source_send_action(source->resource, action); -} - -static void client_data_source_resource_destroy(struct wl_resource *resource) { - struct client_data_source *source = wl_resource_get_user_data(resource); - wlr_data_source_finish(&source->source); - free(source); -} - - static void data_offer_accept(struct wl_client *client, struct wl_resource *resource, uint32_t serial, const char *mime_type) { struct wlr_data_offer *offer = wl_resource_get_user_data(resource); @@ -343,8 +291,11 @@ static void seat_client_selection_data_source_destroy( void wlr_seat_set_selection(struct wlr_seat *seat, struct wlr_data_source *source, uint32_t serial) { - assert(source->send); - assert(source->cancel); + if (source) { + assert(source->send); + assert(source->cancel); + } + if (seat->selection_source && seat->selection_serial - serial < UINT32_MAX / 2) { return; @@ -861,22 +812,50 @@ static void data_device_destroy(struct wl_resource *resource) { wl_list_remove(wl_resource_get_link(resource)); } -void data_device_manager_get_data_device(struct wl_client *client, - struct wl_resource *manager_resource, uint32_t id, - struct wl_resource *seat_resource) { - struct wlr_seat_client *seat_client = - wl_resource_get_user_data(seat_resource); - struct wl_resource *resource = wl_resource_create(client, - &wl_data_device_interface, wl_resource_get_version(manager_resource), - id); - if (resource == NULL) { - wl_resource_post_no_memory(manager_resource); - return; - } - wl_resource_set_implementation(resource, &data_device_impl, seat_client, - &data_device_destroy); - wl_list_insert(&seat_client->data_devices, wl_resource_get_link(resource)); +struct client_data_source { + struct wlr_data_source source; + struct wl_resource *resource; +}; + +static void client_data_source_accept(struct wlr_data_source *wlr_source, + uint32_t serial, const char *mime_type) { + struct client_data_source *source = (struct client_data_source *)wlr_source; + wl_data_source_send_target(source->resource, mime_type); +} + +static void client_data_source_send(struct wlr_data_source *wlr_source, + const char *mime_type, int32_t fd) { + struct client_data_source *source = (struct client_data_source *)wlr_source; + wl_data_source_send_send(source->resource, mime_type, fd); + close(fd); +} + +static void client_data_source_cancel(struct wlr_data_source *wlr_source) { + struct client_data_source *source = (struct client_data_source *)wlr_source; + wl_data_source_send_cancelled(source->resource); +} + +static void client_data_source_dnd_drop(struct wlr_data_source *wlr_source) { + struct client_data_source *source = (struct client_data_source *)wlr_source; + assert(wl_resource_get_version(source->resource) >= + WL_DATA_SOURCE_DND_DROP_PERFORMED_SINCE_VERSION); + wl_data_source_send_dnd_drop_performed(source->resource); +} + +static void client_data_source_dnd_finish(struct wlr_data_source *wlr_source) { + struct client_data_source *source = (struct client_data_source *)wlr_source; + assert(wl_resource_get_version(source->resource) >= + WL_DATA_SOURCE_DND_FINISHED_SINCE_VERSION); + wl_data_source_send_dnd_finished(source->resource); +} + +static void client_data_source_dnd_action(struct wlr_data_source *wlr_source, + enum wl_data_device_manager_dnd_action action) { + struct client_data_source *source = (struct client_data_source *)wlr_source; + assert(wl_resource_get_version(source->resource) >= + WL_DATA_SOURCE_ACTION_SINCE_VERSION); + wl_data_source_send_action(source->resource, action); } static void data_source_destroy(struct wl_client *client, @@ -936,6 +915,12 @@ static struct wl_data_source_interface data_source_impl = { .set_actions = data_source_set_actions, }; +static void data_source_resource_handle_destroy(struct wl_resource *resource) { + struct client_data_source *source = wl_resource_get_user_data(resource); + wlr_data_source_finish(&source->source); + free(source); +} + void wlr_data_source_init(struct wlr_data_source *source) { wl_array_init(&source->mime_types); wl_signal_init(&source->events.destroy); @@ -956,6 +941,25 @@ void wlr_data_source_finish(struct wlr_data_source *source) { wl_array_release(&source->mime_types); } + +void data_device_manager_get_data_device(struct wl_client *client, + struct wl_resource *manager_resource, uint32_t id, + struct wl_resource *seat_resource) { + struct wlr_seat_client *seat_client = + wl_resource_get_user_data(seat_resource); + + struct wl_resource *resource = wl_resource_create(client, + &wl_data_device_interface, wl_resource_get_version(manager_resource), + id); + if (resource == NULL) { + wl_resource_post_no_memory(manager_resource); + return; + } + wl_resource_set_implementation(resource, &data_device_impl, seat_client, + &data_device_destroy); + wl_list_insert(&seat_client->data_devices, wl_resource_get_link(resource)); +} + static void data_device_manager_create_data_source(struct wl_client *client, struct wl_resource *resource, uint32_t id) { struct client_data_source *source = @@ -974,7 +978,7 @@ static void data_device_manager_create_data_source(struct wl_client *client, return; } wl_resource_set_implementation(source->resource, &data_source_impl, - source, client_data_source_resource_destroy); + source, data_source_resource_handle_destroy); source->source.accept = client_data_source_accept; source->source.send = client_data_source_send; @@ -1019,6 +1023,7 @@ void wlr_data_device_manager_destroy(struct wlr_data_device_manager *manager) { return; } wl_list_remove(&manager->display_destroy.link); + // TODO: free wl_resources wl_global_destroy(manager->global); free(manager); } diff --git a/types/wlr_primary_selection.c b/types/wlr_primary_selection.c index 1228e94e..c29856f2 100644 --- a/types/wlr_primary_selection.c +++ b/types/wlr_primary_selection.c @@ -2,23 +2,12 @@ #include #include #include +#include #include #include #include #include -static void client_source_send(struct wlr_primary_selection_source *source, - const char *mime_type, int32_t fd) { - gtk_primary_selection_source_send_send(source->resource, mime_type, fd); - close(fd); -} - -static void client_source_cancel( - struct wlr_primary_selection_source *source) { - gtk_primary_selection_source_send_cancelled(source->resource); -} - - static void offer_handle_receive(struct wl_client *client, struct wl_resource *resource, const char *mime_type, int32_t fd) { struct wlr_primary_selection_offer *offer = @@ -55,8 +44,8 @@ static void offer_resource_handle_destroy(struct wl_resource *resource) { goto out; } - if (offer->source->resource) { - gtk_primary_selection_source_send_cancelled(offer->source->resource); + if (offer->source->cancel) { + offer->source->cancel(offer->source); } offer->source->offer = NULL; @@ -73,6 +62,24 @@ static void offer_handle_source_destroy(struct wl_listener *listener, } +struct client_data_source { + struct wlr_primary_selection_source source; + struct wl_resource *resource; +}; + +static void client_source_send(struct wlr_primary_selection_source *wlr_source, + const char *mime_type, int32_t fd) { + struct client_data_source *source = (struct client_data_source *)wlr_source; + gtk_primary_selection_source_send_send(source->resource, mime_type, fd); + close(fd); +} + +static void client_source_cancel( + struct wlr_primary_selection_source *wlr_source) { + struct client_data_source *source = (struct client_data_source *)wlr_source; + gtk_primary_selection_source_send_cancelled(source->resource); +} + static struct wlr_primary_selection_offer *source_send_offer( struct wlr_primary_selection_source *source, struct wlr_seat_client *target) { @@ -119,16 +126,15 @@ static struct wlr_primary_selection_offer *source_send_offer( static void source_handle_offer(struct wl_client *client, struct wl_resource *resource, const char *mime_type) { - struct wlr_primary_selection_source *source = - wl_resource_get_user_data(resource); + struct client_data_source *source = wl_resource_get_user_data(resource); - char **p = wl_array_add(&source->mime_types, sizeof(*p)); + char **p = wl_array_add(&source->source.mime_types, sizeof(*p)); if (p) { *p = strdup(mime_type); } if (p == NULL || *p == NULL) { if (p) { - source->mime_types.size -= sizeof(*p); + source->source.mime_types.size -= sizeof(*p); } wl_resource_post_no_memory(resource); } @@ -145,9 +151,9 @@ static const struct gtk_primary_selection_source_interface source_impl = { }; static void source_resource_handle_destroy(struct wl_resource *resource) { - struct wlr_primary_selection_source *source = + struct client_data_source *source = wl_resource_get_user_data(resource); - wlr_primary_selection_source_finish(source); + wlr_primary_selection_source_finish(&source->source); free(source); } @@ -197,6 +203,11 @@ static void seat_client_primary_selection_source_destroy( void wlr_seat_set_primary_selection(struct wlr_seat *seat, struct wlr_primary_selection_source *source, uint32_t serial) { + if (source) { + assert(source->send); + assert(source->cancel); + } + if (seat->primary_selection_source && seat->primary_selection_serial - serial < UINT32_MAX / 2) { return; @@ -230,7 +241,7 @@ void wlr_seat_set_primary_selection(struct wlr_seat *seat, static void device_handle_set_selection(struct wl_client *client, struct wl_resource *resource, struct wl_resource *source_resource, uint32_t serial) { - struct wlr_primary_selection_source *source = NULL; + struct client_data_source *source = NULL; if (source_resource != NULL) { source = wl_resource_get_user_data(source_resource); } @@ -239,7 +250,9 @@ static void device_handle_set_selection(struct wl_client *client, wl_resource_get_user_data(resource); // TODO: store serial and check against incoming serial here - wlr_seat_set_primary_selection(seat_client->seat, source, serial); + struct wlr_primary_selection_source *wlr_source = + (struct wlr_primary_selection_source *)source; + wlr_seat_set_primary_selection(seat_client->seat, wlr_source, serial); } static void device_handle_destroy(struct wl_client *client, @@ -280,13 +293,13 @@ void wlr_primary_selection_source_finish( static void device_manager_handle_create_source(struct wl_client *client, struct wl_resource *manager_resource, uint32_t id) { - struct wlr_primary_selection_source *source = - calloc(1, sizeof(struct wlr_primary_selection_source)); + struct client_data_source *source = + calloc(1, sizeof(struct client_data_source)); if (source == NULL) { wl_client_post_no_memory(client); return; } - wlr_primary_selection_source_init(source); + wlr_primary_selection_source_init(&source->source); int version = wl_resource_get_version(manager_resource); source->resource = wl_resource_create(client, @@ -299,8 +312,8 @@ static void device_manager_handle_create_source(struct wl_client *client, wl_resource_set_implementation(source->resource, &source_impl, source, source_resource_handle_destroy); - source->send = client_source_send; - source->cancel = client_source_cancel; + source->source.send = client_source_send; + source->source.cancel = client_source_cancel; } void device_manager_handle_get_device(struct wl_client *client, -- cgit v1.2.3 From 38ed3b42451e350a97f6686324ca2beb10c1dbb3 Mon Sep 17 00:00:00 2001 From: emersion Date: Sat, 30 Dec 2017 09:58:04 +0100 Subject: seat: rename selection_source to selection_data_source, remove unused data_device --- include/wlr/types/wlr_seat.h | 3 +-- types/wlr_data_device.c | 16 ++++++++-------- types/wlr_seat.c | 7 +++---- xwayland/selection.c | 12 +++++++----- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'include') diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index e049d4c7..432e5dc3 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -178,8 +178,7 @@ struct wlr_seat { uint32_t capabilities; struct timespec last_event; - struct wlr_data_device *data_device; // TODO needed? - struct wlr_data_source *selection_source; + struct wlr_data_source *selection_data_source; uint32_t selection_serial; struct wlr_primary_selection_source *primary_selection_source; diff --git a/types/wlr_data_device.c b/types/wlr_data_device.c index fc2060e0..ff209d9f 100644 --- a/types/wlr_data_device.c +++ b/types/wlr_data_device.c @@ -253,9 +253,9 @@ void wlr_seat_client_send_selection(struct wlr_seat_client *seat_client) { return; } - if (seat_client->seat->selection_source) { + if (seat_client->seat->selection_data_source) { struct wlr_data_offer *offer = wlr_data_source_send_offer( - seat_client->seat->selection_source, seat_client); + seat_client->seat->selection_data_source, seat_client); if (offer == NULL) { return; } @@ -285,7 +285,7 @@ static void seat_client_selection_data_source_destroy( } } - seat->selection_source = NULL; + seat->selection_data_source = NULL; wl_signal_emit(&seat->events.selection, seat); } @@ -297,18 +297,18 @@ void wlr_seat_set_selection(struct wlr_seat *seat, assert(source->cancel); } - if (seat->selection_source && + if (seat->selection_data_source && seat->selection_serial - serial < UINT32_MAX / 2) { return; } - if (seat->selection_source) { - seat->selection_source->cancel(seat->selection_source); - seat->selection_source = NULL; + if (seat->selection_data_source) { + seat->selection_data_source->cancel(seat->selection_data_source); + seat->selection_data_source = NULL; wl_list_remove(&seat->selection_data_source_destroy.link); } - seat->selection_source = source; + seat->selection_data_source = source; seat->selection_serial = serial; struct wlr_seat_client *focused_client = diff --git a/types/wlr_seat.c b/types/wlr_seat.c index ec95053b..79638822 100644 --- a/types/wlr_seat.c +++ b/types/wlr_seat.c @@ -352,9 +352,9 @@ void wlr_seat_destroy(struct wlr_seat *seat) { wl_list_remove(&seat->display_destroy.link); - if (seat->selection_source) { - seat->selection_source->cancel(seat->selection_source); - seat->selection_source = NULL; + if (seat->selection_data_source) { + seat->selection_data_source->cancel(seat->selection_data_source); + seat->selection_data_source = NULL; wl_list_remove(&seat->selection_data_source_destroy.link); } if (seat->primary_selection_source) { @@ -373,7 +373,6 @@ void wlr_seat_destroy(struct wlr_seat *seat) { free(seat->pointer_state.default_grab); free(seat->keyboard_state.default_grab); free(seat->touch_state.default_grab); - free(seat->data_device); free(seat->name); free(seat); } diff --git a/xwayland/selection.c b/xwayland/selection.c index 65599145..060c0baf 100644 --- a/xwayland/selection.c +++ b/xwayland/selection.c @@ -153,7 +153,8 @@ error_out: static void xwm_selection_source_send(struct wlr_xwm_selection *selection, const char *mime_type, int32_t fd) { if (selection == &selection->xwm->clipboard_selection) { - struct wlr_data_source *source = selection->xwm->seat->selection_source; + struct wlr_data_source *source = + selection->xwm->seat->selection_data_source; if (source != NULL) { source->send(source, mime_type, fd); return; @@ -214,7 +215,8 @@ static void xwm_selection_send_timestamp(struct wlr_xwm_selection *selection) { static struct wl_array *xwm_selection_source_get_mime_types( struct wlr_xwm_selection *selection) { if (selection == &selection->xwm->clipboard_selection) { - struct wlr_data_source *source = selection->xwm->seat->selection_source; + struct wlr_data_source *source = + selection->xwm->seat->selection_data_source; if (source != NULL) { return &source->mime_types; } @@ -834,8 +836,8 @@ void xwm_selection_finish(struct wlr_xwm *xwm) { xcb_destroy_window(xwm->xcb_conn, xwm->selection_window); } if (xwm->seat) { - if (xwm->seat->selection_source && - xwm->seat->selection_source->cancel == data_source_cancel) { + if (xwm->seat->selection_data_source && + xwm->seat->selection_data_source->cancel == data_source_cancel) { wlr_seat_set_selection(xwm->seat, NULL, wl_display_next_serial(xwm->xwayland->wl_display)); } @@ -871,7 +873,7 @@ static void seat_handle_selection(struct wl_listener *listener, struct wlr_seat *seat = data; struct wlr_xwm *xwm = wl_container_of(listener, xwm, seat_selection); - struct wlr_data_source *source = seat->selection_source; + struct wlr_data_source *source = seat->selection_data_source; if (source != NULL && source->send == data_source_send) { return; -- cgit v1.2.3