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

Fix: Unexpected FL_ENTER after FL_LEAVE when a subwindow is hidden (#1295)

Browse Source
This commit is contained in:
ManoloFLTK 2025-08-18 16:07:59 +02:00
parent f05ee88359
commit 05e37453de
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx
View File

@ -196,6 +196,7 @@ static Fl_Window *event_coords_from_surface(struct wl_surface *surface,
return win;
}
static Fl_Window *need_leave = NULL;
static void pointer_enter(void *data, struct wl_pointer *wl_pointer, uint32_t serial,
struct wl_surface *surface, wl_fixed_t surface_x, wl_fixed_t surface_y) {
@ -217,6 +218,7 @@ static void pointer_enter(void *data, struct wl_pointer *wl_pointer, uint32_t se
}
}
if (!win) return;
//fprintf(stderr, "pointer_enter window=%p\n", win);
// use custom cursor if present
struct wl_cursor *cursor =
fl_wl_xid(win)->custom_cursor ? fl_wl_xid(win)->custom_cursor->wl_cursor : NULL;
@ -224,8 +226,9 @@ static void pointer_enter(void *data, struct wl_pointer *wl_pointer, uint32_t se
seat->serial = serial;
seat->pointer_enter_serial = serial;
set_event_xy(win);
Fl::handle(FL_ENTER, win);
//fprintf(stderr, "pointer_enter window=%p\n", win);
need_leave = NULL;
win = Fl_Wayland_Window_Driver::surface_to_window(surface);
if (!win->parent()) Fl::handle(FL_ENTER, win);
seat->pointer_focus = surface;
}
@ -237,11 +240,16 @@ static void pointer_leave(void *data, struct wl_pointer *wl_pointer,
Fl_Window *win = Fl_Wayland_Window_Driver::surface_to_window(surface);
gtk_shell_surface = NULL;
if (win) {
Fl::belowmouse(0);
//fprintf(stderr, "pointer_leave surface=%p window=%p\n", surface, win);
set_event_xy(win);
Fl::handle(FL_LEAVE, win->top_window());
if (!win->parent()) {
need_leave = win;
wl_display_roundtrip(fl_wl_display()); // pointer_enter to new subwin will run
if (need_leave) { // we really leave the window: we don't enter a subwin of it
Fl::handle(FL_LEAVE, need_leave);
}
}
}
//fprintf(stderr, "pointer_leave surface=%p window=%p\n", surface, win);
}

2
src/drivers/X11/Fl_X11_Window_Driver.cxx
View File

@ -434,6 +434,8 @@ void Fl_X11_Window_Driver::make_current() {
void Fl_X11_Window_Driver::hide() {
Fl_X* ip = Fl_X::flx(pWindow);
extern Fl_Window *fl_xmousewin;
fl_xmousewin = 0;
if (hide_common()) return;
if (ip->region) Fl_Graphics_Driver::default_driver().XDestroyRegion(ip->region);
# if USE_XFT && ! FLTK_USE_CAIRO