From 006edc9dcb08db2019d98ddfe117bb4bf63fdb1f Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Sun, 24 Jun 2018 18:48:13 -0400 Subject: [PATCH] xdg-shell: end pointer and keyboard grab at the same time --- types/xdg_shell/wlr_xdg_popup.c | 3 ++- types/xdg_shell_v6/wlr_xdg_popup_v6.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/types/xdg_shell/wlr_xdg_popup.c b/types/xdg_shell/wlr_xdg_popup.c index e7204def..284f36ad 100644 --- a/types/xdg_shell/wlr_xdg_popup.c +++ b/types/xdg_shell/wlr_xdg_popup.c @@ -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_keyboard_end_grab(grab->seat); } 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) { - 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 = { diff --git a/types/xdg_shell_v6/wlr_xdg_popup_v6.c b/types/xdg_shell_v6/wlr_xdg_popup_v6.c index ff66e812..334519a5 100644 --- a/types/xdg_shell_v6/wlr_xdg_popup_v6.c +++ b/types/xdg_shell_v6/wlr_xdg_popup_v6.c @@ -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_keyboard_end_grab(grab->seat); } 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) { - 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 = {