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

input: close xdg-popups on touch down

Browse source 
Taken over and now shared from the tablet implementation.
This commit is contained in:
Jens Peters 2024-11-01 09:11:33 +01:00 • committed by Hiroaki Yamamoto
parent 7e0cd8ee5a
commit d1cde3c435
4 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/labwc.h
View file

@ -486,6 +486,8 @@ void seat_finish(struct server *server);
void seat_reconfigure(struct server *server);
void seat_focus_surface(struct seat *seat, struct wlr_surface *surface);
void seat_pointer_end_grab(struct seat *seat, struct wlr_surface *surface);
/**
* seat_focus_lock_surface() - ONLY to be called from session-lock.c to
* focus lock screen surfaces. Use seat_focus_surface() otherwise.

27
src/input/tablet.c
View file

@ -458,29 +458,6 @@ 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
handle_tablet_tool_tip(struct wl_listener *listener, void *data)
{
@ -519,7 +496,7 @@ handle_tablet_tool_tip(struct wl_listener *listener, void *data)
bool notify = cursor_process_button_press(tool->seat, BTN_LEFT,
ev->time_msec);
if (notify) {
seat_pointer_end_grab(tool, surface);
seat_pointer_end_grab(tool->seat, surface);
wlr_tablet_v2_tablet_tool_notify_down(tool->tool_v2);
wlr_tablet_tool_v2_start_implicit_grab(tool->tool_v2);
}
@ -603,7 +580,7 @@ handle_tablet_tool_button(struct wl_listener *listener, void *data)
uint32_t stylus_button = to_stylus_button(button);
if (stylus_button && stylus_button != BTN_TOOL_PEN) {
if (ev->state == WLR_BUTTON_PRESSED) {
seat_pointer_end_grab(tool, surface);
seat_pointer_end_grab(tool->seat, surface);
}
wlr_tablet_v2_tablet_tool_notify_button(tool->tool_v2,
stylus_button,

1
src/input/touch.c
View file

@ -126,6 +126,7 @@ handle_touch_down(struct wl_listener *listener, void *data)
int touch_point_count = wl_list_length(&seat->touch_points);
if (touch_point->surface) {
seat_pointer_end_grab(seat, touch_point->surface);
/* Clear focus to not interfere with touch input */
wlr_seat_pointer_notify_clear_focus(seat->seat);

22
src/seat.c
View file

@ -596,6 +596,28 @@ configure_keyboard(struct seat *seat, struct input *input)
keyboard_configure(seat, kb, keyboard->is_virtual);
}
void
seat_pointer_end_grab(struct seat *seat, struct wlr_surface *surface)
{
if (!surface || !wlr_seat_pointer_has_grab(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/touch
* 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(seat->seat);
}
}
/* This is called on SIGHUP (generally in response to labwc --reconfigure */
void
seat_reconfigure(struct server *server)