diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-06-24 16:07:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 16:07:01 -0700 |
| commit | 4c6d80606d13e71ed4b538f8806d08a8d7096520 (patch) | |
| tree | 12862cab6694d6a03a68267bfcc041bcbd9a1cbf | |
| parent | 0fa784de0ec3ca6ddc336f714329d3551107a70b (diff) | |
| parent | 006edc9dcb08db2019d98ddfe117bb4bf63fdb1f (diff) | |
Merge pull request #1085 from acrisci/xdg-popup-grab-fixes
xdg-shell: end pointer and keyboard grab at the same time
| -rw-r--r-- | types/xdg_shell/wlr_xdg_popup.c | 3 | ||||
| -rw-r--r-- | 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 = { |