xdg-shell: end pointer and keyboard grab at the same time

This commit is contained in:
Tony Crisci 2018-06-24 18:48:13 -04:00
parent 0fa784de0e
commit 006edc9dcb
2 changed files with 4 additions and 2 deletions

View file

@ -13,6 +13,7 @@ static void xdg_pointer_grab_end(struct wlr_seat_pointer_grab *grab) {
} }
wlr_seat_pointer_end_grab(grab->seat); wlr_seat_pointer_end_grab(grab->seat);
wlr_seat_keyboard_end_grab(grab->seat);
} }
static void xdg_pointer_grab_enter(struct wlr_seat_pointer_grab *grab, static void xdg_pointer_grab_enter(struct wlr_seat_pointer_grab *grab,
@ -78,7 +79,7 @@ static void xdg_keyboard_grab_modifiers(struct wlr_seat_keyboard_grab *grab,
} }
static void xdg_keyboard_grab_cancel(struct wlr_seat_keyboard_grab *grab) { static void xdg_keyboard_grab_cancel(struct wlr_seat_keyboard_grab *grab) {
wlr_seat_keyboard_end_grab(grab->seat); wlr_seat_pointer_end_grab(grab->seat);
} }
static const struct wlr_keyboard_grab_interface xdg_keyboard_grab_impl = { static const struct wlr_keyboard_grab_interface xdg_keyboard_grab_impl = {

View file

@ -23,6 +23,7 @@ static void xdg_pointer_grab_end(struct wlr_seat_pointer_grab *grab) {
} }
wlr_seat_pointer_end_grab(grab->seat); wlr_seat_pointer_end_grab(grab->seat);
wlr_seat_keyboard_end_grab(grab->seat);
} }
static void xdg_pointer_grab_enter(struct wlr_seat_pointer_grab *grab, static void xdg_pointer_grab_enter(struct wlr_seat_pointer_grab *grab,
@ -88,7 +89,7 @@ static void xdg_keyboard_grab_modifiers(struct wlr_seat_keyboard_grab *grab,
} }
static void xdg_keyboard_grab_cancel(struct wlr_seat_keyboard_grab *grab) { static void xdg_keyboard_grab_cancel(struct wlr_seat_keyboard_grab *grab) {
wlr_seat_keyboard_end_grab(grab->seat); wlr_seat_pointer_end_grab(grab->seat);
} }
static const struct wlr_keyboard_grab_interface xdg_keyboard_grab_impl = { static const struct wlr_keyboard_grab_interface xdg_keyboard_grab_impl = {