mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement cursor input for unmanaged XWayland surfaces

Browse source 
This is necessary for menus in X11 apps to work properly.
Otherwise, any region of the menu that extended out beyond the main
application window was not receiving any mouse input.

Adapted from sway's code.
This commit is contained in:
John Lindgren 2022-02-19 19:51:39 -05:00 • committed by Johan Malm
parent 68d897e1f5
commit 7488ec53dd
2 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/cursor.c
View file

@ -642,8 +642,16 @@ cursor_button(struct wl_listener *listener, void *data)
cursor_rebase(&server->seat, event->time_msec);
}
/* Handle _release_ on root window */
if (!view) {
#if HAVE_XWAYLAND
/* Handle _release_ on unmanaged surface */
if (surface && wlr_surface_is_xwayland_surface(surface)) {
wlr_seat_pointer_notify_button(seat->seat,
event->time_msec, event->button, event->state);
return;
}
#endif
/* Handle _release_ on root window */
handle_release_mousebinding(NULL, server, event->button,
modifiers, LAB_SSD_ROOT, 0);
}
@ -661,8 +669,16 @@ cursor_button(struct wl_listener *listener, void *data)
return;
}
/* Handle _press_ on a layer surface */
if (!view && surface) {
#if HAVE_XWAYLAND
/* Handle _press_ on unmanaged surface */
if (wlr_surface_is_xwayland_surface(surface)) {
wlr_seat_pointer_notify_button(seat->seat,
event->time_msec, event->button, event->state);
return;
}
#endif
/* Handle _press_ on a layer surface */
if (!wlr_surface_is_layer_surface(surface)) {
return;
}

16
src/desktop.c
View file

@ -365,6 +365,22 @@ desktop_surface_and_view_at(struct server *server, double lx, double ly,
return NULL;
}
/* Check for unmanaged surfaces */
#if HAVE_XWAYLAND
struct xwayland_unmanaged *unmanaged_surface;
wl_list_for_each_reverse(unmanaged_surface, &server->unmanaged_surfaces, link) {
double _sx = lx - unmanaged_surface->lx;
double _sy = ly - unmanaged_surface->ly;
if (wlr_surface_point_accepts_input(unmanaged_surface->
xwayland_surface->surface, _sx, _sy)) {
*surface = unmanaged_surface->xwayland_surface->surface;
*sx = _sx;
*sy = _sy;
return NULL;
}
}
#endif
/* Check all layer popups */
*surface = layer_surface_popup_at(output,
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],