summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2020-02-07 12:00:39 -0500
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-02-14 09:21:03 +0100
commitf145b538920cb8604b81009d7b4199fda2ab554f (patch)
tree30d196d968462b237f1f079f8e41f5dab9b7232f
parent77b6d0efd7d714ccd7139a956b439c973ab2e6dd (diff)
efl/gesture: api renames for Efl.Canvas.Gesture_Touch
ref T8554 Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D11300
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_manager.c2
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.c10
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_flick.c28
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.c44
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.c4
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.c10
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_touch.c8
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_touch.eo8
-rw-r--r--src/tests/elementary/custom_recognizer2.c2
9 files changed, 58 insertions, 58 deletions
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.c b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
index 1425cce..da6d830 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
@@ -341,7 +341,7 @@ _gesture_recognizer_process_internal(Efl_Canvas_Gesture_Manager_Data *pd, Efl_Ca
341 return; 341 return;
342 } 342 }
343 343
344 efl_gesture_timestamp_set(gesture, efl_gesture_touch_cur_timestamp_get(touch_event)); 344 efl_gesture_timestamp_set(gesture, efl_gesture_touch_current_timestamp_get(touch_event));
345 efl_event_callback_call(target, gesture_type, gesture); 345 efl_event_callback_call(target, gesture_type, gesture);
346post_event: 346post_event:
347 //If the current event recognizes the gesture continuously, dont delete gesture. 347 //If the current event recognizes the gesture continuously, dont delete gesture.
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.c
index ba6807a..99eee5c 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.c
@@ -88,10 +88,10 @@ _efl_canvas_gesture_recognizer_double_tap_efl_canvas_gesture_recognizer_recogniz
88 case EFL_GESTURE_TOUCH_STATE_UPDATE: 88 case EFL_GESTURE_TOUCH_STATE_UPDATE:
89 { 89 {
90 /* multi-touch */ 90 /* multi-touch */
91 if (efl_gesture_touch_cur_data_get(event)->action == EFL_POINTER_ACTION_DOWN) 91 if (efl_gesture_touch_current_data_get(event)->action == EFL_POINTER_ACTION_DOWN)
92 { 92 {
93 /* a second finger was pressed at the same time-ish as the first: combine into same event */ 93 /* a second finger was pressed at the same time-ish as the first: combine into same event */
94 if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD) 94 if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
95 { 95 {
96 result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE; 96 result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
97 break; 97 break;
@@ -127,14 +127,14 @@ _efl_canvas_gesture_recognizer_double_tap_efl_canvas_gesture_recognizer_recogniz
127 if (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_NONE && 127 if (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_NONE &&
128 !_event_multi_touch_get(event)) 128 !_event_multi_touch_get(event))
129 { 129 {
130 if (efl_gesture_touch_prev_data_get(event)) 130 if (efl_gesture_touch_previous_data_get(event))
131 { 131 {
132 Efl_Pointer_Action prev_act = efl_gesture_touch_prev_data_get(event)->action; 132 Efl_Pointer_Action prev_act = efl_gesture_touch_previous_data_get(event)->action;
133 /* multi-touch */ 133 /* multi-touch */
134 if ((prev_act == EFL_POINTER_ACTION_UP) || (prev_act == EFL_POINTER_ACTION_CANCEL)) 134 if ((prev_act == EFL_POINTER_ACTION_UP) || (prev_act == EFL_POINTER_ACTION_CANCEL))
135 { 135 {
136 /* a second finger was pressed at the same time-ish as the first: combine into same event */ 136 /* a second finger was pressed at the same time-ish as the first: combine into same event */
137 if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD) 137 if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
138 { 138 {
139 result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE; 139 result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
140 break; 140 break;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_flick.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_flick.c
index 80abac6..2c45948 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_flick.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_flick.c
@@ -86,8 +86,8 @@ _single_line_process(Eo *obj,
86 case EFL_GESTURE_TOUCH_STATE_UPDATE: 86 case EFL_GESTURE_TOUCH_STATE_UPDATE:
87 if (!pd->t_st) 87 if (!pd->t_st)
88 { 88 {
89 pd->st_line = efl_gesture_touch_cur_point_get(event); 89 pd->st_line = efl_gesture_touch_current_point_get(event);
90 pd->t_st = efl_gesture_touch_cur_timestamp_get(event); 90 pd->t_st = efl_gesture_touch_current_timestamp_get(event);
91 91
92 efl_gesture_hotspot_set(gesture, pd->st_line); 92 efl_gesture_hotspot_set(gesture, pd->st_line);
93 93
@@ -100,7 +100,7 @@ _single_line_process(Eo *obj,
100 { 100 {
101 if (!pd->t_st) return; 101 if (!pd->t_st) return;
102 102
103 pd->t_end = efl_gesture_touch_cur_timestamp_get(event); 103 pd->t_end = efl_gesture_touch_current_timestamp_get(event);
104 104
105 break; 105 break;
106 } 106 }
@@ -110,8 +110,8 @@ _single_line_process(Eo *obj,
110 return; 110 return;
111 } 111 }
112 112
113 _momentum_set(obj, fd, pd->st_line, efl_gesture_touch_cur_point_get(event), 113 _momentum_set(obj, fd, pd->st_line, efl_gesture_touch_current_point_get(event),
114 pd->t_st, efl_gesture_touch_cur_timestamp_get(event)); 114 pd->t_st, efl_gesture_touch_current_timestamp_get(event));
115} 115}
116 116
117static double 117static double
@@ -227,16 +227,16 @@ _efl_canvas_gesture_recognizer_flick_efl_canvas_gesture_recognizer_recognize(Eo
227 227
228 return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE; 228 return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
229 } 229 }
230 if (pd->touched && (efl_gesture_touch_cur_data_get(event)->action == EFL_POINTER_ACTION_DOWN)) 230 if (pd->touched && (efl_gesture_touch_current_data_get(event)->action == EFL_POINTER_ACTION_DOWN))
231 { 231 {
232 /* a second finger was pressed at the same time-ish as the first: combine into same event */ 232 /* a second finger was pressed at the same time-ish as the first: combine into same event */
233 if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD) 233 if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
234 return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE; 234 return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
235 } 235 }
236 if (pd->t_st && (points > 1) && (fd->id != efl_gesture_touch_cur_data_get(event)->id)) 236 if (pd->t_st && (points > 1) && (fd->id != efl_gesture_touch_current_data_get(event)->id))
237 { 237 {
238 int xdir[2], ydir[2]; 238 int xdir[2], ydir[2];
239 const Efl_Gesture_Touch_Point_Data *data = efl_gesture_touch_cur_data_get(event); 239 const Efl_Gesture_Touch_Point_Data *data = efl_gesture_touch_current_data_get(event);
240 const Efl_Gesture_Touch_Point_Data *data2; 240 const Efl_Gesture_Touch_Point_Data *data2;
241 241
242 if (fd->id == -1) return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE; 242 if (fd->id == -1) return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
@@ -255,7 +255,7 @@ _efl_canvas_gesture_recognizer_flick_efl_canvas_gesture_recognizer_recognize(Eo
255 } 255 }
256 256
257 _single_line_process(obj, pd, gesture, fd, event); 257 _single_line_process(obj, pd, gesture, fd, event);
258 _vector_get(pd->st_line, efl_gesture_touch_cur_point_get(event), 258 _vector_get(pd->st_line, efl_gesture_touch_current_point_get(event),
259 &pd->line_length, &angle); 259 &pd->line_length, &angle);
260 260
261 line_angle = pd->line_angle; 261 line_angle = pd->line_angle;
@@ -293,7 +293,7 @@ _efl_canvas_gesture_recognizer_flick_efl_canvas_gesture_recognizer_recognize(Eo
293 /* This is for continues-gesture */ 293 /* This is for continues-gesture */
294 /* Finish line on zero momentum for continues gesture */ 294 /* Finish line on zero momentum for continues gesture */
295 if ((!fd->momentum.x) && (!fd->momentum.y)) 295 if ((!fd->momentum.x) && (!fd->momentum.y))
296 pd->t_end = efl_gesture_touch_cur_timestamp_get(event); 296 pd->t_end = efl_gesture_touch_current_timestamp_get(event);
297 } 297 }
298 } 298 }
299 else 299 else
@@ -323,7 +323,7 @@ _efl_canvas_gesture_recognizer_flick_efl_canvas_gesture_recognizer_recognize(Eo
323 } 323 }
324 } 324 }
325 325
326 unsigned int tm_end = efl_gesture_touch_cur_timestamp_get(event); 326 unsigned int tm_end = efl_gesture_touch_current_timestamp_get(event);
327 if (pd->t_end) 327 if (pd->t_end)
328 { 328 {
329 if (pd->t_end < tm_end) 329 if (pd->t_end < tm_end)
@@ -348,7 +348,7 @@ _efl_canvas_gesture_recognizer_flick_efl_canvas_gesture_recognizer_recognize(Eo
348 { 348 {
349 case EFL_GESTURE_TOUCH_STATE_BEGIN: 349 case EFL_GESTURE_TOUCH_STATE_BEGIN:
350 if (!glayer_continues_enable) 350 if (!glayer_continues_enable)
351 fd->id = efl_gesture_touch_cur_data_get(event)->id; 351 fd->id = efl_gesture_touch_current_data_get(event)->id;
352 EINA_FALLTHROUGH; 352 EINA_FALLTHROUGH;
353 case EFL_GESTURE_TOUCH_STATE_UPDATE: 353 case EFL_GESTURE_TOUCH_STATE_UPDATE:
354 { 354 {
@@ -382,7 +382,7 @@ _efl_canvas_gesture_recognizer_flick_efl_canvas_gesture_recognizer_recognize(Eo
382 result = EFL_GESTURE_RECOGNIZER_RESULT_FINISH; 382 result = EFL_GESTURE_RECOGNIZER_RESULT_FINISH;
383 } 383 }
384 384
385 efl_gesture_hotspot_set(gesture, efl_gesture_touch_cur_point_get(event)); 385 efl_gesture_hotspot_set(gesture, efl_gesture_touch_current_point_get(event));
386 386
387 _reset_recognizer(pd); 387 _reset_recognizer(pd);
388 388
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.c
index f6cc9a1..90685d6 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.c
@@ -89,21 +89,21 @@ _efl_canvas_gesture_recognizer_momentum_efl_canvas_gesture_recognizer_recognize(
89 89
90 return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE; 90 return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
91 } 91 }
92 if (pd->touched && (efl_gesture_touch_cur_data_get(event)->action == EFL_POINTER_ACTION_DOWN)) 92 if (pd->touched && (efl_gesture_touch_current_data_get(event)->action == EFL_POINTER_ACTION_DOWN))
93 { 93 {
94 /* a second finger was pressed at the same time-ish as the first: combine into same event */ 94 /* a second finger was pressed at the same time-ish as the first: combine into same event */
95 if (efl_gesture_touch_points_count_get(event) > 1) 95 if (efl_gesture_touch_points_count_get(event) > 1)
96 { 96 {
97 if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_touch_prev_data_get(event)->cur.timestamp < TAP_TOUCH_TIME_THRESHOLD) 97 if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_touch_previous_data_get(event)->cur.timestamp < TAP_TOUCH_TIME_THRESHOLD)
98 return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE; 98 return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
99 } 99 }
100 else if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD) 100 else if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
101 return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE; 101 return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
102 } 102 }
103 if (pd->t_st && (md->id != -1) && (md->id != efl_gesture_touch_cur_data_get(event)->id)) 103 if (pd->t_st && (md->id != -1) && (md->id != efl_gesture_touch_current_data_get(event)->id))
104 { 104 {
105 int xdir, ydir; 105 int xdir, ydir;
106 const Efl_Gesture_Touch_Point_Data *data = efl_gesture_touch_cur_data_get(event); 106 const Efl_Gesture_Touch_Point_Data *data = efl_gesture_touch_current_data_get(event);
107 xdir = _direction_get(data->prev.pos.x, data->cur.pos.x); 107 xdir = _direction_get(data->prev.pos.x, data->cur.pos.x);
108 ydir = _direction_get(data->prev.pos.y, data->cur.pos.y); 108 ydir = _direction_get(data->prev.pos.y, data->cur.pos.y);
109 if ((xdir != pd->xdir) || (ydir != pd->ydir)) 109 if ((xdir != pd->xdir) || (ydir != pd->ydir))
@@ -124,35 +124,35 @@ _efl_canvas_gesture_recognizer_momentum_efl_canvas_gesture_recognizer_recognize(
124 if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_STATE_BEGIN || 124 if (efl_gesture_touch_state_get(event) == EFL_GESTURE_TOUCH_STATE_BEGIN ||
125 glayer_continues_enable) 125 glayer_continues_enable)
126 { 126 {
127 if (efl_gesture_touch_prev_data_get(event)) 127 if (efl_gesture_touch_previous_data_get(event))
128 { 128 {
129 if (efl_gesture_touch_prev_data_get(event)->action == efl_gesture_touch_cur_data_get(event)->action) 129 if (efl_gesture_touch_previous_data_get(event)->action == efl_gesture_touch_current_data_get(event)->action)
130 return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE; 130 return EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
131 } 131 }
132 pd->t_st = pd->t_end = efl_gesture_touch_cur_timestamp_get(event); 132 pd->t_st = pd->t_end = efl_gesture_touch_current_timestamp_get(event);
133 133
134 pd->st_line = pd->end_line = 134 pd->st_line = pd->end_line =
135 efl_gesture_touch_start_point_get(event); 135 efl_gesture_touch_start_point_get(event);
136 136
137 efl_gesture_hotspot_set(gesture, pd->st_line); 137 efl_gesture_hotspot_set(gesture, pd->st_line);
138 if (!glayer_continues_enable) 138 if (!glayer_continues_enable)
139 md->id = efl_gesture_touch_cur_data_get(event)->id; 139 md->id = efl_gesture_touch_current_data_get(event)->id;
140 140
141 return EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER; 141 return EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
142 } 142 }
143 } 143 }
144 144
145 if ((efl_gesture_touch_cur_timestamp_get(event) - MOMENTUM_TIMEOUT) > 145 if ((efl_gesture_touch_current_timestamp_get(event) - MOMENTUM_TIMEOUT) >
146 pd->t_end) 146 pd->t_end)
147 { 147 {
148 pd->st_line = efl_gesture_touch_cur_point_get(event); 148 pd->st_line = efl_gesture_touch_current_point_get(event);
149 pd->t_st = efl_gesture_touch_cur_timestamp_get(event); 149 pd->t_st = efl_gesture_touch_current_timestamp_get(event);
150 pd->xdir = pd->ydir = 0; 150 pd->xdir = pd->ydir = 0;
151 } 151 }
152 else 152 else
153 { 153 {
154 int xdir, ydir; 154 int xdir, ydir;
155 Eina_Position2D cur_p = efl_gesture_touch_cur_point_get(event); 155 Eina_Position2D cur_p = efl_gesture_touch_current_point_get(event);
156 156
157 xdir = _direction_get(pd->end_line.x, cur_p.x); 157 xdir = _direction_get(pd->end_line.x, cur_p.x);
158 ydir = _direction_get(pd->end_line.y, cur_p.y); 158 ydir = _direction_get(pd->end_line.y, cur_p.y);
@@ -172,12 +172,12 @@ _efl_canvas_gesture_recognizer_momentum_efl_canvas_gesture_recognizer_recognize(
172 } 172 }
173 } 173 }
174 174
175 pd->end_line = efl_gesture_touch_cur_point_get(event); 175 pd->end_line = efl_gesture_touch_current_point_get(event);
176 pd->t_end = efl_gesture_touch_cur_timestamp_get(event); 176 pd->t_end = efl_gesture_touch_current_timestamp_get(event);
177 efl_gesture_hotspot_set(gesture, pd->end_line); 177 efl_gesture_hotspot_set(gesture, pd->end_line);
178 178
179 _momentum_set(obj, md, pd->st_line, efl_gesture_touch_cur_point_get(event), 179 _momentum_set(obj, md, pd->st_line, efl_gesture_touch_current_point_get(event),
180 pd->t_st, efl_gesture_touch_cur_timestamp_get(event)); 180 pd->t_st, efl_gesture_touch_current_timestamp_get(event));
181 181
182 result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER; 182 result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
183 183
@@ -193,15 +193,15 @@ _efl_canvas_gesture_recognizer_momentum_efl_canvas_gesture_recognizer_recognize(
193 return EFL_GESTURE_RECOGNIZER_RESULT_CANCEL; 193 return EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
194 } 194 }
195 195
196 if ((efl_gesture_touch_cur_timestamp_get(event) - MOMENTUM_TIMEOUT) > pd->t_end) 196 if ((efl_gesture_touch_current_timestamp_get(event) - MOMENTUM_TIMEOUT) > pd->t_end)
197 { 197 {
198 pd->st_line = efl_gesture_touch_cur_point_get(event); 198 pd->st_line = efl_gesture_touch_current_point_get(event);
199 pd->t_st = efl_gesture_touch_cur_timestamp_get(event); 199 pd->t_st = efl_gesture_touch_current_timestamp_get(event);
200 pd->xdir = pd->ydir = 0; 200 pd->xdir = pd->ydir = 0;
201 } 201 }
202 202
203 pd->end_line = efl_gesture_touch_cur_point_get(event); 203 pd->end_line = efl_gesture_touch_current_point_get(event);
204 pd->t_end = efl_gesture_touch_cur_timestamp_get(event); 204 pd->t_end = efl_gesture_touch_current_timestamp_get(event);
205 efl_gesture_hotspot_set(gesture, pd->end_line); 205 efl_gesture_hotspot_set(gesture, pd->end_line);
206 206
207 if ((fabs(md->momentum.x) > EFL_GESTURE_MINIMUM_MOMENTUM) || 207 if ((fabs(md->momentum.x) > EFL_GESTURE_MINIMUM_MOMENTUM) ||
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.c
index fa12645..4bbb00f 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.c
@@ -58,10 +58,10 @@ new_tap:
58 58
59 case EFL_GESTURE_TOUCH_STATE_UPDATE: 59 case EFL_GESTURE_TOUCH_STATE_UPDATE:
60 /* multi-touch */ 60 /* multi-touch */
61 if (efl_gesture_touch_cur_data_get(event)->action == EFL_POINTER_ACTION_DOWN) 61 if (efl_gesture_touch_current_data_get(event)->action == EFL_POINTER_ACTION_DOWN)
62 { 62 {
63 /* a second finger was pressed at the same time-ish as the first: combine into same event */ 63 /* a second finger was pressed at the same time-ish as the first: combine into same event */
64 if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD) 64 if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
65 { 65 {
66 result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE; 66 result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
67 break; 67 break;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.c
index f095147..1d6df3e 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.c
@@ -87,10 +87,10 @@ _efl_canvas_gesture_recognizer_triple_tap_efl_canvas_gesture_recognizer_recogniz
87 case EFL_GESTURE_TOUCH_STATE_UPDATE: 87 case EFL_GESTURE_TOUCH_STATE_UPDATE:
88 { 88 {
89 /* multi-touch */ 89 /* multi-touch */
90 if (efl_gesture_touch_cur_data_get(event)->action == EFL_POINTER_ACTION_DOWN) 90 if (efl_gesture_touch_current_data_get(event)->action == EFL_POINTER_ACTION_DOWN)
91 { 91 {
92 /* a second finger was pressed at the same time-ish as the first: combine into same event */ 92 /* a second finger was pressed at the same time-ish as the first: combine into same event */
93 if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD) 93 if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
94 { 94 {
95 result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE; 95 result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
96 break; 96 break;
@@ -126,14 +126,14 @@ _efl_canvas_gesture_recognizer_triple_tap_efl_canvas_gesture_recognizer_recogniz
126 if (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_NONE && 126 if (efl_gesture_state_get(gesture) != EFL_GESTURE_STATE_NONE &&
127 !_event_multi_touch_get(event)) 127 !_event_multi_touch_get(event))
128 { 128 {
129 if (efl_gesture_touch_prev_data_get(event)) 129 if (efl_gesture_touch_previous_data_get(event))
130 { 130 {
131 Efl_Pointer_Action prev_act = efl_gesture_touch_prev_data_get(event)->action; 131 Efl_Pointer_Action prev_act = efl_gesture_touch_previous_data_get(event)->action;
132 /* multi-touch */ 132 /* multi-touch */
133 if ((prev_act == EFL_POINTER_ACTION_UP) || (prev_act == EFL_POINTER_ACTION_CANCEL)) 133 if ((prev_act == EFL_POINTER_ACTION_UP) || (prev_act == EFL_POINTER_ACTION_CANCEL))
134 { 134 {
135 /* a second finger was pressed at the same time-ish as the first: combine into same event */ 135 /* a second finger was pressed at the same time-ish as the first: combine into same event */
136 if (efl_gesture_touch_cur_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD) 136 if (efl_gesture_touch_current_timestamp_get(event) - efl_gesture_timestamp_get(gesture) < TAP_TOUCH_TIME_THRESHOLD)
137 { 137 {
138 result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE; 138 result = EFL_GESTURE_RECOGNIZER_RESULT_IGNORE;
139 break; 139 break;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_touch.c b/src/lib/evas/gesture/efl_canvas_gesture_touch.c
index 0d7e004..25325d9 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_touch.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_touch.c
@@ -127,13 +127,13 @@ _efl_canvas_gesture_touch_touch_points_count_get(const Eo *obj EINA_UNUSED, Efl_
127} 127}
128 128
129EOLIAN static const Efl_Gesture_Touch_Point_Data * 129EOLIAN static const Efl_Gesture_Touch_Point_Data *
130_efl_canvas_gesture_touch_cur_data_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd) 130_efl_canvas_gesture_touch_current_data_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd)
131{ 131{
132 return pd->cur_touch; 132 return pd->cur_touch;
133} 133}
134 134
135EOLIAN static const Efl_Gesture_Touch_Point_Data * 135EOLIAN static const Efl_Gesture_Touch_Point_Data *
136_efl_canvas_gesture_touch_prev_data_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd) 136_efl_canvas_gesture_touch_previous_data_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd)
137{ 137{
138 return pd->prev_touch; 138 return pd->prev_touch;
139} 139}
@@ -157,7 +157,7 @@ _efl_canvas_gesture_touch_start_point_get(const Eo *obj EINA_UNUSED, Efl_Canvas_
157} 157}
158 158
159EOLIAN static Eina_Position2D 159EOLIAN static Eina_Position2D
160_efl_canvas_gesture_touch_cur_point_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd) 160_efl_canvas_gesture_touch_current_point_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd)
161{ 161{
162 const Efl_Gesture_Touch_Point_Data *point = pd->cur_touch; 162 const Efl_Gesture_Touch_Point_Data *point = pd->cur_touch;
163 Eina_Position2D vec = { 0, 0 }; 163 Eina_Position2D vec = { 0, 0 };
@@ -169,7 +169,7 @@ _efl_canvas_gesture_touch_cur_point_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Ge
169} 169}
170 170
171EOLIAN static unsigned int 171EOLIAN static unsigned int
172_efl_canvas_gesture_touch_cur_timestamp_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd) 172_efl_canvas_gesture_touch_current_timestamp_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Touch_Data *pd)
173{ 173{
174 const Efl_Gesture_Touch_Point_Data *point = pd->cur_touch; 174 const Efl_Gesture_Touch_Point_Data *point = pd->cur_touch;
175 175
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_touch.eo b/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
index 9b64712..24d12a2 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
@@ -40,14 +40,14 @@ class @beta Efl.Canvas.Gesture_Touch extends Efl.Object
40 pos: Eina.Position2D; [[The start position.]] 40 pos: Eina.Position2D; [[The start position.]]
41 } 41 }
42 } 42 }
43 @property cur_point { 43 @property current_point {
44 [[Returns the current touch point.]] 44 [[Returns the current touch point.]]
45 get {} 45 get {}
46 values { 46 values {
47 pos: Eina.Position2D; [[The current position.]] 47 pos: Eina.Position2D; [[The current position.]]
48 } 48 }
49 } 49 }
50 @property cur_timestamp { 50 @property current_timestamp {
51 [[Returns the timestamp.]] 51 [[Returns the timestamp.]]
52 get {} 52 get {}
53 values { 53 values {
@@ -68,14 +68,14 @@ class @beta Efl.Canvas.Gesture_Touch extends Efl.Object
68 return : Efl.Canvas.Gesture_Touch_State; [[touch event state]] 68 return : Efl.Canvas.Gesture_Touch_State; [[touch event state]]
69 } 69 }
70 } 70 }
71 @property cur_data { 71 @property current_data {
72 [[This property holds the data struct of the most recent touch point.]] 72 [[This property holds the data struct of the most recent touch point.]]
73 get {} 73 get {}
74 values { 74 values {
75 data: const(Efl.Canvas.Gesture_Touch_Point_Data) @by_ref; [[The current data.]] 75 data: const(Efl.Canvas.Gesture_Touch_Point_Data) @by_ref; [[The current data.]]
76 } 76 }
77 } 77 }
78 @property prev_data { 78 @property previous_data {
79 [[This property holds the data struct of the second-most recent touch point. 79 [[This property holds the data struct of the second-most recent touch point.
80 If there is only one touch point active, it will return NULL. 80 If there is only one touch point active, it will return NULL.
81 ]] 81 ]]
diff --git a/src/tests/elementary/custom_recognizer2.c b/src/tests/elementary/custom_recognizer2.c
index bea8606..3b89950 100644
--- a/src/tests/elementary/custom_recognizer2.c
+++ b/src/tests/elementary/custom_recognizer2.c
@@ -19,7 +19,7 @@ _custom_recognizer2_efl_canvas_gesture_recognizer_recognize(Eo *obj EINA_UNUSED,
19 Efl_Canvas_Gesture_Touch *event) 19 Efl_Canvas_Gesture_Touch *event)
20{ 20{
21 Eina_Position2D start = efl_gesture_touch_start_point_get(event); 21 Eina_Position2D start = efl_gesture_touch_start_point_get(event);
22 Eina_Position2D cur = efl_gesture_touch_cur_point_get(event); 22 Eina_Position2D cur = efl_gesture_touch_current_point_get(event);
23 switch (efl_gesture_touch_state_get(event)) 23 switch (efl_gesture_touch_state_get(event))
24 { 24 {
25 case EFL_GESTURE_TOUCH_STATE_BEGIN: 25 case EFL_GESTURE_TOUCH_STATE_BEGIN: