summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurkan Sahin <furkan-dev@proton.me>2020-06-19 12:23:23 -0400
committerFurkan Sahin <furkan-dev@proton.me>2020-06-19 12:23:23 -0400
commit968ef6e7714fe4c71cb701d51e39b92d49639422 (patch)
tree89e0b590eab36e967345a491385ea13bb8a554f0
parent86bb6023010d7fc469925b2a3c57361d737d113c (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 1be8d552..aa56394a 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);
}