summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTudor Brindus <me@tbrindus.ca>2020-06-19 12:23:23 -0400
committerSimon Ser <contact@emersion.fr>2020-06-19 18:46:01 +0200
commit2270b4c21300338b8819b9a45b418fa13f6f74c6 (patch)
tree89e0b590eab36e967345a491385ea13bb8a554f0
parentb3f08597cd725ef8136fb3cfb2808be990a6fce8 (diff)
input/seat: don't notify keyboard grabs with NULL surface on shutdown
Fixes #5469, a minor regression introduced in #5368.
-rw-r--r--sway/input/seat.c8
1 files changed, 7 insertions, 1 deletions
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);
}