diff options
Diffstat (limited to 'rootston/seat.c')
| -rw-r--r-- | rootston/seat.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/rootston/seat.c b/rootston/seat.c index 0a1a10ac..d8910660 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -825,10 +825,8 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) { view_activate(view, true); seat->has_focus = true; - // We want to unconditionally send keyboard input to the view we are - // focusing here, so cancel any existing grabs. - struct wlr_seat_keyboard_grab *curr_grab = seat->seat->keyboard_state.grab; - curr_grab->interface->cancel(curr_grab); + // An existing keyboard grab might try to deny setting focus, so cancel it + wlr_seat_keyboard_end_grab(seat->seat); struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->seat); if (keyboard != NULL) { |