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

Merge pull request #1515 from emersion/shell-grab-frame 

Add missing frame events to shell pointer grabs
This commit is contained in:
Drew DeVault 2019-01-30 08:58:28 -05:00 committed by GitHub
parent 77c25c1526 2624f667bf
commit a37dfb380b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
types/wlr_wl_shell.c
View File

@ -98,12 +98,17 @@ static void shell_pointer_grab_axis(struct wlr_seat_pointer_grab *grab,
value_discrete, source); value_discrete, source);
} }
static void shell_pointer_grab_frame(struct wlr_seat_pointer_grab *grab) {
wlr_seat_pointer_send_frame(grab->seat);
}
static const struct wlr_pointer_grab_interface shell_pointer_grab_impl = { static const struct wlr_pointer_grab_interface shell_pointer_grab_impl = {
.enter = shell_pointer_grab_enter, .enter = shell_pointer_grab_enter,
.motion = shell_pointer_grab_motion, .motion = shell_pointer_grab_motion,
.button = shell_pointer_grab_button, .button = shell_pointer_grab_button,
.cancel = shell_pointer_grab_cancel, .cancel = shell_pointer_grab_cancel,
.axis = shell_pointer_grab_axis, .axis = shell_pointer_grab_axis,
.frame = shell_pointer_grab_frame,
}; };
static const struct wl_shell_surface_interface shell_surface_impl; static const struct wl_shell_surface_interface shell_surface_impl;

5
types/xdg_shell/wlr_xdg_popup.c
View File

@ -50,6 +50,10 @@ static void xdg_pointer_grab_axis(struct wlr_seat_pointer_grab *grab,
value_discrete, source); value_discrete, source);
} }
static void xdg_pointer_grab_frame(struct wlr_seat_pointer_grab *grab) {
wlr_seat_pointer_send_frame(grab->seat);
}
static void xdg_pointer_grab_cancel(struct wlr_seat_pointer_grab *grab) { static void xdg_pointer_grab_cancel(struct wlr_seat_pointer_grab *grab) {
xdg_pointer_grab_end(grab); xdg_pointer_grab_end(grab);
} }
@ -60,6 +64,7 @@ static const struct wlr_pointer_grab_interface xdg_pointer_grab_impl = {
.button = xdg_pointer_grab_button, .button = xdg_pointer_grab_button,
.cancel = xdg_pointer_grab_cancel, .cancel = xdg_pointer_grab_cancel,
.axis = xdg_pointer_grab_axis, .axis = xdg_pointer_grab_axis,
.frame = xdg_pointer_grab_frame,
}; };
static void xdg_keyboard_grab_enter(struct wlr_seat_keyboard_grab *grab, static void xdg_keyboard_grab_enter(struct wlr_seat_keyboard_grab *grab,

5
types/xdg_shell_v6/wlr_xdg_popup_v6.c
View File

@ -60,6 +60,10 @@ static void xdg_pointer_grab_axis(struct wlr_seat_pointer_grab *grab,
value_discrete, source); value_discrete, source);
} }
static void xdg_pointer_grab_frame(struct wlr_seat_pointer_grab *grab) {
wlr_seat_pointer_send_frame(grab->seat);
}
static void xdg_pointer_grab_cancel(struct wlr_seat_pointer_grab *grab) { static void xdg_pointer_grab_cancel(struct wlr_seat_pointer_grab *grab) {
xdg_pointer_grab_end(grab); xdg_pointer_grab_end(grab);
} }
@ -70,6 +74,7 @@ static const struct wlr_pointer_grab_interface xdg_pointer_grab_impl = {
.button = xdg_pointer_grab_button, .button = xdg_pointer_grab_button,
.cancel = xdg_pointer_grab_cancel, .cancel = xdg_pointer_grab_cancel,
.axis = xdg_pointer_grab_axis, .axis = xdg_pointer_grab_axis,
.frame = xdg_pointer_grab_frame,
}; };
static void xdg_keyboard_grab_enter(struct wlr_seat_keyboard_grab *grab, static void xdg_keyboard_grab_enter(struct wlr_seat_keyboard_grab *grab,