blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1085 from acrisci/xdg-popup-grab-fixes 

xdg-shell: end pointer and keyboard grab at the same time
This commit is contained in:
Drew DeVault 2018-06-24 16:07:01 -07:00 committed by GitHub
parent 0fa784de0e 006edc9dcb
commit 4c6d80606d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
types/xdg_shell/wlr_xdg_popup.c
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 = {

3
types/xdg_shell_v6/wlr_xdg_popup_v6.c
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 = {