return;
}
- efl_gesture_timestamp_set(gesture, efl_gesture_touch_cur_timestamp_get(touch_event));
+ efl_gesture_timestamp_set(gesture, efl_gesture_touch_current_timestamp_get(touch_event));
efl_event_callback_call(target, gesture_type, gesture);
post_event:
//If the current event recognizes the gesture continuously, dont delete gesture.
case EFL_GESTURE_TOUCH_STATE_UPDATE:
{
/* multi-touch */
- if (efl_gesture_touch_cur_data_get(event)->action == EFL_POINTER_ACTION_DOWN)
+ if (efl_gesture_touch_current_data_get(event)->action == EFL_POINTER_ACTION_DOWN)
{
/* a second finger was pressed at the same time-ish as the first: combine into same event */
- if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
+ if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
{
result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
break;
if (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_NONE &&
!_event_multi_touch_get(event))
{
- if (efl_gesture_touch_prev_data_get(event))
+ if (efl_gesture_touch_previous_data_get(event))
{
- Efl_Pointer_Action prev_act = efl_gesture_touch_prev_data_get(event)->action;
+ Efl_Pointer_Action prev_act = efl_gesture_touch_previous_data_get(event)->action;
/* multi-touch */
if ((prev_act == EFL_POINTER_ACTION_UP) || (prev_act == EFL_POINTER_ACTION_CANCEL))
{
/* a second finger was pressed at the same time-ish as the first: combine into same event */
- if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
+ if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
{
result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
break;
case EFL_GESTURE_TOUCH_STATE_UPDATE:
if (!pd->t_st)
{
- pd->st_line = efl_gesture_touch_cur_point_get(event);
- pd->t_st = efl_gesture_touch_cur_timestamp_get(event);
+ pd->st_line = efl_gesture_touch_current_point_get(event);
+ pd->t_st = efl_gesture_touch_current_timestamp_get(event);
efl_gesture_hotspot_set(gesture, pd->st_line);
{
if (!pd->t_st) return;
- pd->t_end = efl_gesture_touch_cur_timestamp_get(event);
+ pd->t_end = efl_gesture_touch_current_timestamp_get(event);
break;
}
return;
}
- _momentum_set(obj, fd, pd->st_line, efl_gesture_touch_cur_point_get(event),
- pd->t_st, efl_gesture_touch_cur_timestamp_get(event));
+ _momentum_set(obj, fd, pd->st_line, efl_gesture_touch_current_point_get(event),
+ pd->t_st, efl_gesture_touch_current_timestamp_get(event));
}
static double
return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
}
- if (pd->touched && (efl_gesture_touch_cur_data_get(event)->action == EFL_POINTER_ACTION_DOWN))
+ if (pd->touched && (efl_gesture_touch_current_data_get(event)->action == EFL_POINTER_ACTION_DOWN))
{
/* a second finger was pressed at the same time-ish as the first: combine into same event */
- if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
+ if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
}
- if (pd->t_st && (points > 1) && (fd->id != efl_gesture_touch_cur_data_get(event)->id))
+ if (pd->t_st && (points > 1) && (fd->id != efl_gesture_touch_current_data_get(event)->id))
{
int xdir[2], ydir[2];
- const Efl_Gesture_Touch_Point_Data *data = efl_gesture_touch_cur_data_get(event);
+ const Efl_Gesture_Touch_Point_Data *data = efl_gesture_touch_current_data_get(event);
const Efl_Gesture_Touch_Point_Data *data2;
if (fd->id == -1) return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
}
_single_line_process(obj, pd, gesture, fd, event);
- _vector_get(pd->st_line, efl_gesture_touch_cur_point_get(event),
+ _vector_get(pd->st_line, efl_gesture_touch_current_point_get(event),
&pd->line_length, &angle);
line_angle = pd->line_angle;
/* This is for continues-gesture */
/* Finish line on zero momentum for continues gesture */
if ((!fd->momentum.x) && (!fd->momentum.y))
- pd->t_end = efl_gesture_touch_cur_timestamp_get(event);
+ pd->t_end = efl_gesture_touch_current_timestamp_get(event);
}
}
else
}
}
- unsigned int tm_end = efl_gesture_touch_cur_timestamp_get(event);
+ unsigned int tm_end = efl_gesture_touch_current_timestamp_get(event);
if (pd->t_end)
{
if (pd->t_end < tm_end)
{
case EFL_GESTURE_TOUCH_STATE_BEGIN:
if (!glayer_continues_enable)
- fd->id = efl_gesture_touch_cur_data_get(event)->id;
+ fd->id = efl_gesture_touch_current_data_get(event)->id;
EINA_FALLTHROUGH;
case EFL_GESTURE_TOUCH_STATE_UPDATE:
{
result = EFL_GESTURE_RECOGNIZER_RESULT_FINISH;
}
- efl_gesture_hotspot_set(gesture, efl_gesture_touch_cur_point_get(event));
+ efl_gesture_hotspot_set(gesture, efl_gesture_touch_current_point_get(event));
_reset_recognizer(pd);
return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
}
- if (pd->touched && (efl_gesture_touch_cur_data_get(event)->action == EFL_POINTER_ACTION_DOWN))
+ if (pd->touched && (efl_gesture_touch_current_data_get(event)->action == EFL_POINTER_ACTION_DOWN))
{
/* a second finger was pressed at the same time-ish as the first: combine into same event */
if (efl_gesture_touch_points_count_get(event) > 1)
{
- if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_touch_prev_data_get(event)->cur.timestamp < TAP_TOUCH_TIME_THRESHOLD)
+ if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_touch_previous_data_get(event)->cur.timestamp < TAP_TOUCH_TIME_THRESHOLD)
return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
}
- else if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
+ else if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
}
- if (pd->t_st && (md->id != -1) && (md->id != efl_gesture_touch_cur_data_get(event)->id))
+ if (pd->t_st && (md->id != -1) && (md->id != efl_gesture_touch_current_data_get(event)->id))
{
int xdir, ydir;
- const Efl_Gesture_Touch_Point_Data *data = efl_gesture_touch_cur_data_get(event);
+ const Efl_Gesture_Touch_Point_Data *data = efl_gesture_touch_current_data_get(event);
xdir = _direction_get(data->prev.pos.x, data->cur.pos.x);
ydir = _direction_get(data->prev.pos.y, data->cur.pos.y);
if ((xdir != pd->xdir) || (ydir != pd->ydir))
if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_STATE_BEGIN ||
glayer_continues_enable)
{
- if (efl_gesture_touch_prev_data_get(event))
+ if (efl_gesture_touch_previous_data_get(event))
{
- if (efl_gesture_touch_prev_data_get(event)->action == efl_gesture_touch_cur_data_get(event)->action)
+ if (efl_gesture_touch_previous_data_get(event)->action == efl_gesture_touch_current_data_get(event)->action)
return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
}
- pd->t_st = pd->t_end = efl_gesture_touch_cur_timestamp_get(event);
+ pd->t_st = pd->t_end = efl_gesture_touch_current_timestamp_get(event);
pd->st_line = pd->end_line =
efl_gesture_touch_start_point_get(event);
efl_gesture_hotspot_set(gesture, pd->st_line);
if (!glayer_continues_enable)
- md->id = efl_gesture_touch_cur_data_get(event)->id;
+ md->id = efl_gesture_touch_current_data_get(event)->id;
return EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
}
}
- if ((efl_gesture_touch_cur_timestamp_get(event) - MOMENTUM_TIMEOUT) >
+ if ((efl_gesture_touch_current_timestamp_get(event) - MOMENTUM_TIMEOUT) >
pd->t_end)
{
- pd->st_line = efl_gesture_touch_cur_point_get(event);
- pd->t_st = efl_gesture_touch_cur_timestamp_get(event);
+ pd->st_line = efl_gesture_touch_current_point_get(event);
+ pd->t_st = efl_gesture_touch_current_timestamp_get(event);
pd->xdir = pd->ydir = 0;
}
else
{
int xdir, ydir;
- Eina_Position2D cur_p = efl_gesture_touch_cur_point_get(event);
+ Eina_Position2D cur_p = efl_gesture_touch_current_point_get(event);
xdir = _direction_get(pd->end_line.x, cur_p.x);
ydir = _direction_get(pd->end_line.y, cur_p.y);
}
}
- pd->end_line = efl_gesture_touch_cur_point_get(event);
- pd->t_end = efl_gesture_touch_cur_timestamp_get(event);
+ pd->end_line = efl_gesture_touch_current_point_get(event);
+ pd->t_end = efl_gesture_touch_current_timestamp_get(event);
efl_gesture_hotspot_set(gesture, pd->end_line);
- _momentum_set(obj, md, pd->st_line, efl_gesture_touch_cur_point_get(event),
- pd->t_st, efl_gesture_touch_cur_timestamp_get(event));
+ _momentum_set(obj, md, pd->st_line, efl_gesture_touch_current_point_get(event),
+ pd->t_st, efl_gesture_touch_current_timestamp_get(event));
result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
return EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
}
- if ((efl_gesture_touch_cur_timestamp_get(event) - MOMENTUM_TIMEOUT) > pd->t_end)
+ if ((efl_gesture_touch_current_timestamp_get(event) - MOMENTUM_TIMEOUT) > pd->t_end)
{
- pd->st_line = efl_gesture_touch_cur_point_get(event);
- pd->t_st = efl_gesture_touch_cur_timestamp_get(event);
+ pd->st_line = efl_gesture_touch_current_point_get(event);
+ pd->t_st = efl_gesture_touch_current_timestamp_get(event);
pd->xdir = pd->ydir = 0;
}
- pd->end_line = efl_gesture_touch_cur_point_get(event);
- pd->t_end = efl_gesture_touch_cur_timestamp_get(event);
+ pd->end_line = efl_gesture_touch_current_point_get(event);
+ pd->t_end = efl_gesture_touch_current_timestamp_get(event);
efl_gesture_hotspot_set(gesture, pd->end_line);
if ((fabs(md->momentum.x) > EFL_GESTURE_MINIMUM_MOMENTUM) ||
case EFL_GESTURE_TOUCH_STATE_UPDATE:
/* multi-touch */
- if (efl_gesture_touch_cur_data_get(event)->action == EFL_POINTER_ACTION_DOWN)
+ if (efl_gesture_touch_current_data_get(event)->action == EFL_POINTER_ACTION_DOWN)
{
/* a second finger was pressed at the same time-ish as the first: combine into same event */
- if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
+ if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
{
result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
break;
case EFL_GESTURE_TOUCH_STATE_UPDATE:
{
/* multi-touch */
- if (efl_gesture_touch_cur_data_get(event)->action == EFL_POINTER_ACTION_DOWN)
+ if (efl_gesture_touch_current_data_get(event)->action == EFL_POINTER_ACTION_DOWN)
{
/* a second finger was pressed at the same time-ish as the first: combine into same event */
- if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
+ if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
{
result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
break;
if (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_NONE &&
!_event_multi_touch_get(event))
{
- if (efl_gesture_touch_prev_data_get(event))
+ if (efl_gesture_touch_previous_data_get(event))
{
- Efl_Pointer_Action prev_act = efl_gesture_touch_prev_data_get(event)->action;
+ Efl_Pointer_Action prev_act = efl_gesture_touch_previous_data_get(event)->action;
/* multi-touch */
if ((prev_act == EFL_POINTER_ACTION_UP) || (prev_act == EFL_POINTER_ACTION_CANCEL))
{
/* a second finger was pressed at the same time-ish as the first: combine into same event */
- if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
+ if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
{
result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
break;
}
EOLIAN static const Efl_Gesture_Touch_Point_Data *
-_efl_canvas_gesture_touch_cur_data_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd)
+_efl_canvas_gesture_touch_current_data_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd)
{
return pd->cur_touch;
}
EOLIAN static const Efl_Gesture_Touch_Point_Data *
-_efl_canvas_gesture_touch_prev_data_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd)
+_efl_canvas_gesture_touch_previous_data_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd)
{
return pd->prev_touch;
}
}
EOLIAN static Eina_Position2D
-_efl_canvas_gesture_touch_cur_point_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd)
+_efl_canvas_gesture_touch_current_point_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd)
{
const Efl_Gesture_Touch_Point_Data *point = pd->cur_touch;
Eina_Position2D vec = { 0, 0 };
}
EOLIAN static unsigned int
-_efl_canvas_gesture_touch_cur_timestamp_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd)
+_efl_canvas_gesture_touch_current_timestamp_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd)
{
const Efl_Gesture_Touch_Point_Data *point = pd->cur_touch;
pos: Eina.Position2D; [[The start position.]]
}
}
- @property cur_point {
+ @property current_point {
[[Returns the current touch point.]]
get {}
values {
pos: Eina.Position2D; [[The current position.]]
}
}
- @property cur_timestamp {
+ @property current_timestamp {
[[Returns the timestamp.]]
get {}
values {
return : Efl.Canvas.Gesture_Touch_State; [[touch event state]]
}
}
- @property cur_data {
+ @property current_data {
[[This property holds the data struct of the most recent touch point.]]
get {}
values {
data: const(Efl.Canvas.Gesture_Touch_Point_Data) @by_ref; [[The current data.]]
}
}
- @property prev_data {
+ @property previous_data {
[[This property holds the data struct of the second-most recent touch point.
If there is only one touch point active, it will return NULL.
]]
Efl_Canvas_Gesture_Touch *event)
{
Eina_Position2D start = efl_gesture_touch_start_point_get(event);
- Eina_Position2D cur = efl_gesture_touch_cur_point_get(event);
+ Eina_Position2D cur = efl_gesture_touch_current_point_get(event);
switch (efl_gesture_touch_state_get(event))
{
case EFL_GESTURE_TOUCH_STATE_BEGIN: