mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Weston support: handle click on titlebar.

This commit is contained in:
ManoloFLTK 2022-05-17 10:40:09 +02:00
parent b2bd12ae5e
commit f01216f167
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,10 +227,12 @@ struct wl_display *Fl_Wayland_Screen_Driver::wl_display = NULL;
Fl_Window *Fl_Wayland_Screen_Driver::surface_to_window(struct wl_surface *surface) {
Fl_X *xp = Fl_X::first;
while (xp) {
if (xp->xid->wl_surface == surface) return xp->w;
xp = xp->next;
if (surface) {
Fl_X *xp = Fl_X::first;
while (xp) {
if (xp->xid->wl_surface == surface) return xp->w;
xp = xp->next;
}
}
return NULL;
}

11
src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
View File

@ -790,10 +790,12 @@ static void handle_configure(struct libdecor_frame *frame,
"There is no way to know if the surface is currently minimized, nor is there any way to
unset minimization on this surface. If you are looking to throttle redrawing when minimized,
please instead use the wl_surface.frame event" */
if (window_state == LIBDECOR_WINDOW_STATE_NONE) {
Fl::handle(FL_UNFOCUS, window->fl_win);
}
else if (window_state & LIBDECOR_WINDOW_STATE_ACTIVE) {
if (window_state & LIBDECOR_WINDOW_STATE_ACTIVE) {
if (Fl_Wayland_Screen_Driver::compositor == Fl_Wayland_Screen_Driver::WESTON) {
// After click on titlebar, weston calls wl_keyboard_enter() for a
// titlebar-related surface that FLTK can't identify, so we send FL_FOCUS here.
Fl::handle(FL_FOCUS, window->fl_win);
}
if (!window->fl_win->border()) libdecor_frame_set_visibility(window->frame, false);
else if (!libdecor_frame_is_visible(window->frame)) libdecor_frame_set_visibility(window->frame, true);
}
@ -833,6 +835,7 @@ void Fl_Wayland_Window_Driver::wait_for_expose()
wl_display_roundtrip(Fl_Wayland_Screen_Driver::wl_display);
}
} else if (xid->kind == DECORATED) {
// necessary for the windowfocus demo program with recent Wayland versions
if (!(xid->state & LIBDECOR_WINDOW_STATE_ACTIVE)) {
wl_display_dispatch(Fl_Wayland_Screen_Driver::wl_display);
}