mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: close xdg-popups on tablet tip or button press

Browse source
This commit is contained in:
Jens Peters 2024-05-24 16:18:24 +02:00 • committed by Consolatis
parent caf9c9a599
commit 4b17083aa0
1 changed files with 27 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/input/tablet.c
View file

@ -316,6 +316,29 @@ to_stylus_button(uint32_t button)
} }
} }
static void
seat_pointer_end_grab(struct drawing_tablet_tool *tool,
struct wlr_surface *surface)
{
if (!surface || !wlr_seat_pointer_has_grab(tool->seat->seat)) {
return;
}
struct wlr_xdg_surface *xdg_surface =
wlr_xdg_surface_try_from_wlr_surface(surface);
if (!xdg_surface || xdg_surface->role != WLR_XDG_SURFACE_ROLE_POPUP) {
/*
* If we have an active popup grab (an open popup) and we are
* not on the popup itself, end that grab to close the popup.
* Contrary to pointer button notifications, a tablet button
* notification sometimes doesn't end grabs automatically on
* button notifications in another client (observed in GTK4),
* so end the grab manually.
*/
wlr_seat_pointer_end_grab(tool->seat->seat);
}
}
static void static void
handle_tip(struct wl_listener *listener, void *data) handle_tip(struct wl_listener *listener, void *data)
{ {
@ -340,6 +363,7 @@ handle_tip(struct wl_listener *listener, void *data)
bool notify = cursor_process_button_press(tool->seat, BTN_LEFT, bool notify = cursor_process_button_press(tool->seat, BTN_LEFT,
ev->time_msec); ev->time_msec);
if (notify) { if (notify) {
seat_pointer_end_grab(tool, surface);
wlr_tablet_v2_tablet_tool_notify_down(tool->tool_v2); wlr_tablet_v2_tablet_tool_notify_down(tool->tool_v2);
wlr_tablet_tool_v2_start_implicit_grab(tool->tool_v2); wlr_tablet_tool_v2_start_implicit_grab(tool->tool_v2);
} }
@ -408,6 +432,9 @@ handle_button(struct wl_listener *listener, void *data)
uint32_t stylus_button = to_stylus_button(button); uint32_t stylus_button = to_stylus_button(button);
if (stylus_button && stylus_button != BTN_TOOL_PEN) { if (stylus_button && stylus_button != BTN_TOOL_PEN) {
if (ev->state == WLR_BUTTON_PRESSED) {
seat_pointer_end_grab(tool, surface);
}
wlr_tablet_v2_tablet_tool_notify_button(tool->tool_v2, wlr_tablet_v2_tablet_tool_notify_button(tool->tool_v2,
stylus_button, stylus_button,
ev->state == WLR_BUTTON_PRESSED ev->state == WLR_BUTTON_PRESSED