summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/ecore_evas/ecore_evas.c14
-rw-r--r--src/lib/elementary/efl_ui_win.c2
-rw-r--r--src/lib/evas/Evas_Internal.h6
-rw-r--r--src/lib/evas/canvas/efl_input_event.c2
-rw-r--r--src/lib/evas/canvas/efl_input_focus.c11
-rw-r--r--src/lib/evas/canvas/efl_input_hold.c11
-rw-r--r--src/lib/evas/canvas/efl_input_key.c12
-rw-r--r--src/lib/evas/canvas/efl_input_pointer.c12
-rw-r--r--src/lib/evas/canvas/evas_events.c20
-rw-r--r--src/lib/evas/canvas/evas_focus.c2
-rw-r--r--src/lib/evas/canvas/evas_main.c2
-rw-r--r--src/lib/evas/include/evas_private.h2
12 files changed, 43 insertions, 53 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index cbd3107fa3..ff711084d7 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3618,7 +3618,7 @@ _ecore_evas_mouse_move_process_internal(Ecore_Evas *ee,
3618 3618
3619 if (!send_event) return; 3619 if (!send_event) return;
3620 3620
3621 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, ee->evas, (void **) &ev); 3621 evt = efl_input_pointer_instance_get( ee->evas, (void **) &ev);
3622 if (!evt) return; 3622 if (!evt) return;
3623 3623
3624 ev->action = EFL_POINTER_ACTION_MOVE; 3624 ev->action = EFL_POINTER_ACTION_MOVE;
@@ -4811,7 +4811,7 @@ _direct_mouse_updown(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info, Efl_P
4811 * modifiers (already passed to evas, no need to do anything) 4811 * modifiers (already passed to evas, no need to do anything)
4812 */ 4812 */
4813 4813
4814 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev); 4814 evt = efl_input_pointer_instance_get( e, (void **) &ev);
4815 if (!evt) return EINA_FALSE; 4815 if (!evt) return EINA_FALSE;
4816 4816
4817 ev->action = action; 4817 ev->action = action;
@@ -4875,7 +4875,7 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info)
4875 * modifiers (already passed to evas, no need to do anything) 4875 * modifiers (already passed to evas, no need to do anything)
4876 */ 4876 */
4877 4877
4878 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev); 4878 evt = efl_input_pointer_instance_get( e, (void **) &ev);
4879 if (!evt) return EINA_FALSE; 4879 if (!evt) return EINA_FALSE;
4880 4880
4881 ev->action = EFL_POINTER_ACTION_MOVE; 4881 ev->action = EFL_POINTER_ACTION_MOVE;
@@ -4915,7 +4915,7 @@ _direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info)
4915 * modifiers (already passed to evas, no need to do anything) 4915 * modifiers (already passed to evas, no need to do anything)
4916 */ 4916 */
4917 4917
4918 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev); 4918 evt = efl_input_pointer_instance_get( e, (void **) &ev);
4919 if (!evt) return EINA_FALSE; 4919 if (!evt) return EINA_FALSE;
4920 4920
4921 ev->action = EFL_POINTER_ACTION_WHEEL; 4921 ev->action = EFL_POINTER_ACTION_WHEEL;
@@ -4947,7 +4947,7 @@ _direct_mouse_inout(Ecore_Evas *ee, const Ecore_Event_Mouse_IO *info, Efl_Pointe
4947 * modifiers (already passed to evas, no need to do anything) 4947 * modifiers (already passed to evas, no need to do anything)
4948 */ 4948 */
4949 4949
4950 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev); 4950 evt = efl_input_pointer_instance_get( e, (void **) &ev);
4951 if (!evt) return EINA_FALSE; 4951 if (!evt) return EINA_FALSE;
4952 4952
4953 ev->action = action; 4953 ev->action = action;
@@ -4991,7 +4991,7 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info)
4991 * window, root_window, event_window 4991 * window, root_window, event_window
4992 */ 4992 */
4993 4993
4994 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev); 4994 evt = efl_input_pointer_instance_get( e, (void **) &ev);
4995 if (!ev) return EINA_FALSE; 4995 if (!ev) return EINA_FALSE;
4996 4996
4997 ev->action = EFL_POINTER_ACTION_AXIS; 4997 ev->action = EFL_POINTER_ACTION_AXIS;
@@ -5110,7 +5110,7 @@ _direct_key_updown_cb(Ecore_Evas *ee, const Ecore_Event_Key *info, Eina_Bool dow
5110 * modifiers (already passed to evas, no need to do anything) 5110 * modifiers (already passed to evas, no need to do anything)
5111 */ 5111 */
5112 5112
5113 evt = efl_input_instance_get(EFL_INPUT_KEY_CLASS, e, (void **) &ev); 5113 evt = efl_input_key_instance_get( e, (void **) &ev);
5114 if (!evt || !ev) return EINA_FALSE; 5114 if (!evt || !ev) return EINA_FALSE;
5115 5115
5116 ev->timestamp = info->timestamp; 5116 ev->timestamp = info->timestamp;
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 72188bf5f9..2e9e463205 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2534,7 +2534,7 @@ _efl_ui_win_efl_canvas_scene_pointer_iterate(const Eo *obj, Efl_Ui_Win_Data *sd,
2534 Efl_Input_Pointer *ptr; 2534 Efl_Input_Pointer *ptr;
2535 double x, y; 2535 double x, y;
2536 2536
2537 ptr = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, (Eo *) obj, (void **) &ptrdata); 2537 ptr = efl_input_pointer_instance_get( (Eo *) obj, (void **) &ptrdata);
2538 if (!ptrdata) break; 2538 if (!ptrdata) break;
2539 2539
2540 ptrdata->tool = evas_touch_point_list_nth_id_get(sd->evas, i); 2540 ptrdata->tool = evas_touch_point_list_nth_id_get(sd->evas, i);
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index b65277ed2d..6fd25c91cb 100644
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -74,7 +74,11 @@ EOAPI void evas_canvas_seat_focus_out(Eo *obj, Efl_Input_Device *seat);
74EOAPI Eo* evas_canvas_seat_focus_get(const Eo *obj, Efl_Input_Device *seat); 74EOAPI Eo* evas_canvas_seat_focus_get(const Eo *obj, Efl_Input_Device *seat);
75 75
76EOAPI void *efl_input_legacy_info_get(const Eo *obj); 76EOAPI void *efl_input_legacy_info_get(const Eo *obj);
77EOAPI Eo *efl_input_instance_get(const Eo *obj, Efl_Object *owner, void **priv); 77
78EOAPI Eo *efl_input_focus_instance_get(Efl_Object *owner, void **priv);
79EOAPI Eo *efl_input_hold_instance_get(Efl_Object *owner, void **priv);
80EOAPI Eo *efl_input_key_instance_get(Efl_Object *owner, void **priv);
81EOAPI Eo *efl_input_pointer_instance_get(Efl_Object *owner, void **priv);
78 82
79EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE; 83EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE;
80#define EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE)) 84#define EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE))
diff --git a/src/lib/evas/canvas/efl_input_event.c b/src/lib/evas/canvas/efl_input_event.c
index 1a172166b1..8b02713ad7 100644
--- a/src/lib/evas/canvas/efl_input_event.c
+++ b/src/lib/evas/canvas/efl_input_event.c
@@ -95,7 +95,7 @@ _noref_death(void *data EINA_UNUSED, const Efl_Event *event)
95} 95}
96 96
97Efl_Input_Event * 97Efl_Input_Event *
98efl_input_event_instance_get(Eo *klass, Eo *owner) 98efl_input_event_instance_get(const Eo *klass, Eo *owner)
99{ 99{
100 Efl_Input_Event *evt; 100 Efl_Input_Event *evt;
101 101
diff --git a/src/lib/evas/canvas/efl_input_focus.c b/src/lib/evas/canvas/efl_input_focus.c
index f43673bbad..d7b18dec53 100644
--- a/src/lib/evas/canvas/efl_input_focus.c
+++ b/src/lib/evas/canvas/efl_input_focus.c
@@ -101,14 +101,14 @@ _efl_input_focus_efl_duplicate_duplicate(const Eo *obj, Efl_Input_Focus_Data *pd
101 return evt; 101 return evt;
102} 102}
103 103
104EOLIAN static Efl_Input_Focus * 104
105_efl_input_focus_efl_input_event_instance_get(Eo *klass, void *_pd EINA_UNUSED, 105EOAPI Eo*
106 Eo *owner, void **priv) 106efl_input_focus_instance_get(Efl_Object *owner, void **priv)
107{ 107{
108 Efl_Input_Focus_Data *ev; 108 Efl_Input_Focus_Data *ev;
109 Efl_Input_Focus *evt; 109 Efl_Input_Focus *evt;
110 110
111 evt = efl_input_event_instance_get(klass, owner); 111 evt = efl_input_event_instance_get(EFL_INPUT_FOCUS_CLASS, owner);
112 if (!evt) return NULL; 112 if (!evt) return NULL;
113 113
114 ev = efl_data_scope_get(evt, MY_CLASS); 114 ev = efl_data_scope_get(evt, MY_CLASS);
@@ -148,7 +148,4 @@ _efl_input_focus_efl_input_event_event_flags_get(const Eo *obj EINA_UNUSED, Efl_
148 148
149/* Internal EO APIs */ 149/* Internal EO APIs */
150 150
151#define EFL_INPUT_FOCUS_EXTRA_CLASS_OPS \
152 EFL_OBJECT_OP_FUNC(efl_input_instance_get, _efl_input_focus_efl_input_event_instance_get)
153
154#include "efl_input_focus.eo.c" 151#include "efl_input_focus.eo.c"
diff --git a/src/lib/evas/canvas/efl_input_hold.c b/src/lib/evas/canvas/efl_input_hold.c
index e034e4ab6e..0713ca6e2a 100644
--- a/src/lib/evas/canvas/efl_input_hold.c
+++ b/src/lib/evas/canvas/efl_input_hold.c
@@ -82,11 +82,11 @@ _efl_input_hold_efl_object_destructor(Eo *obj, Efl_Input_Hold_Data *pd)
82 efl_destructor(efl_super(obj, MY_CLASS)); 82 efl_destructor(efl_super(obj, MY_CLASS));
83} 83}
84 84
85EOLIAN static Efl_Input_Event * 85
86_efl_input_hold_efl_input_event_instance_get(Eo *klass, void *_pd EINA_UNUSED, 86EOAPI Eo*
87 Efl_Object *owner, void **priv) 87efl_input_hold_instance_get(Efl_Object *owner, void **priv)
88{ 88{
89 Efl_Input_Event *evt = efl_input_event_instance_get(klass, owner);; 89 Efl_Input_Event *evt = efl_input_event_instance_get(EFL_INPUT_HOLD_CLASS, owner);;
90 90
91 if (!evt) return NULL; 91 if (!evt) return NULL;
92 if (priv) *priv = efl_data_scope_get(evt, MY_CLASS); 92 if (priv) *priv = efl_data_scope_get(evt, MY_CLASS);
@@ -139,7 +139,4 @@ _efl_input_hold_efl_input_event_legacy_info_get(Eo *obj, Efl_Input_Hold_Data *pd
139#define EFL_INPUT_HOLD_EXTRA_OPS \ 139#define EFL_INPUT_HOLD_EXTRA_OPS \
140 EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, _efl_input_hold_efl_input_event_legacy_info_get) 140 EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, _efl_input_hold_efl_input_event_legacy_info_get)
141 141
142#define EFL_INPUT_HOLD_EXTRA_CLASS_OPS \
143 EFL_OBJECT_OP_FUNC(efl_input_instance_get, _efl_input_hold_efl_input_event_instance_get)
144
145#include "efl_input_hold.eo.c" 142#include "efl_input_hold.eo.c"
diff --git a/src/lib/evas/canvas/efl_input_key.c b/src/lib/evas/canvas/efl_input_key.c
index ce1acd6b26..11af16b0a2 100644
--- a/src/lib/evas/canvas/efl_input_key.c
+++ b/src/lib/evas/canvas/efl_input_key.c
@@ -12,18 +12,17 @@
12 12
13#define MY_CLASS EFL_INPUT_KEY_CLASS 13#define MY_CLASS EFL_INPUT_KEY_CLASS
14 14
15EOLIAN static Efl_Input_Key * 15EOAPI Eo*
16_efl_input_key_efl_input_event_instance_get(Eo *klass, void *_pd EINA_UNUSED, 16efl_input_key_instance_get(Efl_Object *owner, void **priv)
17 Eo *owner, void **priv)
18{ 17{
19 Efl_Input_Key_Data *ev; 18 Efl_Input_Key_Data *ev;
20 Efl_Input_Key *evt; 19 Efl_Input_Key *evt;
21 Evas *evas; 20 Evas *evas;
22 21
23 evt = efl_input_event_instance_get(klass, owner); 22 evt = efl_input_event_instance_get(EFL_INPUT_KEY_CLASS, owner);
24 if (!evt) return NULL; 23 if (!evt) return NULL;
25 24
26 ev = efl_data_scope_get(evt, klass); 25 ev = efl_data_scope_get(evt, EFL_INPUT_KEY_CLASS);
27 ev->fake = EINA_FALSE; 26 ev->fake = EINA_FALSE;
28 if (priv) *priv = ev; 27 if (priv) *priv = ev;
29 28
@@ -267,7 +266,4 @@ _efl_input_key_efl_input_event_legacy_info_get(Eo *obj, Efl_Input_Key_Data *pd)
267#define EFL_INPUT_KEY_EXTRA_OPS \ 266#define EFL_INPUT_KEY_EXTRA_OPS \
268 EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, _efl_input_key_efl_input_event_legacy_info_get) 267 EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, _efl_input_key_efl_input_event_legacy_info_get)
269 268
270#define EFL_INPUT_KEY_EXTRA_CLASS_OPS \
271 EFL_OBJECT_OP_FUNC(efl_input_instance_get, _efl_input_key_efl_input_event_instance_get)
272
273#include "efl_input_key.eo.c" 269#include "efl_input_key.eo.c"
diff --git a/src/lib/evas/canvas/efl_input_pointer.c b/src/lib/evas/canvas/efl_input_pointer.c
index 4dfa3bc2c6..6c24f88c2c 100644
--- a/src/lib/evas/canvas/efl_input_pointer.c
+++ b/src/lib/evas/canvas/efl_input_pointer.c
@@ -24,17 +24,16 @@
24 */ 24 */
25 25
26/* internal eo */ 26/* internal eo */
27static Efl_Input_Pointer * 27EOAPI Eo*
28_efl_input_pointer_efl_input_event_instance_get(Eo *klass, void *_pd EINA_UNUSED, 28efl_input_pointer_instance_get(Efl_Object *owner, void **priv)
29 Eo *owner, void **priv)
30{ 29{
31 Efl_Input_Pointer_Data *ev; 30 Efl_Input_Pointer_Data *ev;
32 Efl_Input_Pointer *evt; 31 Efl_Input_Pointer *evt;
33 32
34 evt = efl_input_event_instance_get(klass, owner); 33 evt = efl_input_event_instance_get(EFL_INPUT_POINTER_CLASS, owner);
35 if (!evt) return NULL; 34 if (!evt) return NULL;
36 35
37 ev = efl_data_scope_get(evt, klass); 36 ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
38 ev->fake = EINA_FALSE; 37 ev->fake = EINA_FALSE;
39 if (priv) *priv = ev; 38 if (priv) *priv = ev;
40 39
@@ -623,7 +622,4 @@ _efl_input_pointer_efl_input_event_legacy_info_get(Eo *obj, Efl_Input_Pointer_Da
623#define EFL_INPUT_POINTER_EXTRA_OPS \ 622#define EFL_INPUT_POINTER_EXTRA_OPS \
624 EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, _efl_input_pointer_efl_input_event_legacy_info_get) 623 EFL_OBJECT_OP_FUNC(efl_input_legacy_info_get, _efl_input_pointer_efl_input_event_legacy_info_get)
625 624
626#define EFL_INPUT_POINTER_EXTRA_CLASS_OPS \
627 EFL_OBJECT_OP_FUNC(efl_input_instance_get, _efl_input_pointer_efl_input_event_instance_get)
628
629#include "efl_input_pointer.eo.c" 625#include "efl_input_pointer.eo.c"
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 7a2d4cc67b..06d6923e6c 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -1843,7 +1843,7 @@ _canvas_event_feed_mouse_updown(Eo *eo_e, int b, Evas_Button_Flags flags,
1843 if (!e) return; 1843 if (!e) return;
1844 EVAS_EVENT_FEED_SAFETY_CHECK(e); 1844 EVAS_EVENT_FEED_SAFETY_CHECK(e);
1845 1845
1846 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, eo_e, (void **) &ev); 1846 evt = efl_input_pointer_instance_get( eo_e, (void **) &ev);
1847 if (!ev) return; 1847 if (!ev) return;
1848 1848
1849 ev->data = (void *) data; 1849 ev->data = (void *) data;
@@ -1957,7 +1957,7 @@ evas_event_feed_mouse_cancel(Eo *eo_e, unsigned int timestamp, const void *data)
1957 Efl_Input_Pointer_Data *ev = NULL; 1957 Efl_Input_Pointer_Data *ev = NULL;
1958 Efl_Input_Pointer *evt; 1958 Efl_Input_Pointer *evt;
1959 1959
1960 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, eo_e, (void **) &ev); 1960 evt = efl_input_pointer_instance_get( eo_e, (void **) &ev);
1961 if (!ev) return; 1961 if (!ev) return;
1962 EVAS_EVENT_FEED_SAFETY_CHECK(e); 1962 EVAS_EVENT_FEED_SAFETY_CHECK(e);
1963 1963
@@ -2048,7 +2048,7 @@ evas_event_feed_mouse_wheel(Eo *eo_e, int direction, int z, unsigned int timesta
2048{ 2048{
2049 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); 2049 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS));
2050 Efl_Input_Pointer_Data *ev = NULL; 2050 Efl_Input_Pointer_Data *ev = NULL;
2051 Efl_Input_Pointer *evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, eo_e, (void **) &ev); 2051 Efl_Input_Pointer *evt = efl_input_pointer_instance_get( eo_e, (void **) &ev);
2052 2052
2053 if (!ev) return; 2053 if (!ev) return;
2054 2054
@@ -2489,7 +2489,7 @@ _canvas_event_feed_mouse_move_legacy(Evas *eo_e, Evas_Public_Data *e, int x, int
2489 Efl_Input_Pointer_Data *ev = NULL; 2489 Efl_Input_Pointer_Data *ev = NULL;
2490 Efl_Input_Pointer *evt; 2490 Efl_Input_Pointer *evt;
2491 2491
2492 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, eo_e, (void **) &ev); 2492 evt = efl_input_pointer_instance_get( eo_e, (void **) &ev);
2493 if (!ev) return; 2493 if (!ev) return;
2494 2494
2495 ev->data = (void *) data; 2495 ev->data = (void *) data;
@@ -2716,7 +2716,7 @@ _canvas_event_feed_mouse_inout_legacy(Eo *eo_e, unsigned int timestamp,
2716 Efl_Input_Pointer_Data *ev = NULL; 2716 Efl_Input_Pointer_Data *ev = NULL;
2717 Efl_Input_Pointer *evt; 2717 Efl_Input_Pointer *evt;
2718 2718
2719 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, eo_e, (void **) &ev); 2719 evt = efl_input_pointer_instance_get( eo_e, (void **) &ev);
2720 if (!ev) return; 2720 if (!ev) return;
2721 2721
2722 ev->timestamp = timestamp; 2722 ev->timestamp = timestamp;
@@ -2938,7 +2938,7 @@ _canvas_event_feed_multi_internal(Evas *eo_e, Evas_Public_Data *e,
2938 Efl_Input_Pointer_Data *ev = NULL; 2938 Efl_Input_Pointer_Data *ev = NULL;
2939 Efl_Input_Pointer *evt; 2939 Efl_Input_Pointer *evt;
2940 2940
2941 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, eo_e, (void **) &ev); 2941 evt = efl_input_pointer_instance_get( eo_e, (void **) &ev);
2942 if (!e || !ev) return; 2942 if (!e || !ev) return;
2943 EVAS_EVENT_FEED_SAFETY_CHECK(e); 2943 EVAS_EVENT_FEED_SAFETY_CHECK(e);
2944 2944
@@ -3417,7 +3417,7 @@ _canvas_event_feed_key_legacy(Eo *eo_e, Evas_Public_Data *e,
3417 3417
3418 if (!keyname) return; 3418 if (!keyname) return;
3419 3419
3420 evt = efl_input_instance_get(EFL_INPUT_KEY_CLASS, eo_e, (void **) &ev); 3420 evt = efl_input_key_instance_get( eo_e, (void **) &ev);
3421 if (!ev) return; 3421 if (!ev) return;
3422 3422
3423 ev->keyname = (char *) keyname; 3423 ev->keyname = (char *) keyname;
@@ -3491,7 +3491,7 @@ evas_event_feed_hold(Eo *eo_e, int hold, unsigned int timestamp, const void *dat
3491 3491
3492 event_id = _evas_object_event_new(); 3492 event_id = _evas_object_event_new();
3493 3493
3494 evt = efl_input_instance_get(EFL_INPUT_HOLD_CLASS, eo_e, (void **) &ev); 3494 evt = efl_input_hold_instance_get(eo_e, (void **) &ev);
3495 if (!ev) return; 3495 if (!ev) return;
3496 3496
3497 ev->hold = !!hold; 3497 ev->hold = !!hold;
@@ -3590,7 +3590,7 @@ evas_event_feed_axis_update(Evas *eo_e, unsigned int timestamp, int device, int
3590 if (!e) return; 3590 if (!e) return;
3591 EVAS_EVENT_FEED_SAFETY_CHECK(e); 3591 EVAS_EVENT_FEED_SAFETY_CHECK(e);
3592 3592
3593 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, eo_e, (void **) &ev); 3593 evt = efl_input_pointer_instance_get( eo_e, (void **) &ev);
3594 if (!ev) return; 3594 if (!ev) return;
3595 3595
3596 ev->data = (void *) data; 3596 ev->data = (void *) data;
@@ -4203,7 +4203,7 @@ _evas_canvas_event_pointer_move_event_dispatch(Evas_Public_Data *edata,
4203 Efl_Input_Pointer_Data *ev = NULL; 4203 Efl_Input_Pointer_Data *ev = NULL;
4204 Efl_Input_Pointer *evt; 4204 Efl_Input_Pointer *evt;
4205 4205
4206 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, edata->evas, 4206 evt = efl_input_pointer_instance_get( edata->evas,
4207 (void **) &ev); 4207 (void **) &ev);
4208 if (!evt) return; 4208 if (!evt) return;
4209 4209
diff --git a/src/lib/evas/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c
index 52ad4fe033..d76c1042dc 100644
--- a/src/lib/evas/canvas/evas_focus.c
+++ b/src/lib/evas/canvas/evas_focus.c
@@ -107,7 +107,7 @@ _evas_focus_dispatch_event(Evas_Object_Protected_Data *obj, Efl_Input_Device *se
107 const Efl_Event_Description *efl_object_focus_event; 107 const Efl_Event_Description *efl_object_focus_event;
108 108
109 EVAS_OBJECT_DATA_VALID_CHECK(obj); 109 EVAS_OBJECT_DATA_VALID_CHECK(obj);
110 evt = efl_input_instance_get(EFL_INPUT_FOCUS_CLASS, 110 evt = efl_input_focus_instance_get(
111 efl_provider_find(obj->object, EVAS_CANVAS_CLASS), 111 efl_provider_find(obj->object, EVAS_CANVAS_CLASS),
112 (void **) &ev_data); 112 (void **) &ev_data);
113 if (!evt) return; 113 if (!evt) return;
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index c9baf74bca..0d574c5418 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -760,7 +760,7 @@ _evas_canvas_focus_inout_dispatch(Eo *eo_e, Efl_Input_Device *seat,
760 Efl_Input_Focus_Data *ev_data; 760 Efl_Input_Focus_Data *ev_data;
761 Efl_Input_Focus *evt; 761 Efl_Input_Focus *evt;
762 762
763 evt = efl_input_instance_get(EFL_INPUT_FOCUS_CLASS, eo_e, (void **) &ev_data); 763 evt = efl_input_focus_instance_get(eo_e, (void **) &ev_data);
764 if (!evt) return; 764 if (!evt) return;
765 765
766 ev_data->device = efl_ref(seat); 766 ev_data->device = efl_ref(seat);
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 73a0c28e64..984b52ed67 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1867,7 +1867,7 @@ void _evas_device_cleanup(Evas *e);
1867Evas_Device *_evas_device_top_get(const Evas *e); 1867Evas_Device *_evas_device_top_get(const Evas *e);
1868 1868
1869/* legacy/eo events */ 1869/* legacy/eo events */
1870Efl_Input_Event *efl_input_event_instance_get(Eo *klass, Eo *owner); 1870Efl_Input_Event *efl_input_event_instance_get(const Eo *klass, Eo *owner);
1871void efl_input_event_instance_clean(Eo *klass); 1871void efl_input_event_instance_clean(Eo *klass);
1872 1872
1873void *efl_input_pointer_legacy_info_fill(Evas *eo_evas, Efl_Input_Key *eo_ev, Evas_Callback_Type type, Evas_Event_Flags **pflags); 1873void *efl_input_pointer_legacy_info_fill(Evas *eo_evas, Efl_Input_Key *eo_ev, Evas_Callback_Type type, Evas_Event_Flags **pflags);