blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

data-offer: send WL_DATA_OFFER_ERROR_INVALID_FINISH

This commit is contained in:
emersion 2019-02-18 11:37:45 +01:00
parent ae2aeb65cc
commit 7d367a9e21
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
types/data_device/wlr_data_offer.c
View File

@ -135,6 +135,27 @@ static void data_offer_handle_finish(struct wl_client *client,
return; return;
} }
// TODO: also fail while we have a drag-and-drop grab
if (offer->type != WLR_DATA_OFFER_DRAG) {
wl_resource_post_error(offer->resource,
WL_DATA_OFFER_ERROR_INVALID_FINISH, "Offer is not drag-and-drop");
return;
}
if (!offer->source->accepted) {
wl_resource_post_error(offer->resource,
WL_DATA_OFFER_ERROR_INVALID_FINISH, "Premature finish request");
return;
}
enum wl_data_device_manager_dnd_action action =
offer->source->current_dnd_action;
if (action == WL_DATA_DEVICE_MANAGER_DND_ACTION_NONE ||
action == WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK) {
wl_resource_post_error(offer->resource,
WL_DATA_OFFER_ERROR_INVALID_FINISH,
"Offer finished with an invalid action");
return;
}
data_offer_dnd_finish(offer); data_offer_dnd_finish(offer);
data_offer_destroy(offer); data_offer_destroy(offer);
} }