aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas/canvas/evas_callbacks.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/evas/canvas/evas_callbacks.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/evas/canvas/evas_callbacks.c')
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c16
1 files changed, 8 insertions, 8 deletions
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
_eo_evas_object_cb(void *data, const Eo_Event *event)
{
Evas_Event_Flags *event_flags = NULL, evflags = EVAS_EVENT_FLAG_NONE;
- Efl_Event *efl_event_info = event->info;
+ Efl_Input_Event *efl_event_info = event->info;
_eo_evas_object_cb_info *info = data;
void *event_info;
Evas *evas;
@@ -167,15 +167,15 @@ _eo_evas_object_cb(void *data, const Eo_Event *event)
switch (info->efl_event_type)
{
case EFL_EVENT_TYPE_POINTER:
- event_info = efl_event_pointer_legacy_info_fill(efl_event_info, info->type, &event_flags);
+ event_info = efl_input_pointer_legacy_info_fill(efl_event_info, info->type, &event_flags);
break;
case EFL_EVENT_TYPE_KEY:
- event_info = efl_event_key_legacy_info_fill(efl_event_info, &event_flags);
+ event_info = efl_input_key_legacy_info_fill(efl_event_info, &event_flags);
break;
case EFL_EVENT_TYPE_HOLD:
- event_info = efl_event_hold_legacy_info_fill(efl_event_info, &event_flags);
+ event_info = efl_input_hold_legacy_info_fill(efl_event_info, &event_flags);
break;
case EFL_EVENT_TYPE_NULL:
@@ -191,7 +191,7 @@ _eo_evas_object_cb(void *data, const Eo_Event *event)
if (event_flags) evflags = *event_flags;
info->func(info->data, evas, event->object, event_info);
if (event_flags && (evflags != *event_flags))
- efl_event_flags_set(efl_event_info, *event_flags);
+ efl_input_event_flags_set(efl_event_info, *event_flags);
}
static void
@@ -327,11 +327,11 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
if ((type == EVAS_CALLBACK_MOUSE_DOWN) || (type == EVAS_CALLBACK_MOUSE_UP))
{
- flags = efl_event_pointer_button_flags_get(event_info);
+ flags = efl_input_pointer_button_flags_get(event_info);
if (flags & mask)
{
if (obj->last_mouse_down_counter < (e->last_mouse_down_counter - 1))
- efl_event_pointer_button_flags_set(event_info, flags & ~mask);
+ efl_input_pointer_button_flags_set(event_info, flags & ~mask);
}
obj->last_mouse_down_counter = e->last_mouse_down_counter;
}
@@ -345,7 +345,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj, Evas_Object_Protected_Data
efl_event_callback_call(eo_obj, efl_event_desc, event_info);
if ((type == EVAS_CALLBACK_MOUSE_DOWN) || (type == EVAS_CALLBACK_MOUSE_UP))
- efl_event_pointer_button_flags_set(event_info, flags);
+ efl_input_pointer_button_flags_set(event_info, flags);
nothing_here:
if (!obj->no_propagate)