aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary/efl_ui_win.c
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 /src/lib/elementary/efl_ui_win.c
parentevas: Add normalized and window coordinates to axis events (diff)
downloadefl-d504284dd241d2d1713e9e94f7e6efee8e0ee9ac.tar.gz
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 (limited to 'src/lib/elementary/efl_ui_win.c')
-rw-r--r--src/lib/elementary/efl_ui_win.c24
1 files changed, 12 insertions, 12 deletions
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)
{
Eo *win = data;
Eo *evt = ev->info;
- Efl_Event_Key_Data *evdata;
+ Efl_Input_Key_Data *evdata;
- evdata = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
+ evdata = efl_data_scope_get(evt, EFL_INPUT_KEY_CLASS);
if (!evdata || evdata->win_fed)
return;
@@ -1683,9 +1683,9 @@ _evas_event_pointer_cb(void *data, const Eo_Event *ev)
{
Eo *win = data;
Eo *evt = ev->info;
- Efl_Event_Pointer_Data *evdata;
+ Efl_Input_Pointer_Data *evdata;
- evdata = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
+ evdata = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
if (!evdata || evdata->win_fed)
return;
@@ -1697,13 +1697,13 @@ static void
_evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev)
{
Eo *evas = data;
- Efl_Event *evt = ev->info;
- Efl_Event_Key_Data *evdata;
+ Efl_Input_Event *evt = ev->info;
+ Efl_Input_Key_Data *evdata;
- if (!efl_event_fake_get(evt))
+ if (!efl_input_fake_get(evt))
return;
- evdata = efl_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
+ evdata = efl_data_scope_get(evt, EFL_INPUT_KEY_CLASS);
if (!evdata || evdata->win_fed)
return;
evdata->win_fed = EINA_TRUE;
@@ -1717,13 +1717,13 @@ static void
_evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev)
{
Eo *evas = data;
- Efl_Event *evt = ev->info;
- Efl_Event_Pointer_Data *evdata;
+ Efl_Input_Event *evt = ev->info;
+ Efl_Input_Pointer_Data *evdata;
- if (!efl_event_fake_get(evt))
+ if (!efl_input_fake_get(evt))
return;
- evdata = efl_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
+ evdata = efl_data_scope_get(evt, EFL_INPUT_POINTER_CLASS);
if (!evdata || evdata->win_fed)
return;
evdata->win_fed = EINA_TRUE;