hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-02 11:55:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

data-device: keep track of wlr_data_offer in wlr_seat lists

Browse source
This commit is contained in:
emersion 2018-12-09 17:35:11 +01:00
parent 909b3b16f3
commit a1f9d7ad9e
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
4 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/wlr/types/wlr_data_device.h
View file

@ -44,6 +44,7 @@ struct wlr_data_offer {
struct wl_resource *resource; struct wl_resource *resource;
struct wlr_data_source *source; struct wlr_data_source *source;
enum wlr_data_offer_type type; enum wlr_data_offer_type type;
struct wl_list link; // wlr_seat::{selection_offers,drag_offers}
uint32_t actions; uint32_t actions;
enum wl_data_device_manager_dnd_action preferred_action; enum wl_data_device_manager_dnd_action preferred_action;

2
include/wlr/types/wlr_seat.h
View file

@ -197,6 +197,7 @@ struct wlr_seat {
struct wlr_data_source *selection_source; struct wlr_data_source *selection_source;
uint32_t selection_serial; uint32_t selection_serial;
struct wl_list selection_offers; // wlr_data_offer::link
struct wlr_primary_selection_source *primary_selection_source; struct wlr_primary_selection_source *primary_selection_source;
uint32_t primary_selection_serial; uint32_t primary_selection_serial;
@ -205,6 +206,7 @@ struct wlr_seat {
struct wlr_drag *drag; struct wlr_drag *drag;
struct wlr_data_source *drag_source; struct wlr_data_source *drag_source;
uint32_t drag_serial; uint32_t drag_serial;
struct wl_list drag_offers; // wlr_data_offer::link
struct wlr_seat_pointer_state pointer_state; struct wlr_seat_pointer_state pointer_state;
struct wlr_seat_keyboard_state keyboard_state; struct wlr_seat_keyboard_state keyboard_state;

11
types/data_device/wlr_data_offer.c
View file

@ -181,9 +181,11 @@ void data_offer_destroy(struct wlr_data_offer *offer) {
} }
wl_list_remove(&offer->source_destroy.link); wl_list_remove(&offer->source_destroy.link);
wl_list_remove(&offer->link);
// Make the resource inert // Make the resource inert
wl_resource_set_user_data(offer->resource, NULL); wl_resource_set_user_data(offer->resource, NULL);
free(offer); free(offer);
} }
@ -232,6 +234,15 @@ struct wlr_data_offer *data_offer_create(struct wl_resource *device_resource,
wl_resource_set_implementation(offer->resource, &data_offer_impl, offer, wl_resource_set_implementation(offer->resource, &data_offer_impl, offer,
data_offer_handle_resource_destroy); data_offer_handle_resource_destroy);
switch (type) {
case WLR_DATA_OFFER_SELECTION:
wl_list_insert(&seat_client->seat->selection_offers, &offer->link);
break;
case WLR_DATA_OFFER_DRAG:
wl_list_insert(&seat_client->seat->drag_offers, &offer->link);
break;
}
offer->source_destroy.notify = data_offer_handle_source_destroy; offer->source_destroy.notify = data_offer_handle_source_destroy;
wl_signal_add(&source->events.destroy, &offer->source_destroy); wl_signal_add(&source->events.destroy, &offer->source_destroy);

2
types/seat/wlr_seat.c
View file

@ -267,6 +267,8 @@ struct wlr_seat *wlr_seat_create(struct wl_display *display, const char *name) {
seat->name = strdup(name); seat->name = strdup(name);
wl_list_init(&seat->clients); wl_list_init(&seat->clients);
wl_list_init(&seat->drag_icons); wl_list_init(&seat->drag_icons);
wl_list_init(&seat->selection_offers);
wl_list_init(&seat->drag_offers);
wl_signal_init(&seat->events.start_drag); wl_signal_init(&seat->events.start_drag);
wl_signal_init(&seat->events.new_drag_icon); wl_signal_init(&seat->events.new_drag_icon);