use seat function to end grab

This commit is contained in:
Tony Crisci 2018-06-24 18:18:30 -04:00
parent e8c0996b93
commit 356e466d5a

View file

@ -825,10 +825,8 @@ void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view) {
view_activate(view, true); view_activate(view, true);
seat->has_focus = true; seat->has_focus = true;
// We want to unconditionally send keyboard input to the view we are // An existing keyboard grab might try to deny setting focus, so cancel it
// focusing here, so cancel any existing grabs. wlr_seat_keyboard_end_grab(seat->seat);
struct wlr_seat_keyboard_grab *curr_grab = seat->seat->keyboard_state.grab;
curr_grab->interface->cancel(curr_grab);
struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->seat); struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat->seat);
if (keyboard != NULL) { if (keyboard != NULL) {