From 2270b4c21300338b8819b9a45b418fa13f6f74c6 Mon Sep 17 00:00:00 2001 From: Tudor Brindus Date: Fri, 19 Jun 2020 12:23:23 -0400 Subject: [PATCH] input/seat: don't notify keyboard grabs with NULL surface on shutdown Fixes #5469, a minor regression introduced in #5368. --- sway/input/seat.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sway/input/seat.c b/sway/input/seat.c index 1be8d5527..aa56394a9 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -1179,7 +1179,13 @@ void seat_set_focus_surface(struct sway_seat *seat, seat_send_unfocus(focus, seat); seat->has_focus = false; } - seat_keyboard_notify_enter(seat, surface); + + if (surface) { + seat_keyboard_notify_enter(seat, surface); + } else { + wlr_seat_keyboard_notify_clear_focus(seat->wlr_seat); + } + seat_tablet_pads_notify_enter(seat, surface); }