summaryrefslogtreecommitdiff
path: root/ivi-shell
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2014-10-04 16:28:29 +0200
committerJonas Ådahl <jadahl@gmail.com>2015-11-02 14:30:16 +0800
commit0336ca0cc5542a0d65f0f278f89e8d926a720a29 (patch)
tree23881f60288f64ae677b3c9f99c8bd78759a6ff8 /ivi-shell
parent22faea11c8745c46c043a268eec3073b0922ccd0 (diff)
downloadweston-0336ca0cc5542a0d65f0f278f89e8d926a720a29.tar.gz
input: Pass axis events through pointer grab interfaces
Don't only send motions and buttons but also axis events through the pointer grab interface. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
Diffstat (limited to 'ivi-shell')
-rw-r--r--ivi-shell/hmi-controller.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/ivi-shell/hmi-controller.c b/ivi-shell/hmi-controller.c
index d1ed872c..633ea19f 100644
--- a/ivi-shell/hmi-controller.c
+++ b/ivi-shell/hmi-controller.c
@@ -1323,6 +1323,13 @@ pointer_noop_grab_focus(struct weston_pointer_grab *grab)
}
static void
+pointer_default_grab_axis(struct weston_pointer_grab *grab,
+ uint32_t time, uint32_t axis, wl_fixed_t value)
+{
+ weston_pointer_send_axis(grab->pointer, time, axis, value);
+}
+
+static void
move_grab_update(struct move_grab *move, wl_fixed_t pointer[2])
{
struct timespec timestamp = {0};
@@ -1466,6 +1473,7 @@ static const struct weston_pointer_grab_interface pointer_move_grab_workspace_in
pointer_noop_grab_focus,
pointer_move_grab_motion,
pointer_move_workspace_grab_button,
+ pointer_default_grab_axis,
pointer_move_workspace_grab_cancel
};