gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wayland drag-n-drop: handle subwindows as other platforms do (#516)

Browse Source 
The d-n-d target window is now always the top-level window even if the
mouse is over a subwindow. That's what all other platforms do.
Global var fl_dnd_target_surface memorise what's the current d-n-d target
surface and follows changes from top-window to subwindows.
This commit is contained in:
ManoloFLTK 2022-10-19 12:28:04 +02:00
parent f40bd49a7c
commit 24c63c0774
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/drivers/Wayland/fl_wayland_clipboard_dnd.cxx
View File

@ -88,6 +88,7 @@ static void data_source_handle_send(void *data, struct wl_data_source *source, c
}
static Fl_Window *fl_dnd_target_window = 0;
static wl_surface *fl_dnd_target_surface = 0;
static bool doing_dnd = false; // true when DnD is in action
static wl_surface *dnd_icon = NULL; // non null when DnD uses text as cursor
static wl_cursor* save_cursor = NULL; // non null when DnD uses "dnd-copy" cursor
@ -399,11 +400,17 @@ static void data_device_handle_enter(void *data, struct wl_data_device *data_dev
Fl_Window *win = Fl_Wayland_Screen_Driver::surface_to_window(surface);
//printf("Drag entered our surface %p(win=%p) at %dx%d\n", surface, win, wl_fixed_to_int(x), wl_fixed_to_int(y));
if (win) {
fl_dnd_target_surface = surface;
float f = Fl::screen_scale(win->screen_num());
fl_dnd_target_window = win;
Fl::e_x = wl_fixed_to_int(x) / f;
Fl::e_x_root = Fl::e_x + fl_dnd_target_window->x();
Fl::e_y = wl_fixed_to_int(y) / f;
while (win->parent()) {
Fl::e_x += win->x();
Fl::e_y += win->y();
win = win->window();
}
fl_dnd_target_window = win;
Fl::e_x_root = Fl::e_x + fl_dnd_target_window->x();
Fl::e_y_root = Fl::e_y + fl_dnd_target_window->y();
Fl::handle(FL_DND_ENTER, fl_dnd_target_window);
current_drag_offer = offer;
@ -421,9 +428,15 @@ static void data_device_handle_motion(void *data, struct wl_data_device *data_de
int ret = 0;
if (fl_dnd_target_window) {
float f = Fl::screen_scale(fl_dnd_target_window->screen_num());
Fl_Window *win = Fl_Wayland_Screen_Driver::surface_to_window(fl_dnd_target_surface);
Fl::e_x = wl_fixed_to_int(x) / f;
Fl::e_x_root = Fl::e_x + fl_dnd_target_window->x();
Fl::e_y = wl_fixed_to_int(y) / f;
while (win->parent()) {
Fl::e_x += win->x();
Fl::e_y += win->y();
win = win->window();
}
Fl::e_x_root = Fl::e_x + fl_dnd_target_window->x();
Fl::e_y_root = Fl::e_y + fl_dnd_target_window->y();
ret = Fl::handle(FL_DND_DRAG, fl_dnd_target_window);
}