mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

exposay: provide a cancel func to the ptr grab iface

Browse Source 
Fixes a crash when cancel is called while exposay is in progress.
This commit is contained in:
Emilio Pozuelo Monfort
2013-11-26 13:32:08 +01:00
committed by Kristian Høgsberg
parent e3de16ea30
commit 234c5242ab
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shell.c
+10
View File
@@ -5275,10 +5275,20 @@ exposay_button(struct weston_pointer_grab *grab, uint32_t time, uint32_t button,
shell->exposay.clicked = NULL; shell->exposay.clicked = NULL;
} }
static void
exposay_pointer_grab_cancel(struct weston_pointer_grab *grab)
{
struct desktop_shell *shell =
container_of(grab, struct desktop_shell, exposay.grab_ptr);
exposay_set_state(shell, EXPOSAY_TARGET_CANCEL, shell->exposay.seat);
}
static const struct weston_pointer_grab_interface exposay_ptr_grab = { static const struct weston_pointer_grab_interface exposay_ptr_grab = {
noop_grab_focus, noop_grab_focus,
exposay_motion, exposay_motion,
exposay_button, exposay_button,
exposay_pointer_grab_cancel,
}; };
static int static int