diff options
| author | Javier Jardón <jjardon@gnome.org> | 2016-04-17 19:47:48 +0200 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2016-04-17 22:07:58 +0200 |
| commit | d535ee1d8967b860c740bffa6f8291eb023107c6 (patch) | |
| tree | 627d96f6f354f248ea6f4e844242ed0e73df498c | |
| parent | 8374e350ddabd445bc2b38bf08b1a8787c14fcff (diff) | |
| download | wayland-ivi-extension-baserock/jjardon/weston-1.10.tar.gz | |
ivi-input-controller.c: weston_pointer_move() takes a strct nowbaserock/jjardon/weston-1.10
Use weston_pointer_move_to() instead
This has changed in weston commit
d2510105a6e411790f3d5bd3acd1e0d0e295ff06
| -rw-r--r-- | ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c index c18f052..97212c0 100644 --- a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c +++ b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c @@ -172,7 +172,12 @@ set_weston_focus(struct input_context *ctx, struct surface_ctx *surface_ctx, weston_view_to_global_fixed(view, wl_fixed_from_int(0), wl_fixed_from_int(0), &x, &y); // move pointer to local (0,0) of the view - weston_pointer_move(pointer, x, y); + event = (struct weston_pointer_motion_event) { + .mask = WESTON_POINTER_MOTION_ABS, + .x = wl_fixed_to_double(x), + .y = wl_fixed_to_double(y), + }; + weston_pointer_move(pointer, event); weston_pointer_set_focus(pointer, view, wl_fixed_from_int(0), wl_fixed_from_int(0)); } else if (pointer->focus == view){ @@ -308,14 +313,14 @@ pointer_grab_focus(struct weston_pointer_grab *grab) static void pointer_grab_motion(struct weston_pointer_grab *grab, uint32_t time, - wl_fixed_t x, wl_fixed_t y) + struct weston_pointer_motion_event *event) { struct seat_ctx *seat = wl_container_of(grab, seat, pointer_grab); struct surface_ctx *surf_ctx; const struct ivi_controller_interface *interface = seat->input_ctx->ivi_controller_interface; - weston_pointer_move(grab->pointer, x, y); + weston_pointer_move(grab->pointer, event); /* Get coordinates relative to the surface the pointer is in. * This might cause weirdness if there are multiple surfaces |