From 86658f2ca7a22116ba26856555fc2500a7b9b560 Mon Sep 17 00:00:00 2001
From: Sylvain <[EMAIL REDACTED]>
Date: Tue, 3 Jan 2023 16:35:51 +0100
Subject: [PATCH] Wayland / Drag and Drop: find the current window
---
src/video/wayland/SDL_waylanddatamanager.h | 1 +
src/video/wayland/SDL_waylandevents.c | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/video/wayland/SDL_waylanddatamanager.h b/src/video/wayland/SDL_waylanddatamanager.h
index ee5fa070745f..4a40f7d0cbeb 100644
--- a/src/video/wayland/SDL_waylanddatamanager.h
+++ b/src/video/wayland/SDL_waylanddatamanager.h
@@ -75,6 +75,7 @@ typedef struct
uint32_t drag_serial;
SDL_WaylandDataOffer *drag_offer;
SDL_WaylandDataOffer *selection_offer;
+ SDL_Window *dnd_window;
/* Clipboard and Primary Selection */
uint32_t selection_serial;
diff --git a/src/video/wayland/SDL_waylandevents.c b/src/video/wayland/SDL_waylandevents.c
index e4b07892d0f7..dca2a5120c9b 100644
--- a/src/video/wayland/SDL_waylandevents.c
+++ b/src/video/wayland/SDL_waylandevents.c
@@ -1654,6 +1654,14 @@ static void data_device_handle_enter(void *data, struct wl_data_device *wl_data_
wl_data_offer_set_actions(data_device->drag_offer->offer,
dnd_action, dnd_action);
}
+
+ /* find the current window */
+ if (surface && SDL_WAYLAND_own_surface(surface)) {
+ SDL_WindowData *window = (SDL_WindowData *)wl_surface_get_user_data(surface);
+ if (window) {
+ data_device->dnd_window = window->sdlwindow;
+ }
+ }
}
}
@@ -1809,11 +1817,11 @@ static void data_device_handle_drop(void *data, struct wl_data_device *wl_data_d
while (token != NULL) {
char *fn = Wayland_URIToLocal(token);
if (fn) {
- SDL_SendDropFile(NULL, fn); /* FIXME: Window? */
+ SDL_SendDropFile(data_device->dnd_window, fn);
}
token = SDL_strtokr(NULL, "\r\n", &saveptr);
}
- SDL_SendDropComplete(NULL); /* FIXME: Window? */
+ SDL_SendDropComplete(data_device->dnd_window);
SDL_free(buffer);
}
}