From be4f67ac4474dc00fd8beab84ca6bd6b8f25e464 Mon Sep 17 00:00:00 2001 From: Taekyun Kim Date: Thu, 16 Apr 2015 14:30:21 +0900 Subject: [PATCH] wayland: input: Fix some bugs Change-Id: I84997592ec6aba955b78987bf524e2f149047801 --- src/modules/wayland/wayland-input.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/modules/wayland/wayland-input.c b/src/modules/wayland/wayland-input.c index d9fe129..e35f0d5 100644 --- a/src/modules/wayland/wayland-input.c +++ b/src/modules/wayland/wayland-input.c @@ -5,7 +5,7 @@ pointer_handle_enter(void *data, struct wl_pointer *pointer, uint32_t serial, struct wl_surface *surface, wl_fixed_t surface_x, wl_fixed_t surface_y) { - wayland_seat_t *seat = (wayland_seat_t *)seat; + wayland_seat_t *seat = (wayland_seat_t *)data; seat->pointer_x_last = surface_x; seat->pointer_y_last = surface_y; @@ -24,7 +24,7 @@ static void pointer_handle_motion(void *data, struct wl_pointer *pointer, uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) { - wayland_seat_t *seat = (wayland_seat_t *)seat; + wayland_seat_t *seat = (wayland_seat_t *)data; pepper_input_event_t event; event.type = PEPPER_INPUT_EVENT_POINTER_MOTION; @@ -43,7 +43,7 @@ static void pointer_handle_button(void *data, struct wl_pointer *pointer, uint32_t serial, uint32_t time, uint32_t button, uint32_t state) { - wayland_seat_t *seat = (wayland_seat_t *)seat; + wayland_seat_t *seat = (wayland_seat_t *)data; pepper_input_event_t event; event.type = PEPPER_INPUT_EVENT_POINTER_BUTTON; @@ -62,7 +62,7 @@ static void pointer_handle_axis(void *data, struct wl_pointer *pointer, uint32_t time, uint32_t axis, wl_fixed_t value) { - wayland_seat_t *seat = (wayland_seat_t *)seat; + wayland_seat_t *seat = (wayland_seat_t *)data; pepper_input_event_t event; event.type = PEPPER_INPUT_EVENT_POINTER_AXIS; @@ -112,7 +112,7 @@ static void keyboard_handle_key(void *data, struct wl_keyboard *keyboard, uint32_t serial, uint32_t time, uint32_t key, uint32_t state) { - wayland_seat_t *seat = (wayland_seat_t *)seat; + wayland_seat_t *seat = (wayland_seat_t *)data; pepper_input_event_t event; event.type = PEPPER_INPUT_EVENT_KEYBOARD_KEY; @@ -157,7 +157,7 @@ touch_handle_down(void *data, struct wl_touch *touch, uint32_t serial, uint32_t time, struct wl_surface *surface, int32_t id, wl_fixed_t x, wl_fixed_t y) { - wayland_seat_t *seat = (wayland_seat_t *)seat; + wayland_seat_t *seat = (wayland_seat_t *)data; pepper_input_event_t event; event.type = PEPPER_INPUT_EVENT_TOUCH_DOWN; @@ -176,7 +176,7 @@ static void touch_handle_up(void *data, struct wl_touch *touch, uint32_t serial, uint32_t time, int32_t id) { - wayland_seat_t *seat = (wayland_seat_t *)seat; + wayland_seat_t *seat = (wayland_seat_t *)data; pepper_input_event_t event; event.type = PEPPER_INPUT_EVENT_TOUCH_UP; @@ -195,7 +195,7 @@ static void touch_handle_motion(void *data, struct wl_touch *touch, uint32_t time, int32_t id, wl_fixed_t x, wl_fixed_t y) { - wayland_seat_t *seat = (wayland_seat_t *)seat; + wayland_seat_t *seat = (wayland_seat_t *)data; pepper_input_event_t event; event.type = PEPPER_INPUT_EVENT_TOUCH_MOTION; @@ -213,7 +213,7 @@ touch_handle_motion(void *data, struct wl_touch *touch, static void touch_handle_frame(void *data, struct wl_touch *touch) { - wayland_seat_t *seat = (wayland_seat_t *)seat; + wayland_seat_t *seat = (wayland_seat_t *)data; pepper_input_event_t event; event.type = PEPPER_INPUT_EVENT_TOUCH_FRAME; @@ -223,7 +223,7 @@ touch_handle_frame(void *data, struct wl_touch *touch) static void touch_handle_cancel(void *data, struct wl_touch *touch) { - wayland_seat_t *seat = (wayland_seat_t *)seat; + wayland_seat_t *seat = (wayland_seat_t *)data; pepper_input_event_t event; event.type = PEPPER_INPUT_EVENT_TOUCH_CANCEL; -- 2.7.4