mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-07-31 04:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Don't clear the clipboard when a nil selection is ignored

Browse Source 
If the previous selection offering was recursive, a nil selection should be ignored, or clearing the clipboard may clear the backing memory of the client's selection offering as well.

(cherry picked from commit cc2713c047)
This commit is contained in:
Frank Praznik
2026-07-21 19:51:04 -04:00
parent 13f58a7608
commit 01997ebebd
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/wayland/SDL_waylanddatamanager.c
View File

@@ -422,6 +422,11 @@ static void offer_source_done_handler(void *data, struct wl_callback *callback,
SDL_free(id);
if (source_is_external) {
Wayland_data_offer_notify_from_mimes(offer, false);
} else {
// Recursive data offer; just destroy it.
SDL_WaylandDataDevice *data_device = offer->data_device;
Wayland_data_offer_destroy(offer);
data_device->selection_offer = NULL;
}
}
}

12
src/video/wayland/SDL_waylandevents.c
View File

@@ -2990,12 +2990,14 @@ static void data_device_handle_selection(void *data, struct wl_data_device *wl_d
SDL_LogTrace(SDL_LOG_CATEGORY_INPUT,
". In data_device_listener . data_device_handle_selection on data_offer 0x%08x",
(id ? WAYLAND_wl_proxy_get_id((struct wl_proxy *)id) : -1));
if (data_device->selection_offer != offer) {
Wayland_data_offer_destroy(data_device->selection_offer);
data_device->selection_offer = offer;
}
Wayland_data_offer_notify_from_mimes(offer, true);
// Don't notify when clearing the old selection offer if doing so will inadvertently clear the selection source.
const bool notify = offer || (!offer && data_device->selection_offer && (!data_device->selection_offer->callback || !data_device->selection_source));
Wayland_data_offer_destroy(data_device->selection_offer);
data_device->selection_offer = offer;
if (notify) {
Wayland_data_offer_notify_from_mimes(offer, true);
}
}
static const struct wl_data_device_listener data_device_listener = {