Update code after EFL changes

This commit is contained in:
Daniel Zaoui 2017-09-19 10:35:49 +03:00
parent 62298eb8ff
commit 09dc7c8353
1 changed files with 6 additions and 8 deletions

View File

@ -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;
}