From 09dc7c8353f78bab391e85b57fa0f9246c10e569 Mon Sep 17 00:00:00 2001 From: Daniel Zaoui Date: Tue, 19 Sep 2017 10:35:49 +0300 Subject: [PATCH] Update code after EFL changes --- src/lib/tsuite_hook_recorder.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/lib/tsuite_hook_recorder.c b/src/lib/tsuite_hook_recorder.c index cb72134..8dab2b9 100644 --- a/src/lib/tsuite_hook_recorder.c +++ b/src/lib/tsuite_hook_recorder.c @@ -239,9 +239,8 @@ _event_pointer_cb(void *data, const Efl_Event *event) { double rad = 0, radx = 0, rady = 0, pres = 0, ang = 0, fx = 0, fy = 0; int tool = efl_input_pointer_tool_get(evp); - int x = 0, y = 0; - efl_input_pointer_position_get(evp, &x, &y); - multi_move t = { tool, x, y, rad, radx, rady, pres, ang, fx, fy, timestamp, n_evas }; + Eina_Position2D pos = efl_input_pointer_position_get(evp); + multi_move t = { tool, pos.x, pos.y, rad, radx, rady, pres, ang, fx, fy, timestamp, n_evas }; if (t.n_evas >= 0) ADD_TO_LIST(evt, t); break; } @@ -250,10 +249,9 @@ _event_pointer_cb(void *data, const Efl_Event *event) double rad = 0, radx = 0, rady = 0, pres = 0, ang = 0, fx = 0, fy = 0; int b = efl_input_pointer_button_get(evp); int tool = efl_input_pointer_tool_get(evp); - int x = 0, y = 0; - efl_input_pointer_position_get(evp, &x, &y); + Eina_Position2D pos = efl_input_pointer_position_get(evp); Efl_Pointer_Flags flags = efl_input_pointer_button_flags_get(evp); - multi_event t = { tool, b, x, y, rad, radx, rady, pres, ang, + multi_event t = { tool, b, pos.x, pos.y, rad, radx, rady, pres, ang, fx, fy, flags, timestamp, n_evas }; if (t.n_evas >= 0) ADD_TO_LIST(evt, t); break; @@ -266,9 +264,9 @@ _event_pointer_cb(void *data, const Efl_Event *event) } case EFL_POINTER_ACTION_WHEEL: { - int direction = efl_input_pointer_wheel_direction_get(evp); + Eina_Bool horiz = efl_input_pointer_wheel_horizontal_get(evp); int z = efl_input_pointer_wheel_delta_get(evp); - mouse_wheel t = { direction, z, timestamp, n_evas }; + mouse_wheel t = { horiz, z, timestamp, n_evas }; if (t.n_evas >= 0) ADD_TO_LIST(evt, t); break; }