summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2020-02-18 10:16:51 -0500
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-03-03 10:54:26 +0100
commit641c9427ef5f462655750ad3c802f925d09430b4 (patch)
tree7d35649312987515f1f5e26c44234e304c6fd0eb
parente54454b98696e945c6d1a9d02092338bb3506781 (diff)
efl/gesture: rename long_tap -> long_press
this is consistent with the rest of efl naming ref T8503 Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D11376
-rw-r--r--src/bin/elementary/test_gesture_framework.c36
-rw-r--r--src/lib/evas/Efl_Canvas.h4
-rw-r--r--src/lib/evas/Evas_Eo.h4
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_events.eo4
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_long_press.c5
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_long_press.eo (renamed from src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo)6
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_long_tap.c5
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_manager.c12
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_private.h4
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_press.c (renamed from src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.c)28
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_press.eo (renamed from src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo)6
-rw-r--r--src/lib/evas/gesture/meson.build8
-rw-r--r--src/tests/elementary/efl_ui_test_gesture.c48
13 files changed, 85 insertions, 85 deletions
diff --git a/src/bin/elementary/test_gesture_framework.c b/src/bin/elementary/test_gesture_framework.c
index 41a9ffd49a..ff40711cdd 100644
--- a/src/bin/elementary/test_gesture_framework.c
+++ b/src/bin/elementary/test_gesture_framework.c
@@ -6,7 +6,7 @@
6#define TAP_NAME "tap" 6#define TAP_NAME "tap"
7#define DOUBLE_TAP_NAME "double_tap" 7#define DOUBLE_TAP_NAME "double_tap"
8#define TRIPLE_TAP_NAME "triple_tap" 8#define TRIPLE_TAP_NAME "triple_tap"
9#define LONG_TAP_NAME "long_tap" 9#define LONG_PRESS_NAME "long_press"
10#define FLICK_NAME "flick" 10#define FLICK_NAME "flick"
11#define LINE_NAME "line" 11#define LINE_NAME "line"
12#define MOMENTUM_NAME "momentum" 12#define MOMENTUM_NAME "momentum"
@@ -17,7 +17,7 @@
17#define MAX_DOUBLE_TAP 5 17#define MAX_DOUBLE_TAP 5
18#define MAX_FLICK 5 18#define MAX_FLICK 5
19#define MAX_LINE 5 19#define MAX_LINE 5
20#define MAX_LONG_TAP 5 20#define MAX_LONG_PRESS 5
21#define MAX_MOMENTUM 5 21#define MAX_MOMENTUM 5
22#define MAX_ROTATE 1 22#define MAX_ROTATE 1
23#define MAX_TAP 5 23#define MAX_TAP 5
@@ -59,7 +59,7 @@ struct _infra_data
59 icon_properties *icons; 59 icon_properties *icons;
60 Ecore_Timer *colortimer; 60 Ecore_Timer *colortimer;
61 char buf[1024]; 61 char buf[1024];
62 int long_tap_count; 62 int long_press_count;
63}; 63};
64typedef struct _infra_data infra_data; 64typedef struct _infra_data infra_data;
65 65
@@ -360,34 +360,34 @@ finger_double_tap_abort(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
360} 360}
361 361
362static void 362static void
363finger_long_tap_start(void *data , Efl_Canvas_Gesture *tap) 363finger_long_press_start(void *data , Efl_Canvas_Gesture *tap)
364{ 364{
365 Eina_Position2D pos = efl_gesture_hotspot_get(tap); 365 Eina_Position2D pos = efl_gesture_hotspot_get(tap);
366 366
367 _color_and_icon_set(data, LONG_TAP_NAME, 1, MAX_TAP, START_COLOR); 367 _color_and_icon_set(data, LONG_PRESS_NAME, 1, MAX_TAP, START_COLOR);
368 printf("Long Tap Gesture started x,y=<%d,%d> \n", pos.x, pos.y); 368 printf("Long Tap Gesture started x,y=<%d,%d> \n", pos.x, pos.y);
369} 369}
370 370
371static void 371static void
372finger_long_tap_update(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED) 372finger_long_press_update(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
373{ 373{
374 _color_and_icon_set(data, LONG_TAP_NAME, 1, MAX_TAP, UPDATE_COLOR); 374 _color_and_icon_set(data, LONG_PRESS_NAME, 1, MAX_TAP, UPDATE_COLOR);
375 printf("Long Tap Gesture updated\n"); 375 printf("Long Tap Gesture updated\n");
376} 376}
377 377
378static void 378static void
379finger_long_tap_end(void *data , Efl_Canvas_Gesture *tap) 379finger_long_press_end(void *data , Efl_Canvas_Gesture *tap)
380{ 380{
381 Eina_Position2D pos = efl_gesture_hotspot_get(tap); 381 Eina_Position2D pos = efl_gesture_hotspot_get(tap);
382 382
383 _color_and_icon_set(data, LONG_TAP_NAME, 1, MAX_TAP, END_COLOR); 383 _color_and_icon_set(data, LONG_PRESS_NAME, 1, MAX_TAP, END_COLOR);
384 printf("Long Tap Gesture ended x,y=<%d,%d> \n",pos.x, pos.y); 384 printf("Long Tap Gesture ended x,y=<%d,%d> \n",pos.x, pos.y);
385} 385}
386 386
387static void 387static void
388finger_long_tap_abort(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED) 388finger_long_press_abort(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
389{ 389{
390 _color_and_icon_set(data, LONG_TAP_NAME, 1, MAX_TAP, ABORT_COLOR); 390 _color_and_icon_set(data, LONG_PRESS_NAME, 1, MAX_TAP, ABORT_COLOR);
391 printf("Long Tap Aborted\n"); 391 printf("Long Tap Aborted\n");
392} 392}
393 393
@@ -521,22 +521,22 @@ double_tap_gesture_cb(void *data , const Efl_Event *ev)
521} 521}
522 522
523static void 523static void
524long_tap_gesture_cb(void *data , const Efl_Event *ev) 524long_press_gesture_cb(void *data , const Efl_Event *ev)
525{ 525{
526 Efl_Canvas_Gesture *g = ev->info; 526 Efl_Canvas_Gesture *g = ev->info;
527 switch(efl_gesture_state_get(g)) 527 switch(efl_gesture_state_get(g))
528 { 528 {
529 case EFL_GESTURE_STATE_STARTED: 529 case EFL_GESTURE_STATE_STARTED:
530 finger_long_tap_start(data, g); 530 finger_long_press_start(data, g);
531 break; 531 break;
532 case EFL_GESTURE_STATE_UPDATED: 532 case EFL_GESTURE_STATE_UPDATED:
533 finger_long_tap_update(data, g); 533 finger_long_press_update(data, g);
534 break; 534 break;
535 case EFL_GESTURE_STATE_CANCELED: 535 case EFL_GESTURE_STATE_CANCELED:
536 finger_long_tap_abort(data, g); 536 finger_long_press_abort(data, g);
537 break; 537 break;
538 case EFL_GESTURE_STATE_FINISHED: 538 case EFL_GESTURE_STATE_FINISHED:
539 finger_long_tap_end(data, g); 539 finger_long_press_end(data, g);
540 break; 540 break;
541 default: 541 default:
542 break; 542 break;
@@ -625,7 +625,7 @@ test_gesture_framework(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
625 elm_table_pack(tb, bx, 2, 0, 1, 1); 625 elm_table_pack(tb, bx, 2, 0, 1, 1);
626 626
627 /* Box of Long Tap icon and label */ 627 /* Box of Long Tap icon and label */
628 bx = create_gesture_box(win, infra->icons, 3, LONG_TAP_NAME, "Long Tap"); 628 bx = create_gesture_box(win, infra->icons, 3, LONG_PRESS_NAME, "Long Tap");
629 elm_table_pack(tb, bx, 3, 0, 1, 1); 629 elm_table_pack(tb, bx, 3, 0, 1, 1);
630 630
631 /* Box of Momentum icon and label */ 631 /* Box of Momentum icon and label */
@@ -736,7 +736,7 @@ test_gesture_framework(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
736 736
737 // LISTEN FOR GESTURES 737 // LISTEN FOR GESTURES
738 efl_event_callback_add(target, EFL_EVENT_GESTURE_TAP, tap_gesture_cb, infra); 738 efl_event_callback_add(target, EFL_EVENT_GESTURE_TAP, tap_gesture_cb, infra);
739 efl_event_callback_add(target, EFL_EVENT_GESTURE_LONG_TAP, long_tap_gesture_cb, infra); 739 efl_event_callback_add(target, EFL_EVENT_GESTURE_LONG_PRESS, long_press_gesture_cb, infra);
740 efl_event_callback_add(target, EFL_EVENT_GESTURE_DOUBLE_TAP, double_tap_gesture_cb, infra); 740 efl_event_callback_add(target, EFL_EVENT_GESTURE_DOUBLE_TAP, double_tap_gesture_cb, infra);
741 efl_event_callback_add(target, EFL_EVENT_GESTURE_TRIPLE_TAP, triple_tap_gesture_cb, infra); 741 efl_event_callback_add(target, EFL_EVENT_GESTURE_TRIPLE_TAP, triple_tap_gesture_cb, infra);
742 efl_event_callback_add(target, EFL_EVENT_GESTURE_MOMENTUM, momentum_gesture_cb, infra); 742 efl_event_callback_add(target, EFL_EVENT_GESTURE_MOMENTUM, momentum_gesture_cb, infra);
diff --git a/src/lib/evas/Efl_Canvas.h b/src/lib/evas/Efl_Canvas.h
index 3d004c9425..f457acc4bf 100644
--- a/src/lib/evas/Efl_Canvas.h
+++ b/src/lib/evas/Efl_Canvas.h
@@ -109,11 +109,11 @@ extern "C" {
109 109
110#include <gesture/efl_canvas_gesture_double_tap.eo.h> 110#include <gesture/efl_canvas_gesture_double_tap.eo.h>
111#include <gesture/efl_canvas_gesture_flick.eo.h> 111#include <gesture/efl_canvas_gesture_flick.eo.h>
112#include <gesture/efl_canvas_gesture_long_tap.eo.h> 112#include <gesture/efl_canvas_gesture_long_press.eo.h>
113#include <gesture/efl_canvas_gesture_momentum.eo.h> 113#include <gesture/efl_canvas_gesture_momentum.eo.h>
114#include <gesture/efl_canvas_gesture_recognizer_double_tap.eo.h> 114#include <gesture/efl_canvas_gesture_recognizer_double_tap.eo.h>
115#include <gesture/efl_canvas_gesture_recognizer_flick.eo.h> 115#include <gesture/efl_canvas_gesture_recognizer_flick.eo.h>
116#include <gesture/efl_canvas_gesture_recognizer_long_tap.eo.h> 116#include <gesture/efl_canvas_gesture_recognizer_long_press.eo.h>
117#include <gesture/efl_canvas_gesture_recognizer_momentum.eo.h> 117#include <gesture/efl_canvas_gesture_recognizer_momentum.eo.h>
118#include <gesture/efl_canvas_gesture_recognizer_tap.eo.h> 118#include <gesture/efl_canvas_gesture_recognizer_tap.eo.h>
119#include <gesture/efl_canvas_gesture_recognizer_triple_tap.eo.h> 119#include <gesture/efl_canvas_gesture_recognizer_triple_tap.eo.h>
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 409e777853..7d25c38874 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -86,7 +86,7 @@ struct _Efl_Canvas_Object_Animation_Event
86#include "gesture/efl_canvas_gesture_touch.eo.h" 86#include "gesture/efl_canvas_gesture_touch.eo.h"
87#include "gesture/efl_canvas_gesture.eo.h" 87#include "gesture/efl_canvas_gesture.eo.h"
88#include "gesture/efl_canvas_gesture_tap.eo.h" 88#include "gesture/efl_canvas_gesture_tap.eo.h"
89#include "gesture/efl_canvas_gesture_long_tap.eo.h" 89#include "gesture/efl_canvas_gesture_long_press.eo.h"
90#include "gesture/efl_canvas_gesture_double_tap.eo.h" 90#include "gesture/efl_canvas_gesture_double_tap.eo.h"
91#include "gesture/efl_canvas_gesture_triple_tap.eo.h" 91#include "gesture/efl_canvas_gesture_triple_tap.eo.h"
92#include "gesture/efl_canvas_gesture_momentum.eo.h" 92#include "gesture/efl_canvas_gesture_momentum.eo.h"
@@ -95,7 +95,7 @@ struct _Efl_Canvas_Object_Animation_Event
95#include "gesture/efl_canvas_gesture_custom.eo.h" 95#include "gesture/efl_canvas_gesture_custom.eo.h"
96#include "gesture/efl_canvas_gesture_recognizer.eo.h" 96#include "gesture/efl_canvas_gesture_recognizer.eo.h"
97#include "gesture/efl_canvas_gesture_recognizer_tap.eo.h" 97#include "gesture/efl_canvas_gesture_recognizer_tap.eo.h"
98#include "gesture/efl_canvas_gesture_recognizer_long_tap.eo.h" 98#include "gesture/efl_canvas_gesture_recognizer_long_press.eo.h"
99#include "gesture/efl_canvas_gesture_recognizer_double_tap.eo.h" 99#include "gesture/efl_canvas_gesture_recognizer_double_tap.eo.h"
100#include "gesture/efl_canvas_gesture_recognizer_triple_tap.eo.h" 100#include "gesture/efl_canvas_gesture_recognizer_triple_tap.eo.h"
101#include "gesture/efl_canvas_gesture_recognizer_momentum.eo.h" 101#include "gesture/efl_canvas_gesture_recognizer_momentum.eo.h"
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_events.eo b/src/lib/evas/gesture/efl_canvas_gesture_events.eo
index bbf9ef68fd..01c50a7aa8 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_events.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_events.eo
@@ -6,7 +6,7 @@ interface @beta Efl.Canvas.Gesture_Events
6 events { 6 events {
7 gesture,tap: Efl.Canvas.Gesture_Tap; [[Emitted when a Tap gesture has been detected. 7 gesture,tap: Efl.Canvas.Gesture_Tap; [[Emitted when a Tap gesture has been detected.
8 A Tap gesture consists of a touch of the screen (or click of the mouse) quickly followed by 8 A Tap gesture consists of a touch of the screen (or click of the mouse) quickly followed by
9 a release. If the release happens too late a @[Efl.Canvas.Gesture_Events.gesture,long_tap] event will be 9 a release. If the release happens too late a @[Efl.Canvas.Gesture_Events.gesture,long_press] event will be
10 emitted instead. 10 emitted instead.
11 ]] 11 ]]
12 12
@@ -22,7 +22,7 @@ interface @beta Efl.Canvas.Gesture_Events
22 @[Efl.Canvas.Gesture_Events.gesture,tap] or @[Efl.Canvas.Gesture_Events.gesture,double_tap] events. 22 @[Efl.Canvas.Gesture_Events.gesture,tap] or @[Efl.Canvas.Gesture_Events.gesture,double_tap] events.
23 ]] 23 ]]
24 24
25 gesture,long_tap: Efl.Canvas.Gesture_Long_Tap; [[Emitted when a Long-tap gesture has been detected. 25 gesture,long_press: Efl.Canvas.Gesture_Long_Press; [[Emitted when a Long-tap gesture has been detected.
26 A Long-tap gesture consists of a touch of the screen (or click of the mouse) followed by a release 26 A Long-tap gesture consists of a touch of the screen (or click of the mouse) followed by a release
27 after some time. If the release happens too quickly a @[Efl.Canvas.Gesture_Events.gesture,tap] event will be 27 after some time. If the release happens too quickly a @[Efl.Canvas.Gesture_Events.gesture,tap] event will be
28 emitted instead. 28 emitted instead.
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_long_press.c b/src/lib/evas/gesture/efl_canvas_gesture_long_press.c
new file mode 100644
index 0000000000..8403a473d1
--- /dev/null
+++ b/src/lib/evas/gesture/efl_canvas_gesture_long_press.c
@@ -0,0 +1,5 @@
1#include "efl_canvas_gesture_private.h"
2
3#define MY_CLASS EFL_CANVAS_GESTURE_LONG_PRESS_CLASS
4
5#include "efl_canvas_gesture_long_press.eo.c"
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_long_press.eo
index 939da391d7..f039f24ff0 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_long_press.eo
@@ -1,11 +1,11 @@
1class @beta Efl.Canvas.Gesture_Long_Tap extends Efl.Canvas.Gesture 1class @beta Efl.Canvas.Gesture_Long_Press extends Efl.Canvas.Gesture
2{ 2{
3 [[Long-tap gesture class holding state information. 3 [[Long-tap gesture class holding state information.
4 See @Efl.Canvas.Gesture to see what this state is and 4 See @Efl.Canvas.Gesture to see what this state is and
5 @[Efl.Canvas.Gesture_Events.gesture,long_tap] for a description of the Long-tap gesture. 5 @[Efl.Canvas.Gesture_Events.gesture,long_press] for a description of the Long-tap gesture.
6 6
7 Application developers receive these objects inside a gesture event and do not typically need to create their own. 7 Application developers receive these objects inside a gesture event and do not typically need to create their own.
8 ]] 8 ]]
9 data: null; 9 data: null;
10 c_prefix: efl_gesture_long_tap; 10 c_prefix: efl_gesture_long_press;
11} 11}
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_long_tap.c
deleted file mode 100644
index 743f4ded90..0000000000
--- a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.c
+++ /dev/null
@@ -1,5 +0,0 @@
1#include "efl_canvas_gesture_private.h"
2
3#define MY_CLASS EFL_CANVAS_GESTURE_LONG_TAP_CLASS
4
5#include "efl_canvas_gesture_long_tap.eo.c"
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.c b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
index 2bee20c248..5f86e4108c 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
@@ -47,8 +47,8 @@ _gesture_recognizer_event_type_get(const Efl_Canvas_Gesture_Recognizer *recogniz
47 return EFL_EVENT_GESTURE_DOUBLE_TAP; 47 return EFL_EVENT_GESTURE_DOUBLE_TAP;
48 if (type == EFL_CANVAS_GESTURE_TRIPLE_TAP_CLASS) 48 if (type == EFL_CANVAS_GESTURE_TRIPLE_TAP_CLASS)
49 return EFL_EVENT_GESTURE_TRIPLE_TAP; 49 return EFL_EVENT_GESTURE_TRIPLE_TAP;
50 if (type == EFL_CANVAS_GESTURE_LONG_TAP_CLASS) 50 if (type == EFL_CANVAS_GESTURE_LONG_PRESS_CLASS)
51 return EFL_EVENT_GESTURE_LONG_TAP; 51 return EFL_EVENT_GESTURE_LONG_PRESS;
52 if (type == EFL_CANVAS_GESTURE_MOMENTUM_CLASS) 52 if (type == EFL_CANVAS_GESTURE_MOMENTUM_CLASS)
53 return EFL_EVENT_GESTURE_MOMENTUM; 53 return EFL_EVENT_GESTURE_MOMENTUM;
54 if (type == EFL_CANVAS_GESTURE_FLICK_CLASS) 54 if (type == EFL_CANVAS_GESTURE_FLICK_CLASS)
@@ -83,7 +83,7 @@ _update_finger_sizes(Efl_Canvas_Gesture_Manager_Data *pd, int finger_size)
83 Efl_Canvas_Gesture_Recognizer_Tap_Data *td; 83 Efl_Canvas_Gesture_Recognizer_Tap_Data *td;
84 Efl_Canvas_Gesture_Recognizer_Double_Tap_Data *dtd; 84 Efl_Canvas_Gesture_Recognizer_Double_Tap_Data *dtd;
85 Efl_Canvas_Gesture_Recognizer_Triple_Tap_Data *ttd; 85 Efl_Canvas_Gesture_Recognizer_Triple_Tap_Data *ttd;
86 Efl_Canvas_Gesture_Recognizer_Long_Tap_Data *ltd; 86 Efl_Canvas_Gesture_Recognizer_Long_Press_Data *ltd;
87 Efl_Canvas_Gesture_Recognizer_Flick_Data *fd; 87 Efl_Canvas_Gesture_Recognizer_Flick_Data *fd;
88 Efl_Canvas_Gesture_Recognizer_Zoom_Data *zd; 88 Efl_Canvas_Gesture_Recognizer_Zoom_Data *zd;
89 const Efl_Event_Description *type; 89 const Efl_Event_Description *type;
@@ -103,9 +103,9 @@ _update_finger_sizes(Efl_Canvas_Gesture_Manager_Data *pd, int finger_size)
103 ttd = efl_data_scope_get(r, EFL_CANVAS_GESTURE_RECOGNIZER_TRIPLE_TAP_CLASS); 103 ttd = efl_data_scope_get(r, EFL_CANVAS_GESTURE_RECOGNIZER_TRIPLE_TAP_CLASS);
104 ttd->finger_size = finger_size; 104 ttd->finger_size = finger_size;
105 105
106 type = EFL_EVENT_GESTURE_LONG_TAP; 106 type = EFL_EVENT_GESTURE_LONG_PRESS;
107 r = eina_hash_find(pd->m_recognizers, &type); 107 r = eina_hash_find(pd->m_recognizers, &type);
108 ltd = efl_data_scope_get(r, EFL_CANVAS_GESTURE_RECOGNIZER_LONG_TAP_CLASS); 108 ltd = efl_data_scope_get(r, EFL_CANVAS_GESTURE_RECOGNIZER_LONG_PRESS_CLASS);
109 ltd->finger_size = finger_size; 109 ltd->finger_size = finger_size;
110 110
111 type = EFL_EVENT_GESTURE_FLICK; 111 type = EFL_EVENT_GESTURE_FLICK;
@@ -147,7 +147,7 @@ _efl_canvas_gesture_manager_efl_object_constructor(Eo *obj, Efl_Canvas_Gesture_M
147 147
148 //Register all types of recognizers at very first time. 148 //Register all types of recognizers at very first time.
149 efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_TAP_CLASS, obj)); 149 efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_TAP_CLASS, obj));
150 efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_LONG_TAP_CLASS, obj)); 150 efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_LONG_PRESS_CLASS, obj));
151 efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_DOUBLE_TAP_CLASS, obj)); 151 efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_DOUBLE_TAP_CLASS, obj));
152 efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_TRIPLE_TAP_CLASS, obj)); 152 efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_TRIPLE_TAP_CLASS, obj));
153 efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_MOMENTUM_CLASS, obj)); 153 efl_gesture_manager_recognizer_register(obj, efl_add(EFL_CANVAS_GESTURE_RECOGNIZER_MOMENTUM_CLASS, obj));
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_private.h b/src/lib/evas/gesture/efl_canvas_gesture_private.h
index 3ef595c3c8..1b9e7d2ddc 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_private.h
+++ b/src/lib/evas/gesture/efl_canvas_gesture_private.h
@@ -18,7 +18,7 @@ Eina_Bool _event_multi_touch_get(const Efl_Canvas_Gesture_Touch *event);
18typedef struct _Efl_Canvas_Gesture_Manager_Data Efl_Canvas_Gesture_Manager_Data; 18typedef struct _Efl_Canvas_Gesture_Manager_Data Efl_Canvas_Gesture_Manager_Data;
19typedef struct _Efl_Canvas_Gesture_Recognizer_Data Efl_Canvas_Gesture_Recognizer_Data; 19typedef struct _Efl_Canvas_Gesture_Recognizer_Data Efl_Canvas_Gesture_Recognizer_Data;
20typedef struct _Efl_Canvas_Gesture_Recognizer_Tap_Data Efl_Canvas_Gesture_Recognizer_Tap_Data; 20typedef struct _Efl_Canvas_Gesture_Recognizer_Tap_Data Efl_Canvas_Gesture_Recognizer_Tap_Data;
21typedef struct _Efl_Canvas_Gesture_Recognizer_Long_Tap_Data Efl_Canvas_Gesture_Recognizer_Long_Tap_Data; 21typedef struct _Efl_Canvas_Gesture_Recognizer_Long_Press_Data Efl_Canvas_Gesture_Recognizer_Long_Press_Data;
22typedef struct _Efl_Canvas_Gesture_Recognizer_Double_Tap_Data Efl_Canvas_Gesture_Recognizer_Double_Tap_Data; 22typedef struct _Efl_Canvas_Gesture_Recognizer_Double_Tap_Data Efl_Canvas_Gesture_Recognizer_Double_Tap_Data;
23typedef struct _Efl_Canvas_Gesture_Recognizer_Triple_Tap_Data Efl_Canvas_Gesture_Recognizer_Triple_Tap_Data; 23typedef struct _Efl_Canvas_Gesture_Recognizer_Triple_Tap_Data Efl_Canvas_Gesture_Recognizer_Triple_Tap_Data;
24typedef struct _Efl_Canvas_Gesture_Recognizer_Momentum_Data Efl_Canvas_Gesture_Recognizer_Momentum_Data; 24typedef struct _Efl_Canvas_Gesture_Recognizer_Momentum_Data Efl_Canvas_Gesture_Recognizer_Momentum_Data;
@@ -54,7 +54,7 @@ struct _Efl_Canvas_Gesture_Recognizer_Tap_Data
54 int finger_size; 54 int finger_size;
55}; 55};
56 56
57struct _Efl_Canvas_Gesture_Recognizer_Long_Tap_Data 57struct _Efl_Canvas_Gesture_Recognizer_Long_Press_Data
58{ 58{
59 double start_timeout; 59 double start_timeout;
60 Eina_List *target_timeout; 60 Eina_List *target_timeout;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.c b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_press.c
index 5b173858fa..bcbe5bd592 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_press.c
@@ -1,18 +1,18 @@
1#include "efl_canvas_gesture_private.h" 1#include "efl_canvas_gesture_private.h"
2 2
3#define MY_CLASS EFL_CANVAS_GESTURE_RECOGNIZER_LONG_TAP_CLASS 3#define MY_CLASS EFL_CANVAS_GESTURE_RECOGNIZER_LONG_PRESS_CLASS
4 4
5#define EFL_GESTURE_LONG_TAP_TIME_OUT 1.2 5#define EFL_GESTURE_LONG_PRESS_TIME_OUT 1.2
6 6
7EOLIAN static const Efl_Class * 7EOLIAN static const Efl_Class *
8_efl_canvas_gesture_recognizer_long_tap_efl_canvas_gesture_recognizer_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Recognizer_Long_Tap_Data *pd EINA_UNUSED) 8_efl_canvas_gesture_recognizer_long_press_efl_canvas_gesture_recognizer_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Gesture_Recognizer_Long_Press_Data *pd EINA_UNUSED)
9{ 9{
10 return EFL_CANVAS_GESTURE_LONG_TAP_CLASS; 10 return EFL_CANVAS_GESTURE_LONG_PRESS_CLASS;
11} 11}
12 12
13EOLIAN static void 13EOLIAN static void
14_efl_canvas_gesture_recognizer_long_tap_efl_object_destructor(Eo *obj, 14_efl_canvas_gesture_recognizer_long_press_efl_object_destructor(Eo *obj,
15 Efl_Canvas_Gesture_Recognizer_Long_Tap_Data *pd) 15 Efl_Canvas_Gesture_Recognizer_Long_Press_Data *pd)
16{ 16{
17 if (pd->timeout) 17 if (pd->timeout)
18 ecore_timer_del(pd->timeout); 18 ecore_timer_del(pd->timeout);
@@ -21,28 +21,28 @@ _efl_canvas_gesture_recognizer_long_tap_efl_object_destructor(Eo *obj,
21} 21}
22 22
23static Eina_Bool 23static Eina_Bool
24_long_tap_timeout_cb(void *data) 24_long_press_timeout_cb(void *data)
25{ 25{
26 Efl_Canvas_Gesture_Recognizer_Long_Tap_Data *pd = data; 26 Efl_Canvas_Gesture_Recognizer_Long_Press_Data *pd = data;
27 27
28 /* FIXME: Needs to propagate this event back to evas! */ 28 /* FIXME: Needs to propagate this event back to evas! */
29 pd->is_timeout = EINA_TRUE; 29 pd->is_timeout = EINA_TRUE;
30 30
31 efl_gesture_state_set(pd->gesture, EFL_GESTURE_STATE_UPDATED); 31 efl_gesture_state_set(pd->gesture, EFL_GESTURE_STATE_UPDATED);
32 efl_event_callback_call(pd->target, EFL_EVENT_GESTURE_LONG_TAP, pd->gesture); 32 efl_event_callback_call(pd->target, EFL_EVENT_GESTURE_LONG_PRESS, pd->gesture);
33 33
34 return ECORE_CALLBACK_RENEW; 34 return ECORE_CALLBACK_RENEW;
35} 35}
36 36
37EOLIAN static Efl_Canvas_Gesture_Recognizer_Result 37EOLIAN static Efl_Canvas_Gesture_Recognizer_Result
38_efl_canvas_gesture_recognizer_long_tap_efl_canvas_gesture_recognizer_recognize(Eo *obj, 38_efl_canvas_gesture_recognizer_long_press_efl_canvas_gesture_recognizer_recognize(Eo *obj,
39 Efl_Canvas_Gesture_Recognizer_Long_Tap_Data *pd, 39 Efl_Canvas_Gesture_Recognizer_Long_Press_Data *pd,
40 Efl_Canvas_Gesture *gesture, 40 Efl_Canvas_Gesture *gesture,
41 Efl_Object *watched, 41 Efl_Object *watched,
42 Efl_Canvas_Gesture_Touch *event) 42 Efl_Canvas_Gesture_Touch *event)
43{ 43{
44 double length, start_timeout = pd->start_timeout; // Manhattan distance 44 double length, start_timeout = pd->start_timeout; // Manhattan distance
45 double timeout = EFL_GESTURE_LONG_TAP_TIME_OUT; 45 double timeout = EFL_GESTURE_LONG_PRESS_TIME_OUT;
46 Eina_Position2D pos; 46 Eina_Position2D pos;
47 Eina_Vector2 dist; 47 Eina_Vector2 dist;
48 Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL; 48 Efl_Canvas_Gesture_Recognizer_Result result = EFL_GESTURE_RECOGNIZER_RESULT_CANCEL;
@@ -76,7 +76,7 @@ _efl_canvas_gesture_recognizer_long_tap_efl_canvas_gesture_recognizer_recognize(
76 ecore_timer_del(pd->timeout); 76 ecore_timer_del(pd->timeout);
77 } 77 }
78 pd->timeout = ecore_timer_add(timeout, 78 pd->timeout = ecore_timer_add(timeout,
79 _long_tap_timeout_cb, pd); 79 _long_press_timeout_cb, pd);
80 80
81 result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER; 81 result = EFL_GESTURE_RECOGNIZER_RESULT_TRIGGER;
82 82
@@ -140,4 +140,4 @@ _efl_canvas_gesture_recognizer_long_tap_efl_canvas_gesture_recognizer_recognize(
140 return result; 140 return result;
141} 141}
142 142
143#include "efl_canvas_gesture_recognizer_long_tap.eo.c" 143#include "efl_canvas_gesture_recognizer_long_press.eo.c"
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_press.eo
index 9eb9d6afab..316b74d683 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_press.eo
@@ -1,10 +1,10 @@
1class @beta Efl.Canvas.Gesture_Recognizer_Long_Tap extends Efl.Canvas.Gesture_Recognizer 1class @beta Efl.Canvas.Gesture_Recognizer_Long_Press extends Efl.Canvas.Gesture_Recognizer
2{ 2{
3 [[This is the recognizer for Long-tap gestures. 3 [[This is the recognizer for Long-tap gestures.
4 See @Efl.Canvas.Gesture_Long_Tap and @Efl.Canvas.Gesture_Recognizer. 4 See @Efl.Canvas.Gesture_Long_Press and @Efl.Canvas.Gesture_Recognizer.
5 For internal use only. 5 For internal use only.
6 ]] 6 ]]
7 c_prefix: efl_gesture_recognizer_long_tap; 7 c_prefix: efl_gesture_recognizer_long_press;
8 implements { 8 implements {
9 Efl.Object.destructor; 9 Efl.Object.destructor;
10 Efl.Canvas.Gesture_Recognizer.type { get; } 10 Efl.Canvas.Gesture_Recognizer.type { get; }
diff --git a/src/lib/evas/gesture/meson.build b/src/lib/evas/gesture/meson.build
index 5daa6f6f30..7c2fc28a31 100644
--- a/src/lib/evas/gesture/meson.build
+++ b/src/lib/evas/gesture/meson.build
@@ -4,7 +4,7 @@ pub_eo_files = [
4 'efl_canvas_gesture_tap.eo', 4 'efl_canvas_gesture_tap.eo',
5 'efl_canvas_gesture_double_tap.eo', 5 'efl_canvas_gesture_double_tap.eo',
6 'efl_canvas_gesture_triple_tap.eo', 6 'efl_canvas_gesture_triple_tap.eo',
7 'efl_canvas_gesture_long_tap.eo', 7 'efl_canvas_gesture_long_press.eo',
8 'efl_canvas_gesture_momentum.eo', 8 'efl_canvas_gesture_momentum.eo',
9 'efl_canvas_gesture_flick.eo', 9 'efl_canvas_gesture_flick.eo',
10 'efl_canvas_gesture_zoom.eo', 10 'efl_canvas_gesture_zoom.eo',
@@ -13,7 +13,7 @@ pub_eo_files = [
13 'efl_canvas_gesture_recognizer_tap.eo', 13 'efl_canvas_gesture_recognizer_tap.eo',
14 'efl_canvas_gesture_recognizer_double_tap.eo', 14 'efl_canvas_gesture_recognizer_double_tap.eo',
15 'efl_canvas_gesture_recognizer_triple_tap.eo', 15 'efl_canvas_gesture_recognizer_triple_tap.eo',
16 'efl_canvas_gesture_recognizer_long_tap.eo', 16 'efl_canvas_gesture_recognizer_long_press.eo',
17 'efl_canvas_gesture_recognizer_momentum.eo', 17 'efl_canvas_gesture_recognizer_momentum.eo',
18 'efl_canvas_gesture_recognizer_flick.eo', 18 'efl_canvas_gesture_recognizer_flick.eo',
19 'efl_canvas_gesture_recognizer_zoom.eo', 19 'efl_canvas_gesture_recognizer_zoom.eo',
@@ -68,7 +68,7 @@ evas_src += files([
68 'efl_canvas_gesture_tap.c', 68 'efl_canvas_gesture_tap.c',
69 'efl_canvas_gesture_double_tap.c', 69 'efl_canvas_gesture_double_tap.c',
70 'efl_canvas_gesture_triple_tap.c', 70 'efl_canvas_gesture_triple_tap.c',
71 'efl_canvas_gesture_long_tap.c', 71 'efl_canvas_gesture_long_press.c',
72 'efl_canvas_gesture_momentum.c', 72 'efl_canvas_gesture_momentum.c',
73 'efl_canvas_gesture_flick.c', 73 'efl_canvas_gesture_flick.c',
74 'efl_canvas_gesture_zoom.c', 74 'efl_canvas_gesture_zoom.c',
@@ -77,7 +77,7 @@ evas_src += files([
77 'efl_canvas_gesture_recognizer_tap.c', 77 'efl_canvas_gesture_recognizer_tap.c',
78 'efl_canvas_gesture_recognizer_double_tap.c', 78 'efl_canvas_gesture_recognizer_double_tap.c',
79 'efl_canvas_gesture_recognizer_triple_tap.c', 79 'efl_canvas_gesture_recognizer_triple_tap.c',
80 'efl_canvas_gesture_recognizer_long_tap.c', 80 'efl_canvas_gesture_recognizer_long_press.c',
81 'efl_canvas_gesture_recognizer_momentum.c', 81 'efl_canvas_gesture_recognizer_momentum.c',
82 'efl_canvas_gesture_recognizer_flick.c', 82 'efl_canvas_gesture_recognizer_flick.c',
83 'efl_canvas_gesture_recognizer_zoom.c', 83 'efl_canvas_gesture_recognizer_zoom.c',
diff --git a/src/tests/elementary/efl_ui_test_gesture.c b/src/tests/elementary/efl_ui_test_gesture.c
index 0f7d270853..c176818331 100644
--- a/src/tests/elementary/efl_ui_test_gesture.c
+++ b/src/tests/elementary/efl_ui_test_gesture.c
@@ -26,7 +26,7 @@ typedef enum
26enum 26enum
27{ 27{
28 TAP, 28 TAP,
29 LONG_TAP, 29 LONG_PRESS,
30 DOUBLE_TAP, 30 DOUBLE_TAP,
31 TRIPLE_TAP, 31 TRIPLE_TAP,
32 MOMENTUM, 32 MOMENTUM,
@@ -87,7 +87,7 @@ setup(void)
87#define WATCH(type) \ 87#define WATCH(type) \
88 efl_event_callback_add(rect, EFL_EVENT_GESTURE_##type, gesture_cb, &count[(type)]) 88 efl_event_callback_add(rect, EFL_EVENT_GESTURE_##type, gesture_cb, &count[(type)])
89 WATCH(TAP); 89 WATCH(TAP);
90 WATCH(LONG_TAP); 90 WATCH(LONG_PRESS);
91 WATCH(DOUBLE_TAP); 91 WATCH(DOUBLE_TAP);
92 WATCH(TRIPLE_TAP); 92 WATCH(TRIPLE_TAP);
93 WATCH(MOMENTUM); 93 WATCH(MOMENTUM);
@@ -105,7 +105,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
105 /* basic tap */ 105 /* basic tap */
106 click_object(rect); 106 click_object(rect);
107 CHECK_ALL(TAP, 1, 0, 1, 0); 107 CHECK_ALL(TAP, 1, 0, 1, 0);
108 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 108 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
109 CHECK_ALL(DOUBLE_TAP, 1, 1, 0, 0); 109 CHECK_ALL(DOUBLE_TAP, 1, 1, 0, 0);
110 CHECK_ALL(TRIPLE_TAP, 1, 1, 0, 0); 110 CHECK_ALL(TRIPLE_TAP, 1, 1, 0, 0);
111 CHECK_ZERO(MOMENTUM); 111 CHECK_ZERO(MOMENTUM);
@@ -117,7 +117,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
117 /* add a second tap */ 117 /* add a second tap */
118 click_object(rect); 118 click_object(rect);
119 CHECK_ALL(TAP, 1, 0, 1, 0); 119 CHECK_ALL(TAP, 1, 0, 1, 0);
120 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 120 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
121 /* UPDATE -> FINISH */ 121 /* UPDATE -> FINISH */
122 CHECK_ALL(DOUBLE_TAP, 0, 1, 1, 0); 122 CHECK_ALL(DOUBLE_TAP, 0, 1, 1, 0);
123 CHECK_ALL(TRIPLE_TAP, 0, 2, 0, 0); 123 CHECK_ALL(TRIPLE_TAP, 0, 2, 0, 0);
@@ -130,7 +130,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
130 /* add a third tap */ 130 /* add a third tap */
131 click_object(rect); 131 click_object(rect);
132 CHECK_ALL(TAP, 1, 0, 1, 0); 132 CHECK_ALL(TAP, 1, 0, 1, 0);
133 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 133 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
134 /* UPDATE -> FINISH */ 134 /* UPDATE -> FINISH */
135 CHECK_ALL(DOUBLE_TAP, 1, 1, 0, 0); 135 CHECK_ALL(DOUBLE_TAP, 1, 1, 0, 0);
136 CHECK_ALL(TRIPLE_TAP, 0, 1, 1, 0); 136 CHECK_ALL(TRIPLE_TAP, 0, 1, 1, 0);
@@ -146,7 +146,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
146 click_object_at(rect, 500, 500); 146 click_object_at(rect, 500, 500);
147 click_object_at(rect, 505, 505); 147 click_object_at(rect, 505, 505);
148 CHECK_ALL(TAP, 2, 0, 2, 0); 148 CHECK_ALL(TAP, 2, 0, 2, 0);
149 CHECK_ALL(LONG_TAP, 2, 0, 0, 2); 149 CHECK_ALL(LONG_PRESS, 2, 0, 0, 2);
150 /* UPDATE -> FINISH */ 150 /* UPDATE -> FINISH */
151 CHECK_ALL(DOUBLE_TAP, 1, 2, 1, 0); 151 CHECK_ALL(DOUBLE_TAP, 1, 2, 1, 0);
152 CHECK_ALL(TRIPLE_TAP, 1, 3, 0, 0); 152 CHECK_ALL(TRIPLE_TAP, 1, 3, 0, 0);
@@ -161,7 +161,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
161 /* verify multiple simultaneous presses treated as same press */ 161 /* verify multiple simultaneous presses treated as same press */
162 multi_click_object(rect, 2); 162 multi_click_object(rect, 2);
163 CHECK_ALL(TAP, 1, 0, 1, 0); 163 CHECK_ALL(TAP, 1, 0, 1, 0);
164 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 164 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
165 CHECK_ALL(DOUBLE_TAP, 1, 1, 0, 0); 165 CHECK_ALL(DOUBLE_TAP, 1, 1, 0, 0);
166 CHECK_ALL(TRIPLE_TAP, 1, 1, 0, 0); 166 CHECK_ALL(TRIPLE_TAP, 1, 1, 0, 0);
167 CHECK_ZERO(MOMENTUM); 167 CHECK_ZERO(MOMENTUM);
@@ -173,7 +173,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
173 173
174 multi_click_object(rect, 2); 174 multi_click_object(rect, 2);
175 CHECK_ALL(TAP, 1, 0, 1, 0); 175 CHECK_ALL(TAP, 1, 0, 1, 0);
176 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 176 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
177 /* UPDATE -> FINISH */ 177 /* UPDATE -> FINISH */
178 CHECK_ALL(DOUBLE_TAP, 0, 1, 1, 0); 178 CHECK_ALL(DOUBLE_TAP, 0, 1, 1, 0);
179 CHECK_ALL(TRIPLE_TAP, 0, 2, 0, 0); 179 CHECK_ALL(TRIPLE_TAP, 0, 2, 0, 0);
@@ -186,7 +186,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
186 186
187 multi_click_object(rect, 2); 187 multi_click_object(rect, 2);
188 CHECK_ALL(TAP, 1, 0, 1, 0); 188 CHECK_ALL(TAP, 1, 0, 1, 0);
189 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 189 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
190 /* UPDATE -> FINISH */ 190 /* UPDATE -> FINISH */
191 CHECK_ALL(DOUBLE_TAP, 1, 1, 0, 0); 191 CHECK_ALL(DOUBLE_TAP, 1, 1, 0, 0);
192 CHECK_ALL(TRIPLE_TAP, 0, 1, 1, 0); 192 CHECK_ALL(TRIPLE_TAP, 0, 1, 1, 0);
@@ -200,7 +200,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
200 200
201 multi_click_object(rect, 10); 201 multi_click_object(rect, 10);
202 CHECK_ALL(TAP, 1, 0, 1, 0); 202 CHECK_ALL(TAP, 1, 0, 1, 0);
203 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 203 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
204 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1); 204 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
205 CHECK_ALL(TRIPLE_TAP, 1, 0, 0, 1); 205 CHECK_ALL(TRIPLE_TAP, 1, 0, 0, 1);
206 CHECK_ZERO(MOMENTUM); 206 CHECK_ZERO(MOMENTUM);
@@ -212,7 +212,7 @@ EFL_START_TEST(test_efl_ui_gesture_taps)
212} 212}
213EFL_END_TEST 213EFL_END_TEST
214 214
215EFL_START_TEST(test_efl_ui_gesture_long_tap) 215EFL_START_TEST(test_efl_ui_gesture_long_press)
216{ 216{
217 Eo *rect = setup(); 217 Eo *rect = setup();
218 double timeout = 1.2; 218 double timeout = 1.2;
@@ -225,7 +225,7 @@ EFL_START_TEST(test_efl_ui_gesture_long_tap)
225 /* press */ 225 /* press */
226 press_object(rect); 226 press_object(rect);
227 CHECK_ALL(TAP, 1, 0, 0, 0); 227 CHECK_ALL(TAP, 1, 0, 0, 0);
228 CHECK_ALL(LONG_TAP, 1, 0, 0, 0); 228 CHECK_ALL(LONG_PRESS, 1, 0, 0, 0);
229 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 0); 229 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 0);
230 CHECK_ALL(TRIPLE_TAP, 1, 0, 0, 0); 230 CHECK_ALL(TRIPLE_TAP, 1, 0, 0, 0);
231 CHECK_ZERO(MOMENTUM); 231 CHECK_ZERO(MOMENTUM);
@@ -238,7 +238,7 @@ EFL_START_TEST(test_efl_ui_gesture_long_tap)
238 238
239 /* verify longpress */ 239 /* verify longpress */
240 CHECK_ALL(TAP, 0, 0, 0, 1); 240 CHECK_ALL(TAP, 0, 0, 0, 1);
241 CHECK_ALL(LONG_TAP, 0, 1, 0, 0); 241 CHECK_ALL(LONG_PRESS, 0, 1, 0, 0);
242 CHECK_ALL(DOUBLE_TAP, 0, 0, 0, 1); 242 CHECK_ALL(DOUBLE_TAP, 0, 0, 0, 1);
243 CHECK_ALL(TRIPLE_TAP, 0, 0, 0, 1); 243 CHECK_ALL(TRIPLE_TAP, 0, 0, 0, 1);
244 CHECK_ZERO(MOMENTUM); 244 CHECK_ZERO(MOMENTUM);
@@ -249,7 +249,7 @@ EFL_START_TEST(test_efl_ui_gesture_long_tap)
249 evas_event_feed_mouse_up(e, 1, 0, 2, NULL); 249 evas_event_feed_mouse_up(e, 1, 0, 2, NULL);
250 250
251 CHECK_ZERO(TAP); 251 CHECK_ZERO(TAP);
252 CHECK_ALL(LONG_TAP, 0, 0, 1, 0); 252 CHECK_ALL(LONG_PRESS, 0, 0, 1, 0);
253 CHECK_ZERO(DOUBLE_TAP); 253 CHECK_ZERO(DOUBLE_TAP);
254 CHECK_ZERO(TRIPLE_TAP); 254 CHECK_ZERO(TRIPLE_TAP);
255 CHECK_ZERO(MOMENTUM); 255 CHECK_ZERO(MOMENTUM);
@@ -267,7 +267,7 @@ EFL_START_TEST(test_efl_ui_gesture_long_tap)
267 267
268 /* verify longpress */ 268 /* verify longpress */
269 CHECK_ALL(TAP, 0, 1, 0, 0); 269 CHECK_ALL(TAP, 0, 1, 0, 0);
270 CHECK_ALL(LONG_TAP, 0, 1, 0, 0); 270 CHECK_ALL(LONG_PRESS, 0, 1, 0, 0);
271 CHECK_ALL(DOUBLE_TAP, 0, 0, 0, 1); 271 CHECK_ALL(DOUBLE_TAP, 0, 0, 0, 1);
272 CHECK_ALL(TRIPLE_TAP, 0, 0, 0, 1); 272 CHECK_ALL(TRIPLE_TAP, 0, 0, 0, 1);
273 CHECK_ALL(MOMENTUM, 1, 0, 0, 0); 273 CHECK_ALL(MOMENTUM, 1, 0, 0, 0);
@@ -292,7 +292,7 @@ EFL_START_TEST(test_efl_ui_gesture_flick)
292 /* canceled */ 292 /* canceled */
293 CHECK_ALL(TAP, 1, 0, 0, 1); 293 CHECK_ALL(TAP, 1, 0, 0, 1);
294 /* canceled */ 294 /* canceled */
295 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 295 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
296 /* canceled */ 296 /* canceled */
297 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1); 297 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
298 /* canceled */ 298 /* canceled */
@@ -313,7 +313,7 @@ EFL_START_TEST(test_efl_ui_gesture_flick)
313 /* canceled */ 313 /* canceled */
314 CHECK_ALL(TAP, 1, 0, 0, 1); 314 CHECK_ALL(TAP, 1, 0, 0, 1);
315 /* canceled */ 315 /* canceled */
316 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 316 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
317 /* canceled */ 317 /* canceled */
318 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1); 318 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
319 /* canceled */ 319 /* canceled */
@@ -331,7 +331,7 @@ EFL_START_TEST(test_efl_ui_gesture_flick)
331 /* canceled */ 331 /* canceled */
332 CHECK_ALL(TAP, 1, 0, 0, 1); 332 CHECK_ALL(TAP, 1, 0, 0, 1);
333 /* canceled */ 333 /* canceled */
334 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 334 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
335 /* canceled */ 335 /* canceled */
336 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1); 336 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
337 /* canceled */ 337 /* canceled */
@@ -349,7 +349,7 @@ EFL_START_TEST(test_efl_ui_gesture_flick)
349 /* canceled */ 349 /* canceled */
350 CHECK_ALL(TAP, 1, 0, 0, 1); 350 CHECK_ALL(TAP, 1, 0, 0, 1);
351 /* canceled */ 351 /* canceled */
352 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 352 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
353 /* canceled */ 353 /* canceled */
354 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1); 354 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
355 /* canceled */ 355 /* canceled */
@@ -368,7 +368,7 @@ EFL_START_TEST(test_efl_ui_gesture_flick)
368 /* canceled */ 368 /* canceled */
369 CHECK_ALL(TAP, 1, 0, 0, 1); 369 CHECK_ALL(TAP, 1, 0, 0, 1);
370 /* canceled */ 370 /* canceled */
371 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 371 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
372 /* canceled */ 372 /* canceled */
373 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1); 373 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
374 /* canceled */ 374 /* canceled */
@@ -386,7 +386,7 @@ EFL_START_TEST(test_efl_ui_gesture_flick)
386 /* canceled */ 386 /* canceled */
387 CHECK_ALL(TAP, 1, 0, 0, 1); 387 CHECK_ALL(TAP, 1, 0, 0, 1);
388 /* canceled */ 388 /* canceled */
389 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 389 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
390 /* canceled */ 390 /* canceled */
391 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1); 391 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
392 /* canceled */ 392 /* canceled */
@@ -474,7 +474,7 @@ EFL_START_TEST(test_efl_ui_gesture_zoom)
474 /* canceled */ 474 /* canceled */
475 CHECK_ALL(TAP, 1, 0, 0, 1); 475 CHECK_ALL(TAP, 1, 0, 0, 1);
476 /* canceled */ 476 /* canceled */
477 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 477 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
478 /* canceled */ 478 /* canceled */
479 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1); 479 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
480 /* canceled */ 480 /* canceled */
@@ -502,7 +502,7 @@ EFL_START_TEST(test_efl_ui_gesture_zoom)
502 /* canceled */ 502 /* canceled */
503 CHECK_ALL(TAP, 1, 0, 0, 1); 503 CHECK_ALL(TAP, 1, 0, 0, 1);
504 /* canceled */ 504 /* canceled */
505 CHECK_ALL(LONG_TAP, 1, 0, 0, 1); 505 CHECK_ALL(LONG_PRESS, 1, 0, 0, 1);
506 /* canceled */ 506 /* canceled */
507 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1); 507 CHECK_ALL(DOUBLE_TAP, 1, 0, 0, 1);
508 /* canceled */ 508 /* canceled */
@@ -624,7 +624,7 @@ EFL_END_TEST
624void efl_ui_test_gesture(TCase *tc) 624void efl_ui_test_gesture(TCase *tc)
625{ 625{
626 tcase_add_test(tc, test_efl_ui_gesture_taps); 626 tcase_add_test(tc, test_efl_ui_gesture_taps);
627 tcase_add_test(tc, test_efl_ui_gesture_long_tap); 627 tcase_add_test(tc, test_efl_ui_gesture_long_press);
628 tcase_add_test(tc, test_efl_ui_gesture_flick); 628 tcase_add_test(tc, test_efl_ui_gesture_flick);
629 tcase_add_test(tc, test_efl_ui_gesture_zoom); 629 tcase_add_test(tc, test_efl_ui_gesture_zoom);
630 tcase_add_test(tc, test_efl_ui_gesture_custom); 630 tcase_add_test(tc, test_efl_ui_gesture_custom);