summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-08-25 19:20:10 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-08-26 10:18:01 +0900
commitd504284dd241d2d1713e9e94f7e6efee8e0ee9ac (patch)
tree484135bc4391f81cd3d243051732fb23e5d992de
parent60526528a6cc85050a74d5d45f6502ea5c07d70f (diff)
efl: Rename Efl.Event.XX to Efl.Input.XX
This removes: Efl.Event interface And renames: Efl.Event.Input -> Efl.Input.Event Efl.Event -> Efl.Input.Event (merged) Efl.Event.Pointer -> Efl.Input.Pointer Efl.Event.Key -> Efl.Input.Key Efl.Event.Hold -> Efl.Input.Hold This also moves some interfaces from efl/ to evas/ where they belong better. This allows renaming Eo_Event to Efl_Event.
Diffstat
-rw-r--r--src/Makefile_Efl.am5
-rw-r--r--src/Makefile_Evas.am18
-rw-r--r--src/bin/elementary/test_events.c30
-rw-r--r--src/lib/ecore_evas/ecore_evas.c40
-rw-r--r--src/lib/edje/edje_callbacks.c28
-rw-r--r--src/lib/efl/Efl.h8
-rw-r--r--src/lib/efl/interfaces/efl_common_internal.h22
-rw-r--r--src/lib/efl/interfaces/efl_event.eo44
-rw-r--r--src/lib/efl/interfaces/efl_input_types.eot (renamed from src/lib/efl/interfaces/efl_event_types.eot)21
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c4
-rw-r--r--src/lib/elementary/efl_ui_win.c24
-rw-r--r--src/lib/elementary/elc_fileselector.c10
-rw-r--r--src/lib/elementary/elm_spinner.c4
-rw-r--r--src/lib/elementary/elm_widget.c10
-rw-r--r--src/lib/elementary/elm_widget.eo4
-rw-r--r--src/lib/evas/Evas_Common.h16
-rw-r--r--src/lib/evas/Evas_Eo.h10
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo8
-rw-r--r--src/lib/evas/canvas/efl_event_hold.c118
-rw-r--r--src/lib/evas/canvas/efl_event_hold.eo26
-rw-r--r--src/lib/evas/canvas/efl_event_input.c48
-rw-r--r--src/lib/evas/canvas/efl_event_input.eo40
-rw-r--r--src/lib/evas/canvas/efl_input_event.c52
-rw-r--r--src/lib/evas/canvas/efl_input_event.eo76
-rw-r--r--src/lib/evas/canvas/efl_input_hold.c118
-rw-r--r--src/lib/evas/canvas/efl_input_hold.eo25
-rw-r--r--src/lib/evas/canvas/efl_input_interface.eo (renamed from src/lib/efl/interfaces/efl_input_interface.eo)28
-rw-r--r--src/lib/evas/canvas/efl_input_key.c (renamed from src/lib/evas/canvas/efl_event_key.c)94
-rw-r--r--src/lib/evas/canvas/efl_input_key.eo (renamed from src/lib/evas/canvas/efl_event_key.eo)22
-rw-r--r--src/lib/evas/canvas/efl_input_pointer.c (renamed from src/lib/evas/canvas/efl_event_pointer.c)124
-rw-r--r--src/lib/evas/canvas/efl_input_pointer.eo (renamed from src/lib/evas/canvas/efl_event_pointer.eo)24
-rw-r--r--src/lib/evas/canvas/efl_input_state.eo (renamed from src/lib/efl/interfaces/efl_input_state.eo)0
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c16
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo4
-rw-r--r--src/lib/evas/canvas/evas_events.c228
-rw-r--r--src/lib/evas/canvas/evas_events_legacy.c14
-rw-r--r--src/lib/evas/include/evas_private.h6
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c4
38 files changed, 684 insertions, 689 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index a66ab6bd4d..a379137952 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -42,9 +42,6 @@ efl_eolian_files = \
42 lib/efl/interfaces/efl_vpath_file_core.eo \ 42 lib/efl/interfaces/efl_vpath_file_core.eo \
43 lib/efl/interfaces/efl_ui_spin.eo \ 43 lib/efl/interfaces/efl_ui_spin.eo \
44 lib/efl/interfaces/efl_ui_progress.eo \ 44 lib/efl/interfaces/efl_ui_progress.eo \
45 lib/efl/interfaces/efl_event.eo \
46 lib/efl/interfaces/efl_input_interface.eo \
47 lib/efl/interfaces/efl_input_state.eo \
48 lib/efl/interfaces/efl_screen.eo \ 45 lib/efl/interfaces/efl_screen.eo \
49 lib/efl/interfaces/efl_io_closer.eo \ 46 lib/efl/interfaces/efl_io_closer.eo \
50 lib/efl/interfaces/efl_io_positioner.eo \ 47 lib/efl/interfaces/efl_io_positioner.eo \
@@ -58,7 +55,7 @@ efl_eolian_files = \
58 55
59efl_eolian_type_files = \ 56efl_eolian_type_files = \
60 lib/efl/interfaces/efl_gfx_types.eot \ 57 lib/efl/interfaces/efl_gfx_types.eot \
61 lib/efl/interfaces/efl_event_types.eot \ 58 lib/efl/interfaces/efl_input_types.eot \
62 lib/efl/interfaces/efl_types.eot \ 59 lib/efl/interfaces/efl_types.eot \
63 lib/efl/interfaces/efl_text_types.eot \ 60 lib/efl/interfaces/efl_text_types.eot \
64 $(NULL) 61 $(NULL)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index e86f8617bc..f313861fef 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -42,10 +42,12 @@ evas_eolian_pub_files = \
42 lib/evas/canvas/efl_canvas_surface_wayland.eo \ 42 lib/evas/canvas/efl_canvas_surface_wayland.eo \
43 lib/evas/canvas/efl_canvas_filter_internal.eo \ 43 lib/evas/canvas/efl_canvas_filter_internal.eo \
44 lib/evas/canvas/efl_canvas_group_clipped.eo \ 44 lib/evas/canvas/efl_canvas_group_clipped.eo \
45 lib/evas/canvas/efl_event_input.eo \ 45 lib/evas/canvas/efl_input_state.eo \
46 lib/evas/canvas/efl_event_key.eo \ 46 lib/evas/canvas/efl_input_interface.eo \
47 lib/evas/canvas/efl_event_pointer.eo \ 47 lib/evas/canvas/efl_input_event.eo \
48 lib/evas/canvas/efl_event_hold.eo \ 48 lib/evas/canvas/efl_input_key.eo \
49 lib/evas/canvas/efl_input_pointer.eo \
50 lib/evas/canvas/efl_input_hold.eo \
49 lib/evas/canvas/efl_gfx_map.eo \ 51 lib/evas/canvas/efl_gfx_map.eo \
50 $(NULL) 52 $(NULL)
51 53
@@ -202,10 +204,10 @@ lib/evas/canvas/efl_canvas_surface.c \
202lib/evas/canvas/efl_canvas_surface_tbm.c \ 204lib/evas/canvas/efl_canvas_surface_tbm.c \
203lib/evas/canvas/efl_canvas_surface_x11.c \ 205lib/evas/canvas/efl_canvas_surface_x11.c \
204lib/evas/canvas/efl_canvas_surface_wayland.c \ 206lib/evas/canvas/efl_canvas_surface_wayland.c \
205lib/evas/canvas/efl_event_input.c \ 207lib/evas/canvas/efl_input_event.c \
206lib/evas/canvas/efl_event_key.c \ 208lib/evas/canvas/efl_input_key.c \
207lib/evas/canvas/efl_event_pointer.c \ 209lib/evas/canvas/efl_input_pointer.c \
208lib/evas/canvas/efl_event_hold.c \ 210lib/evas/canvas/efl_input_hold.c \
209$(NULL) 211$(NULL)
210 212
211EXTRA_DIST2 += \ 213EXTRA_DIST2 += \
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 3d7c9de778..60bd7f8a3b 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -23,7 +23,7 @@ _pointer_down(void *data, const Eo_Event *ev)
23 testdata *td = data; 23 testdata *td = data;
24 td->down = 1; 24 td->down = 1;
25 efl_del(td->evdown); 25 efl_del(td->evdown);
26 td->evdown = efl_event_dup(ev->info); 26 td->evdown = efl_input_dup(ev->info);
27} 27}
28 28
29static void 29static void
@@ -31,7 +31,7 @@ _pointer_move(void *data, const Eo_Event *ev)
31{ 31{
32 testdata *td = data; 32 testdata *td = data;
33 efl_del(td->evmove); 33 efl_del(td->evmove);
34 td->evmove = efl_event_dup(ev->info); 34 td->evmove = efl_input_dup(ev->info);
35} 35}
36 36
37static void 37static void
@@ -40,7 +40,7 @@ _pointer_up(void *data, const Eo_Event *ev)
40 testdata *td = data; 40 testdata *td = data;
41 td->down = 0; 41 td->down = 0;
42 efl_del(td->evup); 42 efl_del(td->evup);
43 td->evup = efl_event_dup(ev->info); 43 td->evup = efl_input_dup(ev->info);
44} 44}
45 45
46static void 46static void
@@ -56,16 +56,16 @@ _key_down(void *data, const Eo_Event *ev)
56 // 2. ecore_evas -> evas -> focussed obj (elm_win) -> here 56 // 2. ecore_evas -> evas -> focussed obj (elm_win) -> here
57 57
58 sprintf(str, "key=%s keyname=%s string=%s compose=%s", 58 sprintf(str, "key=%s keyname=%s string=%s compose=%s",
59 efl_event_key_get(ev->info), 59 efl_input_key_get(ev->info),
60 efl_event_key_name_get(ev->info), 60 efl_input_key_name_get(ev->info),
61 efl_event_key_string_get(ev->info), 61 efl_input_key_string_get(ev->info),
62 efl_event_key_compose_get(ev->info)); 62 efl_input_key_compose_get(ev->info));
63 elm_object_text_set(td->text, str); 63 elm_object_text_set(td->text, str);
64 64
65 if (!efl_event_fake_get(ev->info)) 65 if (!efl_input_fake_get(ev->info))
66 { 66 {
67 efl_del(td->evkeydown); 67 efl_del(td->evkeydown);
68 td->evkeydown = efl_event_dup(ev->info); 68 td->evkeydown = efl_input_dup(ev->info);
69 } 69 }
70} 70}
71 71
@@ -96,10 +96,10 @@ _key_up(void *data, const Eo_Event *ev)
96{ 96{
97 testdata *td = data; 97 testdata *td = data;
98 98
99 if (!efl_event_fake_get(ev->info)) 99 if (!efl_input_fake_get(ev->info))
100 { 100 {
101 efl_del(td->evkeyup); 101 efl_del(td->evkeyup);
102 td->evkeyup = efl_event_dup(ev->info); 102 td->evkeyup = efl_input_dup(ev->info);
103 } 103 }
104 104
105 // FIXME: how to use efl_loop_timeout? 105 // FIXME: how to use efl_loop_timeout?
@@ -119,7 +119,7 @@ _clicked_button1(void *data, const Eo_Event *ev EINA_UNUSED)
119 Eo *txt = td->text; 119 Eo *txt = td->text;
120 char buf[256]; 120 char buf[256];
121 121
122 // Note: can't do efl_event_fake_get(ev->info) because this is a click evt 122 // Note: can't do efl_input_fake_get(ev->info) because this is a click evt
123 123
124 td->id++; 124 td->id++;
125 sprintf(buf, "Button was clicked %d time%s", td->id, td->id > 1 ? "s" : ""); 125 sprintf(buf, "Button was clicked %d time%s", td->id, td->id > 1 ? "s" : "");
@@ -140,9 +140,9 @@ _clicked_button2(void *data, const Eo_Event *ev EINA_UNUSED)
140 140
141 x = x + w / 2; 141 x = x + w / 2;
142 y = y + h / 2; 142 y = y + h / 2;
143 efl_event_pointer_position_set(td->evmove, x, y); 143 efl_input_pointer_position_set(td->evmove, x, y);
144 efl_event_pointer_position_set(td->evdown, x, y); 144 efl_input_pointer_position_set(td->evdown, x, y);
145 efl_event_pointer_position_set(td->evup, x, y); 145 efl_input_pointer_position_set(td->evup, x, y);
146 146
147 efl_event_callback_call(td->win, EFL_EVENT_POINTER_MOVE, td->evmove); 147 efl_event_callback_call(td->win, EFL_EVENT_POINTER_MOVE, td->evmove);
148 efl_event_callback_call(td->win, EFL_EVENT_POINTER_DOWN, td->evdown); 148 efl_event_callback_call(td->win, EFL_EVENT_POINTER_DOWN, td->evdown);
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index d8d5b8b1e3..73ffc0b8fd 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#define ECORE_EVAS_INTERNAL 5#define ECORE_EVAS_INTERNAL
6#define EFL_EVENT_PROTECTED 6#define EFL_INPUT_EVENT_PROTECTED
7 7
8#include <stdlib.h> 8#include <stdlib.h>
9#include <string.h> 9#include <string.h>
@@ -4306,7 +4306,7 @@ ecore_evas_psl1ght_new(const char* name, int w, int h)
4306 } while (0) 4306 } while (0)
4307 4307
4308static inline void 4308static inline void
4309_pointer_position_set(Efl_Event_Pointer_Data *ev, Ecore_Evas *ee, int x, int y, 4309_pointer_position_set(Efl_Input_Pointer_Data *ev, Ecore_Evas *ee, int x, int y,
4310 double mx, double my) 4310 double mx, double my)
4311{ 4311{
4312 int fx, fy, fw, fh; 4312 int fx, fy, fw, fh;
@@ -4356,8 +4356,8 @@ _event_description_get(Efl_Pointer_Action action)
4356static Eina_Bool 4356static Eina_Bool
4357_direct_mouse_updown(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info, Efl_Pointer_Action action) 4357_direct_mouse_updown(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info, Efl_Pointer_Action action)
4358{ 4358{
4359 Efl_Event_Pointer_Data *ev; 4359 Efl_Input_Pointer_Data *ev;
4360 Efl_Event_Pointer *evt; 4360 Efl_Input_Pointer *evt;
4361 Evas *e = ee->evas; 4361 Evas *e = ee->evas;
4362 Eina_Bool processed; 4362 Eina_Bool processed;
4363 4363
@@ -4370,7 +4370,7 @@ _direct_mouse_updown(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info, Efl_P
4370 * modifiers (already passed to evas, no need to do anything) 4370 * modifiers (already passed to evas, no need to do anything)
4371 */ 4371 */
4372 4372
4373 evt = efl_event_instance_get(EFL_EVENT_POINTER_CLASS, e, (void **) &ev); 4373 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev);
4374 if (!evt) return EINA_FALSE; 4374 if (!evt) return EINA_FALSE;
4375 4375
4376 ev->action = action; 4376 ev->action = action;
@@ -4414,8 +4414,8 @@ _direct_mouse_cancel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info)
4414static Eina_Bool 4414static Eina_Bool
4415_direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info) 4415_direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info)
4416{ 4416{
4417 Efl_Event_Pointer_Data *ev; 4417 Efl_Input_Pointer_Data *ev;
4418 Efl_Event_Pointer *evt; 4418 Efl_Input_Pointer *evt;
4419 Evas *e = ee->evas; 4419 Evas *e = ee->evas;
4420 Eina_Bool processed; 4420 Eina_Bool processed;
4421 4421
@@ -4430,7 +4430,7 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info)
4430 * modifiers (already passed to evas, no need to do anything) 4430 * modifiers (already passed to evas, no need to do anything)
4431 */ 4431 */
4432 4432
4433 evt = efl_event_instance_get(EFL_EVENT_POINTER_CLASS, e, (void **) &ev); 4433 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev);
4434 if (!evt) return EINA_FALSE; 4434 if (!evt) return EINA_FALSE;
4435 4435
4436 ev->action = EFL_POINTER_ACTION_MOVE; 4436 ev->action = EFL_POINTER_ACTION_MOVE;
@@ -4454,8 +4454,8 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info)
4454static Eina_Bool 4454static Eina_Bool
4455_direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info) 4455_direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info)
4456{ 4456{
4457 Efl_Event_Pointer_Data *ev; 4457 Efl_Input_Pointer_Data *ev;
4458 Efl_Event_Pointer *evt; 4458 Efl_Input_Pointer *evt;
4459 Evas *e = ee->evas; 4459 Evas *e = ee->evas;
4460 Eina_Bool processed; 4460 Eina_Bool processed;
4461 4461
@@ -4467,7 +4467,7 @@ _direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info)
4467 * modifiers (already passed to evas, no need to do anything) 4467 * modifiers (already passed to evas, no need to do anything)
4468 */ 4468 */
4469 4469
4470 evt = efl_event_instance_get(EFL_EVENT_POINTER_CLASS, e, (void **) &ev); 4470 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev);
4471 if (!evt) return EINA_FALSE; 4471 if (!evt) return EINA_FALSE;
4472 4472
4473 ev->action = EFL_POINTER_ACTION_WHEEL; 4473 ev->action = EFL_POINTER_ACTION_WHEEL;
@@ -4486,8 +4486,8 @@ _direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info)
4486static Eina_Bool 4486static Eina_Bool
4487_direct_mouse_inout(Ecore_Evas *ee, const Ecore_Event_Mouse_IO *info, Efl_Pointer_Action action) 4487_direct_mouse_inout(Ecore_Evas *ee, const Ecore_Event_Mouse_IO *info, Efl_Pointer_Action action)
4488{ 4488{
4489 Efl_Event_Pointer_Data *ev; 4489 Efl_Input_Pointer_Data *ev;
4490 Efl_Event_Pointer *evt; 4490 Efl_Input_Pointer *evt;
4491 Evas *e = ee->evas; 4491 Evas *e = ee->evas;
4492 Eina_Bool processed; 4492 Eina_Bool processed;
4493 4493
@@ -4496,7 +4496,7 @@ _direct_mouse_inout(Ecore_Evas *ee, const Ecore_Event_Mouse_IO *info, Efl_Pointe
4496 * modifiers (already passed to evas, no need to do anything) 4496 * modifiers (already passed to evas, no need to do anything)
4497 */ 4497 */
4498 4498
4499 evt = efl_event_instance_get(EFL_EVENT_POINTER_CLASS, e, (void **) &ev); 4499 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev);
4500 if (!evt) return EINA_FALSE; 4500 if (!evt) return EINA_FALSE;
4501 4501
4502 ev->action = action; 4502 ev->action = action;
@@ -4526,8 +4526,8 @@ static Eina_Bool
4526_direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info) 4526_direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info)
4527{ 4527{
4528 Eina_Bool haswinx = 0, haswiny = 0; 4528 Eina_Bool haswinx = 0, haswiny = 0;
4529 Efl_Event_Pointer_Data *ev; 4529 Efl_Input_Pointer_Data *ev;
4530 Efl_Event_Pointer *evt; 4530 Efl_Input_Pointer *evt;
4531 Evas *e = ee->evas; 4531 Evas *e = ee->evas;
4532 Eina_Bool processed; 4532 Eina_Bool processed;
4533 double x = 0, y = 0; 4533 double x = 0, y = 0;
@@ -4537,7 +4537,7 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info)
4537 * window, root_window, event_window 4537 * window, root_window, event_window
4538 */ 4538 */
4539 4539
4540 evt = efl_event_instance_get(EFL_EVENT_POINTER_CLASS, e, (void **) &ev); 4540 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, e, (void **) &ev);
4541 if (!ev) return EINA_FALSE; 4541 if (!ev) return EINA_FALSE;
4542 4542
4543 ev->action = EFL_POINTER_ACTION_AXIS; 4543 ev->action = EFL_POINTER_ACTION_AXIS;
@@ -4620,8 +4620,8 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info)
4620static Eina_Bool 4620static Eina_Bool
4621_direct_key_updown_cb(Ecore_Evas *ee, const Ecore_Event_Key *info, Eina_Bool down) 4621_direct_key_updown_cb(Ecore_Evas *ee, const Ecore_Event_Key *info, Eina_Bool down)
4622{ 4622{
4623 Efl_Event_Key_Data *ev; 4623 Efl_Input_Key_Data *ev;
4624 Efl_Event_Key *evt; 4624 Efl_Input_Key *evt;
4625 Evas *e = ee->evas; 4625 Evas *e = ee->evas;
4626 Eina_Bool processed; 4626 Eina_Bool processed;
4627 4627
@@ -4633,7 +4633,7 @@ _direct_key_updown_cb(Ecore_Evas *ee, const Ecore_Event_Key *info, Eina_Bool dow
4633 * modifiers (already passed to evas, no need to do anything) 4633 * modifiers (already passed to evas, no need to do anything)
4634 */ 4634 */
4635 4635
4636 evt = efl_event_instance_get(EFL_EVENT_KEY_CLASS, e, (void **) &ev); 4636 evt = efl_input_instance_get(EFL_INPUT_KEY_CLASS, e, (void **) &ev);
4637 if (!evt || !ev) return EINA_FALSE; 4637 if (!evt || !ev) return EINA_FALSE;
4638 4638
4639 ev->timestamp = info->timestamp; 4639 ev->timestamp = info->timestamp;
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 4dfa8d204e..5187a24154 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -6,7 +6,7 @@
6static void 6static void
7_edje_hold_signal_cb(void *data, const Eo_Event *event) 7_edje_hold_signal_cb(void *data, const Eo_Event *event)
8{ 8{
9 Efl_Event_Hold *ev; 9 Efl_Input_Hold *ev;
10 Edje *ed; 10 Edje *ed;
11 Edje_Real_Part *rp; 11 Edje_Real_Part *rp;
12 12
@@ -14,7 +14,7 @@ _edje_hold_signal_cb(void *data, const Eo_Event *event)
14 ed = data; 14 ed = data;
15 rp = evas_object_data_get(event->object, "real_part"); 15 rp = evas_object_data_get(event->object, "real_part");
16 if (!rp) return; 16 if (!rp) return;
17 if (efl_event_hold_get(ev)) 17 if (efl_input_hold_get(ev))
18 _edje_emit(ed, "hold,on", rp->part->name); 18 _edje_emit(ed, "hold,on", rp->part->name);
19 else 19 else
20 _edje_emit(ed, "hold,off", rp->part->name); 20 _edje_emit(ed, "hold,off", rp->part->name);
@@ -51,11 +51,11 @@ _edje_focus_out_signal_cb(void *data, const Eo_Event *event)
51static void 51static void
52_edje_mouse_in_signal_cb(void *data, const Eo_Event *event) 52_edje_mouse_in_signal_cb(void *data, const Eo_Event *event)
53{ 53{
54 Efl_Event_Pointer_Data *ev; 54 Efl_Input_Pointer_Data *ev;
55 Edje *ed; 55 Edje *ed;
56 Edje_Real_Part *rp; 56 Edje_Real_Part *rp;
57 57
58 ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); 58 ev = efl_data_scope_get(event->info, EFL_INPUT_POINTER_CLASS);
59 ed = data; 59 ed = data;
60 rp = evas_object_data_get(event->object, "real_part"); 60 rp = evas_object_data_get(event->object, "real_part");
61 if (rp) 61 if (rp)
@@ -70,11 +70,11 @@ _edje_mouse_in_signal_cb(void *data, const Eo_Event *event)
70static void 70static void
71_edje_mouse_out_signal_cb(void *data, const Eo_Event *event) 71_edje_mouse_out_signal_cb(void *data, const Eo_Event *event)
72{ 72{
73 Efl_Event_Pointer_Data *ev; 73 Efl_Input_Pointer_Data *ev;
74 Edje *ed; 74 Edje *ed;
75 Edje_Real_Part *rp; 75 Edje_Real_Part *rp;
76 76
77 ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); 77 ev = efl_data_scope_get(event->info, EFL_INPUT_POINTER_CLASS);
78 ed = data; 78 ed = data;
79 rp = evas_object_data_get(event->object, "real_part"); 79 rp = evas_object_data_get(event->object, "real_part");
80 if (rp) 80 if (rp)
@@ -89,13 +89,13 @@ _edje_mouse_out_signal_cb(void *data, const Eo_Event *event)
89static void 89static void
90_edje_mouse_down_signal_cb(void *data, const Eo_Event *event) 90_edje_mouse_down_signal_cb(void *data, const Eo_Event *event)
91{ 91{
92 Efl_Event_Pointer_Data *ev; 92 Efl_Input_Pointer_Data *ev;
93 Edje *ed; 93 Edje *ed;
94 Edje_Real_Part *rp; 94 Edje_Real_Part *rp;
95 char buf[256]; 95 char buf[256];
96 int ignored; 96 int ignored;
97 97
98 ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); 98 ev = efl_data_scope_get(event->info, EFL_INPUT_POINTER_CLASS);
99 ed = data; 99 ed = data;
100 rp = evas_object_data_get(event->object, "real_part"); 100 rp = evas_object_data_get(event->object, "real_part");
101 if (!rp) return; 101 if (!rp) return;
@@ -158,13 +158,13 @@ _edje_mouse_down_signal_cb(void *data, const Eo_Event *event)
158static void 158static void
159_edje_mouse_up_signal_cb(void *data, const Eo_Event *event) 159_edje_mouse_up_signal_cb(void *data, const Eo_Event *event)
160{ 160{
161 Efl_Event_Pointer_Data *ev; 161 Efl_Input_Pointer_Data *ev;
162 Edje *ed; 162 Edje *ed;
163 Edje_Real_Part *rp; 163 Edje_Real_Part *rp;
164 char buf[256]; 164 char buf[256];
165 int ignored; 165 int ignored;
166 166
167 ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); 167 ev = efl_data_scope_get(event->info, EFL_INPUT_POINTER_CLASS);
168 ed = data; 168 ed = data;
169 rp = evas_object_data_get(event->object, "real_part"); 169 rp = evas_object_data_get(event->object, "real_part");
170 if (!rp) return; 170 if (!rp) return;
@@ -231,12 +231,12 @@ _edje_mouse_up_signal_cb(void *data, const Eo_Event *event)
231static void 231static void
232_edje_mouse_move_signal_cb(void *data, const Eo_Event *event) 232_edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
233{ 233{
234 Efl_Event_Pointer_Data *ev; 234 Efl_Input_Pointer_Data *ev;
235 Edje *ed; 235 Edje *ed;
236 Edje_Real_Part *rp; 236 Edje_Real_Part *rp;
237 int ignored; 237 int ignored;
238 238
239 ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); 239 ev = efl_data_scope_get(event->info, EFL_INPUT_POINTER_CLASS);
240 ed = data; 240 ed = data;
241 rp = evas_object_data_get(event->object, "real_part"); 241 rp = evas_object_data_get(event->object, "real_part");
242 if (!rp) return; 242 if (!rp) return;
@@ -338,12 +338,12 @@ _edje_mouse_move_signal_cb(void *data, const Eo_Event *event)
338static void 338static void
339_edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event) 339_edje_mouse_wheel_signal_cb(void *data, const Eo_Event *event)
340{ 340{
341 Efl_Event_Pointer_Data *ev; 341 Efl_Input_Pointer_Data *ev;
342 Edje *ed; 342 Edje *ed;
343 Edje_Real_Part *rp; 343 Edje_Real_Part *rp;
344 char buf[256]; 344 char buf[256];
345 345
346 ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); 346 ev = efl_data_scope_get(event->info, EFL_INPUT_POINTER_CLASS);
347 ed = data; 347 ed = data;
348 rp = evas_object_data_get(event->object, "real_part"); 348 rp = evas_object_data_get(event->object, "real_part");
349 if (rp) 349 if (rp)
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 79733afc02..142950aed6 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -39,7 +39,6 @@ extern "C" {
39/* Add here all the required ifdef for any @protected method */ 39/* Add here all the required ifdef for any @protected method */
40#ifdef EFL_EFL_BUILD 40#ifdef EFL_EFL_BUILD
41# define EFL_PACK_LAYOUT_PROTECTED 41# define EFL_PACK_LAYOUT_PROTECTED
42# define EFL_EVENT_PROTECTED
43# define EFL_GFX_SIZE_HINT_PROTECTED 42# define EFL_GFX_SIZE_HINT_PROTECTED
44#endif 43#endif
45 44
@@ -123,11 +122,8 @@ EAPI extern const Efl_Event_Description _EFL_GFX_PATH_CHANGED;
123#include "interfaces/efl_pack_grid.eo.h" 122#include "interfaces/efl_pack_grid.eo.h"
124 123
125/* Input events */ 124/* Input events */
126#include "interfaces/efl_event_types.eot.h" 125#include "interfaces/efl_input_types.eot.h"
127#include "interfaces/efl_input_device.eo.h" 126#include "interfaces/efl_input_device.eo.h"
128#include "interfaces/efl_input_state.eo.h"
129#include "interfaces/efl_input_interface.eo.h"
130#include "interfaces/efl_event.eo.h"
131 127
132/* Input and Output */ 128/* Input and Output */
133#include "interfaces/efl_io_closer.eo.h" 129#include "interfaces/efl_io_closer.eo.h"
@@ -143,7 +139,7 @@ EAPI extern const Efl_Event_Description _EFL_GFX_PATH_CHANGED;
143 139
144#ifndef EFL_NOLEGACY_API_SUPPORT 140#ifndef EFL_NOLEGACY_API_SUPPORT
145#include "interfaces/efl_gfx_types.eot.h" 141#include "interfaces/efl_gfx_types.eot.h"
146#include "interfaces/efl_event_types.eot.h" 142#include "interfaces/efl_input_types.eot.h"
147#include "interfaces/efl_gfx_fill.eo.legacy.h" 143#include "interfaces/efl_gfx_fill.eo.legacy.h"
148#include "interfaces/efl_gfx.eo.legacy.h" 144#include "interfaces/efl_gfx.eo.legacy.h"
149#include "interfaces/efl_image.eo.legacy.h" 145#include "interfaces/efl_image.eo.legacy.h"
diff --git a/src/lib/efl/interfaces/efl_common_internal.h b/src/lib/efl/interfaces/efl_common_internal.h
index 95b8681b67..07d62367d4 100644
--- a/src/lib/efl/interfaces/efl_common_internal.h
+++ b/src/lib/efl/interfaces/efl_common_internal.h
@@ -13,17 +13,17 @@
13 13
14#include <Efl.h> 14#include <Efl.h>
15 15
16typedef struct _Efl_Event_Pointer_Data Efl_Event_Pointer_Data; 16typedef struct _Efl_Input_Pointer_Data Efl_Input_Pointer_Data;
17typedef struct _Efl_Event_Key_Data Efl_Event_Key_Data; 17typedef struct _Efl_Input_Key_Data Efl_Input_Key_Data;
18typedef struct _Efl_Input_Device_Data Efl_Input_Device_Data; 18typedef struct _Efl_Input_Device_Data Efl_Input_Device_Data;
19typedef struct _Efl_Event_Hold_Data Efl_Event_Hold_Data; 19typedef struct _Efl_Input_Hold_Data Efl_Input_Hold_Data;
20 20
21#ifndef _EVAS_TYPES_EOT_H_ 21#ifndef _EVAS_TYPES_EOT_H_
22typedef struct _Evas_Modifier Evas_Modifier; 22typedef struct _Evas_Modifier Evas_Modifier;
23typedef struct _Evas_Lock Evas_Lock; 23typedef struct _Evas_Lock Evas_Lock;
24#endif 24#endif
25 25
26struct _Efl_Event_Pointer_Data 26struct _Efl_Input_Pointer_Data
27{ 27{
28 Eo *eo; 28 Eo *eo;
29 unsigned int timestamp; /* FIXME: store as double? */ 29 unsigned int timestamp; /* FIXME: store as double? */
@@ -42,7 +42,7 @@ struct _Efl_Event_Pointer_Data
42 Efl_Input_Device *device; 42 Efl_Input_Device *device;
43 Efl_Pointer_Action action; 43 Efl_Pointer_Action action;
44 Efl_Pointer_Flags button_flags; 44 Efl_Pointer_Flags button_flags;
45 Efl_Event_Flags event_flags; 45 Efl_Input_Flags event_flags;
46 void *data; /* evas data - whatever that is */ 46 void *data; /* evas data - whatever that is */
47 Eina_Bool window_pos; /* true if positions are window-relative 47 Eina_Bool window_pos; /* true if positions are window-relative
48 (see input vs. feed: this is "input") */ 48 (see input vs. feed: this is "input") */
@@ -55,7 +55,7 @@ struct _Efl_Event_Pointer_Data
55 Eina_Bool win_fed : 1; 55 Eina_Bool win_fed : 1;
56}; 56};
57 57
58struct _Efl_Event_Key_Data 58struct _Efl_Input_Key_Data
59{ 59{
60 Eo *eo; 60 Eo *eo;
61 unsigned int timestamp; /* FIXME: store as double? */ 61 unsigned int timestamp; /* FIXME: store as double? */
@@ -70,7 +70,7 @@ struct _Efl_Event_Key_Data
70 void *data; 70 void *data;
71 Evas_Modifier *modifiers; 71 Evas_Modifier *modifiers;
72 Evas_Lock *locks; 72 Evas_Lock *locks;
73 Efl_Event_Flags event_flags; 73 Efl_Input_Flags event_flags;
74 Efl_Input_Device *device; 74 Efl_Input_Device *device;
75 void *legacy; /* DO NOT TOUCH THIS */ 75 void *legacy; /* DO NOT TOUCH THIS */
76 Eina_Bool evas_done : 1; /* set by evas */ 76 Eina_Bool evas_done : 1; /* set by evas */
@@ -92,11 +92,11 @@ struct _Efl_Input_Device_Data
92 Efl_Input_Device_Sub_Class subclass; 92 Efl_Input_Device_Sub_Class subclass;
93}; 93};
94 94
95struct _Efl_Event_Hold_Data 95struct _Efl_Input_Hold_Data
96{ 96{
97 Eo *eo; 97 Eo *eo;
98 double timestamp; 98 double timestamp;
99 Efl_Event_Flags event_flags; 99 Efl_Input_Flags event_flags;
100 Efl_Input_Device *device; 100 Efl_Input_Device *device;
101 void *data; 101 void *data;
102 void *legacy; /* DO NOT TOUCH THIS */ 102 void *legacy; /* DO NOT TOUCH THIS */
@@ -105,13 +105,13 @@ struct _Efl_Event_Hold_Data
105}; 105};
106 106
107static inline Eina_Bool 107static inline Eina_Bool
108_efl_input_value_has(const Efl_Event_Pointer_Data *pd, Efl_Input_Value key) 108_efl_input_value_has(const Efl_Input_Pointer_Data *pd, Efl_Input_Value key)
109{ 109{
110 return (pd->value_flags & (1 << (int) key)) != 0; 110 return (pd->value_flags & (1 << (int) key)) != 0;
111} 111}
112 112
113static inline void 113static inline void
114_efl_input_value_mark(Efl_Event_Pointer_Data *pd, Efl_Input_Value key) 114_efl_input_value_mark(Efl_Input_Pointer_Data *pd, Efl_Input_Value key)
115{ 115{
116 pd->value_flags |= (1 << (int) key); 116 pd->value_flags |= (1 << (int) key);
117} 117}
diff --git a/src/lib/efl/interfaces/efl_event.eo b/src/lib/efl/interfaces/efl_event.eo
deleted file mode 100644
index 25069c6b38..0000000000
--- a/src/lib/efl/interfaces/efl_event.eo
+++ /dev/null
@@ -1,44 +0,0 @@
1import efl_object;
2
3interface Efl.Event
4{
5 [[Represents a generic event data.
6
7 Note: Most Eo Events do not carry Eo objects, rather simple data
8 structures. This class is intended to carry more complex event
9 data, such as pointer events.
10
11 @since 1.18
12 ]]
13 legacy_prefix: null;
14 methods {
15 @property timestamp {
16 [[The time at which an event was generated.
17
18 If the event is generated by a server (eg. X.org or Wayland), then
19 the time may be set by the server. Usually this time will be based
20 on the monotonic clock, if available, but this class can not
21 guarantee it.
22 ]]
23 set { [[Call this when generating events manually.]] }
24 get {}
25 values {
26 ms: double; [[Time in milliseconds when the event happened.]]
27 }
28 }
29 reset {
30 [[Resets the internal data to 0 or default values.]]
31 }
32 dup {
33 [[Creates a copy of this event.]]
34 return: own(Efl.Event);
35 }
36 instance_get @class @protected {
37 params {
38 @in owner: Efl.Object;
39 @out priv: void*;
40 }
41 return: Efl.Event;
42 }
43 }
44}
diff --git a/src/lib/efl/interfaces/efl_event_types.eot b/src/lib/efl/interfaces/efl_input_types.eot
index 93aadb845a..8a9211e8d0 100644
--- a/src/lib/efl/interfaces/efl_event_types.eot
+++ b/src/lib/efl/interfaces/efl_input_types.eot
@@ -1,9 +1,8 @@
1/* FIXME: Do we need this? Or just use the Eo Event Description as a type? */
2enum Efl.Pointer.Action 1enum Efl.Pointer.Action
3{ 2{
4 [[Pointer event type. 3 [[Pointer event type. Represents which kind of event this is.
5 4
6 @since 1.18 5 @since 1.19
7 ]] 6 ]]
8 none, [[Not a valid event.]] 7 none, [[Not a valid event.]]
9 move, [[Mouse or equivalent pointer moved.]] 8 move, [[Mouse or equivalent pointer moved.]]
@@ -20,15 +19,21 @@ enum Efl.Pointer.Action
20 19
21enum Efl.Pointer.Flags 20enum Efl.Pointer.Flags
22{ 21{
23 /* Evas.Button_Flags */ 22 [[Pointer flags indicating whether a double or triple click is under way.
23
24 @since 1.19
25 ]]
24 none = 0, [[No extra mouse button data]] 26 none = 0, [[No extra mouse button data]]
25 double_click = (1 << 0), [[This mouse button press was the 2nd press of a double click]] 27 double_click = (1 << 0), [[This mouse button press was the 2nd press of a double click]]
26 triple_click = (1 << 1), [[This mouse button press was the 3rd press of a triple click]] 28 triple_click = (1 << 1), [[This mouse button press was the 3rd press of a triple click]]
27} 29}
28 30
29enum Efl.Event.Flags 31enum Efl.Input.Flags
30{ 32{
31 /* Evas.Event_Flags */ 33 [[Special flags set during an input event propagation.
34
35 @since 1.19
36 ]]
32 none = 0, [[No fancy flags set]] 37 none = 0, [[No fancy flags set]]
33 processed = (1 << 0), [[This event is being delivered and has been processed, 38 processed = (1 << 0), [[This event is being delivered and has been processed,
34 so it should be put "on hold" until the flag is unset. 39 so it should be put "on hold" until the flag is unset.
@@ -42,7 +47,7 @@ enum Efl.Event.Flags
42 actually perform anything.]] 47 actually perform anything.]]
43} 48}
44 49
45enum Efl.Event.Object_Pointer_Mode { 50enum Efl.Input.Object_Pointer_Mode {
46 [[How the mouse pointer should be handled by EFL. 51 [[How the mouse pointer should be handled by EFL.
47 52
48 In the mode $autograb, when a mouse button is pressed down over an 53 In the mode $autograb, when a mouse button is pressed down over an
@@ -54,6 +59,8 @@ enum Efl.Event.Object_Pointer_Mode {
54 59
55 In the mode $nograb, the pointer will always be bound to the object 60 In the mode $nograb, the pointer will always be bound to the object
56 right below it. 61 right below it.
62
63 @since 1.19
57 ]] 64 ]]
58 auto_grab, [[Default, X11-like.]] 65 auto_grab, [[Default, X11-like.]]
59 no_grab, [[Pointer always bound to the object right below it.]] 66 no_grab, [[Pointer always bound to the object right below it.]]
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index b3d4c54486..c16c8dbc93 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -54,10 +54,6 @@ EAPI const Efl_Event_Description _EFL_GFX_PATH_CHANGED =
54#include "interfaces/efl_ui_spin.eo.c" 54#include "interfaces/efl_ui_spin.eo.c"
55#include "interfaces/efl_ui_progress.eo.c" 55#include "interfaces/efl_ui_progress.eo.c"
56 56
57#include "interfaces/efl_event.eo.c"
58#include "interfaces/efl_input_state.eo.c"
59#include "interfaces/efl_input_interface.eo.c"
60
61EAPI void 57EAPI void
62__efl_internal_init(void) 58__efl_internal_init(void)
63{ 59{
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 00b6ab16ad..aced7badc3 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1665,9 +1665,9 @@ _evas_event_key_cb(void *data, const Eo_Event *ev)
1665{ 1665{
1666 Eo *win = data; 1666 Eo *win = data;
1667 Eo *evt = ev->info; 1667 Eo *evt = ev->info;
1668 Efl_Event_Key_Data *evdata; 1668 Efl_Input_Key_Data *evdata;
1669 1669
1670 evdata = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS); 1670 evdata = efl_data_scope_get(evt, EFL_INPUT_KEY_CLASS);
1671 if (!evdata || evdata->win_fed) 1671 if (!evdata || evdata->win_fed)
1672 return; 1672 return;
1673 1673
@@ -1683,9 +1683,9 @@ _evas_event_pointer_cb(void *data, const Eo_Event *ev)
1683{ 1683{
1684 Eo *win = data; 1684 Eo *win = data;
1685 Eo *evt = ev->info; 1685 Eo *evt = ev->info;
1686 Efl_Event_Pointer_Data *evdata; 1686 Efl_Input_Pointer_Data *evdata;
1687 1687
1688 evdata = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 1688 evdata = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
1689 if (!evdata || evdata->win_fed) 1689 if (!evdata || evdata->win_fed)
1690 return; 1690 return;
1691 1691
@@ -1697,13 +1697,13 @@ static void
1697_evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev) 1697_evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev)
1698{ 1698{
1699 Eo *evas = data; 1699 Eo *evas = data;
1700 Efl_Event *evt = ev->info; 1700 Efl_Input_Event *evt = ev->info;
1701 Efl_Event_Key_Data *evdata; 1701 Efl_Input_Key_Data *evdata;
1702 1702
1703 if (!efl_event_fake_get(evt)) 1703 if (!efl_input_fake_get(evt))
1704 return; 1704 return;
1705 1705
1706 evdata = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS); 1706 evdata = efl_data_scope_get(evt, EFL_INPUT_KEY_CLASS);
1707 if (!evdata || evdata->win_fed) 1707 if (!evdata || evdata->win_fed)
1708 return; 1708 return;
1709 evdata->win_fed = EINA_TRUE; 1709 evdata->win_fed = EINA_TRUE;
@@ -1717,13 +1717,13 @@ static void
1717_evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev) 1717_evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev)
1718{ 1718{
1719 Eo *evas = data; 1719 Eo *evas = data;
1720 Efl_Event *evt = ev->info; 1720 Efl_Input_Event *evt = ev->info;
1721 Efl_Event_Pointer_Data *evdata; 1721 Efl_Input_Pointer_Data *evdata;
1722 1722
1723 if (!efl_event_fake_get(evt)) 1723 if (!efl_input_fake_get(evt))
1724 return; 1724 return;
1725 1725
1726 evdata = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 1726 evdata = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
1727 if (!evdata || evdata->win_fed) 1727 if (!evdata || evdata->win_fed)
1728 return; 1728 return;
1729 evdata->win_fed = EINA_TRUE; 1729 evdata->win_fed = EINA_TRUE;
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index eaa2aeb644..0cf92b7207 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1531,7 +1531,7 @@ _anchor_clicked(void *data, const Eo_Event *event)
1531static void 1531static void
1532_files_key_down(void *data, const Eo_Event *event) 1532_files_key_down(void *data, const Eo_Event *event)
1533{ 1533{
1534 Efl_Event_Key *ev = event->info; 1534 Efl_Input_Key *ev = event->info;
1535 Evas_Object *par, *searchbar; 1535 Evas_Object *par, *searchbar;
1536 const char *string, *key; 1536 const char *string, *key;
1537 1537
@@ -1540,13 +1540,13 @@ _files_key_down(void *data, const Eo_Event *event)
1540 1540
1541 if (!searchbar) return; 1541 if (!searchbar) return;
1542 1542
1543 key = efl_event_key_get(ev); 1543 key = efl_input_key_get(ev);
1544 string = efl_event_key_string_get(ev); 1544 string = efl_input_key_string_get(ev);
1545 if (string && *(string) && (isalpha(*string) || isdigit(*string))) 1545 if (string && *(string) && (isalpha(*string) || isdigit(*string)))
1546 { 1546 {
1547 1547
1548 elm_entry_entry_append(searchbar, string); 1548 elm_entry_entry_append(searchbar, string);
1549 efl_event_processed_set(ev, EINA_TRUE); 1549 efl_input_processed_set(ev, EINA_TRUE);
1550 } 1550 }
1551 else if (key && *(key) && !strcmp(key, "BackSpace")) 1551 else if (key && *(key) && !strcmp(key, "BackSpace"))
1552 { 1552 {
@@ -1558,7 +1558,7 @@ _files_key_down(void *data, const Eo_Event *event)
1558 memmove(buf, en, strlen(en) -1); 1558 memmove(buf, en, strlen(en) -1);
1559 buf[strlen(en) -1] = '\0'; 1559 buf[strlen(en) -1] = '\0';
1560 elm_entry_entry_set(searchbar, buf); 1560 elm_entry_entry_set(searchbar, buf);
1561 efl_event_processed_set(ev, EINA_TRUE); 1561 efl_input_processed_set(ev, EINA_TRUE);
1562 } 1562 }
1563 } 1563 }
1564} 1564}
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index 72c30822f1..04478eaf09 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -884,10 +884,10 @@ _text_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
884static void 884static void
885_inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event) 885_inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event)
886{ 886{
887 Efl_Event_Pointer *ev = event->info; 887 Efl_Input_Pointer *ev = event->info;
888 ELM_SPINNER_DATA_GET(data, sd); 888 ELM_SPINNER_DATA_GET(data, sd);
889 889
890 if (efl_event_processed_get(ev) && sd->longpress_timer) 890 if (efl_input_processed_get(ev) && sd->longpress_timer)
891 { 891 {
892 ecore_timer_del(sd->longpress_timer); 892 ecore_timer_del(sd->longpress_timer);
893 sd->longpress_timer = NULL; 893 sd->longpress_timer = NULL;
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 24119e1755..c7e0185f9a 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -725,11 +725,11 @@ _propagate_event(void *data EINA_UNUSED, const Eo_Event *event)
725 725
726 /* FIXME: Avoid this translation to evas struct and use pointer/key events 726 /* FIXME: Avoid this translation to evas struct and use pointer/key events
727 * in all of elementary widgets 727 * in all of elementary widgets
728 * See also: efl_event_key_legacy_info_fill(). 728 * See also: efl_input_key_legacy_info_fill().
729 */ 729 */
730 if (event->desc == EFL_EVENT_KEY_DOWN) 730 if (event->desc == EFL_EVENT_KEY_DOWN)
731 { 731 {
732 Efl_Event_Key_Data *ev = efl_data_scope_get(event->info, EFL_EVENT_KEY_CLASS); 732 Efl_Input_Key_Data *ev = efl_data_scope_get(event->info, EFL_INPUT_KEY_CLASS);
733 if (!ev) return; 733 if (!ev) return;
734 event_info.down.timestamp = ev->timestamp; 734 event_info.down.timestamp = ev->timestamp;
735 event_info.down.keyname = (char*) ev->keyname; 735 event_info.down.keyname = (char*) ev->keyname;
@@ -748,7 +748,7 @@ _propagate_event(void *data EINA_UNUSED, const Eo_Event *event)
748 } 748 }
749 else if (event->desc == EFL_EVENT_KEY_UP) 749 else if (event->desc == EFL_EVENT_KEY_UP)
750 { 750 {
751 Efl_Event_Key_Data *ev = efl_data_scope_get(event->info, EFL_EVENT_KEY_CLASS); 751 Efl_Input_Key_Data *ev = efl_data_scope_get(event->info, EFL_INPUT_KEY_CLASS);
752 if (!ev) return; 752 if (!ev) return;
753 event_info.up.timestamp = ev->timestamp; 753 event_info.up.timestamp = ev->timestamp;
754 event_info.up.keyname = (char*) ev->keyname; 754 event_info.up.keyname = (char*) ev->keyname;
@@ -767,7 +767,7 @@ _propagate_event(void *data EINA_UNUSED, const Eo_Event *event)
767 } 767 }
768 else if (event->desc == EFL_EVENT_POINTER_WHEEL) 768 else if (event->desc == EFL_EVENT_POINTER_WHEEL)
769 { 769 {
770 Efl_Event_Pointer_Data *ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); 770 Efl_Input_Pointer_Data *ev = efl_data_scope_get(event->info, EFL_INPUT_POINTER_CLASS);
771 if (!ev) return; 771 if (!ev) return;
772 event_info.wheel.direction = (ev->wheel.dir != EFL_ORIENT_HORIZONTAL) ? 1 : 0; 772 event_info.wheel.direction = (ev->wheel.dir != EFL_ORIENT_HORIZONTAL) ? 1 : 0;
773 event_info.wheel.z = ev->wheel.z; 773 event_info.wheel.z = ev->wheel.z;
@@ -790,7 +790,7 @@ _propagate_event(void *data EINA_UNUSED, const Eo_Event *event)
790 790
791 elm_widget_event_propagate(obj, type, &event_info, event_flags); 791 elm_widget_event_propagate(obj, type, &event_info, event_flags);
792 if (!was_hold && (*event_flags & EVAS_EVENT_FLAG_ON_HOLD)) 792 if (!was_hold && (*event_flags & EVAS_EVENT_FLAG_ON_HOLD))
793 efl_event_processed_set(event->info, EINA_TRUE); 793 efl_input_processed_set(event->info, EINA_TRUE);
794} 794}
795 795
796/** 796/**
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index ecb96ae0af..63f6d38ea4 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -1,6 +1,6 @@
1import edje_types; 1import edje_types;
2import elm_general; 2import elm_general;
3import efl_event_types; 3import efl_input_types;
4 4
5/* FIXME: This shouldn't be here. */ 5/* FIXME: This shouldn't be here. */
6type list_data_get_func_type: __undefined_type; 6type list_data_get_func_type: __undefined_type;
@@ -624,7 +624,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter
624 params { 624 params {
625 @in type: Evas.Callback_Type; 625 @in type: Evas.Callback_Type;
626 @in event_info: void_ptr; 626 @in event_info: void_ptr;
627 @in event_flags: Efl.Event.Flags *; 627 @in event_flags: Efl.Input.Flags *;
628 } 628 }
629 } 629 }
630 signal_callback_add { 630 signal_callback_add {
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 05c2a0607e..6b264c9d2f 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -356,11 +356,11 @@ typedef Efl_Pointer_Flags Evas_Button_Flags;
356#define EVAS_BUTTON_DOUBLE_CLICK EFL_POINTER_FLAGS_DOUBLE_CLICK 356#define EVAS_BUTTON_DOUBLE_CLICK EFL_POINTER_FLAGS_DOUBLE_CLICK
357#define EVAS_BUTTON_TRIPLE_CLICK EFL_POINTER_FLAGS_TRIPLE_CLICK 357#define EVAS_BUTTON_TRIPLE_CLICK EFL_POINTER_FLAGS_TRIPLE_CLICK
358 358
359typedef Efl_Event_Flags Evas_Event_Flags; 359typedef Efl_Input_Flags Evas_Event_Flags;
360 360
361#define EVAS_EVENT_FLAG_NONE EFL_EVENT_FLAGS_NONE 361#define EVAS_EVENT_FLAG_NONE EFL_INPUT_FLAGS_NONE
362#define EVAS_EVENT_FLAG_ON_HOLD EFL_EVENT_FLAGS_PROCESSED 362#define EVAS_EVENT_FLAG_ON_HOLD EFL_INPUT_FLAGS_PROCESSED
363#define EVAS_EVENT_FLAG_ON_SCROLL EFL_EVENT_FLAGS_SCROLLING 363#define EVAS_EVENT_FLAG_ON_SCROLL EFL_INPUT_FLAGS_SCROLLING
364 364
365typedef Efl_Gfx_Size_Hint_Aspect Evas_Aspect_Control; /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set */ 365typedef Efl_Gfx_Size_Hint_Aspect Evas_Aspect_Control; /**< Aspect types/policies for scaling size hints, used for evas_object_size_hint_aspect_set */
366 366
@@ -385,11 +385,11 @@ typedef Efl_Text_Bidirectional_Type Evas_BiDi_Direction;
385#define EVAS_BIDI_DIRECTION_RTL EFL_TEXT_BIDIRECTIONAL_TYPE_RTL 385#define EVAS_BIDI_DIRECTION_RTL EFL_TEXT_BIDIRECTIONAL_TYPE_RTL
386#define EVAS_BIDI_DIRECTION_INHERIT EFL_TEXT_BIDIRECTIONAL_TYPE_INHERIT 386#define EVAS_BIDI_DIRECTION_INHERIT EFL_TEXT_BIDIRECTIONAL_TYPE_INHERIT
387 387
388typedef Efl_Event_Object_Pointer_Mode Evas_Object_Pointer_Mode; 388typedef Efl_Input_Object_Pointer_Mode Evas_Object_Pointer_Mode;
389 389
390#define EVAS_OBJECT_POINTER_MODE_AUTOGRAB EFL_EVENT_OBJECT_POINTER_MODE_AUTO_GRAB 390#define EVAS_OBJECT_POINTER_MODE_AUTOGRAB EFL_INPUT_OBJECT_POINTER_MODE_AUTO_GRAB
391#define EVAS_OBJECT_POINTER_MODE_NOGRAB EFL_EVENT_OBJECT_POINTER_MODE_NO_GRAB 391#define EVAS_OBJECT_POINTER_MODE_NOGRAB EFL_INPUT_OBJECT_POINTER_MODE_NO_GRAB
392#define EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN EFL_EVENT_OBJECT_POINTER_MODE_NO_GRAB_NO_REPEAT_UPDOWN 392#define EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN EFL_INPUT_OBJECT_POINTER_MODE_NO_GRAB_NO_REPEAT_UPDOWN
393 393
394struct _Evas_Engine_Info /** Generic engine information. Generic info is useless */ 394struct _Evas_Engine_Info /** Generic engine information. Generic info is useless */
395{ 395{
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 7cd4c68fde..cc7273e59e 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -301,8 +301,10 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
301#endif /* EFL_BETA_API_SUPPORT */ 301#endif /* EFL_BETA_API_SUPPORT */
302 302
303#ifdef EFL_EO_API_SUPPORT 303#ifdef EFL_EO_API_SUPPORT
304#include "canvas/efl_event_input.eo.h" 304#include "canvas/efl_input_state.eo.h"
305#include "canvas/efl_event_pointer.eo.h" 305#include "canvas/efl_input_event.eo.h"
306#include "canvas/efl_event_key.eo.h" 306#include "canvas/efl_input_pointer.eo.h"
307#include "canvas/efl_event_hold.eo.h" 307#include "canvas/efl_input_key.eo.h"
308#include "canvas/efl_input_hold.eo.h"
309#include "canvas/efl_input_interface.eo.h"
308#endif /* EFL_EO_API_SUPPORT */ 310#endif /* EFL_EO_API_SUPPORT */
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index e115d16cda..c7d1bf4be1 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -26,19 +26,19 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
26 This function has a direct effect on event callbacks related to 26 This function has a direct effect on event callbacks related to
27 pointers (mouse, ...). 27 pointers (mouse, ...).
28 28
29 If the value is @Efl.Event.Object_Pointer_Mode.auto_grab (default), 29 If the value is @Efl.Input.Object_Pointer_Mode.auto_grab (default),
30 then when mouse is pressed down over this object, events will be 30 then when mouse is pressed down over this object, events will be
31 restricted to it as source, mouse moves, for example, will be 31 restricted to it as source, mouse moves, for example, will be
32 emitted even when the pointer goes outside this objects 32 emitted even when the pointer goes outside this objects
33 geometry. 33 geometry.
34 34
35 If the value is @Efl.Event.Object_Pointer_Mode.no_grab, then events 35 If the value is @Efl.Input.Object_Pointer_Mode.no_grab, then events
36 will be emitted just when inside this object area. 36 will be emitted just when inside this object area.
37 37
38 The default value is @Efl.Event.Object_Pointer_Mode.auto_grab. 38 The default value is @Efl.Input.Object_Pointer_Mode.auto_grab.
39 ]] 39 ]]
40 values { 40 values {
41 pointer_mode: Efl.Event.Object_Pointer_Mode; 41 pointer_mode: Efl.Input.Object_Pointer_Mode;
42 } 42 }
43 } 43 }
44 @property render_op { 44 @property render_op {
diff --git a/src/lib/evas/canvas/efl_event_hold.c b/src/lib/evas/canvas/efl_event_hold.c
deleted file mode 100644
index 9e51da0e22..0000000000
--- a/src/lib/evas/canvas/efl_event_hold.c
+++ /dev/null
@@ -1,118 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#define EFL_EVENT_PROTECTED
6
7#include <Evas.h>
8
9#define EFL_INTERNAL_UNSTABLE
10#include "interfaces/efl_common_internal.h"
11
12#define MY_CLASS EFL_EVENT_HOLD_CLASS
13
14EOLIAN static void
15_efl_event_hold_hold_set(Eo *obj EINA_UNUSED, Efl_Event_Hold_Data *pd, Eina_Bool val)
16{
17 pd->hold = !!val;
18}
19
20EOLIAN static Eina_Bool
21_efl_event_hold_hold_get(Eo *obj EINA_UNUSED, Efl_Event_Hold_Data *pd)
22{
23 return pd->hold;
24}
25
26EOLIAN static void
27_efl_event_hold_efl_event_input_device_set(Eo *obj EINA_UNUSED, Efl_Event_Hold_Data *pd, Efl_Input_Device *dev)
28{
29 pd->device = dev;
30}
31
32EOLIAN static Efl_Input_Device *
33_efl_event_hold_efl_event_input_device_get(Eo *obj EINA_UNUSED, Efl_Event_Hold_Data *pd)
34{
35 return pd->device;
36}
37
38EOLIAN static double
39_efl_event_hold_efl_event_timestamp_get(Eo *obj EINA_UNUSED, Efl_Event_Hold_Data *pd)
40{
41 return pd->timestamp;
42}
43
44EOLIAN static void
45_efl_event_hold_efl_event_timestamp_set(Eo *obj EINA_UNUSED, Efl_Event_Hold_Data *pd, double ms)
46{
47 pd->timestamp = ms;
48}
49
50EOLIAN static void
51_efl_event_hold_efl_event_input_event_flags_set(Eo *obj EINA_UNUSED, Efl_Event_Hold_Data *pd, Efl_Event_Flags flags)
52{
53 pd->event_flags = flags;
54}
55
56EOLIAN static Efl_Event_Flags
57_efl_event_hold_efl_event_input_event_flags_get(Eo *obj EINA_UNUSED, Efl_Event_Hold_Data *pd)
58{
59 return pd->event_flags;
60}
61
62EOLIAN static Eo *
63_efl_event_hold_efl_object_constructor(Eo *obj, Efl_Event_Hold_Data *pd EINA_UNUSED)
64{
65 obj = efl_constructor(efl_super(obj, MY_CLASS));
66 efl_event_reset(obj);
67 return obj;
68}
69
70static inline void
71_efl_event_hold_free(Efl_Event_Hold_Data *pd)
72{
73 free(pd->legacy);
74}
75
76EOLIAN static void
77_efl_event_hold_efl_object_destructor(Eo *obj, Efl_Event_Hold_Data *pd)
78{
79 _efl_event_hold_free(pd);
80 efl_destructor(efl_super(obj, MY_CLASS));
81}
82
83EOLIAN static Efl_Event *
84_efl_event_hold_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUSED,
85 Efl_Object *owner, void **priv)
86{
87 // TODO: Implement a cache. Depends only on how many hold events we trigger.
88 Efl_Event *evt = efl_add(MY_CLASS, owner);
89 if (priv) *priv = efl_data_scope_get(evt, MY_CLASS);
90 return evt;
91}
92
93EOLIAN static void
94_efl_event_hold_efl_event_reset(Eo *obj, Efl_Event_Hold_Data *pd)
95{
96 _efl_event_hold_free(pd);
97 memset(pd, 0, sizeof(*pd));
98 pd->eo = obj;
99}
100
101EOLIAN static Efl_Event *
102_efl_event_hold_efl_event_dup(Eo *obj, Efl_Event_Hold_Data *pd)
103{
104 Efl_Event_Hold_Data *ev;
105 Efl_Event *evt = efl_add(EFL_EVENT_HOLD_CLASS, efl_parent_get(obj));
106 ev = efl_data_scope_get(evt, MY_CLASS);
107 if (!ev) return NULL;
108
109 ev->eo = evt;
110 ev->timestamp = pd->timestamp;
111 ev->data = pd->data;
112 ev->hold = pd->hold;
113 ev->device = pd->device; // lacks a proper ref :(
114
115 return evt;
116}
117
118#include "efl_event_hold.eo.c"
diff --git a/src/lib/evas/canvas/efl_event_hold.eo b/src/lib/evas/canvas/efl_event_hold.eo
deleted file mode 100644
index 142a1b6539..0000000000
--- a/src/lib/evas/canvas/efl_event_hold.eo
+++ /dev/null
@@ -1,26 +0,0 @@
1class Efl.Event.Hold (Efl.Object, Efl.Event.Input)
2{
3 [[Event data sent when inputs are put on hold or resumed.]]
4 methods {
5 @property hold {
6 [[$true if inputs are now on hold.]]
7 values {
8 val: bool;
9 }
10 }
11 }
12 implements {
13 Efl.Object.constructor;
14 Efl.Object.destructor;
15 Efl.Event.instance_get;
16 Efl.Event.reset;
17 Efl.Event.dup;
18 Efl.Event.timestamp.get;
19 Efl.Event.timestamp.set;
20 //Efl.Event.Input.fake.get;
21 Efl.Event.Input.event_flags.set;
22 Efl.Event.Input.event_flags.get;
23 Efl.Event.Input.device.set;
24 Efl.Event.Input.device.get;
25 }
26}
diff --git a/src/lib/evas/canvas/efl_event_input.c b/src/lib/evas/canvas/efl_event_input.c
deleted file mode 100644
index a4c313d33e..0000000000
--- a/src/lib/evas/canvas/efl_event_input.c
+++ /dev/null
@@ -1,48 +0,0 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include <Evas.h>
6
7#define EFL_INTERNAL_UNSTABLE
8#include "interfaces/efl_common_internal.h"
9
10#define MY_CLASS EFL_EVENT_INPUT_MIXIN
11
12EOLIAN static void
13_efl_event_input_processed_set(Eo *obj, void *pd EINA_UNUSED, Eina_Bool val)
14{
15 if (val)
16 efl_event_flags_set(obj, efl_event_flags_get(obj) | EFL_EVENT_FLAGS_PROCESSED);
17 else
18 efl_event_flags_set(obj, efl_event_flags_get(obj) & ~EFL_EVENT_FLAGS_PROCESSED);
19}
20
21EOLIAN static Eina_Bool
22_efl_event_input_processed_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
23{
24 return !!(efl_event_flags_get(obj) & EFL_EVENT_FLAGS_PROCESSED);
25}
26
27EOLIAN static void
28_efl_event_input_scrolling_set(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Eina_Bool val)
29{
30 if (val)
31 efl_event_flags_set(obj, efl_event_flags_get(obj) | EFL_EVENT_FLAGS_SCROLLING);
32 else
33 efl_event_flags_set(obj, efl_event_flags_get(obj) & ~EFL_EVENT_FLAGS_SCROLLING);
34}
35
36EOLIAN static Eina_Bool
37_efl_event_input_scrolling_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
38{
39 return !!(efl_event_flags_get(obj) & EFL_EVENT_FLAGS_SCROLLING);
40}
41
42EOLIAN static Eina_Bool
43_efl_event_input_fake_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
44{
45 return EINA_FALSE;
46}
47
48#include "efl_event_input.eo.c"
diff --git a/src/lib/evas/canvas/efl_event_input.eo b/src/lib/evas/canvas/efl_event_input.eo
deleted file mode 100644
index b23fdfa98b..0000000000
--- a/src/lib/evas/canvas/efl_event_input.eo
+++ /dev/null
@@ -1,40 +0,0 @@
1import efl_event_types;
2
3mixin Efl.Event.Input (Efl.Event)
4{
5 eo_prefix: efl_event;
6 data: null;
7 methods {
8 @property device @virtual_pure {
9 [[Input device that originated this event.]]
10 values {
11 dev: Efl.Input.Device;
12 }
13 }
14 @property event_flags @virtual_pure {
15 [[Extra flags for this event, may be changed by the user.]]
16 values {
17 flags: Efl.Event.Flags;
18 }
19 }
20 @property processed {
21 [[$true if @.event_flags indicates the event is on hold.]]
22 values {
23 val: bool;
24 }
25 }
26 @property scrolling {
27 [[$true if @.event_flags indicates the event happened while scrolling.]]
28 values {
29 val: bool;
30 }
31 }
32 @property fake {
33 [[$true if the event was fake, not triggered by real hardware.]]
34 get {}
35 values {
36 val: bool;
37 }
38 }
39 }
40}
diff --git a/src/lib/evas/canvas/efl_input_event.c b/src/lib/evas/canvas/efl_input_event.c
new file mode 100644
index 0000000000..8d93cb902d
--- /dev/null
+++ b/src/lib/evas/canvas/efl_input_event.c
@@ -0,0 +1,52 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#define EFL_INPUT_EVENT_PROTECTED
6
7#include <Evas.h>
8
9#define EFL_INTERNAL_UNSTABLE
10#include "interfaces/efl_common_internal.h"
11
12#define MY_CLASS EFL_INPUT_EVENT_MIXIN
13
14EOLIAN static void
15_efl_input_event_processed_set(Eo *obj, void *pd EINA_UNUSED, Eina_Bool val)
16{
17 if (val)
18 efl_input_event_flags_set(obj, efl_input_event_flags_get(obj) | EFL_INPUT_FLAGS_PROCESSED);
19 else
20 efl_input_event_flags_set(obj, efl_input_event_flags_get(obj) & ~EFL_INPUT_FLAGS_PROCESSED);
21}
22
23EOLIAN static Eina_Bool
24_efl_input_event_processed_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
25{
26 return !!(efl_input_event_flags_get(obj) & EFL_INPUT_FLAGS_PROCESSED);
27}
28
29EOLIAN static void
30_efl_input_event_scrolling_set(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, Eina_Bool val)
31{
32 if (val)
33 efl_input_event_flags_set(obj, efl_input_event_flags_get(obj) | EFL_INPUT_FLAGS_SCROLLING);
34 else
35 efl_input_event_flags_set(obj, efl_input_event_flags_get(obj) & ~EFL_INPUT_FLAGS_SCROLLING);
36}
37
38EOLIAN static Eina_Bool
39_efl_input_event_scrolling_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
40{
41 return !!(efl_input_event_flags_get(obj) & EFL_INPUT_FLAGS_SCROLLING);
42}
43
44EOLIAN static Eina_Bool
45_efl_input_event_fake_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
46{
47 return EINA_FALSE;
48}
49
50#include "efl_input_event.eo.c"
51#include "efl_input_state.eo.c"
52#include "efl_input_interface.eo.c"
diff --git a/src/lib/evas/canvas/efl_input_event.eo b/src/lib/evas/canvas/efl_input_event.eo
new file mode 100644
index 0000000000..9bc90e7fa6
--- /dev/null
+++ b/src/lib/evas/canvas/efl_input_event.eo
@@ -0,0 +1,76 @@
1import efl_input_types;
2
3mixin Efl.Input.Event
4{
5 [[Represents a generic event data.
6
7 Note: Most Efl Events do not carry Efl Objects, rather simple data
8 structures. This class is intended to carry more complex event
9 data, such as pointer events.
10
11 @since 1.19
12 ]]
13 eo_prefix: efl_input;
14 data: null;
15 methods {
16 @property timestamp @virtual_pure {
17 [[The time at which an event was generated.
18
19 If the event is generated by a server (eg. X.org or Wayland), then
20 the time may be set by the server. Usually this time will be based
21 on the monotonic clock, if available, but this class can not
22 guarantee it.
23 ]]
24 set { [[Call this when generating events manually.]] }
25 get {}
26 values {
27 ms: double; [[Time in milliseconds when the event happened.]]
28 }
29 }
30 reset @virtual_pure {
31 [[Resets the internal data to 0 or default values.]]
32 }
33 dup @virtual_pure {
34 [[Creates a copy of this event.]]
35 return: own(Efl.Input.Event);
36 }
37 @property device @virtual_pure {
38 [[Input device that originated this event.]]
39 values {
40 dev: Efl.Input.Device;
41 }
42 }
43 @property event_flags @virtual_pure {
44 [[Extra flags for this event, may be changed by the user.]]
45 values {
46 flags: Efl.Input.Flags;
47 }
48 }
49 @property processed {
50 [[$true if @.event_flags indicates the event is on hold.]]
51 values {
52 val: bool;
53 }
54 }
55 @property scrolling {
56 [[$true if @.event_flags indicates the event happened while scrolling.]]
57 values {
58 val: bool;
59 }
60 }
61 @property fake {
62 [[$true if the event was fake, not triggered by real hardware.]]
63 get {}
64 values {
65 val: bool;
66 }
67 }
68 instance_get @class @protected @virtual_pure {
69 params {
70 @in owner: Efl.Object;
71 @out priv: void*;
72 }
73 return: own(Efl.Input.Event);
74 }
75 }
76}
diff --git a/src/lib/evas/canvas/efl_input_hold.c b/src/lib/evas/canvas/efl_input_hold.c
new file mode 100644
index 0000000000..4c509dce60
--- /dev/null
+++ b/src/lib/evas/canvas/efl_input_hold.c
@@ -0,0 +1,118 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#define EFL_INPUT_EVENT_PROTECTED
6
7#include <Evas.h>
8
9#define EFL_INTERNAL_UNSTABLE
10#include "interfaces/efl_common_internal.h"
11
12#define MY_CLASS EFL_INPUT_HOLD_CLASS
13
14EOLIAN static void
15_efl_input_hold_hold_set(Eo *obj EINA_UNUSED, Efl_Input_Hold_Data *pd, Eina_Bool val)
16{
17 pd->hold = !!val;
18}
19
20EOLIAN static Eina_Bool
21_efl_input_hold_hold_get(Eo *obj EINA_UNUSED, Efl_Input_Hold_Data *pd)
22{
23 return pd->hold;
24}
25
26EOLIAN static void
27_efl_input_hold_efl_input_event_device_set(Eo *obj EINA_UNUSED, Efl_Input_Hold_Data *pd, Efl_Input_Device *dev)
28{
29 pd->device = dev;
30}
31
32EOLIAN static Efl_Input_Device *
33_efl_input_hold_efl_input_event_device_get(Eo *obj EINA_UNUSED, Efl_Input_Hold_Data *pd)
34{
35 return pd->device;
36}
37
38EOLIAN static double
39_efl_input_hold_efl_input_event_timestamp_get(Eo *obj EINA_UNUSED, Efl_Input_Hold_Data *pd)
40{
41 return pd->timestamp;
42}
43
44EOLIAN static void
45_efl_input_hold_efl_input_event_timestamp_set(Eo *obj EINA_UNUSED, Efl_Input_Hold_Data *pd, double ms)
46{
47 pd->timestamp = ms;
48}
49
50EOLIAN static void
51_efl_input_hold_efl_input_event_event_flags_set(Eo *obj EINA_UNUSED, Efl_Input_Hold_Data *pd, Efl_Input_Flags flags)
52{
53 pd->event_flags = flags;
54}
55
56EOLIAN static Efl_Input_Flags
57_efl_input_hold_efl_input_event_event_flags_get(Eo *obj EINA_UNUSED, Efl_Input_Hold_Data *pd)
58{
59 return pd->event_flags;
60}
61
62EOLIAN static Eo *
63_efl_input_hold_efl_object_constructor(Eo *obj, Efl_Input_Hold_Data *pd EINA_UNUSED)
64{
65 obj = efl_constructor(efl_super(obj, MY_CLASS));
66 efl_input_reset(obj);
67 return obj;
68}
69
70static inline void
71_efl_input_hold_free(Efl_Input_Hold_Data *pd)
72{
73 free(pd->legacy);
74}
75
76EOLIAN static void
77_efl_input_hold_efl_object_destructor(Eo *obj, Efl_Input_Hold_Data *pd)
78{
79 _efl_input_hold_free(pd);
80 efl_destructor(efl_super(obj, MY_CLASS));
81}
82
83EOLIAN static Efl_Input_Event *
84_efl_input_hold_efl_input_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUSED,
85 Efl_Object *owner, void **priv)
86{
87 // TODO: Implement a cache. Depends only on how many hold events we trigger.
88 Efl_Input_Event *evt = efl_add(MY_CLASS, owner);
89 if (priv) *priv = efl_data_scope_get(evt, MY_CLASS);
90 return evt;
91}
92
93EOLIAN static void
94_efl_input_hold_efl_input_event_reset(Eo *obj, Efl_Input_Hold_Data *pd)
95{
96 _efl_input_hold_free(pd);
97 memset(pd, 0, sizeof(*pd));
98 pd->eo = obj;
99}
100
101EOLIAN static Efl_Input_Event *
102_efl_input_hold_efl_input_event_dup(Eo *obj, Efl_Input_Hold_Data *pd)
103{
104 Efl_Input_Hold_Data *ev;
105 Efl_Input_Event *evt = efl_add(EFL_INPUT_HOLD_CLASS, efl_parent_get(obj));
106 ev = efl_data_scope_get(evt, MY_CLASS);
107 if (!ev) return NULL;
108
109 ev->eo = evt;
110 ev->timestamp = pd->timestamp;
111 ev->data = pd->data;
112 ev->hold = pd->hold;
113 ev->device = pd->device; // lacks a proper ref :(
114
115 return evt;
116}
117
118#include "efl_input_hold.eo.c"
diff --git a/src/lib/evas/canvas/efl_input_hold.eo b/src/lib/evas/canvas/efl_input_hold.eo
new file mode 100644
index 0000000000..0d0c86fffc
--- /dev/null
+++ b/src/lib/evas/canvas/efl_input_hold.eo
@@ -0,0 +1,25 @@
1class Efl.Input.Hold (Efl.Object, Efl.Input.Event)
2{
3 [[Event data sent when inputs are put on hold or resumed.]]
4 methods {
5 @property hold {
6 [[$true if inputs are now on hold.]]
7 values {
8 val: bool;
9 }
10 }
11 }
12 implements {
13 Efl.Object.constructor;
14 Efl.Object.destructor;
15 Efl.Input.Event.instance_get;
16 Efl.Input.Event.reset;
17 Efl.Input.Event.dup;
18 Efl.Input.Event.timestamp.get;
19 Efl.Input.Event.timestamp.set;
20 Efl.Input.Event.event_flags.set;
21 Efl.Input.Event.event_flags.get;
22 Efl.Input.Event.device.set;
23 Efl.Input.Event.device.get;
24 }
25}
diff --git a/src/lib/efl/interfaces/efl_input_interface.eo b/src/lib/evas/canvas/efl_input_interface.eo
index 6a66a74455..609fbb159e 100644
--- a/src/lib/efl/interfaces/efl_input_interface.eo
+++ b/src/lib/evas/canvas/efl_input_interface.eo
@@ -23,23 +23,23 @@ interface Efl.Input.Interface ()
23 ]] 23 ]]
24 event_prefix: efl; 24 event_prefix: efl;
25 events { 25 events {
26 pointer,move: Efl.Event.Pointer; [[Main pointer move (current and previous positions are known).]] 26 pointer,move: Efl.Input.Pointer; [[Main pointer move (current and previous positions are known).]]
27 pointer,down: Efl.Event.Pointer; [[Main pointer button pressed (button id is known).]] 27 pointer,down: Efl.Input.Pointer; [[Main pointer button pressed (button id is known).]]
28 pointer,up: Efl.Event.Pointer; [[Main pointer button released (button id is known).]] 28 pointer,up: Efl.Input.Pointer; [[Main pointer button released (button id is known).]]
29 pointer,cancel: Efl.Event.Pointer; [[Main pointer button press was cancelled (button id is known). 29 pointer,cancel: Efl.Input.Pointer; [[Main pointer button press was cancelled (button id is known).
30 This can happen in rare cases when the window manager passes 30 This can happen in rare cases when the window manager passes
31 the focus to a more urgent window, for instance. You probably 31 the focus to a more urgent window, for instance. You probably
32 don't need to listen to this event, as it will be accompanied 32 don't need to listen to this event, as it will be accompanied
33 by an up event.]] 33 by an up event.]]
34 pointer,in: Efl.Event.Pointer; [[Pointer entered a window or a widget.]] 34 pointer,in: Efl.Input.Pointer; [[Pointer entered a window or a widget.]]
35 pointer,out: Efl.Event.Pointer; [[Pointer left a window or a widget.]] 35 pointer,out: Efl.Input.Pointer; [[Pointer left a window or a widget.]]
36 pointer,wheel: Efl.Event.Pointer; [[Mouse wheel event.]] 36 pointer,wheel: Efl.Input.Pointer; [[Mouse wheel event.]]
37 pointer,axis: Efl.Event.Pointer; [[Pen or other axis event update.]] 37 pointer,axis: Efl.Input.Pointer; [[Pen or other axis event update.]]
38 finger,move: Efl.Event.Pointer; [[Finger moved (current and previous positions are known).]] 38 finger,move: Efl.Input.Pointer; [[Finger moved (current and previous positions are known).]]
39 finger,down: Efl.Event.Pointer; [[Finger pressed (finger id is known).]] 39 finger,down: Efl.Input.Pointer; [[Finger pressed (finger id is known).]]
40 finger,up: Efl.Event.Pointer; [[Finger released (finger id is known).]] 40 finger,up: Efl.Input.Pointer; [[Finger released (finger id is known).]]
41 key,down: Efl.Event.Key; [[Keyboard key press.]] 41 key,down: Efl.Input.Key; [[Keyboard key press.]]
42 key,up: Efl.Event.Key; [[Keyboard key release.]] 42 key,up: Efl.Input.Key; [[Keyboard key release.]]
43 hold: Efl.Event.Hold; [[All input events are on hold or resumed.]] 43 hold: Efl.Input.Hold; [[All input events are on hold or resumed.]]
44 } 44 }
45} 45}
diff --git a/src/lib/evas/canvas/efl_event_key.c b/src/lib/evas/canvas/efl_input_key.c
index 3642b337f9..7f955f7235 100644
--- a/src/lib/evas/canvas/efl_event_key.c
+++ b/src/lib/evas/canvas/efl_input_key.c
@@ -2,16 +2,16 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#define EFL_EVENT_PROTECTED 5#define EFL_INPUT_EVENT_PROTECTED
6 6
7#include <Evas.h> 7#include <Evas.h>
8 8
9#define EFL_INTERNAL_UNSTABLE 9#define EFL_INTERNAL_UNSTABLE
10#include "interfaces/efl_common_internal.h" 10#include "interfaces/efl_common_internal.h"
11 11
12#define MY_CLASS EFL_EVENT_KEY_CLASS 12#define MY_CLASS EFL_INPUT_KEY_CLASS
13 13
14static Efl_Event_Key *s_cached_event = NULL; 14static Efl_Input_Key *s_cached_event = NULL;
15 15
16static void 16static void
17_del_hook(Eo *evt) 17_del_hook(Eo *evt)
@@ -32,27 +32,27 @@ _del_hook(Eo *evt)
32 } 32 }
33} 33}
34 34
35EOLIAN static Efl_Event_Key * 35EOLIAN static Efl_Input_Key *
36_efl_event_key_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUSED, 36_efl_input_key_efl_input_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUSED,
37 Eo *owner, void **priv) 37 Eo *owner, void **priv)
38{ 38{
39 Efl_Event_Key_Data *ev; 39 Efl_Input_Key_Data *ev;
40 Efl_Event_Key *evt; 40 Efl_Input_Key *evt;
41 41
42 if (s_cached_event) 42 if (s_cached_event)
43 { 43 {
44 evt = s_cached_event; 44 evt = s_cached_event;
45 s_cached_event = NULL; 45 s_cached_event = NULL;
46 efl_event_reset(evt); 46 efl_input_reset(evt);
47 efl_parent_set(evt, owner); 47 efl_parent_set(evt, owner);
48 } 48 }
49 else 49 else
50 { 50 {
51 evt = efl_add(EFL_EVENT_KEY_CLASS, owner); 51 evt = efl_add(EFL_INPUT_KEY_CLASS, owner);
52 efl_del_intercept_set(evt, _del_hook); 52 efl_del_intercept_set(evt, _del_hook);
53 } 53 }
54 54
55 ev = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS); 55 ev = efl_data_scope_get(evt, EFL_INPUT_KEY_CLASS);
56 ev->fake = EINA_FALSE; 56 ev->fake = EINA_FALSE;
57 if (priv) *priv = ev; 57 if (priv) *priv = ev;
58 58
@@ -60,7 +60,7 @@ _efl_event_key_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUS
60} 60}
61 61
62EOLIAN static void 62EOLIAN static void
63_efl_event_key_class_destructor(Efl_Class *klass EINA_UNUSED) 63_efl_input_key_class_destructor(Efl_Class *klass EINA_UNUSED)
64{ 64{
65 // this is a strange situation... 65 // this is a strange situation...
66 efl_del_intercept_set(s_cached_event, NULL); 66 efl_del_intercept_set(s_cached_event, NULL);
@@ -69,15 +69,15 @@ _efl_event_key_class_destructor(Efl_Class *klass EINA_UNUSED)
69} 69}
70 70
71EOLIAN static Efl_Object * 71EOLIAN static Efl_Object *
72_efl_event_key_efl_object_constructor(Eo *obj, Efl_Event_Key_Data *pd EINA_UNUSED) 72_efl_input_key_efl_object_constructor(Eo *obj, Efl_Input_Key_Data *pd EINA_UNUSED)
73{ 73{
74 obj = efl_constructor(efl_super(obj, MY_CLASS)); 74 obj = efl_constructor(efl_super(obj, MY_CLASS));
75 efl_event_reset(obj); 75 efl_input_reset(obj);
76 return obj; 76 return obj;
77} 77}
78 78
79static inline void 79static inline void
80_efl_event_key_free(Efl_Event_Key_Data *pd) 80_efl_input_key_free(Efl_Input_Key_Data *pd)
81{ 81{
82 free(pd->legacy); 82 free(pd->legacy);
83 if (pd->no_stringshare) return; 83 if (pd->no_stringshare) return;
@@ -88,101 +88,101 @@ _efl_event_key_free(Efl_Event_Key_Data *pd)
88} 88}
89 89
90EOLIAN static void 90EOLIAN static void
91_efl_event_key_efl_object_destructor(Eo *obj, Efl_Event_Key_Data *pd) 91_efl_input_key_efl_object_destructor(Eo *obj, Efl_Input_Key_Data *pd)
92{ 92{
93 _efl_event_key_free(pd); 93 _efl_input_key_free(pd);
94 efl_destructor(efl_super(obj, MY_CLASS)); 94 efl_destructor(efl_super(obj, MY_CLASS));
95} 95}
96 96
97EOLIAN static void 97EOLIAN static void
98_efl_event_key_pressed_set(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, Eina_Bool val) 98_efl_input_key_pressed_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, Eina_Bool val)
99{ 99{
100 pd->pressed = !!val; 100 pd->pressed = !!val;
101} 101}
102 102
103EOLIAN static Eina_Bool 103EOLIAN static Eina_Bool
104_efl_event_key_pressed_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd) 104_efl_input_key_pressed_get(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
105{ 105{
106 return pd->pressed; 106 return pd->pressed;
107} 107}
108 108
109EOLIAN static void 109EOLIAN static void
110_efl_event_key_key_name_set(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, const char *val) 110_efl_input_key_key_name_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, const char *val)
111{ 111{
112 eina_stringshare_replace(&pd->keyname, val); 112 eina_stringshare_replace(&pd->keyname, val);
113} 113}
114 114
115EOLIAN static const char * 115EOLIAN static const char *
116_efl_event_key_key_name_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd) 116_efl_input_key_key_name_get(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
117{ 117{
118 return pd->keyname; 118 return pd->keyname;
119} 119}
120 120
121EOLIAN static void 121EOLIAN static void
122_efl_event_key_key_set(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, const char *val) 122_efl_input_key_key_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, const char *val)
123{ 123{
124 eina_stringshare_replace(&pd->key, val); 124 eina_stringshare_replace(&pd->key, val);
125} 125}
126 126
127EOLIAN static const char * 127EOLIAN static const char *
128_efl_event_key_key_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd) 128_efl_input_key_key_get(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
129{ 129{
130 return pd->key; 130 return pd->key;
131} 131}
132 132
133EOLIAN static void 133EOLIAN static void
134_efl_event_key_string_set(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, const char *val) 134_efl_input_key_string_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, const char *val)
135{ 135{
136 eina_stringshare_replace(&pd->string, val); 136 eina_stringshare_replace(&pd->string, val);
137} 137}
138 138
139EOLIAN static const char * 139EOLIAN static const char *
140_efl_event_key_string_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd) 140_efl_input_key_string_get(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
141{ 141{
142 return pd->string; 142 return pd->string;
143} 143}
144 144
145EOLIAN static void 145EOLIAN static void
146_efl_event_key_compose_set(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, const char *val) 146_efl_input_key_compose_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, const char *val)
147{ 147{
148 eina_stringshare_replace(&pd->compose, val); 148 eina_stringshare_replace(&pd->compose, val);
149} 149}
150 150
151EOLIAN static const char * 151EOLIAN static const char *
152_efl_event_key_compose_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd) 152_efl_input_key_compose_get(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
153{ 153{
154 return pd->compose; 154 return pd->compose;
155} 155}
156 156
157EOLIAN static void 157EOLIAN static void
158_efl_event_key_key_code_set(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, int val) 158_efl_input_key_key_code_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, int val)
159{ 159{
160 pd->keycode = val; 160 pd->keycode = val;
161} 161}
162 162
163EOLIAN static int 163EOLIAN static int
164_efl_event_key_key_code_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd) 164_efl_input_key_key_code_get(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
165{ 165{
166 return pd->keycode; 166 return pd->keycode;
167} 167}
168 168
169EOLIAN static void 169EOLIAN static void
170_efl_event_key_efl_event_reset(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd) 170_efl_input_key_efl_input_event_reset(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
171{ 171{
172 _efl_event_key_free(pd); 172 _efl_input_key_free(pd);
173 memset(pd, 0, sizeof(*pd)); 173 memset(pd, 0, sizeof(*pd));
174 pd->eo = obj; 174 pd->eo = obj;
175 pd->fake = EINA_TRUE; 175 pd->fake = EINA_TRUE;
176} 176}
177 177
178EOLIAN static Efl_Event * 178EOLIAN static Efl_Input_Event *
179_efl_event_key_efl_event_dup(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd) 179_efl_input_key_efl_input_event_dup(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
180{ 180{
181 Efl_Event_Key_Data *ev; 181 Efl_Input_Key_Data *ev;
182 Efl_Event_Key *evt; 182 Efl_Input_Key *evt;
183 183
184 // no parent 184 // no parent
185 evt = efl_event_instance_get(EFL_EVENT_KEY_CLASS, NULL, (void **) &ev); 185 evt = efl_input_instance_get(EFL_INPUT_KEY_CLASS, NULL, (void **) &ev);
186 if (!evt || !ev) return NULL; 186 if (!evt || !ev) return NULL;
187 187
188 memcpy(ev, pd, sizeof(*ev)); 188 memcpy(ev, pd, sizeof(*ev));
@@ -201,59 +201,59 @@ _efl_event_key_efl_event_dup(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd)
201} 201}
202 202
203EOLIAN static void 203EOLIAN static void
204_efl_event_key_efl_event_timestamp_set(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, double ms) 204_efl_input_key_efl_input_event_timestamp_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, double ms)
205{ 205{
206 pd->timestamp = ms; 206 pd->timestamp = ms;
207} 207}
208 208
209EOLIAN static double 209EOLIAN static double
210_efl_event_key_efl_event_timestamp_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd) 210_efl_input_key_efl_input_event_timestamp_get(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
211{ 211{
212 return pd->timestamp; 212 return pd->timestamp;
213} 213}
214 214
215EOLIAN static void 215EOLIAN static void
216_efl_event_key_efl_event_input_event_flags_set(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, Efl_Event_Flags flags) 216_efl_input_key_efl_input_event_event_flags_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, Efl_Input_Flags flags)
217{ 217{
218 pd->event_flags = flags; 218 pd->event_flags = flags;
219} 219}
220 220
221EOLIAN static Efl_Event_Flags 221EOLIAN static Efl_Input_Flags
222_efl_event_key_efl_event_input_event_flags_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd) 222_efl_input_key_efl_input_event_event_flags_get(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
223{ 223{
224 return pd->event_flags; 224 return pd->event_flags;
225} 225}
226 226
227EOLIAN static void 227EOLIAN static void
228_efl_event_key_efl_event_input_device_set(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, Efl_Input_Device *dev) 228_efl_input_key_efl_input_event_device_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, Efl_Input_Device *dev)
229{ 229{
230 pd->device = dev; 230 pd->device = dev;
231} 231}
232 232
233EOLIAN static Efl_Input_Device * 233EOLIAN static Efl_Input_Device *
234_efl_event_key_efl_event_input_device_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd) 234_efl_input_key_efl_input_event_device_get(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
235{ 235{
236 return pd->device; 236 return pd->device;
237} 237}
238 238
239EOLIAN static Eina_Bool 239EOLIAN static Eina_Bool
240_efl_event_key_efl_input_state_modifier_enabled_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, const char * name) 240_efl_input_key_efl_input_state_modifier_enabled_get(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, const char * name)
241{ 241{
242 if (!pd->modifiers) return EINA_FALSE; 242 if (!pd->modifiers) return EINA_FALSE;
243 return evas_key_modifier_is_set(pd->modifiers, name); 243 return evas_key_modifier_is_set(pd->modifiers, name);
244} 244}
245 245
246EOLIAN static Eina_Bool 246EOLIAN static Eina_Bool
247_efl_event_key_efl_input_state_lock_enabled_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd, const char * name) 247_efl_input_key_efl_input_state_lock_enabled_get(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, const char * name)
248{ 248{
249 if (!pd->locks) return EINA_FALSE; 249 if (!pd->locks) return EINA_FALSE;
250 return evas_key_lock_is_set(pd->locks, name); 250 return evas_key_lock_is_set(pd->locks, name);
251} 251}
252 252
253EOLIAN static Eina_Bool 253EOLIAN static Eina_Bool
254_efl_event_key_efl_event_input_fake_get(Eo *obj EINA_UNUSED, Efl_Event_Key_Data *pd) 254_efl_input_key_efl_input_event_fake_get(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
255{ 255{
256 return pd->fake; 256 return pd->fake;
257} 257}
258 258
259#include "efl_event_key.eo.c" 259#include "efl_input_key.eo.c"
diff --git a/src/lib/evas/canvas/efl_event_key.eo b/src/lib/evas/canvas/efl_input_key.eo
index e85b8aeee3..28c3ccee82 100644
--- a/src/lib/evas/canvas/efl_event_key.eo
+++ b/src/lib/evas/canvas/efl_input_key.eo
@@ -1,4 +1,4 @@
1class Efl.Event.Key (Efl.Object, Efl.Event, Efl.Input.State, Efl.Event.Input) 1class Efl.Input.Key (Efl.Object, Efl.Input.Event, Efl.Input.State, Efl.Input.Event)
2{ 2{
3 [[Represents a single key event from a keyboard or similar device. 3 [[Represents a single key event from a keyboard or similar device.
4 4
@@ -55,16 +55,16 @@ class Efl.Event.Key (Efl.Object, Efl.Event, Efl.Input.State, Efl.Event.Input)
55 class.destructor; 55 class.destructor;
56 Efl.Object.constructor; 56 Efl.Object.constructor;
57 Efl.Object.destructor; 57 Efl.Object.destructor;
58 Efl.Event.instance_get; 58 Efl.Input.Event.instance_get;
59 Efl.Event.reset; 59 Efl.Input.Event.reset;
60 Efl.Event.dup; 60 Efl.Input.Event.dup;
61 Efl.Event.timestamp.set; 61 Efl.Input.Event.timestamp.set;
62 Efl.Event.timestamp.get; 62 Efl.Input.Event.timestamp.get;
63 Efl.Event.Input.fake.get; 63 Efl.Input.Event.fake.get;
64 Efl.Event.Input.event_flags.set; 64 Efl.Input.Event.event_flags.set;
65 Efl.Event.Input.event_flags.get; 65 Efl.Input.Event.event_flags.get;
66 Efl.Event.Input.device.set; 66 Efl.Input.Event.device.set;
67 Efl.Event.Input.device.get; 67 Efl.Input.Event.device.get;
68 Efl.Input.State.modifier_enabled.get; 68 Efl.Input.State.modifier_enabled.get;
69 Efl.Input.State.lock_enabled.get; 69 Efl.Input.State.lock_enabled.get;
70 } 70 }
diff --git a/src/lib/evas/canvas/efl_event_pointer.c b/src/lib/evas/canvas/efl_input_pointer.c
index 71b78f42a7..dd055a1572 100644
--- a/src/lib/evas/canvas/efl_event_pointer.c
+++ b/src/lib/evas/canvas/efl_input_pointer.c
@@ -2,14 +2,14 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#define EFL_EVENT_PROTECTED 5#define EFL_INPUT_EVENT_PROTECTED
6 6
7#include <Evas.h> 7#include <Evas.h>
8 8
9#define EFL_INTERNAL_UNSTABLE 9#define EFL_INTERNAL_UNSTABLE
10#include "interfaces/efl_common_internal.h" 10#include "interfaces/efl_common_internal.h"
11 11
12#define MY_CLASS EFL_EVENT_POINTER_CLASS 12#define MY_CLASS EFL_INPUT_POINTER_CLASS
13 13
14 14
15/* Pointer Event 15/* Pointer Event
@@ -22,7 +22,7 @@
22 * Do not add any logic here. 22 * Do not add any logic here.
23 */ 23 */
24 24
25static Efl_Event_Pointer *s_cached_event = NULL; 25static Efl_Input_Pointer *s_cached_event = NULL;
26 26
27static void 27static void
28_del_hook(Eo *evt) 28_del_hook(Eo *evt)
@@ -43,27 +43,27 @@ _del_hook(Eo *evt)
43 } 43 }
44} 44}
45 45
46EOLIAN static Efl_Event_Pointer * 46EOLIAN static Efl_Input_Pointer *
47_efl_event_pointer_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUSED, 47_efl_input_pointer_efl_input_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUSED,
48 Eo *owner, void **priv) 48 Eo *owner, void **priv)
49{ 49{
50 Efl_Event_Pointer_Data *ev; 50 Efl_Input_Pointer_Data *ev;
51 Efl_Event_Pointer *evt; 51 Efl_Input_Pointer *evt;
52 52
53 if (s_cached_event) 53 if (s_cached_event)
54 { 54 {
55 evt = s_cached_event; 55 evt = s_cached_event;
56 s_cached_event = NULL; 56 s_cached_event = NULL;
57 efl_event_reset(evt); 57 efl_input_reset(evt);
58 efl_parent_set(evt, owner); 58 efl_parent_set(evt, owner);
59 } 59 }
60 else 60 else
61 { 61 {
62 evt = efl_add(EFL_EVENT_POINTER_CLASS, owner); 62 evt = efl_add(EFL_INPUT_POINTER_CLASS, owner);
63 efl_del_intercept_set(evt, _del_hook); 63 efl_del_intercept_set(evt, _del_hook);
64 } 64 }
65 65
66 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 66 ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
67 ev->fake = EINA_FALSE; 67 ev->fake = EINA_FALSE;
68 if (priv) *priv = ev; 68 if (priv) *priv = ev;
69 69
@@ -71,7 +71,7 @@ _efl_event_pointer_efl_event_instance_get(Eo *klass EINA_UNUSED, void *_pd EINA_
71} 71}
72 72
73EOLIAN static void 73EOLIAN static void
74_efl_event_pointer_class_destructor(Efl_Class *klass EINA_UNUSED) 74_efl_input_pointer_class_destructor(Efl_Class *klass EINA_UNUSED)
75{ 75{
76 // this is a strange situation... 76 // this is a strange situation...
77 efl_del_intercept_set(s_cached_event, NULL); 77 efl_del_intercept_set(s_cached_event, NULL);
@@ -80,45 +80,45 @@ _efl_event_pointer_class_destructor(Efl_Class *klass EINA_UNUSED)
80} 80}
81 81
82EOLIAN static Efl_Object * 82EOLIAN static Efl_Object *
83_efl_event_pointer_efl_object_constructor(Eo *obj, Efl_Event_Pointer_Data *pd EINA_UNUSED) 83_efl_input_pointer_efl_object_constructor(Eo *obj, Efl_Input_Pointer_Data *pd EINA_UNUSED)
84{ 84{
85 obj = efl_constructor(efl_super(obj, MY_CLASS)); 85 obj = efl_constructor(efl_super(obj, MY_CLASS));
86 efl_event_reset(obj); 86 efl_input_reset(obj);
87 return obj; 87 return obj;
88} 88}
89 89
90static inline void 90static inline void
91_efl_event_pointer_free(Efl_Event_Pointer_Data *pd) 91_efl_input_pointer_free(Efl_Input_Pointer_Data *pd)
92{ 92{
93 free(pd->legacy); 93 free(pd->legacy);
94} 94}
95 95
96EOLIAN static void 96EOLIAN static void
97_efl_event_pointer_efl_object_destructor(Eo *obj, Efl_Event_Pointer_Data *pd) 97_efl_input_pointer_efl_object_destructor(Eo *obj, Efl_Input_Pointer_Data *pd)
98{ 98{
99 _efl_event_pointer_free(pd); 99 _efl_input_pointer_free(pd);
100 efl_destructor(efl_super(obj, MY_CLASS)); 100 efl_destructor(efl_super(obj, MY_CLASS));
101} 101}
102 102
103EOLIAN static void 103EOLIAN static void
104_efl_event_pointer_efl_event_reset(Eo *obj, Efl_Event_Pointer_Data *pd) 104_efl_input_pointer_efl_input_event_reset(Eo *obj, Efl_Input_Pointer_Data *pd)
105{ 105{
106 Eina_Bool fake = pd->fake; 106 Eina_Bool fake = pd->fake;
107 _efl_event_pointer_free(pd); 107 _efl_input_pointer_free(pd);
108 memset(pd, 0, sizeof(*pd)); 108 memset(pd, 0, sizeof(*pd));
109 pd->eo = obj; 109 pd->eo = obj;
110 pd->wheel.dir = EFL_ORIENT_VERTICAL; 110 pd->wheel.dir = EFL_ORIENT_VERTICAL;
111 pd->fake = fake; 111 pd->fake = fake;
112} 112}
113 113
114EOLIAN static Efl_Event * 114EOLIAN static Efl_Input_Event *
115_efl_event_pointer_efl_event_dup(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 115_efl_input_pointer_efl_input_event_dup(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
116{ 116{
117 Efl_Event_Pointer_Data *ev; 117 Efl_Input_Pointer_Data *ev;
118 Efl_Event_Pointer *evt; 118 Efl_Input_Pointer *evt;
119 119
120 // no parent 120 // no parent
121 evt = efl_event_instance_get(EFL_EVENT_POINTER_CLASS, NULL, (void **) &ev); 121 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, NULL, (void **) &ev);
122 if (!evt) return NULL; 122 if (!evt) return NULL;
123 123
124 memcpy(ev, pd, sizeof(*ev)); 124 memcpy(ev, pd, sizeof(*ev));
@@ -133,31 +133,31 @@ _efl_event_pointer_efl_event_dup(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd
133} 133}
134 134
135EOLIAN static void 135EOLIAN static void
136_efl_event_pointer_action_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Efl_Pointer_Action act) 136_efl_input_pointer_action_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Efl_Pointer_Action act)
137{ 137{
138 pd->action = act; 138 pd->action = act;
139} 139}
140 140
141EOLIAN static Efl_Pointer_Action 141EOLIAN static Efl_Pointer_Action
142_efl_event_pointer_action_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 142_efl_input_pointer_action_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
143{ 143{
144 return pd->action; 144 return pd->action;
145} 145}
146 146
147EOLIAN static void 147EOLIAN static void
148_efl_event_pointer_button_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, int but) 148_efl_input_pointer_button_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, int but)
149{ 149{
150 pd->button = but; 150 pd->button = but;
151} 151}
152 152
153EOLIAN static int 153EOLIAN static int
154_efl_event_pointer_button_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 154_efl_input_pointer_button_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
155{ 155{
156 return pd->button; 156 return pd->button;
157} 157}
158 158
159EOLIAN static void 159EOLIAN static void
160_efl_event_pointer_button_pressed_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, int button, Eina_Bool pressed) 160_efl_input_pointer_button_pressed_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, int button, Eina_Bool pressed)
161{ 161{
162 if (button < 0) return; 162 if (button < 0) return;
163 if (button > 31) return; 163 if (button > 31) return;
@@ -168,7 +168,7 @@ _efl_event_pointer_button_pressed_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Dat
168} 168}
169 169
170EOLIAN static Eina_Bool 170EOLIAN static Eina_Bool
171_efl_event_pointer_button_pressed_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, int button) 171_efl_input_pointer_button_pressed_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, int button)
172{ 172{
173 if (button < 0) return EINA_FALSE; 173 if (button < 0) return EINA_FALSE;
174 if (button > 31) return EINA_FALSE; 174 if (button > 31) return EINA_FALSE;
@@ -176,35 +176,35 @@ _efl_event_pointer_button_pressed_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Dat
176} 176}
177 177
178EOLIAN static void 178EOLIAN static void
179_efl_event_pointer_position_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, int x, int y) 179_efl_input_pointer_position_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, int x, int y)
180{ 180{
181 pd->cur.x = (double) x; 181 pd->cur.x = (double) x;
182 pd->cur.y = (double) y; 182 pd->cur.y = (double) y;
183} 183}
184 184
185EOLIAN static void 185EOLIAN static void
186_efl_event_pointer_position_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, int *x, int *y) 186_efl_input_pointer_position_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, int *x, int *y)
187{ 187{
188 if (x) *x = (int) pd->cur.x; 188 if (x) *x = (int) pd->cur.x;
189 if (y) *y = (int) pd->cur.y; 189 if (y) *y = (int) pd->cur.y;
190} 190}
191 191
192EOLIAN static void 192EOLIAN static void
193_efl_event_pointer_previous_position_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, int x, int y) 193_efl_input_pointer_previous_position_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, int x, int y)
194{ 194{
195 pd->prev.x = (double) x; 195 pd->prev.x = (double) x;
196 pd->prev.y = (double) y; 196 pd->prev.y = (double) y;
197} 197}
198 198
199EOLIAN static void 199EOLIAN static void
200_efl_event_pointer_previous_position_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, int *x, int *y) 200_efl_input_pointer_previous_position_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, int *x, int *y)
201{ 201{
202 if (x) *x = (int) pd->prev.x; 202 if (x) *x = (int) pd->prev.x;
203 if (y) *y = (int) pd->prev.y; 203 if (y) *y = (int) pd->prev.y;
204} 204}
205 205
206EOLIAN static void 206EOLIAN static void
207_efl_event_pointer_delta_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, int *dx, int *dy) 207_efl_input_pointer_delta_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, int *dx, int *dy)
208{ 208{
209 // Using (int) twice to return the same as previous_position - position 209 // Using (int) twice to return the same as previous_position - position
210 if (dx) *dx = (int) pd->prev.x - (int) pd->cur.x; 210 if (dx) *dx = (int) pd->prev.x - (int) pd->cur.x;
@@ -212,119 +212,119 @@ _efl_event_pointer_delta_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, in
212} 212}
213 213
214EOLIAN static void 214EOLIAN static void
215_efl_event_pointer_efl_event_input_device_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Efl_Input_Device *dev) 215_efl_input_pointer_efl_input_event_device_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Efl_Input_Device *dev)
216{ 216{
217 /* ref? */ 217 /* ref? */
218 pd->device = dev; 218 pd->device = dev;
219} 219}
220 220
221EOLIAN static Efl_Input_Device * 221EOLIAN static Efl_Input_Device *
222_efl_event_pointer_efl_event_input_device_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 222_efl_input_pointer_efl_input_event_device_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
223{ 223{
224 return pd->device; 224 return pd->device;
225} 225}
226 226
227EOLIAN static void 227EOLIAN static void
228_efl_event_pointer_source_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Efl_Gfx *src) 228_efl_input_pointer_source_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Efl_Gfx *src)
229{ 229{
230 /* ref? */ 230 /* ref? */
231 pd->source = src; 231 pd->source = src;
232} 232}
233 233
234EOLIAN static Efl_Gfx * 234EOLIAN static Efl_Gfx *
235_efl_event_pointer_source_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 235_efl_input_pointer_source_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
236{ 236{
237 return pd->source; 237 return pd->source;
238} 238}
239 239
240EOLIAN static void 240EOLIAN static void
241_efl_event_pointer_button_flags_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Efl_Pointer_Flags flags) 241_efl_input_pointer_button_flags_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Efl_Pointer_Flags flags)
242{ 242{
243 pd->button_flags = flags; 243 pd->button_flags = flags;
244} 244}
245 245
246EOLIAN static Efl_Pointer_Flags 246EOLIAN static Efl_Pointer_Flags
247_efl_event_pointer_button_flags_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 247_efl_input_pointer_button_flags_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
248{ 248{
249 return pd->button_flags; 249 return pd->button_flags;
250} 250}
251 251
252EOLIAN static void 252EOLIAN static void
253_efl_event_pointer_efl_event_input_event_flags_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Efl_Event_Flags flags) 253_efl_input_pointer_efl_input_event_event_flags_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Efl_Input_Flags flags)
254{ 254{
255 pd->event_flags = flags; 255 pd->event_flags = flags;
256} 256}
257 257
258EOLIAN static Efl_Event_Flags 258EOLIAN static Efl_Input_Flags
259_efl_event_pointer_efl_event_input_event_flags_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 259_efl_input_pointer_efl_input_event_event_flags_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
260{ 260{
261 return pd->event_flags; 261 return pd->event_flags;
262} 262}
263 263
264EOLIAN static void 264EOLIAN static void
265_efl_event_pointer_efl_event_timestamp_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, double ms) 265_efl_input_pointer_efl_input_event_timestamp_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, double ms)
266{ 266{
267 pd->timestamp = (unsigned int) ms; 267 pd->timestamp = (unsigned int) ms;
268} 268}
269 269
270EOLIAN static double 270EOLIAN static double
271_efl_event_pointer_efl_event_timestamp_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 271_efl_input_pointer_efl_input_event_timestamp_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
272{ 272{
273 return (double) pd->timestamp; 273 return (double) pd->timestamp;
274} 274}
275 275
276EOLIAN static void 276EOLIAN static void
277_efl_event_pointer_wheel_direction_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Efl_Orient dir) 277_efl_input_pointer_wheel_direction_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Efl_Orient dir)
278{ 278{
279 pd->wheel.dir = dir; 279 pd->wheel.dir = dir;
280} 280}
281 281
282EOLIAN static Efl_Orient 282EOLIAN static Efl_Orient
283_efl_event_pointer_wheel_direction_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 283_efl_input_pointer_wheel_direction_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
284{ 284{
285 return pd->wheel.dir; 285 return pd->wheel.dir;
286} 286}
287 287
288EOLIAN static void 288EOLIAN static void
289_efl_event_pointer_wheel_delta_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, int dist) 289_efl_input_pointer_wheel_delta_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, int dist)
290{ 290{
291 pd->wheel.z = dist; 291 pd->wheel.z = dist;
292} 292}
293 293
294EOLIAN static int 294EOLIAN static int
295_efl_event_pointer_wheel_delta_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 295_efl_input_pointer_wheel_delta_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
296{ 296{
297 return pd->wheel.z; 297 return pd->wheel.z;
298} 298}
299 299
300EOLIAN static int 300EOLIAN static int
301_efl_event_pointer_tool_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 301_efl_input_pointer_tool_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
302{ 302{
303 return pd->tool; 303 return pd->tool;
304} 304}
305 305
306EOLIAN static void 306EOLIAN static void
307_efl_event_pointer_tool_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, int id) 307_efl_input_pointer_tool_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, int id)
308{ 308{
309 pd->tool = id; 309 pd->tool = id;
310} 310}
311 311
312EOLIAN static Eina_Bool 312EOLIAN static Eina_Bool
313_efl_event_pointer_efl_input_state_modifier_enabled_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, const char *name) 313_efl_input_pointer_efl_input_state_modifier_enabled_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, const char *name)
314{ 314{
315 if (!pd->modifiers) return EINA_FALSE; 315 if (!pd->modifiers) return EINA_FALSE;
316 return evas_key_modifier_is_set(pd->modifiers, name); 316 return evas_key_modifier_is_set(pd->modifiers, name);
317} 317}
318 318
319EOLIAN static Eina_Bool 319EOLIAN static Eina_Bool
320_efl_event_pointer_efl_input_state_lock_enabled_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, const char *name) 320_efl_input_pointer_efl_input_state_lock_enabled_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, const char *name)
321{ 321{
322 if (!pd->locks) return EINA_FALSE; 322 if (!pd->locks) return EINA_FALSE;
323 return evas_key_lock_is_set(pd->locks, name); 323 return evas_key_lock_is_set(pd->locks, name);
324} 324}
325 325
326EOLIAN static void 326EOLIAN static void
327_efl_event_pointer_double_click_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Eina_Bool val) 327_efl_input_pointer_double_click_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Eina_Bool val)
328{ 328{
329 if (val) 329 if (val)
330 pd->button_flags |= EFL_POINTER_FLAGS_DOUBLE_CLICK; 330 pd->button_flags |= EFL_POINTER_FLAGS_DOUBLE_CLICK;
@@ -333,13 +333,13 @@ _efl_event_pointer_double_click_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data
333} 333}
334 334
335EOLIAN static Eina_Bool 335EOLIAN static Eina_Bool
336_efl_event_pointer_double_click_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 336_efl_input_pointer_double_click_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
337{ 337{
338 return !!(pd->button_flags & EFL_POINTER_FLAGS_DOUBLE_CLICK); 338 return !!(pd->button_flags & EFL_POINTER_FLAGS_DOUBLE_CLICK);
339} 339}
340 340
341EOLIAN static void 341EOLIAN static void
342_efl_event_pointer_triple_click_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Eina_Bool val) 342_efl_input_pointer_triple_click_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Eina_Bool val)
343{ 343{
344 if (val) 344 if (val)
345 pd->button_flags |= EFL_POINTER_FLAGS_TRIPLE_CLICK; 345 pd->button_flags |= EFL_POINTER_FLAGS_TRIPLE_CLICK;
@@ -348,20 +348,20 @@ _efl_event_pointer_triple_click_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data
348} 348}
349 349
350EOLIAN static Eina_Bool 350EOLIAN static Eina_Bool
351_efl_event_pointer_triple_click_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 351_efl_input_pointer_triple_click_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
352{ 352{
353 return !!(pd->button_flags & EFL_POINTER_FLAGS_TRIPLE_CLICK); 353 return !!(pd->button_flags & EFL_POINTER_FLAGS_TRIPLE_CLICK);
354} 354}
355 355
356EOLIAN static Eina_Bool 356EOLIAN static Eina_Bool
357_efl_event_pointer_efl_event_input_fake_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd) 357_efl_input_pointer_efl_input_event_fake_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
358{ 358{
359 // read-only 359 // read-only
360 return pd->fake; 360 return pd->fake;
361} 361}
362 362
363EOLIAN static Eina_Bool 363EOLIAN static Eina_Bool
364_efl_event_pointer_value_has_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Efl_Input_Value key) 364_efl_input_pointer_value_has_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Efl_Input_Value key)
365{ 365{
366 if (!pd || (key <= EFL_INPUT_VALUE_NONE) || (key > EFL_INPUT_VALUE_SLIDER)) 366 if (!pd || (key <= EFL_INPUT_VALUE_NONE) || (key > EFL_INPUT_VALUE_SLIDER))
367 return EINA_FALSE; 367 return EINA_FALSE;
@@ -369,7 +369,7 @@ _efl_event_pointer_value_has_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd
369} 369}
370 370
371EOLIAN static Eina_Bool 371EOLIAN static Eina_Bool
372_efl_event_pointer_value_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Efl_Input_Value key, double val) 372_efl_input_pointer_value_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Efl_Input_Value key, double val)
373{ 373{
374 if ((key <= EFL_INPUT_VALUE_NONE) || (key > EFL_INPUT_VALUE_SLIDER)) 374 if ((key <= EFL_INPUT_VALUE_NONE) || (key > EFL_INPUT_VALUE_SLIDER))
375 return EINA_FALSE; 375 return EINA_FALSE;
@@ -469,7 +469,7 @@ _efl_event_pointer_value_set(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Ef
469} 469}
470 470
471EOLIAN static double 471EOLIAN static double
472_efl_event_pointer_value_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Efl_Input_Value key) 472_efl_input_pointer_value_get(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Efl_Input_Value key)
473{ 473{
474 switch (key) 474 switch (key)
475 { 475 {
@@ -551,4 +551,4 @@ _efl_event_pointer_value_get(Eo *obj EINA_UNUSED, Efl_Event_Pointer_Data *pd, Ef
551 } 551 }
552} 552}
553 553
554#include "efl_event_pointer.eo.c" 554#include "efl_input_pointer.eo.c"
diff --git a/src/lib/evas/canvas/efl_event_pointer.eo b/src/lib/evas/canvas/efl_input_pointer.eo
index 2722d1cc9a..28a201fa84 100644
--- a/src/lib/evas/canvas/efl_event_pointer.eo
+++ b/src/lib/evas/canvas/efl_input_pointer.eo
@@ -1,7 +1,7 @@
1import efl_orientation; 1import efl_orientation;
2import efl_event_types; 2import efl_input_types;
3 3
4class Efl.Event.Pointer (Efl.Object, Efl.Event, Efl.Input.State, Efl.Event.Input) 4class Efl.Input.Pointer (Efl.Object, Efl.Input.Event, Efl.Input.State, Efl.Input.Event)
5{ 5{
6 [[Event data carried over with any pointer event (mouse, touch, pen, ...) 6 [[Event data carried over with any pointer event (mouse, touch, pen, ...)
7 7
@@ -164,16 +164,16 @@ class Efl.Event.Pointer (Efl.Object, Efl.Event, Efl.Input.State, Efl.Event.Input
164 Efl.Object.constructor; 164 Efl.Object.constructor;
165 Efl.Object.destructor; 165 Efl.Object.destructor;
166 class.destructor; 166 class.destructor;
167 Efl.Event.instance_get; 167 Efl.Input.Event.instance_get;
168 Efl.Event.reset; 168 Efl.Input.Event.reset;
169 Efl.Event.dup; 169 Efl.Input.Event.dup;
170 Efl.Event.timestamp.set; 170 Efl.Input.Event.timestamp.set;
171 Efl.Event.timestamp.get; 171 Efl.Input.Event.timestamp.get;
172 Efl.Event.Input.fake.get; 172 Efl.Input.Event.fake.get;
173 Efl.Event.Input.event_flags.set; 173 Efl.Input.Event.event_flags.set;
174 Efl.Event.Input.event_flags.get; 174 Efl.Input.Event.event_flags.get;
175 Efl.Event.Input.device.set; 175 Efl.Input.Event.device.set;
176 Efl.Event.Input.device.get; 176 Efl.Input.Event.device.get;
177 Efl.Input.State.modifier_enabled.get; 177 Efl.Input.State.modifier_enabled.get;
178 Efl.Input.State.lock_enabled.get; 178 Efl.Input.State.lock_enabled.get;
179 } 179 }
diff --git a/src/lib/efl/interfaces/efl_input_state.eo b/src/lib/evas/canvas/efl_input_state.eo
index 0622adc5e0..0622adc5e0 100644
--- a/src/lib/efl/interfaces/efl_input_state.eo
+++ b/src/lib/evas/canvas/efl_input_state.eo
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 81a1e6dd4a..0e2835b1d0 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -156,7 +156,7 @@ static void
156_eo_evas_object_cb(void *data, const Eo_Event *event) 156_eo_evas_object_cb(void *data, const Eo_Event *event)
157{ 157{
158 Evas_Event_Flags *event_flags = NULL, evflags = EVAS_EVENT_FLAG_NONE; 158 Evas_Event_Flags *event_flags = NULL, evflags = EVAS_EVENT_FLAG_NONE;
159 Efl_Event *efl_event_info = event->info; 159 Efl_Input_Event *efl_event_info = event->info;
160 _eo_evas_object_cb_info *info = data; 160 _eo_evas_object_cb_info *info = data;
161 void *event_info; 161 void *event_info;
162 Evas *evas; 162 Evas *evas;
@@ -167,15 +167,15 @@ _eo_evas_object_cb(void *data, const Eo_Event *event)
167 switch (info->efl_event_type) 167 switch (info->efl_event_type)
168 { 168 {
169 case EFL_EVENT_TYPE_POINTER: 169 case EFL_EVENT_TYPE_POINTER:
170 event_info = efl_event_pointer_legacy_info_fill(efl_event_info, info->type, &event_flags); 170 event_info = efl_input_pointer_legacy_info_fill(efl_event_info, info->type, &event_flags);
171 break; 171 break;
172 172
173 case EFL_EVENT_TYPE_KEY: 173 case EFL_EVENT_TYPE_KEY:
174 event_info = efl_event_key_legacy_info_fill(efl_event_info, &event_flags); 174 event_info = efl_input_key_legacy_info_fill(efl_event_info, &event_flags);
175 break; 175 break;
176 176
177 case EFL_EVENT_TYPE_HOLD: 177 case EFL_EVENT_TYPE_HOLD:
178 event_info = efl_event_hold_legacy_info_fill(efl_event_info, &event_flags); 178 event_info = efl_input_hold_legacy_info_fill(efl_event_info, &event_flags);
179 break; 179 break;
180 180
181 case EFL_EVENT_TYPE_NULL: 181 case EFL_EVENT_TYPE_NULL:
@@ -191,7 +191,7 @@ _eo_evas_object_cb(void *data, const Eo_Event *event)
191 if (event_flags) evflags = *event_flags; 191 if (event_flags) evflags = *event_flags;
192 info->func(info->data, evas, event->object, event_info); 192 info->func(info->data, evas, event->object, event_info);
193 if (event_flags && (evflags != *event_flags)) 193 if (event_flags && (evflags != *event_flags))
194 efl_event_flags_set(efl_event_info, *event_flags); 194 efl_input_event_flags_set(efl_event_info, *event_flags);
195} 195}
196 196
197static void 197static void
@@ -327,11 +327,11 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
327 327
328 if ((type == EVAS_CALLBACK_MOUSE_DOWN) || (type == EVAS_CALLBACK_MOUSE_UP)) 328 if ((type == EVAS_CALLBACK_MOUSE_DOWN) || (type == EVAS_CALLBACK_MOUSE_UP))
329 { 329 {
330 flags = efl_event_pointer_button_flags_get(event_info); 330 flags = efl_input_pointer_button_flags_get(event_info);
331 if (flags & mask) 331 if (flags & mask)
332 { 332 {
333 if (obj->last_mouse_down_counter < (e->last_mouse_down_counter - 1)) 333 if (obj->last_mouse_down_counter < (e->last_mouse_down_counter - 1))
334 efl_event_pointer_button_flags_set(event_info, flags & ~mask); 334 efl_input_pointer_button_flags_set(event_info, flags & ~mask);
335 } 335 }
336 obj->last_mouse_down_counter = e->last_mouse_down_counter; 336 obj->last_mouse_down_counter = e->last_mouse_down_counter;
337 } 337 }
@@ -345,7 +345,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
345 efl_event_callback_call(eo_obj, efl_event_desc, event_info); 345 efl_event_callback_call(eo_obj, efl_event_desc, event_info);
346 346
347 if ((type == EVAS_CALLBACK_MOUSE_DOWN) || (type == EVAS_CALLBACK_MOUSE_UP)) 347 if ((type == EVAS_CALLBACK_MOUSE_DOWN) || (type == EVAS_CALLBACK_MOUSE_UP))
348 efl_event_pointer_button_flags_set(event_info, flags); 348 efl_input_pointer_button_flags_set(event_info, flags);
349 349
350nothing_here: 350nothing_here:
351 if (!obj->no_propagate) 351 if (!obj->no_propagate)
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index ea75d1ec85..a9a76ddfe2 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -1,5 +1,5 @@
1import evas_types; 1import evas_types;
2import efl_event_types; 2import efl_input_types;
3 3
4class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface) 4class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface)
5{ 5{
@@ -44,7 +44,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface)
44 ]] 44 ]]
45 } 45 }
46 values { 46 values {
47 flags: Efl.Event.Flags; [[The default flags to use.]] 47 flags: Efl.Input.Flags; [[The default flags to use.]]
48 } 48 }
49 } 49 }
50 @property font_cache { 50 @property font_cache {
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index d8359478b2..bc09992a9d 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -1,4 +1,4 @@
1#define EFL_EVENT_PROTECTED 1#define EFL_INPUT_EVENT_PROTECTED
2 2
3#include "evas_common_private.h" 3#include "evas_common_private.h"
4#include "evas_private.h" 4#include "evas_private.h"
@@ -18,13 +18,13 @@ static Eina_List *
18evas_event_list_copy(Eina_List *list); 18evas_event_list_copy(Eina_List *list);
19 19
20static void 20static void
21_canvas_event_feed_mouse_move_internal(Evas_Public_Data *e, Efl_Event_Pointer_Data *ev); 21_canvas_event_feed_mouse_move_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data *ev);
22 22
23static void 23static void
24_canvas_event_feed_multi_up_internal(Evas_Public_Data *e, Efl_Event_Pointer_Data *ev); 24_canvas_event_feed_multi_up_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data *ev);
25 25
26static void 26static void
27_canvas_event_feed_multi_move_internal(Evas_Public_Data *e, Efl_Event_Pointer_Data *ev); 27_canvas_event_feed_multi_move_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data *ev);
28 28
29static void 29static void
30_canvas_event_feed_mouse_move_legacy(Evas *eo_e, Evas_Public_Data *e, int x, int y, 30_canvas_event_feed_mouse_move_legacy(Evas *eo_e, Evas_Public_Data *e, int x, int y,
@@ -371,7 +371,7 @@ _transform_to_src_space_f(Evas_Object_Protected_Data *obj, Evas_Object_Protected
371 371
372static void 372static void
373_evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, 373_evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
374 Efl_Event_Pointer *parent_ev, int event_id) 374 Efl_Input_Pointer *parent_ev, int event_id)
375{ 375{
376 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 376 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
377 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 377 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
@@ -380,16 +380,16 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
380 Evas_Object_Protected_Data *child; 380 Evas_Object_Protected_Data *child;
381 Evas_Object *eo_child; 381 Evas_Object *eo_child;
382 Eina_List *copy, *l; 382 Eina_List *copy, *l;
383 Efl_Event_Pointer_Data *ev; 383 Efl_Input_Pointer_Data *ev;
384 Efl_Event_Pointer *evt; 384 Efl_Input_Pointer *evt;
385 Eina_Vector2 point; 385 Eina_Vector2 point;
386 int addgrab = 0; 386 int addgrab = 0;
387 int no_rep = 0; 387 int no_rep = 0;
388 388
389 if (obj->delete_me || src->delete_me || e->is_frozen) return; 389 if (obj->delete_me || src->delete_me || e->is_frozen) return;
390 390
391 evt = efl_event_dup(parent_ev); 391 evt = efl_input_dup(parent_ev);
392 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 392 ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
393 if (!ev) return; 393 if (!ev) return;
394 394
395 _transform_to_src_space_f(obj, src, &ev->cur); 395 _transform_to_src_space_f(obj, src, &ev->cur);
@@ -454,7 +454,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e,
454 454
455static void 455static void
456_evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, 456_evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
457 Efl_Event_Pointer *parent_ev, int event_id) 457 Efl_Input_Pointer *parent_ev, int event_id)
458{ 458{
459 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 459 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
460 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 460 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
@@ -463,14 +463,14 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
463 Evas_Object_Protected_Data *child; 463 Evas_Object_Protected_Data *child;
464 Evas_Object *eo_child; 464 Evas_Object *eo_child;
465 Eina_List *l; 465 Eina_List *l;
466 Efl_Event_Pointer_Data *ev; 466 Efl_Input_Pointer_Data *ev;
467 Efl_Event_Pointer *evt; 467 Efl_Input_Pointer *evt;
468 Eina_Vector2 curpt, curpt_real, prevpt, prevpt_real; 468 Eina_Vector2 curpt, curpt_real, prevpt, prevpt_real;
469 469
470 if (obj->delete_me || src->delete_me || e->is_frozen) return; 470 if (obj->delete_me || src->delete_me || e->is_frozen) return;
471 471
472 evt = efl_event_dup(parent_ev); 472 evt = efl_input_dup(parent_ev);
473 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 473 ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
474 if (!ev) return; 474 if (!ev) return;
475 475
476 curpt_real = ev->cur; 476 curpt_real = ev->cur;
@@ -628,7 +628,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e,
628 628
629static void 629static void
630_evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, 630_evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e,
631 Efl_Event_Pointer *parent_ev, int event_id) 631 Efl_Input_Pointer *parent_ev, int event_id)
632{ 632{
633 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 633 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
634 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 634 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
@@ -637,14 +637,14 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e,
637 Evas_Object_Protected_Data *child; 637 Evas_Object_Protected_Data *child;
638 Evas_Object *eo_child; 638 Evas_Object *eo_child;
639 Eina_List *copy, *l; 639 Eina_List *copy, *l;
640 Efl_Event_Pointer_Data *ev; 640 Efl_Input_Pointer_Data *ev;
641 Efl_Event_Pointer *evt; 641 Efl_Input_Pointer *evt;
642 Eina_Vector2 point; 642 Eina_Vector2 point;
643 643
644 if (obj->delete_me || src->delete_me || e->is_frozen) return; 644 if (obj->delete_me || src->delete_me || e->is_frozen) return;
645 645
646 evt = efl_event_dup(parent_ev); 646 evt = efl_input_dup(parent_ev);
647 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 647 ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
648 if (!ev) return; 648 if (!ev) return;
649 649
650 _transform_to_src_space_f(obj, src, &ev->cur); 650 _transform_to_src_space_f(obj, src, &ev->cur);
@@ -685,7 +685,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e,
685} 685}
686 686
687static void 687static void
688_evas_event_source_hold_events(Evas_Object *eo_obj, int event_id, Efl_Event_Hold *evt) 688_evas_event_source_hold_events(Evas_Object *eo_obj, int event_id, Efl_Input_Hold *evt)
689{ 689{
690 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 690 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
691 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 691 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
@@ -708,7 +708,7 @@ _evas_event_source_hold_events(Evas_Object *eo_obj, int event_id, Efl_Event_Hold
708 708
709static void 709static void
710_evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, 710_evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e,
711 Efl_Event_Pointer *parent_ev, int event_id) 711 Efl_Input_Pointer *parent_ev, int event_id)
712{ 712{
713 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 713 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
714 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 714 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
@@ -717,14 +717,14 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e,
717 Evas_Object_Protected_Data *child; 717 Evas_Object_Protected_Data *child;
718 Evas_Object *eo_child; 718 Evas_Object *eo_child;
719 Eina_List *copy, *l; 719 Eina_List *copy, *l;
720 Efl_Event_Pointer_Data *ev; 720 Efl_Input_Pointer_Data *ev;
721 Efl_Event_Pointer *evt; 721 Efl_Input_Pointer *evt;
722 Eina_Vector2 point; 722 Eina_Vector2 point;
723 723
724 if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return; 724 if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return;
725 725
726 evt = efl_event_dup(parent_ev); 726 evt = efl_input_dup(parent_ev);
727 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 727 ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
728 if (!ev) return; 728 if (!ev) return;
729 729
730 _transform_to_src_space_f(obj, src, &ev->cur); 730 _transform_to_src_space_f(obj, src, &ev->cur);
@@ -749,22 +749,22 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e,
749 749
750static void 750static void
751_evas_event_source_multi_down_events(Evas_Object_Protected_Data *obj, Evas_Public_Data *e, 751_evas_event_source_multi_down_events(Evas_Object_Protected_Data *obj, Evas_Public_Data *e,
752 Efl_Event_Pointer *parent_ev, int event_id) 752 Efl_Input_Pointer *parent_ev, int event_id)
753{ 753{
754 Evas_Object *eo_src = _evas_object_image_source_get(obj->object); 754 Evas_Object *eo_src = _evas_object_image_source_get(obj->object);
755 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 755 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
756 Evas_Object_Protected_Data *child; 756 Evas_Object_Protected_Data *child;
757 Evas_Object *eo_child; 757 Evas_Object *eo_child;
758 Eina_List *copy, *l; 758 Eina_List *copy, *l;
759 Efl_Event_Pointer_Data *ev; 759 Efl_Input_Pointer_Data *ev;
760 Efl_Event_Pointer *evt; 760 Efl_Input_Pointer *evt;
761 Eina_Vector2 point; 761 Eina_Vector2 point;
762 int addgrab = 0; 762 int addgrab = 0;
763 763
764 if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return; 764 if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return;
765 765
766 evt = efl_event_dup(parent_ev); 766 evt = efl_input_dup(parent_ev);
767 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 767 ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
768 if (!ev) return; 768 if (!ev) return;
769 769
770 _transform_to_src_space_f(obj, src, &ev->cur); 770 _transform_to_src_space_f(obj, src, &ev->cur);
@@ -801,21 +801,21 @@ _evas_event_source_multi_down_events(Evas_Object_Protected_Data *obj, Evas_Publi
801 801
802static void 802static void
803_evas_event_source_multi_up_events(Evas_Object_Protected_Data *obj, Evas_Public_Data *e, 803_evas_event_source_multi_up_events(Evas_Object_Protected_Data *obj, Evas_Public_Data *e,
804 Efl_Event_Pointer *parent_ev, int event_id) 804 Efl_Input_Pointer *parent_ev, int event_id)
805{ 805{
806 Evas_Object *eo_src = _evas_object_image_source_get(obj->object); 806 Evas_Object *eo_src = _evas_object_image_source_get(obj->object);
807 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 807 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
808 Evas_Object_Protected_Data *child; 808 Evas_Object_Protected_Data *child;
809 Evas_Object *eo_child; 809 Evas_Object *eo_child;
810 Eina_List *copy, *l; 810 Eina_List *copy, *l;
811 Efl_Event_Pointer_Data *ev; 811 Efl_Input_Pointer_Data *ev;
812 Efl_Event_Pointer *evt; 812 Efl_Input_Pointer *evt;
813 Eina_Vector2 point; 813 Eina_Vector2 point;
814 814
815 if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return; 815 if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return;
816 816
817 evt = efl_event_dup(parent_ev); 817 evt = efl_input_dup(parent_ev);
818 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 818 ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
819 if (!ev) return; 819 if (!ev) return;
820 820
821 _transform_to_src_space_f(obj, src, &ev->cur); 821 _transform_to_src_space_f(obj, src, &ev->cur);
@@ -847,22 +847,22 @@ _evas_event_source_multi_up_events(Evas_Object_Protected_Data *obj, Evas_Public_
847 847
848static void 848static void
849_evas_event_source_multi_move_events(Evas_Object_Protected_Data *obj, Evas_Public_Data *e, 849_evas_event_source_multi_move_events(Evas_Object_Protected_Data *obj, Evas_Public_Data *e,
850 Efl_Event_Pointer *parent_ev, int event_id) 850 Efl_Input_Pointer *parent_ev, int event_id)
851{ 851{
852 Evas_Object *eo_src = _evas_object_image_source_get(obj->object); 852 Evas_Object *eo_src = _evas_object_image_source_get(obj->object);
853 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS); 853 Evas_Object_Protected_Data *src = efl_data_scope_get(eo_src, EFL_CANVAS_OBJECT_CLASS);
854 Evas_Object_Protected_Data *child; 854 Evas_Object_Protected_Data *child;
855 Evas_Object *eo_child; 855 Evas_Object *eo_child;
856 Eina_List *copy, *l; 856 Eina_List *copy, *l;
857 Efl_Event_Pointer_Data *ev; 857 Efl_Input_Pointer_Data *ev;
858 Efl_Event_Pointer *evt; 858 Efl_Input_Pointer *evt;
859 Eina_Vector2 point; 859 Eina_Vector2 point;
860 Evas *eo_e = e->evas; 860 Evas *eo_e = e->evas;
861 861
862 if (obj->delete_me || src->delete_me || e->is_frozen) return; 862 if (obj->delete_me || src->delete_me || e->is_frozen) return;
863 863
864 evt = efl_event_dup(parent_ev); 864 evt = efl_input_dup(parent_ev);
865 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 865 ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
866 if (!ev) return; 866 if (!ev) return;
867 867
868 _transform_to_src_space_f(obj, src, &ev->cur); 868 _transform_to_src_space_f(obj, src, &ev->cur);
@@ -950,7 +950,7 @@ _evas_event_source_multi_move_events(Evas_Object_Protected_Data *obj, Evas_Publi
950 950
951static void 951static void
952_evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, 952_evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e,
953 Efl_Event_Pointer *parent_ev, int event_id) 953 Efl_Input_Pointer *parent_ev, int event_id)
954{ 954{
955 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 955 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
956 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 956 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
@@ -959,14 +959,14 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e,
959 Evas_Object_Protected_Data *child; 959 Evas_Object_Protected_Data *child;
960 Evas_Object *eo_child; 960 Evas_Object *eo_child;
961 Eina_List *ins = NULL, *l; 961 Eina_List *ins = NULL, *l;
962 Efl_Event_Pointer_Data *ev; 962 Efl_Input_Pointer_Data *ev;
963 Efl_Event_Pointer *evt; 963 Efl_Input_Pointer *evt;
964 Eina_Vector2 point; 964 Eina_Vector2 point;
965 965
966 if (obj->delete_me || src->delete_me || e->is_frozen) return; 966 if (obj->delete_me || src->delete_me || e->is_frozen) return;
967 967
968 evt = efl_event_dup(parent_ev); 968 evt = efl_input_dup(parent_ev);
969 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 969 ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
970 if (!ev) return; 970 if (!ev) return;
971 971
972 _transform_to_src_space_f(obj, src, &ev->cur); 972 _transform_to_src_space_f(obj, src, &ev->cur);
@@ -1011,7 +1011,7 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e,
1011 1011
1012static void 1012static void
1013_evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e, 1013_evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e,
1014 Efl_Event_Pointer *parent_ev, int event_id) 1014 Efl_Input_Pointer *parent_ev, int event_id)
1015{ 1015{
1016 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 1016 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
1017 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 1017 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
@@ -1020,14 +1020,14 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e,
1020 Evas_Object_Protected_Data *child; 1020 Evas_Object_Protected_Data *child;
1021 Evas_Object *eo_child; 1021 Evas_Object *eo_child;
1022 Eina_List *copy, *l; 1022 Eina_List *copy, *l;
1023 Efl_Event_Pointer_Data *ev; 1023 Efl_Input_Pointer_Data *ev;
1024 Efl_Event_Pointer *evt; 1024 Efl_Input_Pointer *evt;
1025 Eina_Vector2 point; 1025 Eina_Vector2 point;
1026 1026
1027 if (obj->delete_me || src->delete_me || e->is_frozen) return; 1027 if (obj->delete_me || src->delete_me || e->is_frozen) return;
1028 1028
1029 evt = efl_event_dup(parent_ev); 1029 evt = efl_input_dup(parent_ev);
1030 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 1030 ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
1031 if (!ev) return; 1031 if (!ev) return;
1032 1032
1033 _transform_to_src_space_f(obj, src, &ev->cur); 1033 _transform_to_src_space_f(obj, src, &ev->cur);
@@ -1213,9 +1213,9 @@ evas_event_thaw_eval(Evas *eo_e)
1213} 1213}
1214 1214
1215static void 1215static void
1216_canvas_event_feed_mouse_down_internal(Evas_Public_Data *e, Efl_Event_Pointer_Data *ev) 1216_canvas_event_feed_mouse_down_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data *ev)
1217{ 1217{
1218 Efl_Event_Pointer *evt; 1218 Efl_Input_Pointer *evt;
1219 Eina_List *l, *copy; 1219 Eina_List *l, *copy;
1220 Evas_Object *eo_obj; 1220 Evas_Object *eo_obj;
1221 int event_id, b; 1221 int event_id, b;
@@ -1310,11 +1310,11 @@ _canvas_event_feed_mouse_down_internal(Evas_Public_Data *e, Efl_Event_Pointer_Da
1310} 1310}
1311 1311
1312static int 1312static int
1313_post_up_handle(Evas_Public_Data *e, Efl_Event_Pointer *parent_ev) 1313_post_up_handle(Evas_Public_Data *e, Efl_Input_Pointer *parent_ev)
1314{ 1314{
1315 Eina_List *l, *copy, *ins, *ll; 1315 Eina_List *l, *copy, *ins, *ll;
1316 Efl_Event_Pointer_Data *ev; 1316 Efl_Input_Pointer_Data *ev;
1317 Efl_Event_Pointer *evt; 1317 Efl_Input_Pointer *evt;
1318 Evas_Object *eo_obj; 1318 Evas_Object *eo_obj;
1319 Evas *eo_e = e->evas; 1319 Evas *eo_e = e->evas;
1320 int post_called = 0; 1320 int post_called = 0;
@@ -1323,8 +1323,8 @@ _post_up_handle(Evas_Public_Data *e, Efl_Event_Pointer *parent_ev)
1323 event_id = _evas_object_event_new(); 1323 event_id = _evas_object_event_new();
1324 1324
1325 /* Duplicating UP event */ 1325 /* Duplicating UP event */
1326 evt = efl_event_dup(parent_ev); 1326 evt = efl_input_dup(parent_ev);
1327 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 1327 ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
1328 if (!ev) return 0; 1328 if (!ev) return 0;
1329 1329
1330 /* Actually we want an OUT */ 1330 /* Actually we want an OUT */
@@ -1413,9 +1413,9 @@ _post_up_handle(Evas_Public_Data *e, Efl_Event_Pointer *parent_ev)
1413} 1413}
1414 1414
1415static void 1415static void
1416_canvas_event_feed_mouse_up_internal(Evas_Public_Data *e, Efl_Event_Pointer_Data *ev) 1416_canvas_event_feed_mouse_up_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data *ev)
1417{ 1417{
1418 Efl_Event_Pointer *evt; 1418 Efl_Input_Pointer *evt;
1419 Eina_List *l, *copy; 1419 Eina_List *l, *copy;
1420 Evas_Object *eo_obj; 1420 Evas_Object *eo_obj;
1421 int event_id, b; 1421 int event_id, b;
@@ -1508,14 +1508,14 @@ _canvas_event_feed_mouse_updown_legacy(Eo *eo_e, int b, Evas_Button_Flags flags,
1508 unsigned int timestamp, const void *data, 1508 unsigned int timestamp, const void *data,
1509 Eina_Bool down) 1509 Eina_Bool down)
1510{ 1510{
1511 Efl_Event_Pointer_Data *ev = NULL; 1511 Efl_Input_Pointer_Data *ev = NULL;
1512 Efl_Event_Pointer *evt; 1512 Efl_Input_Pointer *evt;
1513 Evas_Public_Data *e; 1513 Evas_Public_Data *e;
1514 1514
1515 e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 1515 e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
1516 if (!e) return; 1516 if (!e) return;
1517 1517
1518 evt = efl_event_instance_get(EFL_EVENT_POINTER_CLASS, eo_e, (void **) &ev); 1518 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, eo_e, (void **) &ev);
1519 if (!ev) return; 1519 if (!ev) return;
1520 1520
1521 ev->data = (void *) data; 1521 ev->data = (void *) data;
@@ -1556,10 +1556,10 @@ evas_event_feed_mouse_up(Eo *eo_e, int b, Evas_Button_Flags flags, unsigned int
1556} 1556}
1557 1557
1558static void 1558static void
1559_canvas_event_feed_mouse_cancel_internal(Evas_Public_Data *e, Efl_Event_Pointer_Data *ev) 1559_canvas_event_feed_mouse_cancel_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data *ev)
1560{ 1560{
1561 Evas_Coord_Touch_Point *point; 1561 Evas_Coord_Touch_Point *point;
1562 Efl_Event_Pointer_Data save; 1562 Efl_Input_Pointer_Data save;
1563 Eina_List *l, *ll; 1563 Eina_List *l, *ll;
1564 Evas_Event_Flags flags; 1564 Evas_Event_Flags flags;
1565 Evas *eo_e; 1565 Evas *eo_e;
@@ -1604,10 +1604,10 @@ evas_event_feed_mouse_cancel(Eo *eo_e, unsigned int timestamp, const void *data)
1604{ 1604{
1605 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); 1605 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS));
1606 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 1606 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
1607 Efl_Event_Pointer_Data *ev = NULL; 1607 Efl_Input_Pointer_Data *ev = NULL;
1608 Efl_Event_Pointer *evt; 1608 Efl_Input_Pointer *evt;
1609 1609
1610 evt = efl_event_instance_get(EFL_EVENT_POINTER_CLASS, eo_e, (void **) &ev); 1610 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, eo_e, (void **) &ev);
1611 if (!ev) return; 1611 if (!ev) return;
1612 1612
1613 ev->timestamp = timestamp; 1613 ev->timestamp = timestamp;
@@ -1620,11 +1620,11 @@ evas_event_feed_mouse_cancel(Eo *eo_e, unsigned int timestamp, const void *data)
1620} 1620}
1621 1621
1622static void 1622static void
1623_canvas_event_feed_mouse_wheel_internal(Eo *eo_e, Efl_Event_Pointer_Data *pe) 1623_canvas_event_feed_mouse_wheel_internal(Eo *eo_e, Efl_Input_Pointer_Data *pe)
1624{ 1624{
1625 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 1625 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
1626 Efl_Event_Pointer_Data *ev = NULL; 1626 Efl_Input_Pointer_Data *ev = NULL;
1627 Efl_Event_Pointer *evt; 1627 Efl_Input_Pointer *evt;
1628 Eina_List *l, *copy; 1628 Eina_List *l, *copy;
1629 Evas_Object *eo_obj; 1629 Evas_Object *eo_obj;
1630 int event_id = 0; 1630 int event_id = 0;
@@ -1634,8 +1634,8 @@ _canvas_event_feed_mouse_wheel_internal(Eo *eo_e, Efl_Event_Pointer_Data *pe)
1634 1634
1635 event_id = _evas_object_event_new(); 1635 event_id = _evas_object_event_new();
1636 1636
1637 evt = efl_event_dup(pe->eo); 1637 evt = efl_input_dup(pe->eo);
1638 ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 1638 ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
1639 if (!ev) return; 1639 if (!ev) return;
1640 1640
1641 // adjust missing data based on evas state 1641 // adjust missing data based on evas state
@@ -1676,8 +1676,8 @@ _canvas_event_feed_mouse_wheel_internal(Eo *eo_e, Efl_Event_Pointer_Data *pe)
1676EAPI void 1676EAPI void
1677evas_event_feed_mouse_wheel(Eo *eo_e, int direction, int z, unsigned int timestamp, const void *data) 1677evas_event_feed_mouse_wheel(Eo *eo_e, int direction, int z, unsigned int timestamp, const void *data)
1678{ 1678{
1679 Efl_Event_Pointer_Data *ev = NULL; 1679 Efl_Input_Pointer_Data *ev = NULL;
1680 Efl_Event_Pointer *evt = efl_event_instance_get(EFL_EVENT_POINTER_CLASS, eo_e, (void **) &ev); 1680 Efl_Input_Pointer *evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, eo_e, (void **) &ev);
1681 1681
1682 if (!ev) return; 1682 if (!ev) return;
1683 1683
@@ -1691,11 +1691,11 @@ evas_event_feed_mouse_wheel(Eo *eo_e, int direction, int z, unsigned int timesta
1691} 1691}
1692 1692
1693static void 1693static void
1694_canvas_event_feed_mouse_move_internal(Evas_Public_Data *e, Efl_Event_Pointer_Data *ev) 1694_canvas_event_feed_mouse_move_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data *ev)
1695{ 1695{
1696 Evas_Object *nogrep_obj = NULL; 1696 Evas_Object *nogrep_obj = NULL;
1697 Evas_Object_Protected_Data *obj; 1697 Evas_Object_Protected_Data *obj;
1698 Efl_Event_Pointer *evt; 1698 Efl_Input_Pointer *evt;
1699 Eina_List *l, *copy; 1699 Eina_List *l, *copy;
1700 Evas_Object *eo_obj; 1700 Evas_Object *eo_obj;
1701 Eina_Vector2 point; 1701 Eina_Vector2 point;
@@ -2042,10 +2042,10 @@ static void
2042_canvas_event_feed_mouse_move_legacy(Evas *eo_e, Evas_Public_Data *e, int x, int y, 2042_canvas_event_feed_mouse_move_legacy(Evas *eo_e, Evas_Public_Data *e, int x, int y,
2043 unsigned int timestamp, const void *data) 2043 unsigned int timestamp, const void *data)
2044{ 2044{
2045 Efl_Event_Pointer_Data *ev = NULL; 2045 Efl_Input_Pointer_Data *ev = NULL;
2046 Efl_Event_Pointer *evt; 2046 Efl_Input_Pointer *evt;
2047 2047
2048 evt = efl_event_instance_get(EFL_EVENT_POINTER_CLASS, eo_e, (void **) &ev); 2048 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, eo_e, (void **) &ev);
2049 if (!ev) return; 2049 if (!ev) return;
2050 2050
2051 ev->data = (void *) data; 2051 ev->data = (void *) data;
@@ -2076,10 +2076,10 @@ evas_event_feed_mouse_move(Eo *eo_e, int x, int y, unsigned int timestamp, const
2076} 2076}
2077 2077
2078static void 2078static void
2079_canvas_event_feed_mouse_in_internal(Evas *eo_e, Efl_Event_Pointer_Data *ev) 2079_canvas_event_feed_mouse_in_internal(Evas *eo_e, Efl_Input_Pointer_Data *ev)
2080{ 2080{
2081 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 2081 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
2082 Efl_Event_Pointer *evt; 2082 Efl_Input_Pointer *evt;
2083 Eina_List *ins; 2083 Eina_List *ins;
2084 Eina_List *l; 2084 Eina_List *l;
2085 Evas_Object *eo_obj; 2085 Evas_Object *eo_obj;
@@ -2137,10 +2137,10 @@ _canvas_event_feed_mouse_in_internal(Evas *eo_e, Efl_Event_Pointer_Data *ev)
2137} 2137}
2138 2138
2139static void 2139static void
2140_canvas_event_feed_mouse_out_internal(Evas *eo_e, Efl_Event_Pointer_Data *ev) 2140_canvas_event_feed_mouse_out_internal(Evas *eo_e, Efl_Input_Pointer_Data *ev)
2141{ 2141{
2142 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 2142 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
2143 Efl_Event_Pointer *evt; 2143 Efl_Input_Pointer *evt;
2144 Eina_List *l, *copy; 2144 Eina_List *l, *copy;
2145 Evas_Object *eo_obj; 2145 Evas_Object *eo_obj;
2146 int event_id; 2146 int event_id;
@@ -2200,10 +2200,10 @@ static void
2200_canvas_event_feed_mouse_inout_legacy(Eo *eo_e, unsigned int timestamp, 2200_canvas_event_feed_mouse_inout_legacy(Eo *eo_e, unsigned int timestamp,
2201 const void *data, Eina_Bool in) 2201 const void *data, Eina_Bool in)
2202{ 2202{
2203 Efl_Event_Pointer_Data *ev = NULL; 2203 Efl_Input_Pointer_Data *ev = NULL;
2204 Efl_Event_Pointer *evt; 2204 Efl_Input_Pointer *evt;
2205 2205
2206 evt = efl_event_instance_get(EFL_EVENT_POINTER_CLASS, eo_e, (void **) &ev); 2206 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, eo_e, (void **) &ev);
2207 if (!ev) return; 2207 if (!ev) return;
2208 2208
2209 ev->timestamp = timestamp; 2209 ev->timestamp = timestamp;
@@ -2231,9 +2231,9 @@ evas_event_feed_mouse_out(Eo *eo_e, unsigned int timestamp, const void *data)
2231} 2231}
2232 2232
2233static void 2233static void
2234_canvas_event_feed_multi_down_internal(Evas_Public_Data *e, Efl_Event_Pointer_Data *ev) 2234_canvas_event_feed_multi_down_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data *ev)
2235{ 2235{
2236 Efl_Event_Pointer *evt; 2236 Efl_Input_Pointer *evt;
2237 Eina_List *l, *copy; 2237 Eina_List *l, *copy;
2238 Evas_Object *eo_obj; 2238 Evas_Object *eo_obj;
2239 Eina_Vector2 point; 2239 Eina_Vector2 point;
@@ -2299,9 +2299,9 @@ _canvas_event_feed_multi_down_internal(Evas_Public_Data *e, Efl_Event_Pointer_Da
2299} 2299}
2300 2300
2301static void 2301static void
2302_canvas_event_feed_multi_up_internal(Evas_Public_Data *e, Efl_Event_Pointer_Data *ev) 2302_canvas_event_feed_multi_up_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data *ev)
2303{ 2303{
2304 Efl_Event_Pointer *evt; 2304 Efl_Input_Pointer *evt;
2305 Eina_List *l, *copy; 2305 Eina_List *l, *copy;
2306 Evas_Object *eo_obj; 2306 Evas_Object *eo_obj;
2307 Eina_Vector2 point; 2307 Eina_Vector2 point;
@@ -2370,10 +2370,10 @@ _canvas_event_feed_multi_internal(Evas *eo_e, Evas_Public_Data *e,
2370 unsigned int timestamp, 2370 unsigned int timestamp,
2371 const void *data, Efl_Pointer_Action action) 2371 const void *data, Efl_Pointer_Action action)
2372{ 2372{
2373 Efl_Event_Pointer_Data *ev = NULL; 2373 Efl_Input_Pointer_Data *ev = NULL;
2374 Efl_Event_Pointer *evt; 2374 Efl_Input_Pointer *evt;
2375 2375
2376 evt = efl_event_instance_get(EFL_EVENT_POINTER_CLASS, eo_e, (void **) &ev); 2376 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, eo_e, (void **) &ev);
2377 if (!e || !ev) return; 2377 if (!e || !ev) return;
2378 2378
2379 if (!fx) fx = x; 2379 if (!fx) fx = x;
@@ -2450,9 +2450,9 @@ evas_event_feed_multi_up(Eo *eo_e, int d, int x, int y, double rad, double radx,
2450} 2450}
2451 2451
2452static void 2452static void
2453_canvas_event_feed_multi_move_internal(Evas_Public_Data *e, Efl_Event_Pointer_Data *ev) 2453_canvas_event_feed_multi_move_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data *ev)
2454{ 2454{
2455 Efl_Event_Pointer *evt; 2455 Efl_Input_Pointer *evt;
2456 Eina_List *l, *copy; 2456 Eina_List *l, *copy;
2457 Evas_Object *eo_obj; 2457 Evas_Object *eo_obj;
2458 Eina_Vector2 point; 2458 Eina_Vector2 point;
@@ -2590,10 +2590,10 @@ evas_event_feed_multi_move(Eo *eo_e, int d, int x, int y, double rad, double rad
2590} 2590}
2591 2591
2592static void 2592static void
2593_canvas_event_feed_key_down_internal(Evas_Public_Data *e, Efl_Event_Key_Data *ev) 2593_canvas_event_feed_key_down_internal(Evas_Public_Data *e, Efl_Input_Key_Data *ev)
2594{ 2594{
2595 Eina_Bool exclusive = EINA_FALSE; 2595 Eina_Bool exclusive = EINA_FALSE;
2596 Efl_Event_Pointer *evt; 2596 Efl_Input_Pointer *evt;
2597 int event_id = 0; 2597 int event_id = 0;
2598 2598
2599 if (!e || !ev) return; 2599 if (!e || !ev) return;
@@ -2679,10 +2679,10 @@ _canvas_event_feed_key_down_internal(Evas_Public_Data *e, Efl_Event_Key_Data *ev
2679} 2679}
2680 2680
2681static void 2681static void
2682_canvas_event_feed_key_up_internal(Evas_Public_Data *e, Efl_Event_Key_Data *ev) 2682_canvas_event_feed_key_up_internal(Evas_Public_Data *e, Efl_Input_Key_Data *ev)
2683{ 2683{
2684 Eina_Bool exclusive = EINA_FALSE; 2684 Eina_Bool exclusive = EINA_FALSE;
2685 Efl_Event_Pointer *evt; 2685 Efl_Input_Pointer *evt;
2686 int event_id = 0; 2686 int event_id = 0;
2687 2687
2688 if (!e || !ev) return; 2688 if (!e || !ev) return;
@@ -2776,12 +2776,12 @@ _canvas_event_feed_key_legacy(Eo *eo_e, Evas_Public_Data *e,
2776 unsigned int timestamp, const void *data, 2776 unsigned int timestamp, const void *data,
2777 unsigned int keycode, Eina_Bool down) 2777 unsigned int keycode, Eina_Bool down)
2778{ 2778{
2779 Efl_Event_Key_Data *ev = NULL; 2779 Efl_Input_Key_Data *ev = NULL;
2780 Efl_Event_Key *evt; 2780 Efl_Input_Key *evt;
2781 2781
2782 if (!keyname) return; 2782 if (!keyname) return;
2783 2783
2784 evt = efl_event_instance_get(EFL_EVENT_KEY_CLASS, eo_e, (void **) &ev); 2784 evt = efl_input_instance_get(EFL_INPUT_KEY_CLASS, eo_e, (void **) &ev);
2785 if (!ev) return; 2785 if (!ev) return;
2786 2786
2787 ev->keyname = (char *) keyname; 2787 ev->keyname = (char *) keyname;
@@ -2838,8 +2838,8 @@ EAPI void
2838evas_event_feed_hold(Eo *eo_e, int hold, unsigned int timestamp, const void *data) 2838evas_event_feed_hold(Eo *eo_e, int hold, unsigned int timestamp, const void *data)
2839{ 2839{
2840 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 2840 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
2841 Efl_Event_Hold_Data *ev = NULL; 2841 Efl_Input_Hold_Data *ev = NULL;
2842 Efl_Event_Hold *evt; 2842 Efl_Input_Hold *evt;
2843 Eina_List *l, *copy; 2843 Eina_List *l, *copy;
2844 Evas_Object *eo_obj; 2844 Evas_Object *eo_obj;
2845 int event_id = 0; 2845 int event_id = 0;
@@ -2849,7 +2849,7 @@ evas_event_feed_hold(Eo *eo_e, int hold, unsigned int timestamp, const void *dat
2849 2849
2850 event_id = _evas_object_event_new(); 2850 event_id = _evas_object_event_new();
2851 2851
2852 evt = efl_event_instance_get(EFL_EVENT_HOLD_CLASS, eo_e, (void **) &ev); 2852 evt = efl_input_instance_get(EFL_INPUT_HOLD_CLASS, eo_e, (void **) &ev);
2853 if (!ev) return; 2853 if (!ev) return;
2854 2854
2855 ev->hold = !!hold; 2855 ev->hold = !!hold;
@@ -2882,9 +2882,9 @@ evas_event_feed_hold(Eo *eo_e, int hold, unsigned int timestamp, const void *dat
2882} 2882}
2883 2883
2884void 2884void
2885_canvas_event_feed_axis_update_internal(Evas_Public_Data *e, Efl_Event_Pointer_Data *ev) 2885_canvas_event_feed_axis_update_internal(Evas_Public_Data *e, Efl_Input_Pointer_Data *ev)
2886{ 2886{
2887 Efl_Event_Pointer *evt; 2887 Efl_Input_Pointer *evt;
2888 Eina_List *l, *copy; 2888 Eina_List *l, *copy;
2889 Evas_Object *eo_obj; 2889 Evas_Object *eo_obj;
2890 int event_id = 0; 2890 int event_id = 0;
@@ -2928,13 +2928,13 @@ evas_event_feed_axis_update(Evas *eo_e, unsigned int timestamp, int device, int
2928{ 2928{
2929 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS)); 2929 EINA_SAFETY_ON_FALSE_RETURN(efl_isa(eo_e, EVAS_CANVAS_CLASS));
2930 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 2930 Evas_Public_Data *e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
2931 Efl_Event_Pointer_Data *ev = NULL; 2931 Efl_Input_Pointer_Data *ev = NULL;
2932 Eina_Bool haswinx = 0, haswiny = 0; 2932 Eina_Bool haswinx = 0, haswiny = 0;
2933 Efl_Event_Pointer *evt; 2933 Efl_Input_Pointer *evt;
2934 double x = 0, y = 0; 2934 double x = 0, y = 0;
2935 int n; 2935 int n;
2936 2936
2937 evt = efl_event_instance_get(EFL_EVENT_POINTER_CLASS, eo_e, (void **) &ev); 2937 evt = efl_input_instance_get(EFL_INPUT_POINTER_CLASS, eo_e, (void **) &ev);
2938 if (!ev) return; 2938 if (!ev) return;
2939 2939
2940 ev->data = (void *) data; 2940 ev->data = (void *) data;
@@ -3266,7 +3266,7 @@ _evas_canvas_event_down_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e)
3266static void 3266static void
3267_evas_canvas_event_pointer_cb(void *data, const Eo_Event *event) 3267_evas_canvas_event_pointer_cb(void *data, const Eo_Event *event)
3268{ 3268{
3269 Efl_Event_Pointer_Data *ev = efl_data_scope_get(event->info, EFL_EVENT_POINTER_CLASS); 3269 Efl_Input_Pointer_Data *ev = efl_data_scope_get(event->info, EFL_INPUT_POINTER_CLASS);
3270 Evas_Public_Data *e = data; 3270 Evas_Public_Data *e = data;
3271 Evas *eo_e = event->object; 3271 Evas *eo_e = event->object;
3272 Eina_Bool nodev = 0; 3272 Eina_Bool nodev = 0;
@@ -3338,12 +3338,12 @@ _evas_canvas_event_pointer_cb(void *data, const Eo_Event *event)
3338static void 3338static void
3339_evas_canvas_event_key_cb(void *data, const Eo_Event *event) 3339_evas_canvas_event_key_cb(void *data, const Eo_Event *event)
3340{ 3340{
3341 Efl_Event_Key *evt = event->info; 3341 Efl_Input_Key *evt = event->info;
3342 Evas_Public_Data *e = data; 3342 Evas_Public_Data *e = data;
3343 Efl_Event_Key_Data *ev; 3343 Efl_Input_Key_Data *ev;
3344 Eina_Bool nodev = 0; 3344 Eina_Bool nodev = 0;
3345 3345
3346 ev = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS); 3346 ev = efl_data_scope_get(evt, EFL_INPUT_KEY_CLASS);
3347 if (!ev) return; 3347 if (!ev) return;
3348 3348
3349 if (!ev->device) 3349 if (!ev->device)
diff --git a/src/lib/evas/canvas/evas_events_legacy.c b/src/lib/evas/canvas/evas_events_legacy.c
index 0b79fd2cab..8a8067ff62 100644
--- a/src/lib/evas/canvas/evas_events_legacy.c
+++ b/src/lib/evas/canvas/evas_events_legacy.c
@@ -33,9 +33,9 @@ _event_alloc(void *old)
33} 33}
34 34
35void * 35void *
36efl_event_pointer_legacy_info_fill(Efl_Event_Key *evt, Evas_Callback_Type type, Evas_Event_Flags **pflags) 36efl_input_pointer_legacy_info_fill(Efl_Input_Key *evt, Evas_Callback_Type type, Evas_Event_Flags **pflags)
37{ 37{
38 Efl_Event_Pointer_Data *ev = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 38 Efl_Input_Pointer_Data *ev = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
39 if (!ev) return NULL; 39 if (!ev) return NULL;
40 40
41#define COORD_DUP(e) do { (e)->output.x = (e)->canvas.x; (e)->output.y = (e)->canvas.y; } while (0) 41#define COORD_DUP(e) do { (e)->output.x = (e)->canvas.x; (e)->output.y = (e)->canvas.y; } while (0)
@@ -295,11 +295,11 @@ efl_event_pointer_legacy_info_fill(Efl_Event_Key *evt, Evas_Callback_Type type,
295} 295}
296 296
297void * 297void *
298efl_event_key_legacy_info_fill(Efl_Event_Key *evt, Evas_Event_Flags **pflags) 298efl_input_key_legacy_info_fill(Efl_Input_Key *evt, Evas_Event_Flags **pflags)
299{ 299{
300 Efl_Event_Key_Data *ev; 300 Efl_Input_Key_Data *ev;
301 301
302 ev = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS); 302 ev = efl_data_scope_get(evt, EFL_INPUT_KEY_CLASS);
303 if (!ev) return NULL; 303 if (!ev) return NULL;
304 304
305 if (ev->pressed) 305 if (ev->pressed)
@@ -341,9 +341,9 @@ efl_event_key_legacy_info_fill(Efl_Event_Key *evt, Evas_Event_Flags **pflags)
341} 341}
342 342
343void * 343void *
344efl_event_hold_legacy_info_fill(Efl_Event_Hold *evt, Evas_Event_Flags **pflags) 344efl_input_hold_legacy_info_fill(Efl_Input_Hold *evt, Evas_Event_Flags **pflags)
345{ 345{
346 Efl_Event_Hold_Data *ev = efl_data_scope_get(evt, EFL_EVENT_HOLD_CLASS); 346 Efl_Input_Hold_Data *ev = efl_data_scope_get(evt, EFL_INPUT_HOLD_CLASS);
347 Evas_Event_Hold *e; 347 Evas_Event_Hold *e;
348 348
349 if (!ev) return NULL; 349 if (!ev) return NULL;
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index b3b52a1560..0e09c9938a 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1955,9 +1955,9 @@ void _evas_device_cleanup(Evas *e);
1955Evas_Device *_evas_device_top_get(const Evas *e); 1955Evas_Device *_evas_device_top_get(const Evas *e);
1956 1956
1957/* legacy/eo events */ 1957/* legacy/eo events */
1958void *efl_event_pointer_legacy_info_fill(Efl_Event_Key *evt, Evas_Callback_Type type, Evas_Event_Flags **pflags); 1958void *efl_input_pointer_legacy_info_fill(Efl_Input_Key *evt, Evas_Callback_Type type, Evas_Event_Flags **pflags);
1959void *efl_event_key_legacy_info_fill(Efl_Event_Key *evt, Evas_Event_Flags **pflags); 1959void *efl_input_key_legacy_info_fill(Efl_Input_Key *evt, Evas_Event_Flags **pflags);
1960void *efl_event_hold_legacy_info_fill(Efl_Event_Hold *evt, Evas_Event_Flags **pflags); 1960void *efl_input_hold_legacy_info_fill(Efl_Input_Hold *evt, Evas_Event_Flags **pflags);
1961 1961
1962Eina_Bool evas_vg_loader_svg(Evas_Object *vg, const Eina_File *f, const char *key EINA_UNUSED); 1962Eina_Bool evas_vg_loader_svg(Evas_Object *vg, const Eina_File *f, const char *key EINA_UNUSED);
1963 1963
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index 073db0f748..07ad64aec7 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -134,10 +134,10 @@ broadcast_event(Emotion_Event ev)
134static void 134static void
135bg_key_down(void *data EINA_UNUSED, const Eo_Event *event) 135bg_key_down(void *data EINA_UNUSED, const Eo_Event *event)
136{ 136{
137 Efl_Event_Key *ev = event->info; 137 Efl_Input_Key *ev = event->info;
138 Eina_List *l; 138 Eina_List *l;