summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-06-20 12:13:37 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-06-20 17:14:54 +0200
commitf77bc6957c1a43af22ae269c57ea0b6914e222b8 (patch)
treeddaf5bc597913acee5d46c669a94eb463e0cf149
parentff97b0ed3dec3e156c9400dba745660643557fd2 (diff)
efl_input_pointer: rename tool to touch_id
tool was not very helpfull, and additionally, the docuemtnation of it was completly wrong. After searching through the code where tool was actaully set (efl_ui_win.c) it turned out that it is actaully the "id" of the pointer when there are multiple touch events. ref T7963 Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es> Differential Revision: https://phab.enlightenment.org/D9135
-rw-r--r--src/lib/ecore_evas/ecore_evas.c6
-rw-r--r--src/lib/efl/interfaces/efl_common_internal.h2
-rw-r--r--src/lib/efl/interfaces/efl_input_types.eot4
-rw-r--r--src/lib/elementary/efl_ui_win.c4
-rw-r--r--src/lib/elementary/efl_ui_win.eo2
-rw-r--r--src/lib/evas/canvas/efl_input_pointer.c18
-rw-r--r--src/lib/evas/canvas/efl_input_pointer.eo9
-rw-r--r--src/lib/evas/canvas/evas_events.c62
-rw-r--r--src/lib/evas/canvas/evas_events_legacy.c14
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_manager.c2
-rw-r--r--src/tests/elementary/elm_test_win.c12
11 files changed, 69 insertions, 66 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 599d7ec9e8..3e12ab5218 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -4819,7 +4819,7 @@ _direct_mouse_updown(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info, Efl_P
4819 if (info->double_click) ev->button_flags |= EFL_POINTER_FLAGS_DOUBLE_CLICK; 4819 if (info->double_click) ev->button_flags |= EFL_POINTER_FLAGS_DOUBLE_CLICK;
4820 if (info->triple_click) ev->button_flags |= EFL_POINTER_FLAGS_TRIPLE_CLICK; 4820 if (info->triple_click) ev->button_flags |= EFL_POINTER_FLAGS_TRIPLE_CLICK;
4821 ev->timestamp = info->timestamp; 4821 ev->timestamp = info->timestamp;
4822 ev->tool = info->multi.device; 4822 ev->touch_id = info->multi.device;
4823 _pointer_position_set(ev, ee, info->x, info->y, info->multi.x, info->multi.y); 4823 _pointer_position_set(ev, ee, info->x, info->y, info->multi.x, info->multi.y);
4824 ev->radius = info->multi.radius; 4824 ev->radius = info->multi.radius;
4825 ev->radius_x = info->multi.radius_x; 4825 ev->radius_x = info->multi.radius_x;
@@ -4880,7 +4880,7 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info)
4880 4880
4881 ev->action = EFL_POINTER_ACTION_MOVE; 4881 ev->action = EFL_POINTER_ACTION_MOVE;
4882 ev->timestamp = info->timestamp; 4882 ev->timestamp = info->timestamp;
4883 ev->tool = info->multi.device; 4883 ev->touch_id = info->multi.device;
4884 _pointer_position_set(ev, ee, info->x, info->y, info->multi.x, info->multi.y); 4884 _pointer_position_set(ev, ee, info->x, info->y, info->multi.x, info->multi.y);
4885 4885
4886 ev->radius = info->multi.radius; 4886 ev->radius = info->multi.radius;
@@ -4996,7 +4996,7 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info)
4996 4996
4997 ev->action = EFL_POINTER_ACTION_AXIS; 4997 ev->action = EFL_POINTER_ACTION_AXIS;
4998 ev->timestamp = info->timestamp; 4998 ev->timestamp = info->timestamp;
4999 ev->tool = info->toolid; 4999 ev->touch_id = info->toolid;
5000 5000
5001 // see also evas_events.c 5001 // see also evas_events.c
5002 for (n = 0; n < info->naxis; n++) 5002 for (n = 0; n < info->naxis; n++)
diff --git a/src/lib/efl/interfaces/efl_common_internal.h b/src/lib/efl/interfaces/efl_common_internal.h
index 11ca0cea07..f465c08f80 100644
--- a/src/lib/efl/interfaces/efl_common_internal.h
+++ b/src/lib/efl/interfaces/efl_common_internal.h
@@ -30,7 +30,7 @@ struct _Efl_Input_Pointer_Data
30 unsigned int timestamp; /* FIXME: store as double? */ 30 unsigned int timestamp; /* FIXME: store as double? */
31 int button; 31 int button;
32 unsigned int pressed_buttons; 32 unsigned int pressed_buttons;
33 int tool; /* finger or tool ID */ 33 int touch_id; /* finger or tool ID */
34 double radius, radius_x, radius_y; 34 double radius, radius_x, radius_y;
35 double pressure, distance, azimuth, tilt, twist; 35 double pressure, distance, azimuth, tilt, twist;
36 double angle; 36 double angle;
diff --git a/src/lib/efl/interfaces/efl_input_types.eot b/src/lib/efl/interfaces/efl_input_types.eot
index eb5f8edeb7..61f3ee922d 100644
--- a/src/lib/efl/interfaces/efl_input_types.eot
+++ b/src/lib/efl/interfaces/efl_input_types.eot
@@ -85,8 +85,8 @@ enum @beta Efl.Input.Value {
85 Prefer the method $button to read this value. Default: 0.]] 85 Prefer the method $button to read this value. Default: 0.]]
86 buttons_pressed, [[32-bit bit mask (unsigned int). Prefer the 86 buttons_pressed, [[32-bit bit mask (unsigned int). Prefer the
87 method $buttons_pressed to read this value. Default: 0.]] 87 method $buttons_pressed to read this value. Default: 0.]]
88 tool, [[ID of the finger or tool (eg. pen) that triggered this event. 88 touch_id, [[ID of the finger or tool (eg. pen) that triggered this event.
89 Prefer the property $tool to read this value. Default: 0.]] 89 Prefer the property $touch_id to read this value. Default: 0.]]
90 x, [[Absolute X position where this event occurred, in pixels. 90 x, [[Absolute X position where this event occurred, in pixels.
91 Relative to the window. Default: last known position. 91 Relative to the window. Default: last known position.
92 This value may be smoothed out or even extrapolated by EFL.]] 92 This value may be smoothed out or even extrapolated by EFL.]]
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 2e24a00b99..508083098b 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2658,8 +2658,8 @@ _efl_ui_win_pointer_iterate(const Eo *obj, Efl_Ui_Win_Data *sd,
2658 ptr = efl_input_pointer_instance_get( (Eo *) obj, (void **) &ptrdata); 2658 ptr = efl_input_pointer_instance_get( (Eo *) obj, (void **) &ptrdata);
2659 if (!ptrdata) break; 2659 if (!ptrdata) break;
2660 2660
2661 ptrdata->tool = evas_touch_point_list_nth_id_get(sd->evas, i); 2661 ptrdata->touch_id = evas_touch_point_list_nth_id_get(sd->evas, i);
2662 _efl_input_value_mark(ptrdata, EFL_INPUT_VALUE_TOOL); 2662 _efl_input_value_mark(ptrdata, EFL_INPUT_VALUE_TOUCH_ID);
2663 2663
2664 // Note that "still" maps to "down" here. 2664 // Note that "still" maps to "down" here.
2665 state = evas_touch_point_list_nth_state_get(sd->evas, i); 2665 state = evas_touch_point_list_nth_state_get(sd->evas, i);
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 1a3e3a4db3..315770daf1 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -734,7 +734,7 @@ class Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Access.W
734 an object of type @Efl.Input.Pointer. 734 an object of type @Efl.Input.Pointer.
735 735
736 Each finger in a multi touch environment can then be identified 736 Each finger in a multi touch environment can then be identified
737 by the @Efl.Input.Pointer.tool property. The order of the pointers 737 by the @Efl.Input.Pointer.touch_id property. The order of the pointers
738 in this iterator is not defined. 738 in this iterator is not defined.
739 739
740 Note: If the input surface supports hovering input, some pointers 740 Note: If the input surface supports hovering input, some pointers
diff --git a/src/lib/evas/canvas/efl_input_pointer.c b/src/lib/evas/canvas/efl_input_pointer.c
index 6c24f88c2c..8b16c5767a 100644
--- a/src/lib/evas/canvas/efl_input_pointer.c
+++ b/src/lib/evas/canvas/efl_input_pointer.c
@@ -316,16 +316,16 @@ _efl_input_pointer_wheel_delta_get(const Eo *obj EINA_UNUSED, Efl_Input_Pointer_
316} 316}
317 317
318EOLIAN static int 318EOLIAN static int
319_efl_input_pointer_tool_get(const Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd) 319_efl_input_pointer_touch_id_get(const Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
320{ 320{
321 return pd->tool; 321 return pd->touch_id;
322} 322}
323 323
324EOLIAN static void 324EOLIAN static void
325_efl_input_pointer_tool_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, int id) 325_efl_input_pointer_touch_id_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, int id)
326{ 326{
327 _efl_input_value_mark(pd, EFL_INPUT_VALUE_TOOL); 327 _efl_input_value_mark(pd, EFL_INPUT_VALUE_TOUCH_ID);
328 pd->tool = id; 328 pd->touch_id = id;
329} 329}
330 330
331EOLIAN static Eina_Bool 331EOLIAN static Eina_Bool
@@ -438,8 +438,8 @@ _efl_input_pointer_value_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Ef
438 pd->pressed_buttons = (int) val; 438 pd->pressed_buttons = (int) val;
439 break; 439 break;
440 440
441 case EFL_INPUT_VALUE_TOOL: 441 case EFL_INPUT_VALUE_TOUCH_ID:
442 pd->tool = (int) val; 442 pd->touch_id = (int) val;
443 break; 443 break;
444 444
445 case EFL_INPUT_VALUE_X: 445 case EFL_INPUT_VALUE_X:
@@ -531,8 +531,8 @@ _efl_input_pointer_value_get(const Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *
531 case EFL_INPUT_VALUE_BUTTONS_PRESSED: 531 case EFL_INPUT_VALUE_BUTTONS_PRESSED:
532 return (double) pd->pressed_buttons; 532 return (double) pd->pressed_buttons;
533 533
534 case EFL_INPUT_VALUE_TOOL: 534 case EFL_INPUT_VALUE_TOUCH_ID:
535 return (double) pd->tool; 535 return (double) pd->touch_id;
536 536
537 case EFL_INPUT_VALUE_X: 537 case EFL_INPUT_VALUE_X:
538 return pd->cur.x; 538 return pd->cur.x;
diff --git a/src/lib/evas/canvas/efl_input_pointer.eo b/src/lib/evas/canvas/efl_input_pointer.eo
index 852c3b143c..f50b511d20 100644
--- a/src/lib/evas/canvas/efl_input_pointer.eo
+++ b/src/lib/evas/canvas/efl_input_pointer.eo
@@ -102,10 +102,13 @@ class @beta Efl.Input.Pointer extends Efl.Object implements Efl.Input.Event, Efl
102 pos: Eina.Position2D; [[The position of the event, in pixels.]] 102 pos: Eina.Position2D; [[The position of the event, in pixels.]]
103 } 103 }
104 } 104 }
105 @property tool { 105 @property touch_id {
106 [[ID of the tool (eg. pen) that triggered this event.]] 106 [[TThe ID associated with this pointer.
107
108 In case there are multiple pointers (for example when multiple fingers are touching the screen) this number uniquely identifies each pointer, for as long as it is present. This is, when a finger is lifted its ID can be later reused by another finger touching the screen.
109 ]]
107 values { 110 values {
108 id: int; [[Tool ID]] 111 id: int; [[An ID uniquely identifying this pointer among the currently present pointers.]]
109 } 112 }
110 } 113 }
111 @property source { 114 @property source {
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 9dfa24ca39..8ab6bf4cd4 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -476,7 +476,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
476 _transform_to_src_space_f(obj, src, &ev->cur); 476 _transform_to_src_space_f(obj, src, &ev->cur);
477 point = ev->cur; 477 point = ev->cur;
478 ev->source = eo_obj; 478 ev->source = eo_obj;
479 ev->tool = 0; 479 ev->touch_id = 0;
480 480
481 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child) 481 EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child)
482 { 482 {
@@ -626,7 +626,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
626 curpt = ev->cur; 626 curpt = ev->cur;
627 prevpt = ev->prev; 627 prevpt = ev->prev;
628 ev->source = eo_obj; 628 ev->source = eo_obj;
629 ev->tool = 0; 629 ev->touch_id = 0;
630 630
631 if (pdata->seat->mouse_grabbed) 631 if (pdata->seat->mouse_grabbed)
632 { 632 {
@@ -663,7 +663,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
663 else 663 else
664 outs = eina_list_append(outs, eo_child); 664 outs = eina_list_append(outs, eo_child);
665 if (e->delete_me || e->is_frozen) break; 665 if (e->delete_me || e->is_frozen) break;
666 //FIXME: take care nograb object 666 //FIXME: take care nograb object
667 } 667 }
668 eina_list_free(copy); 668 eina_list_free(copy);
669 669
@@ -836,7 +836,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e,
836 _transform_to_src_space_f(obj, src, &ev->cur); 836 _transform_to_src_space_f(obj, src, &ev->cur);
837 point = ev->cur; 837 point = ev->cur;
838 ev->source = eo_obj; 838 ev->source = eo_obj;
839 ev->tool = 0; 839 ev->touch_id = 0;
840 840
841 copy = evas_event_list_copy(src->proxy->src_event_in); 841 copy = evas_event_list_copy(src->proxy->src_event_in);
842 EINA_LIST_FOREACH(copy, l, eo_child) 842 EINA_LIST_FOREACH(copy, l, eo_child)
@@ -1400,7 +1400,7 @@ evas_event_objects_event_list(Evas *eo_e, Evas_Object *stop, int x, int y)
1400 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 1400 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
1401 1401
1402 if ((!e->layers) || (e->is_frozen)) return NULL; 1402 if ((!e->layers) || (e->is_frozen)) return NULL;
1403 D("------------------------------GET EVETNS AT ............... %i %i\n", x, y); 1403 D("------------------------------GET EVETNS AT ............... %i %i\n", x, y);
1404 return _evas_event_objects_event_list_no_frozen_check(eo_e, stop, x, y); 1404 return _evas_event_objects_event_list_no_frozen_check(eo_e, stop, x, y);
1405} 1405}
1406 1406
@@ -1515,7 +1515,7 @@ _canvas_event_feed_mouse_down_internal(Evas_Public_Data *e, Efl_Input_Pointer_Da
1515 _efl_input_value_mask(EFL_INPUT_VALUE_TIMESTAMP) | 1515 _efl_input_value_mask(EFL_INPUT_VALUE_TIMESTAMP) |
1516 _efl_input_value_mask(EFL_INPUT_VALUE_X) | 1516 _efl_input_value_mask(EFL_INPUT_VALUE_X) |
1517 _efl_input_value_mask(EFL_INPUT_VALUE_Y) | 1517 _efl_input_value_mask(EFL_INPUT_VALUE_Y) |
1518 _efl_input_value_mask(EFL_INPUT_VALUE_TOOL) | 1518 _efl_input_value_mask(EFL_INPUT_VALUE_TOUCH_ID) |
1519 _efl_input_value_mask(EFL_INPUT_VALUE_BUTTON); 1519 _efl_input_value_mask(EFL_INPUT_VALUE_BUTTON);
1520 1520
1521 if (!e || !ev) return; 1521 if (!e || !ev) return;
@@ -1544,7 +1544,7 @@ _canvas_event_feed_mouse_down_internal(Evas_Public_Data *e, Efl_Input_Pointer_Da
1544 ev->modifiers = &(e->modifiers); 1544 ev->modifiers = &(e->modifiers);
1545 ev->locks = &(e->locks); 1545 ev->locks = &(e->locks);
1546 ev->event_flags = e->default_event_flags; 1546 ev->event_flags = e->default_event_flags;
1547 ev->tool = 0; 1547 ev->touch_id = 0;
1548 ev->action = EFL_POINTER_ACTION_DOWN; 1548 ev->action = EFL_POINTER_ACTION_DOWN;
1549 ev->value_flags |= value_flags; 1549 ev->value_flags |= value_flags;
1550 if (ev->device) efl_ref(ev->device); 1550 if (ev->device) efl_ref(ev->device);
@@ -1763,7 +1763,7 @@ _canvas_event_feed_mouse_up_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data
1763 _efl_input_value_mask(EFL_INPUT_VALUE_TIMESTAMP) | 1763 _efl_input_value_mask(EFL_INPUT_VALUE_TIMESTAMP) |
1764 _efl_input_value_mask(EFL_INPUT_VALUE_X) | 1764 _efl_input_value_mask(EFL_INPUT_VALUE_X) |
1765 _efl_input_value_mask(EFL_INPUT_VALUE_Y) | 1765 _efl_input_value_mask(EFL_INPUT_VALUE_Y) |
1766 _efl_input_value_mask(EFL_INPUT_VALUE_TOOL) | 1766 _efl_input_value_mask(EFL_INPUT_VALUE_TOUCH_ID) |
1767 _efl_input_value_mask(EFL_INPUT_VALUE_BUTTON); 1767 _efl_input_value_mask(EFL_INPUT_VALUE_BUTTON);
1768 1768
1769 if (!e || !ev) return; 1769 if (!e || !ev) return;
@@ -1793,7 +1793,7 @@ _canvas_event_feed_mouse_up_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data
1793 ev->modifiers = &(e->modifiers); 1793 ev->modifiers = &(e->modifiers);
1794 ev->locks = &(e->locks); 1794 ev->locks = &(e->locks);
1795 ev->event_flags = e->default_event_flags; 1795 ev->event_flags = e->default_event_flags;
1796 ev->tool = 0; 1796 ev->touch_id = 0;
1797 ev->value_flags |= value_flags; 1797 ev->value_flags |= value_flags;
1798 if (ev->device) efl_ref(ev->device); 1798 if (ev->device) efl_ref(ev->device);
1799 1799
@@ -1935,7 +1935,7 @@ _canvas_event_feed_mouse_cancel_internal(Evas_Public_Data *e, Efl_Input_Pointer_
1935 _efl_input_value_mask(EFL_INPUT_VALUE_TIMESTAMP) | 1935 _efl_input_value_mask(EFL_INPUT_VALUE_TIMESTAMP) |
1936 _efl_input_value_mask(EFL_INPUT_VALUE_X) | 1936 _efl_input_value_mask(EFL_INPUT_VALUE_X) |
1937 _efl_input_value_mask(EFL_INPUT_VALUE_Y) | 1937 _efl_input_value_mask(EFL_INPUT_VALUE_Y) |
1938 _efl_input_value_mask(EFL_INPUT_VALUE_TOOL); 1938 _efl_input_value_mask(EFL_INPUT_VALUE_TOUCH_ID);
1939 1939
1940 if (!e || !ev) return; 1940 if (!e || !ev) return;
1941 if (e->is_frozen) return; 1941 if (e->is_frozen) return;
@@ -1966,7 +1966,7 @@ _canvas_event_feed_mouse_cancel_internal(Evas_Public_Data *e, Efl_Input_Pointer_
1966 (point->state == EVAS_TOUCH_POINT_MOVE) || 1966 (point->state == EVAS_TOUCH_POINT_MOVE) ||
1967 (point->state == EVAS_TOUCH_POINT_STILL)) 1967 (point->state == EVAS_TOUCH_POINT_STILL))
1968 { 1968 {
1969 ev->tool = point->id; 1969 ev->touch_id = point->id;
1970 ev->cur.x = point->x; 1970 ev->cur.x = point->x;
1971 ev->cur.y = point->y; 1971 ev->cur.y = point->y;
1972 ev->prev = ev->cur; 1972 ev->prev = ev->cur;
@@ -2117,7 +2117,7 @@ _canvas_event_feed_mouse_move_internal(Evas_Public_Data *e, Efl_Input_Pointer_Da
2117 _efl_input_value_mask(EFL_INPUT_VALUE_DX) | 2117 _efl_input_value_mask(EFL_INPUT_VALUE_DX) |
2118 _efl_input_value_mask(EFL_INPUT_VALUE_DY) | 2118 _efl_input_value_mask(EFL_INPUT_VALUE_DY) |
2119 _efl_input_value_mask(EFL_INPUT_VALUE_BUTTONS_PRESSED) | 2119 _efl_input_value_mask(EFL_INPUT_VALUE_BUTTONS_PRESSED) |
2120 _efl_input_value_mask(EFL_INPUT_VALUE_TOOL); 2120 _efl_input_value_mask(EFL_INPUT_VALUE_TOUCH_ID);
2121 2121
2122 if (!e || !ev) return; 2122 if (!e || !ev) return;
2123 if (e->is_frozen) return; 2123 if (e->is_frozen) return;
@@ -2165,7 +2165,7 @@ _canvas_event_feed_mouse_move_internal(Evas_Public_Data *e, Efl_Input_Pointer_Da
2165 ev->locks = &(e->locks); 2165 ev->locks = &(e->locks);
2166 ev->event_flags = e->default_event_flags; 2166 ev->event_flags = e->default_event_flags;
2167 ev->pressed_buttons = pdata->button; 2167 ev->pressed_buttons = pdata->button;
2168 ev->tool = 0; 2168 ev->touch_id = 0;
2169 ev->value_flags |= value_flags; 2169 ev->value_flags |= value_flags;
2170 if (ev->device) efl_ref(ev->device); 2170 if (ev->device) efl_ref(ev->device);
2171 2171
@@ -2565,7 +2565,7 @@ _canvas_event_feed_mouse_in_internal(Evas *eo_e, Efl_Input_Pointer_Data *ev)
2565 _efl_input_value_mask(EFL_INPUT_VALUE_X) | 2565 _efl_input_value_mask(EFL_INPUT_VALUE_X) |
2566 _efl_input_value_mask(EFL_INPUT_VALUE_Y) | 2566 _efl_input_value_mask(EFL_INPUT_VALUE_Y) |
2567 _efl_input_value_mask(EFL_INPUT_VALUE_BUTTONS_PRESSED) | 2567 _efl_input_value_mask(EFL_INPUT_VALUE_BUTTONS_PRESSED) |
2568 _efl_input_value_mask(EFL_INPUT_VALUE_TOOL); 2568 _efl_input_value_mask(EFL_INPUT_VALUE_TOUCH_ID);
2569 2569
2570 if (!e || !ev) return; 2570 if (!e || !ev) return;
2571 EVAS_EVENT_FEED_SAFETY_CHECK(e); 2571 EVAS_EVENT_FEED_SAFETY_CHECK(e);
@@ -2668,7 +2668,7 @@ _canvas_event_feed_mouse_out_internal(Evas *eo_e, Efl_Input_Pointer_Data *ev)
2668 _efl_input_value_mask(EFL_INPUT_VALUE_X) | 2668 _efl_input_value_mask(EFL_INPUT_VALUE_X) |
2669 _efl_input_value_mask(EFL_INPUT_VALUE_Y) | 2669 _efl_input_value_mask(EFL_INPUT_VALUE_Y) |
2670 _efl_input_value_mask(EFL_INPUT_VALUE_BUTTONS_PRESSED) | 2670 _efl_input_value_mask(EFL_INPUT_VALUE_BUTTONS_PRESSED) |
2671 _efl_input_value_mask(EFL_INPUT_VALUE_TOOL); 2671 _efl_input_value_mask(EFL_INPUT_VALUE_TOUCH_ID);
2672 2672
2673 if (!e || !ev) return; 2673 if (!e || !ev) return;
2674 EVAS_EVENT_FEED_SAFETY_CHECK(e); 2674 EVAS_EVENT_FEED_SAFETY_CHECK(e);
@@ -2797,7 +2797,7 @@ _canvas_event_feed_multi_down_internal(Evas_Public_Data *e, Efl_Input_Pointer_Da
2797 _efl_input_value_mask(EFL_INPUT_VALUE_TIMESTAMP) | 2797 _efl_input_value_mask(EFL_INPUT_VALUE_TIMESTAMP) |
2798 _efl_input_value_mask(EFL_INPUT_VALUE_X) | 2798 _efl_input_value_mask(EFL_INPUT_VALUE_X) |
2799 _efl_input_value_mask(EFL_INPUT_VALUE_Y) | 2799 _efl_input_value_mask(EFL_INPUT_VALUE_Y) |
2800 _efl_input_value_mask(EFL_INPUT_VALUE_TOOL) | 2800 _efl_input_value_mask(EFL_INPUT_VALUE_TOUCH_ID) |
2801 _efl_input_value_mask(EFL_INPUT_VALUE_BUTTON); 2801 _efl_input_value_mask(EFL_INPUT_VALUE_BUTTON);
2802 2802
2803 if (!e || !ev) return; 2803 if (!e || !ev) return;
@@ -2807,7 +2807,7 @@ _canvas_event_feed_multi_down_internal(Evas_Public_Data *e, Efl_Input_Pointer_Da
2807 if (!pdata) return; 2807 if (!pdata) return;
2808 eo_e = e->evas; 2808 eo_e = e->evas;
2809 DBG("ButtonEvent:multi down time=%u x=%.1f y=%.1f button=%d downs=%d", 2809 DBG("ButtonEvent:multi down time=%u x=%.1f y=%.1f button=%d downs=%d",
2810 ev->timestamp, ev->cur.x, ev->cur.y, ev->tool, pdata->seat->downs); 2810 ev->timestamp, ev->cur.x, ev->cur.y, ev->touch_id, pdata->seat->downs);
2811 pdata->seat->downs++; 2811 pdata->seat->downs++;
2812 if (e->is_frozen) return; 2812 if (e->is_frozen) return;
2813 e->last_timestamp = ev->timestamp; 2813 e->last_timestamp = ev->timestamp;
@@ -2825,7 +2825,7 @@ _canvas_event_feed_multi_down_internal(Evas_Public_Data *e, Efl_Input_Pointer_Da
2825 2825
2826 _evas_walk(e); 2826 _evas_walk(e);
2827 /* append new touch point to the touch point list */ 2827 /* append new touch point to the touch point list */
2828 _evas_touch_point_append(eo_e, ev->tool, ev->cur.x, ev->cur.y); 2828 _evas_touch_point_append(eo_e, ev->touch_id, ev->cur.x, ev->cur.y);
2829 if (pdata->seat->mouse_grabbed == 0) 2829 if (pdata->seat->mouse_grabbed == 0)
2830 { 2830 {
2831 if (pdata->seat->downs > 1) addgrab = pdata->seat->downs - 1; 2831 if (pdata->seat->downs > 1) addgrab = pdata->seat->downs - 1;
@@ -2869,7 +2869,7 @@ _canvas_event_feed_multi_down_internal(Evas_Public_Data *e, Efl_Input_Pointer_Da
2869 2869
2870 _evas_post_event_callback_call(eo_e, e, event_id); 2870 _evas_post_event_callback_call(eo_e, e, event_id);
2871 /* update touch point's state to EVAS_TOUCH_POINT_STILL */ 2871 /* update touch point's state to EVAS_TOUCH_POINT_STILL */
2872 _evas_touch_point_update(eo_e, ev->tool, ev->cur.x, ev->cur.y, EVAS_TOUCH_POINT_STILL); 2872 _evas_touch_point_update(eo_e, ev->touch_id, ev->cur.x, ev->cur.y, EVAS_TOUCH_POINT_STILL);
2873 _evas_unwalk(e); 2873 _evas_unwalk(e);
2874 2874
2875 if (ev->device) efl_unref(ev->device); 2875 if (ev->device) efl_unref(ev->device);
@@ -2890,7 +2890,7 @@ _canvas_event_feed_multi_up_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data
2890 _efl_input_value_mask(EFL_INPUT_VALUE_TIMESTAMP) | 2890 _efl_input_value_mask(EFL_INPUT_VALUE_TIMESTAMP) |
2891 _efl_input_value_mask(EFL_INPUT_VALUE_X) | 2891 _efl_input_value_mask(EFL_INPUT_VALUE_X) |
2892 _efl_input_value_mask(EFL_INPUT_VALUE_Y) | 2892 _efl_input_value_mask(EFL_INPUT_VALUE_Y) |
2893 _efl_input_value_mask(EFL_INPUT_VALUE_TOOL); 2893 _efl_input_value_mask(EFL_INPUT_VALUE_TOUCH_ID);
2894 2894
2895 if (!e || !ev) return; 2895 if (!e || !ev) return;
2896 EVAS_EVENT_FEED_SAFETY_CHECK(e); 2896 EVAS_EVENT_FEED_SAFETY_CHECK(e);
@@ -2899,7 +2899,7 @@ _canvas_event_feed_multi_up_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data
2899 if (!pdata) return; 2899 if (!pdata) return;
2900 eo_e = e->evas; 2900 eo_e = e->evas;
2901 DBG("ButtonEvent:multi up time=%u x=%.1f y=%.1f device=%d downs=%d", 2901 DBG("ButtonEvent:multi up time=%u x=%.1f y=%.1f device=%d downs=%d",
2902 ev->timestamp, ev->cur.x, ev->cur.y, ev->tool, pdata->seat->downs); 2902 ev->timestamp, ev->cur.x, ev->cur.y, ev->touch_id, pdata->seat->downs);
2903 if (pdata->seat->downs <= 0) return; 2903 if (pdata->seat->downs <= 0) return;
2904 pdata->seat->downs--; 2904 pdata->seat->downs--;
2905 if (e->is_frozen) return; 2905 if (e->is_frozen) return;
@@ -2918,7 +2918,7 @@ _canvas_event_feed_multi_up_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data
2918 2918
2919 _evas_walk(e); 2919 _evas_walk(e);
2920 /* update released touch point */ 2920 /* update released touch point */
2921 _evas_touch_point_update(eo_e, ev->tool, ev->cur.x, ev->cur.y, EVAS_TOUCH_POINT_UP); 2921 _evas_touch_point_update(eo_e, ev->touch_id, ev->cur.x, ev->cur.y, EVAS_TOUCH_POINT_UP);
2922 copy = evas_event_list_copy(pdata->seat->object.in); 2922 copy = evas_event_list_copy(pdata->seat->object.in);
2923 EINA_LIST_FOREACH(copy, l, eo_obj) 2923 EINA_LIST_FOREACH(copy, l, eo_obj)
2924 { 2924 {
@@ -2954,7 +2954,7 @@ _canvas_event_feed_multi_up_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data
2954 } 2954 }
2955 2955
2956 /* remove released touch point from the touch point list */ 2956 /* remove released touch point from the touch point list */
2957 _evas_touch_point_remove(eo_e, ev->tool); 2957 _evas_touch_point_remove(eo_e, ev->touch_id);
2958 _evas_unwalk(e); 2958 _evas_unwalk(e);
2959 2959
2960 if (ev->device) efl_unref(ev->device); 2960 if (ev->device) efl_unref(ev->device);
@@ -2981,7 +2981,7 @@ _canvas_event_feed_multi_internal(Evas *eo_e, Evas_Public_Data *e,
2981 if (EINA_DBL_EQ(fy, 0.0)) fy = y; 2981 if (EINA_DBL_EQ(fy, 0.0)) fy = y;
2982 2982
2983 ev->action = action; 2983 ev->action = action;
2984 ev->tool = d; 2984 ev->touch_id = d;
2985 ev->cur.x = fx; 2985 ev->cur.x = fx;
2986 ev->cur.y = fy; 2986 ev->cur.y = fy;
2987 ev->pressure = pres; 2987 ev->pressure = pres;
@@ -3071,7 +3071,7 @@ _canvas_event_feed_multi_move_internal(Evas_Public_Data *e, Efl_Input_Pointer_Da
3071 _efl_input_value_mask(EFL_INPUT_VALUE_TIMESTAMP) | 3071 _efl_input_value_mask(EFL_INPUT_VALUE_TIMESTAMP) |
3072 _efl_input_value_mask(EFL_INPUT_VALUE_X) | 3072 _efl_input_value_mask(EFL_INPUT_VALUE_X) |
3073 _efl_input_value_mask(EFL_INPUT_VALUE_Y) | 3073 _efl_input_value_mask(EFL_INPUT_VALUE_Y) |
3074 _efl_input_value_mask(EFL_INPUT_VALUE_TOOL); 3074 _efl_input_value_mask(EFL_INPUT_VALUE_TOUCH_ID);
3075 3075
3076 if (!e || !ev) return; 3076 if (!e || !ev) return;
3077 EVAS_EVENT_FEED_SAFETY_CHECK(e); 3077 EVAS_EVENT_FEED_SAFETY_CHECK(e);
@@ -3098,7 +3098,7 @@ _canvas_event_feed_multi_move_internal(Evas_Public_Data *e, Efl_Input_Pointer_Da
3098 3098
3099 _evas_walk(e); 3099 _evas_walk(e);
3100 /* update moved touch point */ 3100 /* update moved touch point */
3101 _evas_touch_point_update(eo_e, ev->tool, ev->cur.x, ev->cur.y, EVAS_TOUCH_POINT_MOVE); 3101 _evas_touch_point_update(eo_e, ev->touch_id, ev->cur.x, ev->cur.y, EVAS_TOUCH_POINT_MOVE);
3102 /* if our mouse button is grabbed to any objects */ 3102 /* if our mouse button is grabbed to any objects */
3103 if (pdata->seat->mouse_grabbed > 0) 3103 if (pdata->seat->mouse_grabbed > 0)
3104 { 3104 {
@@ -3631,7 +3631,7 @@ evas_event_feed_axis_update(Evas *eo_e, unsigned int timestamp, int device, int
3631 ev->data = (void *) data; 3631 ev->data = (void *) data;
3632 ev->timestamp = timestamp; 3632 ev->timestamp = timestamp;
3633 ev->action = EFL_POINTER_ACTION_AXIS; 3633 ev->action = EFL_POINTER_ACTION_AXIS;
3634 ev->tool = toolid; 3634 ev->touch_id = toolid;
3635 3635
3636 // see also ecore_evas.c 3636 // see also ecore_evas.c
3637 for (n = 0; n < naxis; n++) 3637 for (n = 0; n < naxis; n++)
@@ -3978,7 +3978,7 @@ _efl_canvas_object_efl_canvas_pointer_pointer_inside_get(const Eo *eo_obj,
3978 if (!obj->is_smart) 3978 if (!obj->is_smart)
3979 return obj_pdata->mouse_in; 3979 return obj_pdata->mouse_in;
3980 3980
3981 /* This is to keep the legacy APIs evas_object_pointer_inside_by_device_get() & 3981 /* This is to keep the legacy APIs evas_object_pointer_inside_by_device_get() &
3982 * evas_object_pointer_inside_get() old behaviour. */ 3982 * evas_object_pointer_inside_get() old behaviour. */
3983 if (obj->is_pointer_inside_legacy) return EINA_FALSE; 3983 if (obj->is_pointer_inside_legacy) return EINA_FALSE;
3984 3984
@@ -4130,21 +4130,21 @@ _evas_canvas_event_pointer_cb(void *data, const Efl_Event *event)
4130 switch (ev->action) 4130 switch (ev->action)
4131 { 4131 {
4132 case EFL_POINTER_ACTION_MOVE: 4132 case EFL_POINTER_ACTION_MOVE:
4133 if (ev->tool == 0) 4133 if (ev->touch_id == 0)
4134 _canvas_event_feed_mouse_move_internal(e, ev); 4134 _canvas_event_feed_mouse_move_internal(e, ev);
4135 else 4135 else
4136 _canvas_event_feed_multi_move_internal(e, ev); 4136 _canvas_event_feed_multi_move_internal(e, ev);
4137 break; 4137 break;
4138 4138
4139 case EFL_POINTER_ACTION_DOWN: 4139 case EFL_POINTER_ACTION_DOWN:
4140 if (ev->tool == 0) 4140 if (ev->touch_id == 0)
4141 _canvas_event_feed_mouse_down_internal(e, ev); 4141 _canvas_event_feed_mouse_down_internal(e, ev);
4142 else 4142 else
4143 _canvas_event_feed_multi_down_internal(e, ev); 4143 _canvas_event_feed_multi_down_internal(e, ev);
4144 break; 4144 break;
4145 4145
4146 case EFL_POINTER_ACTION_UP: 4146 case EFL_POINTER_ACTION_UP:
4147 if (ev->tool == 0) 4147 if (ev->touch_id == 0)
4148 _canvas_event_feed_mouse_up_internal(e, ev); 4148 _canvas_event_feed_mouse_up_internal(e, ev);
4149 else 4149 else
4150 _canvas_event_feed_multi_up_internal(e, ev); 4150 _canvas_event_feed_multi_up_internal(e, ev);
diff --git a/src/lib/evas/canvas/evas_events_legacy.c b/src/lib/evas/canvas/evas_events_legacy.c
index 37059068c7..4675735727 100644
--- a/src/lib/evas/canvas/evas_events_legacy.c
+++ b/src/lib/evas/canvas/evas_events_legacy.c
@@ -89,7 +89,7 @@ efl_input_pointer_legacy_info_fill(Evas *eo_evas, Efl_Input_Key *eo_ev, Evas_Cal
89 } 89 }
90 90
91 case EFL_POINTER_ACTION_DOWN: 91 case EFL_POINTER_ACTION_DOWN:
92 if (ev->tool == 0) 92 if (ev->touch_id == 0)
93 { 93 {
94 // filter out MULTI with finger 0, valid for eo, invalid for legacy 94 // filter out MULTI with finger 0, valid for eo, invalid for legacy
95 if (type == EVAS_CALLBACK_MULTI_DOWN) 95 if (type == EVAS_CALLBACK_MULTI_DOWN)
@@ -116,7 +116,7 @@ efl_input_pointer_legacy_info_fill(Evas *eo_evas, Efl_Input_Key *eo_ev, Evas_Cal
116 { 116 {
117 TYPE_CHK(MULTI_DOWN); 117 TYPE_CHK(MULTI_DOWN);
118 Evas_Event_Multi_Down *e = _event_alloc(ev->legacy); 118 Evas_Event_Multi_Down *e = _event_alloc(ev->legacy);
119 e->device = ev->tool; 119 e->device = ev->touch_id;
120 e->radius = ev->radius; 120 e->radius = ev->radius;
121 e->radius_x = ev->radius_x; 121 e->radius_x = ev->radius_x;
122 e->radius_y = ev->radius_y; 122 e->radius_y = ev->radius_y;
@@ -140,7 +140,7 @@ efl_input_pointer_legacy_info_fill(Evas *eo_evas, Efl_Input_Key *eo_ev, Evas_Cal
140 } 140 }
141 141
142 case EFL_POINTER_ACTION_UP: 142 case EFL_POINTER_ACTION_UP:
143 if (ev->tool == 0) 143 if (ev->touch_id == 0)
144 { 144 {
145 // filter out MULTI with finger 0, valid for eo, invalid for legacy 145 // filter out MULTI with finger 0, valid for eo, invalid for legacy
146 if (type == EVAS_CALLBACK_MULTI_UP) 146 if (type == EVAS_CALLBACK_MULTI_UP)
@@ -167,7 +167,7 @@ efl_input_pointer_legacy_info_fill(Evas *eo_evas, Efl_Input_Key *eo_ev, Evas_Cal
167 { 167 {
168 TYPE_CHK(MULTI_UP); 168 TYPE_CHK(MULTI_UP);
169 Evas_Event_Multi_Up *e = _event_alloc(ev->legacy); 169 Evas_Event_Multi_Up *e = _event_alloc(ev->legacy);
170 e->device = ev->tool; 170 e->device = ev->touch_id;
171 e->radius = ev->radius; 171 e->radius = ev->radius;
172 e->radius_x = ev->radius_x; 172 e->radius_x = ev->radius_x;
173 e->radius_y = ev->radius_y; 173 e->radius_y = ev->radius_y;
@@ -191,7 +191,7 @@ efl_input_pointer_legacy_info_fill(Evas *eo_evas, Efl_Input_Key *eo_ev, Evas_Cal
191 } 191 }
192 192
193 case EFL_POINTER_ACTION_MOVE: 193 case EFL_POINTER_ACTION_MOVE:
194 if (ev->tool == 0) 194 if (ev->touch_id == 0)
195 { 195 {
196 // filter out MULTI with finger 0, valid for eo, invalid for legacy 196 // filter out MULTI with finger 0, valid for eo, invalid for legacy
197 if (type == EVAS_CALLBACK_MULTI_MOVE) 197 if (type == EVAS_CALLBACK_MULTI_MOVE)
@@ -220,7 +220,7 @@ efl_input_pointer_legacy_info_fill(Evas *eo_evas, Efl_Input_Key *eo_ev, Evas_Cal
220 { 220 {
221 TYPE_CHK(MULTI_MOVE); 221 TYPE_CHK(MULTI_MOVE);
222 Evas_Event_Multi_Move *e = _event_alloc(ev->legacy); 222 Evas_Event_Multi_Move *e = _event_alloc(ev->legacy);
223 e->device = ev->tool; 223 e->device = ev->touch_id;
224 e->radius = ev->radius; 224 e->radius = ev->radius;
225 e->radius_x = ev->radius_x; 225 e->radius_x = ev->radius_x;
226 e->radius_y = ev->radius_y; 226 e->radius_y = ev->radius_y;
@@ -274,7 +274,7 @@ efl_input_pointer_legacy_info_fill(Evas *eo_evas, Efl_Input_Key *eo_ev, Evas_Cal
274 e->dev = ev->device; 274 e->dev = ev->device;
275 /* FIXME: Get device id from above device object. 0 for now. */ 275 /* FIXME: Get device id from above device object. 0 for now. */
276 e->device = 0; 276 e->device = 0;
277 e->toolid = ev->tool; 277 e->toolid = ev->touch_id;
278 e->axis = malloc(sizeof(Evas_Axis) * 11); 278 e->axis = malloc(sizeof(Evas_Axis) * 11);
279 e->axis[e->naxis].label = EVAS_AXIS_LABEL_WINDOW_X; 279 e->axis[e->naxis].label = EVAS_AXIS_LABEL_WINDOW_X;
280 e->axis[e->naxis].value = ev->cur.x; 280 e->axis[e->naxis].value = ev->cur.x;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.c b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
index 4fbb4d49ee..fb934c6df1 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.c
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.c
@@ -180,7 +180,7 @@ _efl_canvas_gesture_manager_filter_event(Eo *obj, Eo *target, void *event)
180 eina_hash_add(pd->m_object_events, &gesture_type, touch_event); 180 eina_hash_add(pd->m_object_events, &gesture_type, touch_event);
181 } 181 }
182 182
183 efl_gesture_touch_point_record(touch_event, pointer_data->tool, pointer_data->cur, 183 efl_gesture_touch_point_record(touch_event, pointer_data->touch_id, pointer_data->cur,
184 pointer_data->timestamp, pointer_data->action); 184 pointer_data->timestamp, pointer_data->action);
185 185
186 //This is for handling the case that mouse event pairs dont match. 186 //This is for handling the case that mouse event pairs dont match.
diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c
index bf98148534..dc335bff68 100644
--- a/src/tests/elementary/elm_test_win.c
+++ b/src/tests/elementary/elm_test_win.c
@@ -283,7 +283,7 @@ _inputs_timer1_cb(void *data)
283 { 283 {
284 ptr = efl_add(EFL_INPUT_POINTER_CLASS, win); 284 ptr = efl_add(EFL_INPUT_POINTER_CLASS, win);
285 efl_input_pointer_position_set(ptr, points[0][i]); 285 efl_input_pointer_position_set(ptr, points[0][i]);
286 efl_input_pointer_tool_set(ptr, i); 286 efl_input_pointer_touch_id_set(ptr, i);
287 efl_input_pointer_button_set(ptr, 1); 287 efl_input_pointer_button_set(ptr, 1);
288 288
289 if (i == 0) 289 if (i == 0)
@@ -323,12 +323,12 @@ _inputs_timer2_cb(void *data)
323 323
324 fail_if(!efl_input_pointer_value_has_get(ptr, EFL_INPUT_VALUE_X)); 324 fail_if(!efl_input_pointer_value_has_get(ptr, EFL_INPUT_VALUE_X));
325 fail_if(!efl_input_pointer_value_has_get(ptr, EFL_INPUT_VALUE_Y)); 325 fail_if(!efl_input_pointer_value_has_get(ptr, EFL_INPUT_VALUE_Y));
326 fail_if(!efl_input_pointer_value_has_get(ptr, EFL_INPUT_VALUE_TOOL)); 326 fail_if(!efl_input_pointer_value_has_get(ptr, EFL_INPUT_VALUE_TOUCH_ID));
327 fail_if(efl_input_pointer_action_get(ptr) != EFL_POINTER_ACTION_DOWN); 327 fail_if(efl_input_pointer_action_get(ptr) != EFL_POINTER_ACTION_DOWN);
328 328
329 x = efl_input_pointer_value_get(ptr, EFL_INPUT_VALUE_X); 329 x = efl_input_pointer_value_get(ptr, EFL_INPUT_VALUE_X);
330 y = efl_input_pointer_value_get(ptr, EFL_INPUT_VALUE_Y); 330 y = efl_input_pointer_value_get(ptr, EFL_INPUT_VALUE_Y);
331 tool = efl_input_pointer_tool_get(ptr); 331 tool = efl_input_pointer_touch_id_get(ptr);
332 332
333 for (i = 0; i < 4; i++) 333 for (i = 0; i < 4; i++)
334 if (tool == i) 334 if (tool == i)
@@ -350,7 +350,7 @@ _inputs_timer2_cb(void *data)
350 { 350 {
351 ptr = efl_add(EFL_INPUT_POINTER_CLASS, win); 351 ptr = efl_add(EFL_INPUT_POINTER_CLASS, win);
352 efl_input_pointer_position_set(ptr, points[1][i]); 352 efl_input_pointer_position_set(ptr, points[1][i]);
353 efl_input_pointer_tool_set(ptr, i); 353 efl_input_pointer_touch_id_set(ptr, i);
354 efl_input_pointer_button_set(ptr, 1); 354 efl_input_pointer_button_set(ptr, 1);
355 355
356 /* move first */ 356 /* move first */
@@ -386,12 +386,12 @@ _inputs_timer3_cb(void *data)
386 386
387 fail_if(!efl_input_pointer_value_has_get(ptr, EFL_INPUT_VALUE_X)); 387 fail_if(!efl_input_pointer_value_has_get(ptr, EFL_INPUT_VALUE_X));
388 fail_if(!efl_input_pointer_value_has_get(ptr, EFL_INPUT_VALUE_Y)); 388 fail_if(!efl_input_pointer_value_has_get(ptr, EFL_INPUT_VALUE_Y));
389 fail_if(!efl_input_pointer_value_has_get(ptr, EFL_INPUT_VALUE_TOOL)); 389 fail_if(!efl_input_pointer_value_has_get(ptr, EFL_INPUT_VALUE_TOUCH_ID));
390 fail_if(efl_input_pointer_action_get(ptr) != EFL_POINTER_ACTION_MOVE); 390 fail_if(efl_input_pointer_action_get(ptr) != EFL_POINTER_ACTION_MOVE);
391 391
392 x = efl_input_pointer_value_get(ptr, EFL_INPUT_VALUE_X); 392 x = efl_input_pointer_value_get(ptr, EFL_INPUT_VALUE_X);
393 y = efl_input_pointer_value_get(ptr, EFL_INPUT_VALUE_Y); 393 y = efl_input_pointer_value_get(ptr, EFL_INPUT_VALUE_Y);
394 tool = efl_input_pointer_tool_get(ptr); 394 tool = efl_input_pointer_touch_id_get(ptr);
395 395
396 for (i = 0; i < 4; i++) 396 for (i = 0; i < 4; i++)
397 if (tool == i) 397 if (tool == i)