summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-05 10:47:26 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:32 -0700
commit55bd097a3d5c0201c28bc0bd045cbe77aa76f5af (patch)
tree6929ab1b8bddee873305e58aed933d7039488fcf /src/lib/evas
parent7934d152dd5c185df1b89f50239d27f25c6f2b88 (diff)
Efl.Gfx.Entity (from Efl.Gfx)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_scale.c2
-rw-r--r--src/lib/evas/canvas/efl_canvas_animation_translate.c2
-rw-r--r--src/lib/evas/canvas/efl_canvas_event_grabber.c24
-rw-r--r--src/lib/evas/canvas/efl_canvas_event_grabber.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_group.eo4
-rw-r--r--src/lib/evas/canvas/efl_canvas_object.eo12
-rw-r--r--src/lib/evas/canvas/efl_canvas_text.eo2
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_node.eo10
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg_object.c6
-rw-r--r--src/lib/evas/canvas/efl_gfx_map.c38
-rw-r--r--src/lib/evas/canvas/efl_gfx_map.eo12
-rw-r--r--src/lib/evas/canvas/efl_input_pointer.c4
-rw-r--r--src/lib/evas/canvas/efl_input_pointer.eo2
-rw-r--r--src/lib/evas/canvas/evas_box.eo4
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c12
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c4
-rw-r--r--src/lib/evas/canvas/evas_main.c2
-rw-r--r--src/lib/evas/canvas/evas_object_box.c12
-rw-r--r--src/lib/evas/canvas/evas_object_image.c4
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c12
-rw-r--r--src/lib/evas/canvas/evas_object_intercept.c2
-rw-r--r--src/lib/evas/canvas/evas_object_main.c80
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c14
-rw-r--r--src/lib/evas/canvas/evas_object_table.c10
-rw-r--r--src/lib/evas/canvas/evas_object_text.c16
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c16
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c6
-rw-r--r--src/lib/evas/canvas/evas_render.c2
-rw-r--r--src/lib/evas/canvas/evas_table.eo4
-rw-r--r--src/lib/evas/canvas/evas_text.eo4
-rw-r--r--src/lib/evas/canvas/evas_textgrid.eo2
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c28
-rw-r--r--src/lib/evas/include/evas_private.h2
33 files changed, 180 insertions, 180 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_animation_scale.c b/src/lib/evas/canvas/efl_canvas_animation_scale.c
index 8e92d68910..b09d7a794b 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_scale.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_scale.c
@@ -9,7 +9,7 @@ _scale_get(Eo *target)
9 Efl_Canvas_Animation_Scale_Property scale; 9 Efl_Canvas_Animation_Scale_Property scale;
10 Eina_Rect geometry; 10 Eina_Rect geometry;
11 11
12 geometry = efl_gfx_geometry_get(target); 12 geometry = efl_gfx_entity_geometry_get(target);
13 efl_gfx_map_coord_absolute_get(target, 0, &x1, &y1, NULL); 13 efl_gfx_map_coord_absolute_get(target, 0, &x1, &y1, NULL);
14 efl_gfx_map_coord_absolute_get(target, 1, &x2, &y2, NULL); 14 efl_gfx_map_coord_absolute_get(target, 1, &x2, &y2, NULL);
15 efl_gfx_map_coord_absolute_get(target, 2, &x3, &y3, NULL); 15 efl_gfx_map_coord_absolute_get(target, 2, &x3, &y3, NULL);
diff --git a/src/lib/evas/canvas/efl_canvas_animation_translate.c b/src/lib/evas/canvas/efl_canvas_animation_translate.c
index 0307fd425a..e0c9ef7424 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_translate.c
+++ b/src/lib/evas/canvas/efl_canvas_animation_translate.c
@@ -15,7 +15,7 @@ _translation_get(Eo *target)
15 _Translate_Property_Double translate; 15 _Translate_Property_Double translate;
16 Eina_Rect geometry; 16 Eina_Rect geometry;
17 17
18 geometry = efl_gfx_geometry_get(target); 18 geometry = efl_gfx_entity_geometry_get(target);
19 19
20 efl_gfx_map_coord_absolute_get(target, 0, &x1, &y1, NULL); 20 efl_gfx_map_coord_absolute_get(target, 0, &x1, &y1, NULL);
21 efl_gfx_map_coord_absolute_get(target, 2, &x2, &y2, NULL); 21 efl_gfx_map_coord_absolute_get(target, 2, &x2, &y2, NULL);
diff --git a/src/lib/evas/canvas/efl_canvas_event_grabber.c b/src/lib/evas/canvas/efl_canvas_event_grabber.c
index a054c993bf..536e1ee916 100644
--- a/src/lib/evas/canvas/efl_canvas_event_grabber.c
+++ b/src/lib/evas/canvas/efl_canvas_event_grabber.c
@@ -246,7 +246,7 @@ _efl_canvas_event_grabber_efl_canvas_group_group_member_add(Eo *eo_obj, Efl_Obje
246 _child_insert(pd, sub); 246 _child_insert(pd, sub);
247 efl_event_callback_add(eo_sub, EFL_EVENT_DEL, _efl_canvas_object_event_grabber_child_del, pd); 247 efl_event_callback_add(eo_sub, EFL_EVENT_DEL, _efl_canvas_object_event_grabber_child_del, pd);
248 if (eo_sub != pd->rect) 248 if (eo_sub != pd->rect)
249 efl_event_callback_add(eo_sub, EFL_GFX_EVENT_RESTACK, _efl_canvas_object_event_grabber_child_restack, pd); 249 efl_event_callback_add(eo_sub, EFL_GFX_ENTITY_EVENT_RESTACK, _efl_canvas_object_event_grabber_child_restack, pd);
250} 250}
251 251
252EOLIAN static void 252EOLIAN static void
@@ -255,7 +255,7 @@ _efl_canvas_event_grabber_efl_canvas_group_group_member_del(Eo *eo_obj EINA_UNUS
255 Evas_Object_Protected_Data *obj = efl_data_scope_get(member, EFL_CANVAS_OBJECT_CLASS); 255 Evas_Object_Protected_Data *obj = efl_data_scope_get(member, EFL_CANVAS_OBJECT_CLASS);
256 256
257 efl_event_callback_del(member, EFL_EVENT_DEL, _efl_canvas_object_event_grabber_child_del, pd); 257 efl_event_callback_del(member, EFL_EVENT_DEL, _efl_canvas_object_event_grabber_child_del, pd);
258 efl_event_callback_del(member, EFL_GFX_EVENT_RESTACK, _efl_canvas_object_event_grabber_child_restack, pd); 258 efl_event_callback_del(member, EFL_GFX_ENTITY_EVENT_RESTACK, _efl_canvas_object_event_grabber_child_restack, pd);
259 pd->contained = eina_list_remove(pd->contained, obj); 259 pd->contained = eina_list_remove(pd->contained, obj);
260 260
261 EINA_COW_WRITE_BEGIN(evas_object_events_cow, obj->events, Evas_Object_Events_Data, events) 261 EINA_COW_WRITE_BEGIN(evas_object_events_cow, obj->events, Evas_Object_Events_Data, events)
@@ -282,27 +282,27 @@ _efl_canvas_event_grabber_efl_canvas_group_group_need_recalculate_get(const Eo *
282} 282}
283 283
284EOLIAN static void 284EOLIAN static void
285_efl_canvas_event_grabber_efl_gfx_position_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Position2D pos) 285_efl_canvas_event_grabber_efl_gfx_entity_position_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Position2D pos)
286{ 286{
287 efl_gfx_position_set(efl_super(eo_obj, MY_CLASS), pos); 287 efl_gfx_entity_position_set(efl_super(eo_obj, MY_CLASS), pos);
288 efl_gfx_position_set(pd->rect, pos); 288 efl_gfx_entity_position_set(pd->rect, pos);
289} 289}
290 290
291EOLIAN static void 291EOLIAN static void
292_efl_canvas_event_grabber_efl_gfx_size_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Size2D sz) 292_efl_canvas_event_grabber_efl_gfx_entity_size_set(Eo *eo_obj, Efl_Object_Event_Grabber_Data *pd, Eina_Size2D sz)
293{ 293{
294 efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), sz); 294 efl_gfx_entity_size_set(efl_super(eo_obj, MY_CLASS), sz);
295 efl_gfx_size_set(pd->rect, sz); 295 efl_gfx_entity_size_set(pd->rect, sz);
296} 296}
297 297
298EOLIAN static Eina_Bool 298EOLIAN static Eina_Bool
299_efl_canvas_event_grabber_efl_gfx_visible_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd) 299_efl_canvas_event_grabber_efl_gfx_entity_visible_get(const Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd)
300{ 300{
301 return pd->vis; 301 return pd->vis;
302} 302}
303 303
304EOLIAN static void 304EOLIAN static void
305_efl_canvas_event_grabber_efl_gfx_visible_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eina_Bool set) 305_efl_canvas_event_grabber_efl_gfx_entity_visible_set(Eo *eo_obj EINA_UNUSED, Efl_Object_Event_Grabber_Data *pd, Eina_Bool set)
306{ 306{
307 if (set) 307 if (set)
308 { 308 {
@@ -313,7 +313,7 @@ _efl_canvas_event_grabber_efl_gfx_visible_set(Eo *eo_obj EINA_UNUSED, Efl_Object
313 if (obj->object != pd->rect) _stacking_verify(pd, obj); 313 if (obj->object != pd->rect) _stacking_verify(pd, obj);
314 } 314 }
315 pd->vis = !!set; 315 pd->vis = !!set;
316 efl_gfx_visible_set(pd->rect, set); 316 efl_gfx_entity_visible_set(pd->rect, set);
317 if (pd->restack && pd->freeze && (!set)) 317 if (pd->restack && pd->freeze && (!set))
318 _full_restack(pd); 318 _full_restack(pd);
319} 319}
@@ -350,7 +350,7 @@ _efl_canvas_event_grabber_efl_object_constructor(Eo *eo_obj, Efl_Object_Event_Gr
350 obj->is_event_parent = 1; 350 obj->is_event_parent = 1;
351 obj->is_smart = 0; 351 obj->is_smart = 0;
352 352
353 efl_event_callback_add(eo_obj, EFL_GFX_EVENT_RESTACK, _efl_canvas_object_event_grabber_restack, pd); 353 efl_event_callback_add(eo_obj, EFL_GFX_ENTITY_EVENT_RESTACK, _efl_canvas_object_event_grabber_restack, pd);
354 pd->rect = evas_object_rectangle_add(efl_parent_get(eo_obj)); 354 pd->rect = evas_object_rectangle_add(efl_parent_get(eo_obj));
355 evas_object_pointer_mode_set(pd->rect, EVAS_OBJECT_POINTER_MODE_NOGRAB); 355 evas_object_pointer_mode_set(pd->rect, EVAS_OBJECT_POINTER_MODE_NOGRAB);
356 efl_parent_set(pd->rect, eo_obj); 356 efl_parent_set(pd->rect, eo_obj);
diff --git a/src/lib/evas/canvas/efl_canvas_event_grabber.eo b/src/lib/evas/canvas/efl_canvas_event_grabber.eo
index 53019d385e..f756820815 100644
--- a/src/lib/evas/canvas/efl_canvas_event_grabber.eo
+++ b/src/lib/evas/canvas/efl_canvas_event_grabber.eo
@@ -41,9 +41,9 @@ class Efl.Canvas.Event_Grabber (Efl.Canvas.Group)
41 Efl.Canvas.Group.group_calculate; 41 Efl.Canvas.Group.group_calculate;
42 Efl.Canvas.Group.group_change; 42 Efl.Canvas.Group.group_change;
43 Efl.Canvas.Group.group_need_recalculate { get; set; } 43 Efl.Canvas.Group.group_need_recalculate { get; set; }
44 Efl.Gfx.position { set; } 44 Efl.Gfx.Entity.position { set; }
45 Efl.Gfx.size { set; } 45 Efl.Gfx.Entity.size { set; }
46 Efl.Gfx.visible { get; set; } 46 Efl.Gfx.Entity.visible { get; set; }
47 Efl.Gfx.Stack.layer { set; } 47 Efl.Gfx.Stack.layer { set; }
48 } 48 }
49} 49}
diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
index 62c6df5bde..eecb255ad3 100644
--- a/src/lib/evas/canvas/efl_canvas_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -130,8 +130,8 @@ class Efl.Canvas.Group (Efl.Canvas.Object)
130 Efl.Object.destructor; 130 Efl.Object.destructor;
131 Efl.Object.debug_name_override; 131 Efl.Object.debug_name_override;
132 Efl.Gfx.Color.color { set; } 132 Efl.Gfx.Color.color { set; }
133 Efl.Gfx.visible { set; } 133 Efl.Gfx.Entity.visible { set; }
134 Efl.Gfx.position { set; } 134 Efl.Gfx.Entity.position { set; }
135 Efl.Canvas.Object.clip { set; } 135 Efl.Canvas.Object.clip { set; }
136 Efl.Canvas.Object.no_render { set; } 136 Efl.Canvas.Object.no_render { set; }
137 Efl.Canvas.Object.paragraph_direction { get; set; } 137 Efl.Canvas.Object.paragraph_direction { get; set; }
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index 5ec948af2f..c2524e0cb9 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -1,7 +1,7 @@
1import efl_text_types; 1import efl_text_types;
2import efl_canvas_animation_types; 2import efl_canvas_animation_types;
3 3
4abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator, 4abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator,
5 Efl.Input.Interface, Efl.Gfx.Size.Hint, 5 Efl.Input.Interface, Efl.Gfx.Size.Hint,
6 Efl.Gfx.Map, Efl.Loop.Consumer, Efl.Ui.Base, Efl.Canvas.Pointer) 6 Efl.Gfx.Map, Efl.Loop.Consumer, Efl.Ui.Base, Efl.Canvas.Pointer)
7{ 7{
@@ -597,11 +597,11 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, E
597 Efl.Object.provider_find; 597 Efl.Object.provider_find;
598 Efl.Object.del; 598 Efl.Object.del;
599 Efl.Object.debug_name_override; 599 Efl.Object.debug_name_override;
600 Efl.Gfx.visible { get; set; } 600 Efl.Gfx.Entity.visible { get; set; }
601 Efl.Gfx.Color.color { get; set; } 601 Efl.Gfx.Color.color { get; set; }
602 Efl.Gfx.geometry { get; set; } 602 Efl.Gfx.Entity.geometry { get; set; }
603 Efl.Gfx.position { get; set; } 603 Efl.Gfx.Entity.position { get; set; }
604 Efl.Gfx.size { get; set; } 604 Efl.Gfx.Entity.size { get; set; }
605 Efl.Gfx.Stack.layer { get; set; } 605 Efl.Gfx.Stack.layer { get; set; }
606 Efl.Gfx.Stack.below { get; } 606 Efl.Gfx.Stack.below { get; }
607 Efl.Gfx.Stack.above { get; } 607 Efl.Gfx.Stack.above { get; }
@@ -617,7 +617,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, E
617 Efl.Gfx.Size.Hint.hint_max { get; set; } 617 Efl.Gfx.Size.Hint.hint_max { get; set; }
618 Efl.Gfx.Size.Hint.hint_margin { get; set; } 618 Efl.Gfx.Size.Hint.hint_margin { get; set; }
619 Efl.Gfx.Size.Hint.hint_weight { get; set; } 619 Efl.Gfx.Size.Hint.hint_weight { get; set; }
620 Efl.Gfx.scale { set; get; } 620 Efl.Gfx.Entity.scale { set; get; }
621 Efl.Input.Interface.seat_event_filter { get; set; } 621 Efl.Input.Interface.seat_event_filter { get; set; }
622 Efl.Loop.Consumer.loop { get; } 622 Efl.Loop.Consumer.loop { get; }
623 Efl.Canvas.Pointer.pointer_inside { get; } 623 Efl.Canvas.Pointer.pointer_inside { get; }
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index 13bf191222..33f5dce659 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -352,7 +352,7 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
352 Efl.Text.Annotate.cursor_item_insert; 352 Efl.Text.Annotate.cursor_item_insert;
353 Efl.Text.Markup.markup { set; get; } 353 Efl.Text.Markup.markup { set; get; }
354 Efl.Text.Markup.cursor_markup_insert; 354 Efl.Text.Markup.cursor_markup_insert;
355 Efl.Gfx.scale { set; } 355 Efl.Gfx.Entity.scale { set; }
356 } 356 }
357 events { 357 events {
358 cursor,changed; [[Called when cursor changed]] 358 cursor,changed; [[Called when cursor changed]]
diff --git a/src/lib/evas/canvas/efl_canvas_vg_node.eo b/src/lib/evas/canvas/efl_canvas_vg_node.eo
index 300aaebb3e..9ea185e8fb 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_node.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_node.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3abstract Efl.Canvas.Vg.Node (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate, Efl.Gfx.Path) 3abstract Efl.Canvas.Vg.Node (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate, Efl.Gfx.Path)
4{ 4{
5 [[Efl vector graphics abstract class]] 5 [[Efl vector graphics abstract class]]
6 eo_prefix: efl_canvas_vg_node; 6 eo_prefix: efl_canvas_vg_node;
@@ -67,11 +67,11 @@ abstract Efl.Canvas.Vg.Node (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack,
67 Efl.Object.constructor; 67 Efl.Object.constructor;
68 Efl.Object.invalidate; 68 Efl.Object.invalidate;
69 Efl.Object.destructor; 69 Efl.Object.destructor;
70 Efl.Gfx.visible { get; set; } 70 Efl.Gfx.Entity.visible { get; set; }
71 Efl.Gfx.Color.color { get; set; } 71 Efl.Gfx.Color.color { get; set; }
72 Efl.Gfx.size { get; } 72 Efl.Gfx.Entity.size { get; }
73 Efl.Gfx.position { get; set; } 73 Efl.Gfx.Entity.position { get; set; }
74 Efl.Gfx.geometry { get; } 74 Efl.Gfx.Entity.geometry { get; }
75 Efl.Gfx.Stack.below { get; } 75 Efl.Gfx.Stack.below { get; }
76 Efl.Gfx.Stack.above { get; } 76 Efl.Gfx.Stack.above { get; }
77 Efl.Gfx.Stack.stack_below; 77 Efl.Gfx.Stack.stack_below;
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c b/src/lib/evas/canvas/efl_canvas_vg_object.c
index a01f98ad7c..935e0021db 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.c
@@ -78,7 +78,7 @@ static void
78_update_vgtree_viewport(Eo *obj, Efl_Canvas_Vg_Object_Data *pd) 78_update_vgtree_viewport(Eo *obj, Efl_Canvas_Vg_Object_Data *pd)
79{ 79{
80 double vb_w, vb_h, vp_w, vp_h, scale_w, scale_h, scale; 80 double vb_w, vb_h, vp_w, vp_h, scale_w, scale_h, scale;
81 Eina_Size2D sz = efl_gfx_size_get(obj); 81 Eina_Size2D sz = efl_gfx_entity_size_get(obj);
82 Eina_Matrix3 m; 82 Eina_Matrix3 m;
83 83
84 eina_matrix3_identity(&m); 84 eina_matrix3_identity(&m);
@@ -214,13 +214,13 @@ _efl_canvas_vg_object_viewbox_set(Eo *obj, Efl_Canvas_Vg_Object_Data *pd, Eina_R
214 eina_matrix3_identity(&m); 214 eina_matrix3_identity(&m);
215 efl_canvas_vg_node_transformation_set(pd->root, &m); 215 efl_canvas_vg_node_transformation_set(pd->root, &m);
216 // un register the resize callback 216 // un register the resize callback
217 efl_event_callback_del(obj, EFL_GFX_EVENT_RESIZE, _evas_vg_resize, pd); 217 efl_event_callback_del(obj, EFL_GFX_ENTITY_EVENT_RESIZE, _evas_vg_resize, pd);
218 } 218 }
219 return; 219 return;
220 } 220 }
221 // register for resize callback if not done yet 221 // register for resize callback if not done yet
222 if (eina_rectangle_is_empty(&pd->viewbox.rect)) 222 if (eina_rectangle_is_empty(&pd->viewbox.rect))
223 efl_event_callback_add(obj, EFL_GFX_EVENT_RESIZE, _evas_vg_resize, pd); 223 efl_event_callback_add(obj, EFL_GFX_ENTITY_EVENT_RESIZE, _evas_vg_resize, pd);
224 224
225 pd->viewbox = viewbox; 225 pd->viewbox = viewbox;
226 _update_vgtree_viewport(obj, pd); 226 _update_vgtree_viewport(obj, pd);
diff --git a/src/lib/evas/canvas/efl_gfx_map.c b/src/lib/evas/canvas/efl_gfx_map.c
index 58ddb9953f..8e64469e84 100644
--- a/src/lib/evas/canvas/efl_gfx_map.c
+++ b/src/lib/evas/canvas/efl_gfx_map.c
@@ -194,8 +194,8 @@ _geometry_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED)
194} 194}
195 195
196EFL_CALLBACKS_ARRAY_DEFINE(_geometry_changes, 196EFL_CALLBACKS_ARRAY_DEFINE(_geometry_changes,
197 { EFL_GFX_EVENT_MOVE, _geometry_changed_cb }, 197 { EFL_GFX_ENTITY_EVENT_MOVE, _geometry_changed_cb },
198 { EFL_GFX_EVENT_RESIZE, _geometry_changed_cb }); 198 { EFL_GFX_ENTITY_EVENT_RESIZE, _geometry_changed_cb });
199 199
200static void 200static void
201_pivot_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED) 201_pivot_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED)
@@ -208,8 +208,8 @@ _pivot_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED)
208} 208}
209 209
210EFL_CALLBACKS_ARRAY_DEFINE(_pivot_changes, 210EFL_CALLBACKS_ARRAY_DEFINE(_pivot_changes,
211 { EFL_GFX_EVENT_MOVE, _pivot_changed_cb }, 211 { EFL_GFX_ENTITY_EVENT_MOVE, _pivot_changed_cb },
212 { EFL_GFX_EVENT_RESIZE, _pivot_changed_cb }); 212 { EFL_GFX_ENTITY_EVENT_RESIZE, _pivot_changed_cb });
213 213
214static inline void 214static inline void
215_map_dirty(Eo *eo_obj, Efl_Gfx_Map_Data *pd, Eina_Bool reset) 215_map_dirty(Eo *eo_obj, Efl_Gfx_Map_Data *pd, Eina_Bool reset)
@@ -269,7 +269,7 @@ _map_calc(const Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Map_Data *p
269 pivot->changed = EINA_FALSE; 269 pivot->changed = EINA_FALSE;
270 if (!pivot->is_canvas) 270 if (!pivot->is_canvas)
271 { 271 {
272 pivot->geometry = efl_gfx_geometry_get(pivot->eo_obj); 272 pivot->geometry = efl_gfx_entity_geometry_get(pivot->eo_obj);
273 } 273 }
274 else 274 else
275 { 275 {
@@ -277,7 +277,7 @@ _map_calc(const Eo *eo_obj, Evas_Object_Protected_Data *obj, Efl_Gfx_Map_Data *p
277 if (pivot->is_evas) 277 if (pivot->is_evas)
278 evas_output_size_get(pivot->eo_obj, &pivot->geometry.w, &pivot->geometry.h); 278 evas_output_size_get(pivot->eo_obj, &pivot->geometry.w, &pivot->geometry.h);
279 else 279 else
280 pivot->geometry.size = efl_gfx_size_get(pivot->eo_obj); 280 pivot->geometry.size = efl_gfx_entity_size_get(pivot->eo_obj);
281 pivot->geometry.x = 0; 281 pivot->geometry.x = 0;
282 pivot->geometry.y = 0; 282 pivot->geometry.y = 0;
283 } 283 }
@@ -706,7 +706,7 @@ _efl_gfx_map_map_color_get(const Eo *eo_obj EINA_UNUSED, Efl_Gfx_Map_Data *pd,
706 706
707static Gfx_Map_Op * 707static Gfx_Map_Op *
708_gfx_map_op_add(Eo *eo_obj, Efl_Gfx_Map_Data *pd, Gfx_Map_Op_Type type, 708_gfx_map_op_add(Eo *eo_obj, Efl_Gfx_Map_Data *pd, Gfx_Map_Op_Type type,
709 const Efl_Gfx *eo_pivot, double cx, double cy, double cz, 709 const Efl_Gfx_Entity *eo_pivot, double cx, double cy, double cz,
710 Eina_Bool is_absolute) 710 Eina_Bool is_absolute)
711{ 711{
712 Eina_Bool is_self = EINA_FALSE; 712 Eina_Bool is_self = EINA_FALSE;
@@ -817,7 +817,7 @@ _efl_gfx_map_translate(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
817 817
818static inline void 818static inline void
819_map_rotate(Eo *eo_obj, Efl_Gfx_Map_Data *pd, 819_map_rotate(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
820 double degrees, const Efl_Gfx *pivot, double cx, double cy, 820 double degrees, const Efl_Gfx_Entity *pivot, double cx, double cy,
821 Eina_Bool absolute) 821 Eina_Bool absolute)
822{ 822{
823 Gfx_Map_Op *op; 823 Gfx_Map_Op *op;
@@ -830,7 +830,7 @@ _map_rotate(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
830 830
831EOLIAN static void 831EOLIAN static void
832_efl_gfx_map_rotate(Eo *eo_obj, Efl_Gfx_Map_Data *pd, 832_efl_gfx_map_rotate(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
833 double degrees, const Efl_Gfx *pivot, double cx, double cy) 833 double degrees, const Efl_Gfx_Entity *pivot, double cx, double cy)
834{ 834{
835 _map_rotate(eo_obj, pd, degrees, pivot, cx, cy, EINA_FALSE); 835 _map_rotate(eo_obj, pd, degrees, pivot, cx, cy, EINA_FALSE);
836} 836}
@@ -844,7 +844,7 @@ _efl_gfx_map_rotate_absolute(Eo *eo_obj, Efl_Gfx_Map_Data *pd, double degrees, d
844static inline void 844static inline void
845_map_rotate_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd, 845_map_rotate_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
846 double dx, double dy, double dz, 846 double dx, double dy, double dz,
847 const Efl_Gfx *pivot, double cx, double cy, double cz, 847 const Efl_Gfx_Entity *pivot, double cx, double cy, double cz,
848 Eina_Bool absolute) 848 Eina_Bool absolute)
849{ 849{
850 Gfx_Map_Op *op; 850 Gfx_Map_Op *op;
@@ -860,7 +860,7 @@ _map_rotate_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
860EOLIAN static void 860EOLIAN static void
861_efl_gfx_map_rotate_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd, 861_efl_gfx_map_rotate_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
862 double dx, double dy, double dz, 862 double dx, double dy, double dz,
863 const Efl_Gfx *pivot, double cx, double cy, double cz) 863 const Efl_Gfx_Entity *pivot, double cx, double cy, double cz)
864{ 864{
865 _map_rotate_3d(eo_obj, pd, dx, dy, dz, pivot, cx, cy, cz, EINA_FALSE); 865 _map_rotate_3d(eo_obj, pd, dx, dy, dz, pivot, cx, cy, cz, EINA_FALSE);
866} 866}
@@ -875,7 +875,7 @@ _efl_gfx_map_rotate_3d_absolute(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
875static inline void 875static inline void
876_map_rotate_quat(Eo *eo_obj, Efl_Gfx_Map_Data *pd, 876_map_rotate_quat(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
877 double qx, double qy, double qz, double qw, 877 double qx, double qy, double qz, double qw,
878 const Efl_Gfx *pivot, double cx, double cy, double cz, 878 const Efl_Gfx_Entity *pivot, double cx, double cy, double cz,
879 Eina_Bool absolute) 879 Eina_Bool absolute)
880{ 880{
881 Gfx_Map_Op *op; 881 Gfx_Map_Op *op;
@@ -892,7 +892,7 @@ _map_rotate_quat(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
892EOLIAN static void 892EOLIAN static void
893_efl_gfx_map_rotate_quat(Eo *eo_obj, Efl_Gfx_Map_Data *pd, 893_efl_gfx_map_rotate_quat(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
894 double qx, double qy, double qz, double qw, 894 double qx, double qy, double qz, double qw,
895 const Efl_Gfx *pivot, double cx, double cy, double cz) 895 const Efl_Gfx_Entity *pivot, double cx, double cy, double cz)
896{ 896{
897 _map_rotate_quat(eo_obj, pd, qx, qy, qz, qw, pivot, cx, cy, cz, EINA_FALSE); 897 _map_rotate_quat(eo_obj, pd, qx, qy, qz, qw, pivot, cx, cy, cz, EINA_FALSE);
898} 898}
@@ -908,7 +908,7 @@ _efl_gfx_map_rotate_quat_absolute(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
908static inline void 908static inline void
909_map_zoom(Eo *eo_obj, Efl_Gfx_Map_Data *pd, 909_map_zoom(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
910 double zoomx, double zoomy, 910 double zoomx, double zoomy,
911 const Efl_Gfx *pivot, double cx, double cy, 911 const Efl_Gfx_Entity *pivot, double cx, double cy,
912 Eina_Bool absolute) 912 Eina_Bool absolute)
913{ 913{
914 Gfx_Map_Op *op; 914 Gfx_Map_Op *op;
@@ -923,7 +923,7 @@ _map_zoom(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
923EOLIAN static void 923EOLIAN static void
924_efl_gfx_map_zoom(Eo *eo_obj, Efl_Gfx_Map_Data *pd, 924_efl_gfx_map_zoom(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
925 double zoomx, double zoomy, 925 double zoomx, double zoomy,
926 const Efl_Gfx *pivot, double cx, double cy) 926 const Efl_Gfx_Entity *pivot, double cx, double cy)
927{ 927{
928 _map_zoom(eo_obj, pd, zoomx, zoomy, pivot, cx, cy, EINA_FALSE); 928 _map_zoom(eo_obj, pd, zoomx, zoomy, pivot, cx, cy, EINA_FALSE);
929} 929}
@@ -937,7 +937,7 @@ _efl_gfx_map_zoom_absolute(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
937 937
938static inline void 938static inline void
939_map_lightning_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd, 939_map_lightning_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
940 const Efl_Gfx *pivot, double lx, double ly, double lz, 940 const Efl_Gfx_Entity *pivot, double lx, double ly, double lz,
941 int lr, int lg, int lb, int ar, int ag, int ab, 941 int lr, int lg, int lb, int ar, int ag, int ab,
942 Eina_Bool absolute) 942 Eina_Bool absolute)
943{ 943{
@@ -956,7 +956,7 @@ _map_lightning_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
956 956
957EOLIAN static void 957EOLIAN static void
958_efl_gfx_map_lightning_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd, 958_efl_gfx_map_lightning_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
959 const Efl_Gfx *pivot, double lx, double ly, double lz, 959 const Efl_Gfx_Entity *pivot, double lx, double ly, double lz,
960 int lr, int lg, int lb, int ar, int ag, int ab) 960 int lr, int lg, int lb, int ar, int ag, int ab)
961{ 961{
962 _map_lightning_3d(eo_obj, pd, pivot, lx, ly, lz, lr, lg, lb, ar, ag, ab, EINA_FALSE); 962 _map_lightning_3d(eo_obj, pd, pivot, lx, ly, lz, lr, lg, lb, ar, ag, ab, EINA_FALSE);
@@ -972,7 +972,7 @@ _efl_gfx_map_lightning_3d_absolute(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
972 972
973static inline void 973static inline void
974_map_perspective_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd, 974_map_perspective_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
975 const Efl_Gfx *pivot, double px, double py, 975 const Efl_Gfx_Entity *pivot, double px, double py,
976 double z0, double foc, 976 double z0, double foc,
977 Eina_Bool absolute) 977 Eina_Bool absolute)
978{ 978{
@@ -993,7 +993,7 @@ _map_perspective_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
993 993
994EOLIAN static void 994EOLIAN static void
995_efl_gfx_map_perspective_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd, 995_efl_gfx_map_perspective_3d(Eo *eo_obj, Efl_Gfx_Map_Data *pd,
996 const Efl_Gfx *pivot, double px, double py, 996 const Efl_Gfx_Entity *pivot, double px, double py,
997 double z0, double foc) 997 double z0, double foc)
998{ 998{
999 _map_perspective_3d(eo_obj, pd, pivot, px, py, z0, foc, EINA_FALSE); 999 _map_perspective_3d(eo_obj, pd, pivot, px, py, z0, foc, EINA_FALSE);
diff --git a/src/lib/evas/canvas/efl_gfx_map.eo b/src/lib/evas/canvas/efl_gfx_map.eo
index 4e6ab03bf7..c581ba1093 100644
--- a/src/lib/evas/canvas/efl_gfx_map.eo
+++ b/src/lib/evas/canvas/efl_gfx_map.eo
@@ -198,7 +198,7 @@ mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
198 ]] 198 ]]
199 params { 199 params {
200 degrees: double; [[CCW rotation in degrees.]] 200 degrees: double; [[CCW rotation in degrees.]]
201 pivot: const(Efl.Gfx); [[A pivot object for the center point, can be $null.]] 201 pivot: const(Efl.Gfx.Entity); [[A pivot object for the center point, can be $null.]]
202 cx: double; [[X relative coordinate of the center point.]] 202 cx: double; [[X relative coordinate of the center point.]]
203 cy: double; [[y relative coordinate of the center point.]] 203 cy: double; [[y relative coordinate of the center point.]]
204 } 204 }
@@ -221,7 +221,7 @@ mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
221 dx: double; [[Rotation in degrees around X axis (0 to 360).]] 221 dx: double; [[Rotation in degrees around X axis (0 to 360).]]
222 dy: double; [[Rotation in degrees around Y axis (0 to 360).]] 222 dy: double; [[Rotation in degrees around Y axis (0 to 360).]]
223 dz: double; [[Rotation in degrees around Z axis (0 to 360).]] 223 dz: double; [[Rotation in degrees around Z axis (0 to 360).]]
224 pivot: const(Efl.Gfx); [[A pivot object for the center point, can be $null.]] 224 pivot: const(Efl.Gfx.Entity); [[A pivot object for the center point, can be $null.]]
225 cx: double; [[X relative coordinate of the center point.]] 225 cx: double; [[X relative coordinate of the center point.]]
226 cy: double; [[y relative coordinate of the center point.]] 226 cy: double; [[y relative coordinate of the center point.]]
227 cz: double; [[Z absolute coordinate of the center point.]] 227 cz: double; [[Z absolute coordinate of the center point.]]
@@ -244,7 +244,7 @@ mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
244 qy: double; [[The y component of the imaginary part of the quaternion.]] 244 qy: double; [[The y component of the imaginary part of the quaternion.]]
245 qz: double; [[The z component of the imaginary part of the quaternion.]] 245 qz: double; [[The z component of the imaginary part of the quaternion.]]
246 qw: double; [[The w component of the real part of the quaternion.]] 246 qw: double; [[The w component of the real part of the quaternion.]]
247 pivot: const(Efl.Gfx); [[A pivot object for the center point, can be $null.]] 247 pivot: const(Efl.Gfx.Entity); [[A pivot object for the center point, can be $null.]]
248 cx: double; [[X relative coordinate of the center point.]] 248 cx: double; [[X relative coordinate of the center point.]]
249 cy: double; [[y relative coordinate of the center point.]] 249 cy: double; [[y relative coordinate of the center point.]]
250 cz: double; [[Z absolute coordinate of the center point.]] 250 cz: double; [[Z absolute coordinate of the center point.]]
@@ -265,7 +265,7 @@ mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
265 params { 265 params {
266 zoomx: double; [[Zoom in X direction]] 266 zoomx: double; [[Zoom in X direction]]
267 zoomy: double; [[Zoom in Y direction]] 267 zoomy: double; [[Zoom in Y direction]]
268 pivot: const(Efl.Gfx); [[A pivot object for the center point, can be $null.]] 268 pivot: const(Efl.Gfx.Entity); [[A pivot object for the center point, can be $null.]]
269 cx: double; [[X relative coordinate of the center point.]] 269 cx: double; [[X relative coordinate of the center point.]]
270 cy: double; [[y relative coordinate of the center point.]] 270 cy: double; [[y relative coordinate of the center point.]]
271 } 271 }
@@ -288,7 +288,7 @@ mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
288 is $null then this object will be its own pivot. 288 is $null then this object will be its own pivot.
289 ]] 289 ]]
290 params { 290 params {
291 pivot: const(Efl.Gfx); [[A pivot object for the light point, can be $null.]] 291 pivot: const(Efl.Gfx.Entity); [[A pivot object for the light point, can be $null.]]
292 lx: double; [[X relative coordinate in space of light point.]] 292 lx: double; [[X relative coordinate in space of light point.]]
293 ly: double; [[Y relative coordinate in space of light point.]] 293 ly: double; [[Y relative coordinate in space of light point.]]
294 lz: double; [[Z absolute coordinate in space of light point.]] 294 lz: double; [[Z absolute coordinate in space of light point.]]
@@ -322,7 +322,7 @@ mixin Efl.Gfx.Map (Efl.Interface, Efl.Object)
322 is $null then this object will be its own pivot. 322 is $null then this object will be its own pivot.
323 ]] 323 ]]
324 params { 324 params {
325 pivot: const(Efl.Gfx); [[A pivot object for the infinite point, can be $null.]] 325 pivot: const(Efl.Gfx.Entity); [[A pivot object for the infinite point, can be $null.]]
326 px: double; [[The perspective distance X relative coordinate.]] 326 px: double; [[The perspective distance X relative coordinate.]]
327 py: double; [[The perspective distance Y relative coordinate.]] 327 py: double; [[The perspective distance Y relative coordinate.]]
328 z0: double; [[The "0" Z plane value.]] 328 z0: double; [[The "0" Z plane value.]]
diff --git a/src/lib/evas/canvas/efl_input_pointer.c b/src/lib/evas/canvas/efl_input_pointer.c
index 4db5fb8d0c..ec4c1f2638 100644
--- a/src/lib/evas/canvas/efl_input_pointer.c
+++ b/src/lib/evas/canvas/efl_input_pointer.c
@@ -269,13 +269,13 @@ _efl_input_pointer_efl_input_event_device_get(const Eo *obj EINA_UNUSED, Efl_Inp
269} 269}
270 270
271EOLIAN static void 271EOLIAN static void
272_efl_input_pointer_source_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Efl_Gfx *src) 272_efl_input_pointer_source_set(Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd, Efl_Gfx_Entity *src)
273{ 273{
274 /* ref? */ 274 /* ref? */
275 pd->source = src; 275 pd->source = src;
276} 276}
277 277
278EOLIAN static Efl_Gfx * 278EOLIAN static Efl_Gfx_Entity *
279_efl_input_pointer_source_get(const Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd) 279_efl_input_pointer_source_get(const Eo *obj EINA_UNUSED, Efl_Input_Pointer_Data *pd)
280{ 280{
281 return pd->source; 281 return pd->source;
diff --git a/src/lib/evas/canvas/efl_input_pointer.eo b/src/lib/evas/canvas/efl_input_pointer.eo
index 400ce3481b..3628552951 100644
--- a/src/lib/evas/canvas/efl_input_pointer.eo
+++ b/src/lib/evas/canvas/efl_input_pointer.eo
@@ -116,7 +116,7 @@ class Efl.Input.Pointer (Efl.Object, Efl.Input.Event, Efl.Input.State)
116 propagation or repetition of the event. 116 propagation or repetition of the event.
117 ]] 117 ]]
118 values { 118 values {
119 src: Efl.Object; [[Source object: @Efl.Gfx]] 119 src: Efl.Object; [[Source object: @Efl.Gfx.Entity]]
120 } 120 }
121 } 121 }
122 @property button_flags { 122 @property button_flags {
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index 7a75da352a..ba805a3694 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -658,8 +658,8 @@ class Evas.Box (Efl.Canvas.Group)
658 implements { 658 implements {
659 class.constructor; 659 class.constructor;
660 Efl.Object.constructor; 660 Efl.Object.constructor;
661 Efl.Gfx.size { set; } 661 Efl.Gfx.Entity.size { set; }
662 Efl.Gfx.position { set; } 662 Efl.Gfx.Entity.position { set; }
663 Efl.Canvas.Group.group_calculate; 663 Efl.Canvas.Group.group_calculate;
664 } 664 }
665 events { 665 events {
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index a94fba30d4..a9bef9dfd8 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -50,14 +50,14 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST,
50 EFL_EVENT_KEY_UP, 50 EFL_EVENT_KEY_UP,
51 EFL_EVENT_FOCUS_IN, 51 EFL_EVENT_FOCUS_IN,
52 EFL_EVENT_FOCUS_OUT, 52 EFL_EVENT_FOCUS_OUT,
53 EFL_GFX_EVENT_SHOW, 53 EFL_GFX_ENTITY_EVENT_SHOW,
54 EFL_GFX_EVENT_HIDE, 54 EFL_GFX_ENTITY_EVENT_HIDE,
55 EFL_GFX_EVENT_MOVE, 55 EFL_GFX_ENTITY_EVENT_MOVE,
56 EFL_GFX_EVENT_RESIZE, 56 EFL_GFX_ENTITY_EVENT_RESIZE,
57 EFL_GFX_EVENT_RESTACK, 57 EFL_GFX_ENTITY_EVENT_RESTACK,
58 EVAS_OBJECT_EVENT_DEL, 58 EVAS_OBJECT_EVENT_DEL,
59 EFL_EVENT_HOLD, 59 EFL_EVENT_HOLD,
60 EFL_GFX_EVENT_CHANGE_SIZE_HINTS, 60 EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS,
61 EFL_IMAGE_EVENT_PRELOAD, 61 EFL_IMAGE_EVENT_PRELOAD,
62 EFL_CANVAS_SCENE_EVENT_FOCUS_IN, 62 EFL_CANVAS_SCENE_EVENT_FOCUS_IN,
63 EFL_CANVAS_SCENE_EVENT_FOCUS_OUT, 63 EFL_CANVAS_SCENE_EVENT_FOCUS_OUT,
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c
index 07a8035e57..4da1c6ddaf 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -519,7 +519,7 @@ _efl_canvas_filter_internal_efl_gfx_filter_filter_program_get(const Eo *eo_obj E
519 519
520EOLIAN static void 520EOLIAN static void
521_efl_canvas_filter_internal_efl_gfx_filter_filter_source_set(Eo *eo_obj, Evas_Filter_Data *pd, 521_efl_canvas_filter_internal_efl_gfx_filter_filter_source_set(Eo *eo_obj, Evas_Filter_Data *pd,
522 const char *name, Efl_Gfx *eo_source) 522 const char *name, Efl_Gfx_Entity *eo_source)
523{ 523{
524 Evas_Object_Protected_Data *obj; 524 Evas_Object_Protected_Data *obj;
525 Evas_Filter_Proxy_Binding *pb, *pb_old = NULL; 525 Evas_Filter_Proxy_Binding *pb, *pb_old = NULL;
@@ -604,7 +604,7 @@ update:
604 evas_filter_dirty(eo_obj); 604 evas_filter_dirty(eo_obj);
605} 605}
606 606
607EOLIAN static Efl_Gfx * 607EOLIAN static Efl_Gfx_Entity *
608_efl_canvas_filter_internal_efl_gfx_filter_filter_source_get(const Eo *obj EINA_UNUSED, Evas_Filter_Data *pd, 608_efl_canvas_filter_internal_efl_gfx_filter_filter_source_get(const Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
609 const char * name) 609 const char * name)
610{ 610{
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 8157abc32d..3b82098d2d 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -1405,7 +1405,7 @@ typedef struct _Efl_Canvas_Iterator
1405static Eina_Bool 1405static Eina_Bool
1406_efl_canvas_iterator_next(Efl_Canvas_Iterator *it, void **data) 1406_efl_canvas_iterator_next(Efl_Canvas_Iterator *it, void **data)
1407{ 1407{
1408 Efl_Gfx *sub; 1408 Efl_Gfx_Entity *sub;
1409 1409
1410 if (!it->object) return EINA_FALSE; 1410 if (!it->object) return EINA_FALSE;
1411 if (!eina_iterator_next(it->real_iterator, (void **) &sub)) 1411 if (!eina_iterator_next(it->real_iterator, (void **) &sub))
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index d92919af57..e5b9b5aef6 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -165,9 +165,9 @@ _evas_object_box_option_new(Evas_Object *o, Evas_Object_Box_Data *priv EINA_UNUS
165} 165}
166 166
167EFL_CALLBACKS_ARRAY_DEFINE(evas_object_box_callbacks, 167EFL_CALLBACKS_ARRAY_DEFINE(evas_object_box_callbacks,
168 { EFL_GFX_EVENT_RESIZE, _on_child_resize }, 168 { EFL_GFX_ENTITY_EVENT_RESIZE, _on_child_resize },
169 { EFL_EVENT_DEL, _on_child_del }, 169 { EFL_EVENT_DEL, _on_child_del },
170 { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed } 170 { EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }
171); 171);
172 172
173static void 173static void
@@ -432,22 +432,22 @@ _evas_box_efl_canvas_group_group_del(Eo *o, Evas_Object_Box_Data *priv)
432} 432}
433 433
434EOLIAN static void 434EOLIAN static void
435_evas_box_efl_gfx_size_set(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Eina_Size2D sz) 435_evas_box_efl_gfx_entity_size_set(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Eina_Size2D sz)
436{ 436{
437 if (_evas_object_intercept_call(o, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) 437 if (_evas_object_intercept_call(o, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
438 return; 438 return;
439 439
440 efl_gfx_size_set(efl_super(o, MY_CLASS), sz); 440 efl_gfx_entity_size_set(efl_super(o, MY_CLASS), sz);
441 evas_object_smart_changed(o); 441 evas_object_smart_changed(o);
442} 442}
443 443
444EOLIAN static void 444EOLIAN static void
445_evas_box_efl_gfx_position_set(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Eina_Position2D pos) 445_evas_box_efl_gfx_entity_position_set(Eo *o, Evas_Object_Box_Data *_pd EINA_UNUSED, Eina_Position2D pos)
446{ 446{
447 if (_evas_object_intercept_call(o, EVAS_OBJECT_INTERCEPT_CB_MOVE , 0, pos.x, pos.y)) 447 if (_evas_object_intercept_call(o, EVAS_OBJECT_INTERCEPT_CB_MOVE , 0, pos.x, pos.y))
448 return; 448 return;
449 449
450 efl_gfx_position_set(efl_super(o, MY_CLASS), pos); 450 efl_gfx_entity_position_set(efl_super(o, MY_CLASS), pos);
451 evas_object_smart_changed(o); 451 evas_object_smart_changed(o);
452} 452}
453 453
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 5c99600a9e..bc9a572c33 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -578,7 +578,7 @@ _efl_canvas_image_internal_efl_gfx_fill_fill_auto_set(Eo *eo_obj, Evas_Image_Dat
578 { 578 {
579 Eina_Size2D sz; 579 Eina_Size2D sz;
580 580
581 sz = efl_gfx_size_get(eo_obj); 581 sz = efl_gfx_entity_size_get(eo_obj);
582 _evas_image_fill_set(eo_obj, o, 0, 0, sz.w, sz.h); 582 _evas_image_fill_set(eo_obj, o, 0, 0, sz.w, sz.h);
583 583
584 evas_object_event_callback_add(eo_obj, EVAS_CALLBACK_RESIZE, 584 evas_object_event_callback_add(eo_obj, EVAS_CALLBACK_RESIZE,
@@ -3390,7 +3390,7 @@ evas_object_image_filled_resize_listener(void *data EINA_UNUSED, Evas *e EINA_UN
3390 Evas_Image_Data *o = efl_data_scope_get(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS); 3390 Evas_Image_Data *o = efl_data_scope_get(obj, EFL_CANVAS_IMAGE_INTERNAL_CLASS);
3391 Eina_Size2D sz; 3391 Eina_Size2D sz;
3392 3392
3393 sz = efl_gfx_size_get(obj); 3393 sz = efl_gfx_entity_size_get(obj);
3394 if (sz.w < 1) sz.w = 1; 3394 if (sz.w < 1) sz.w = 1;
3395 if (sz.h < 1) sz.h = 1; 3395 if (sz.h < 1) sz.h = 1;
3396 _evas_image_fill_set(obj, o, 0, 0, sz.w, sz.h); 3396 _evas_image_fill_set(obj, o, 0, 0, sz.w, sz.h);
diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index cdfa88b6bf..8b3a90761e 100644
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -9,7 +9,7 @@ evas_object_inform_call_show(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
9{ 9{
10 int event_id = _evas_object_event_new(); 10 int event_id = _evas_object_event_new();
11 11
12 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, NULL, event_id, EFL_GFX_EVENT_SHOW); 12 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, NULL, event_id, EFL_GFX_ENTITY_EVENT_SHOW);
13 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); 13 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
14} 14}
15 15
@@ -18,7 +18,7 @@ evas_object_inform_call_hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
18{ 18{
19 int event_id = _evas_object_event_new(); 19 int event_id = _evas_object_event_new();
20 20
21 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HIDE, NULL, event_id, EFL_GFX_EVENT_HIDE); 21 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HIDE, NULL, event_id, EFL_GFX_ENTITY_EVENT_HIDE);
22 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); 22 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
23} 23}
24 24
@@ -27,7 +27,7 @@ evas_object_inform_call_move(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
27{ 27{
28 int event_id = _evas_object_event_new(); 28 int event_id = _evas_object_event_new();
29 29
30 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOVE, NULL, event_id, EFL_GFX_EVENT_MOVE); 30 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOVE, NULL, event_id, EFL_GFX_ENTITY_EVENT_MOVE);
31 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); 31 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
32} 32}
33 33
@@ -36,7 +36,7 @@ evas_object_inform_call_resize(Evas_Object *eo_obj, Evas_Object_Protected_Data *
36{ 36{
37 int event_id = _evas_object_event_new(); 37 int event_id = _evas_object_event_new();
38 38
39 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, event_id, EFL_GFX_EVENT_RESIZE); 39 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESIZE, NULL, event_id, EFL_GFX_ENTITY_EVENT_RESIZE);
40 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); 40 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
41} 41}
42 42
@@ -45,7 +45,7 @@ evas_object_inform_call_restack(Evas_Object *eo_obj, Evas_Object_Protected_Data
45{ 45{
46 int event_id = _evas_object_event_new(); 46 int event_id = _evas_object_event_new();
47 47
48 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, event_id, EFL_GFX_EVENT_RESTACK); 48 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_RESTACK, NULL, event_id, EFL_GFX_ENTITY_EVENT_RESTACK);
49 if (obj->layer) 49 if (obj->layer)
50 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); 50 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
51} 51}
@@ -55,7 +55,7 @@ evas_object_inform_call_changed_size_hints(Evas_Object *eo_obj, Evas_Object_Prot
55{ 55{
56 int event_id = _evas_object_event_new(); 56 int event_id = _evas_object_event_new();
57 57
58 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, NULL, event_id, EFL_GFX_EVENT_CHANGE_SIZE_HINTS); 58 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, NULL, event_id, EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS);
59 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); 59 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id);
60} 60}
61 61
diff --git a/src/lib/evas/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c
index c18e43d52c..cc4232b3df 100644
--- a/src/lib/evas/canvas/evas_object_intercept.c
+++ b/src/lib/evas/canvas/evas_object_intercept.c
@@ -134,7 +134,7 @@ _evas_object_intercept_call_internal(Evas_Object *eo_obj,
134 j = va_arg(args, int); 134 j = va_arg(args, int);
135 if (obj->interceptors) 135 if (obj->interceptors)
136 blocked = evas_object_intercept_call_resize(eo_obj, obj, i, j); 136 blocked = evas_object_intercept_call_resize(eo_obj, obj, i, j);
137 if (!blocked && _efl_canvas_object_efl_gfx_size_set_block(eo_obj, obj, i, j, internal)) 137 if (!blocked && _efl_canvas_object_efl_gfx_entity_size_set_block(eo_obj, obj, i, j, internal))
138 blocked = 1; 138 blocked = 1;
139 break; 139 break;
140 140
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 2005c34ef8..8f2edafafe 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -215,7 +215,7 @@ _anim_ended_cb(void *data, const Efl_Event *ev)
215 efl_event_callback_call(eo_obj, EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED, 215 efl_event_callback_call(eo_obj, EFL_CANVAS_OBJECT_EVENT_ANIM_ENDED,
216 &event); 216 &event);
217 217
218 if (desc == EFL_GFX_EVENT_HIDE) 218 if (desc == EFL_GFX_ENTITY_EVENT_HIDE)
219 { 219 {
220 Evas_Object_Protected_Data *obj = EVAS_OBJECT_DATA_SAFE_GET(eo_obj); 220 Evas_Object_Protected_Data *obj = EVAS_OBJECT_DATA_SAFE_GET(eo_obj);
221 if (!obj) return; 221 if (!obj) return;
@@ -238,13 +238,13 @@ _animation_intercept_hide(void *data, Evas_Object *eo_obj)
238 238
239 efl_event_callback_add(obj->anim_player, 239 efl_event_callback_add(obj->anim_player,
240 EFL_ANIMATION_PLAYER_EVENT_STARTED, 240 EFL_ANIMATION_PLAYER_EVENT_STARTED,
241 _anim_started_cb, EFL_GFX_EVENT_HIDE); 241 _anim_started_cb, EFL_GFX_ENTITY_EVENT_HIDE);
242 efl_event_callback_add(obj->anim_player, 242 efl_event_callback_add(obj->anim_player,
243 EFL_ANIMATION_PLAYER_EVENT_RUNNING, 243 EFL_ANIMATION_PLAYER_EVENT_RUNNING,
244 _anim_running_cb, EFL_GFX_EVENT_HIDE); 244 _anim_running_cb, EFL_GFX_ENTITY_EVENT_HIDE);
245 efl_event_callback_add(obj->anim_player, 245 efl_event_callback_add(obj->anim_player,
246 EFL_ANIMATION_PLAYER_EVENT_ENDED, 246 EFL_ANIMATION_PLAYER_EVENT_ENDED,
247 _anim_ended_cb, EFL_GFX_EVENT_HIDE); 247 _anim_ended_cb, EFL_GFX_ENTITY_EVENT_HIDE);
248 248
249 //Start animation 249 //Start animation
250 efl_player_start(obj->anim_player); 250 efl_player_start(obj->anim_player);
@@ -257,7 +257,7 @@ _event_anim_free(Event_Animation *event_anim, Evas_Object_Protected_Data *obj)
257 if (event_anim->anim) 257 if (event_anim->anim)
258 { 258 {
259 //Unset callbacks for Hide event 259 //Unset callbacks for Hide event
260 if (event_anim->desc == EFL_GFX_EVENT_HIDE) 260 if (event_anim->desc == EFL_GFX_ENTITY_EVENT_HIDE)
261 evas_object_intercept_hide_callback_del(obj->object, 261 evas_object_intercept_hide_callback_del(obj->object,
262 _animation_intercept_hide); 262 _animation_intercept_hide);
263 263
@@ -1029,7 +1029,7 @@ _efl_canvas_object_efl_object_del(const Eo *eo_obj, Evas_Object_Protected_Data *
1029 evas_object_intercept_hide_callback_del((Eo *)eo_obj, 1029 evas_object_intercept_hide_callback_del((Eo *)eo_obj,
1030 _animation_intercept_hide); 1030 _animation_intercept_hide);
1031 1031
1032 efl_gfx_visible_set((Eo *) eo_obj, EINA_FALSE); 1032 efl_gfx_entity_visible_set((Eo *) eo_obj, EINA_FALSE);
1033 obj->efl_del_called = EINA_TRUE; 1033 obj->efl_del_called = EINA_TRUE;
1034 efl_del(efl_super(eo_obj, MY_CLASS)); 1034 efl_del(efl_super(eo_obj, MY_CLASS));
1035} 1035}
@@ -1169,7 +1169,7 @@ _efl_canvas_object_efl_object_event_callback_call(Eo *eo_obj,
1169 //Start animation corresponding to the current event 1169 //Start animation corresponding to the current event
1170 if (desc) 1170 if (desc)
1171 { 1171 {
1172 if ((desc != EFL_GFX_EVENT_HIDE) && desc != (EFL_GFX_EVENT_SHOW)) 1172 if ((desc != EFL_GFX_ENTITY_EVENT_HIDE) && desc != (EFL_GFX_ENTITY_EVENT_SHOW))
1173 { 1173 {
1174 Event_Animation *event_anim = _event_animation_find(obj, desc); 1174 Event_Animation *event_anim = _event_animation_find(obj, desc);
1175 if (event_anim) 1175 if (event_anim)
@@ -1208,7 +1208,7 @@ _efl_canvas_object_efl_object_event_callback_legacy_call(Eo *eo_obj,
1208 //Start animation corresponding to the current event 1208 //Start animation corresponding to the current event
1209 if (desc) 1209 if (desc)
1210 { 1210 {
1211 if ((desc != EFL_GFX_EVENT_HIDE) && desc != (EFL_GFX_EVENT_SHOW)) 1211 if ((desc != EFL_GFX_ENTITY_EVENT_HIDE) && desc != (EFL_GFX_ENTITY_EVENT_SHOW))
1212 { 1212 {
1213 Event_Animation *event_anim = _event_animation_find(obj, desc); 1213 Event_Animation *event_anim = _event_animation_find(obj, desc);
1214 if (event_anim) 1214 if (event_anim)
@@ -1359,10 +1359,10 @@ end:
1359} 1359}
1360 1360
1361EOLIAN static void 1361EOLIAN static void
1362_efl_canvas_object_efl_gfx_geometry_set(Eo *obj, Evas_Object_Protected_Data *pd EINA_UNUSED, Eina_Rect r) 1362_efl_canvas_object_efl_gfx_entity_geometry_set(Eo *obj, Evas_Object_Protected_Data *pd EINA_UNUSED, Eina_Rect r)
1363{ 1363{
1364 efl_gfx_position_set(obj, r.pos); 1364 efl_gfx_entity_position_set(obj, r.pos);
1365 efl_gfx_size_set(obj, EINA_SIZE2D(r.w, r.h)); 1365 efl_gfx_entity_size_set(obj, EINA_SIZE2D(r.w, r.h));
1366} 1366}
1367 1367
1368EAPI void 1368EAPI void
@@ -1371,17 +1371,17 @@ evas_object_geometry_set(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y, Evas_C
1371 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 1371 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1372 return; 1372 return;
1373 MAGIC_CHECK_END(); 1373 MAGIC_CHECK_END();
1374 efl_gfx_geometry_set(eo_obj, EINA_RECT(x, y, w, h)); 1374 efl_gfx_entity_geometry_set(eo_obj, EINA_RECT(x, y, w, h));
1375} 1375}
1376 1376
1377EAPI void 1377EAPI void
1378evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y) 1378evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
1379{ 1379{
1380 efl_gfx_position_set(obj, EINA_POSITION2D(x, y)); 1380 efl_gfx_entity_position_set(obj, EINA_POSITION2D(x, y));
1381} 1381}
1382 1382
1383EOLIAN static void 1383EOLIAN static void
1384_efl_canvas_object_efl_gfx_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Position2D pos) 1384_efl_canvas_object_efl_gfx_entity_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Position2D pos)
1385{ 1385{
1386 Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE; 1386 Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
1387 Eina_Bool source_invisible = EINA_FALSE; 1387 Eina_Bool source_invisible = EINA_FALSE;
@@ -1442,11 +1442,11 @@ _efl_canvas_object_efl_gfx_position_set(Eo *eo_obj, Evas_Object_Protected_Data *
1442EAPI void 1442EAPI void
1443evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h) 1443evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
1444{ 1444{
1445 efl_gfx_size_set((Evas_Object *)obj, EINA_SIZE2D(w, h)); 1445 efl_gfx_entity_size_set((Evas_Object *)obj, EINA_SIZE2D(w, h));
1446} 1446}
1447 1447
1448Eina_Bool 1448Eina_Bool
1449_efl_canvas_object_efl_gfx_size_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj, 1449_efl_canvas_object_efl_gfx_entity_size_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj,
1450 Evas_Coord w, Evas_Coord h, Eina_Bool internal) 1450 Evas_Coord w, Evas_Coord h, Eina_Bool internal)
1451{ 1451{
1452 if (!internal && (obj->doing.in_resize > 0)) 1452 if (!internal && (obj->doing.in_resize > 0))
@@ -1466,7 +1466,7 @@ _efl_canvas_object_efl_gfx_size_set_block(Eo *eo_obj, Evas_Object_Protected_Data
1466} 1466}
1467 1467
1468EOLIAN static void 1468EOLIAN static void
1469_efl_canvas_object_efl_gfx_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, 1469_efl_canvas_object_efl_gfx_entity_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
1470 Eina_Size2D sz) 1470 Eina_Size2D sz)
1471{ 1471{
1472 Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE; 1472 Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
@@ -1521,7 +1521,7 @@ _efl_canvas_object_efl_gfx_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
1521} 1521}
1522 1522
1523EOLIAN Eina_Rect 1523EOLIAN Eina_Rect
1524_efl_canvas_object_efl_gfx_geometry_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) 1524_efl_canvas_object_efl_gfx_entity_geometry_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
1525{ 1525{
1526 return (Eina_Rect) obj->cur->geometry; 1526 return (Eina_Rect) obj->cur->geometry;
1527} 1527}
@@ -1529,7 +1529,7 @@ _efl_canvas_object_efl_gfx_geometry_get(const Eo *eo_obj EINA_UNUSED, Evas_Objec
1529EAPI void 1529EAPI void
1530evas_object_geometry_get(const Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) 1530evas_object_geometry_get(const Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
1531{ 1531{
1532 Eina_Rect r = efl_gfx_geometry_get(eo_obj); 1532 Eina_Rect r = efl_gfx_entity_geometry_get(eo_obj);
1533 if (x) *x = r.x; 1533 if (x) *x = r.x;
1534 if (y) *y = r.y; 1534 if (y) *y = r.y;
1535 if (w) *w = r.w; 1535 if (w) *w = r.w;
@@ -1537,7 +1537,7 @@ evas_object_geometry_get(const Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y
1537} 1537}
1538 1538
1539EOLIAN static Eina_Position2D 1539EOLIAN static Eina_Position2D
1540_efl_canvas_object_efl_gfx_position_get(const Eo *obj EINA_UNUSED, 1540_efl_canvas_object_efl_gfx_entity_position_get(const Eo *obj EINA_UNUSED,
1541 Evas_Object_Protected_Data *pd) 1541 Evas_Object_Protected_Data *pd)
1542{ 1542{
1543 if ((pd->delete_me) || (!pd->layer)) 1543 if ((pd->delete_me) || (!pd->layer))
@@ -1547,8 +1547,8 @@ _efl_canvas_object_efl_gfx_position_get(const Eo *obj EINA_UNUSED,
1547} 1547}
1548 1548
1549EOLIAN static Eina_Size2D 1549EOLIAN static Eina_Size2D
1550_efl_canvas_object_efl_gfx_size_get(const Eo *obj EINA_UNUSED, 1550_efl_canvas_object_efl_gfx_entity_size_get(const Eo *obj EINA_UNUSED,
1551 Evas_Object_Protected_Data *pd) 1551 Evas_Object_Protected_Data *pd)
1552{ 1552{
1553 if (pd->delete_me) 1553 if (pd->delete_me)
1554 return EINA_SIZE2D(0, 0); 1554 return EINA_SIZE2D(0, 0);
@@ -1890,20 +1890,20 @@ evas_object_show(Evas_Object *eo_obj)
1890 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 1890 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1891 return; 1891 return;
1892 MAGIC_CHECK_END(); 1892 MAGIC_CHECK_END();
1893 efl_gfx_visible_set(eo_obj, EINA_TRUE); 1893 efl_gfx_entity_visible_set(eo_obj, EINA_TRUE);
1894} 1894}
1895 1895
1896EAPI void 1896EAPI void
1897evas_object_hide(Evas_Object *eo_obj) 1897evas_object_hide(Evas_Object *eo_obj)
1898{ 1898{
1899 if (!eo_obj) return; 1899 if (!eo_obj) return;
1900 efl_gfx_visible_set(eo_obj, EINA_FALSE); 1900 efl_gfx_entity_visible_set(eo_obj, EINA_FALSE);
1901} 1901}
1902 1902
1903EAPI Eina_Bool 1903EAPI Eina_Bool
1904evas_object_visible_get(const Evas_Object *obj) 1904evas_object_visible_get(const Evas_Object *obj)
1905{ 1905{
1906 return efl_gfx_visible_get((Evas_Object *)obj); 1906 return efl_gfx_entity_visible_get((Evas_Object *)obj);
1907} 1907}
1908 1908
1909static void 1909static void
@@ -1944,7 +1944,7 @@ _show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
1944 evas_object_update_bounding_box(eo_obj, obj, NULL); 1944 evas_object_update_bounding_box(eo_obj, obj, NULL);
1945 evas_object_inform_call_show(eo_obj, obj); 1945 evas_object_inform_call_show(eo_obj, obj);
1946 1946
1947 Event_Animation *event_anim = _event_animation_find(obj, EFL_GFX_EVENT_SHOW); 1947 Event_Animation *event_anim = _event_animation_find(obj, EFL_GFX_ENTITY_EVENT_SHOW);
1948 if (event_anim) 1948 if (event_anim)
1949 { 1949 {
1950 //Create animation object to start animation 1950 //Create animation object to start animation
@@ -1952,13 +1952,13 @@ _show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
1952 1952
1953 efl_event_callback_add(obj->anim_player, 1953 efl_event_callback_add(obj->anim_player,
1954 EFL_ANIMATION_PLAYER_EVENT_STARTED, 1954 EFL_ANIMATION_PLAYER_EVENT_STARTED,
1955 _anim_started_cb, EFL_GFX_EVENT_SHOW); 1955 _anim_started_cb, EFL_GFX_ENTITY_EVENT_SHOW);
1956 efl_event_callback_add(obj->anim_player, 1956 efl_event_callback_add(obj->anim_player,
1957 EFL_ANIMATION_PLAYER_EVENT_RUNNING, 1957 EFL_ANIMATION_PLAYER_EVENT_RUNNING,
1958 _anim_running_cb, EFL_GFX_EVENT_SHOW); 1958 _anim_running_cb, EFL_GFX_ENTITY_EVENT_SHOW);
1959 efl_event_callback_add(obj->anim_player, 1959 efl_event_callback_add(obj->anim_player,
1960 EFL_ANIMATION_PLAYER_EVENT_ENDED, 1960 EFL_ANIMATION_PLAYER_EVENT_ENDED,
1961 _anim_ended_cb, EFL_GFX_EVENT_SHOW); 1961 _anim_ended_cb, EFL_GFX_ENTITY_EVENT_SHOW);
1962 1962
1963 //Start animation 1963 //Start animation
1964 efl_player_start(obj->anim_player); 1964 efl_player_start(obj->anim_player);
@@ -2077,7 +2077,7 @@ _hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
2077} 2077}
2078 2078
2079EOLIAN static void 2079EOLIAN static void
2080_efl_canvas_object_efl_gfx_visible_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, 2080_efl_canvas_object_efl_gfx_entity_visible_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
2081 Eina_Bool vis) 2081 Eina_Bool vis)
2082{ 2082{
2083 if (!obj->legacy.visible_set) 2083 if (!obj->legacy.visible_set)
@@ -2090,8 +2090,8 @@ _efl_canvas_object_efl_gfx_visible_set(Eo *eo_obj, Evas_Object_Protected_Data *o
2090} 2090}
2091 2091
2092EOLIAN static Eina_Bool 2092EOLIAN static Eina_Bool
2093_efl_canvas_object_efl_gfx_visible_get(const Eo *eo_obj EINA_UNUSED, 2093_efl_canvas_object_efl_gfx_entity_visible_get(const Eo *eo_obj EINA_UNUSED,
2094 Evas_Object_Protected_Data *obj) 2094 Evas_Object_Protected_Data *obj)
2095{ 2095{
2096 if (!EVAS_OBJECT_DATA_ALIVE(obj)) return EINA_FALSE; 2096 if (!EVAS_OBJECT_DATA_ALIVE(obj)) return EINA_FALSE;
2097#if 0 2097#if 0
@@ -2201,7 +2201,7 @@ _efl_canvas_object_anti_alias_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Prot
2201} 2201}
2202 2202
2203EOLIAN static void 2203EOLIAN static void
2204_efl_canvas_object_efl_gfx_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double scale) 2204_efl_canvas_object_efl_gfx_entity_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double scale)
2205{ 2205{
2206 if (obj->delete_me) return; 2206 if (obj->delete_me) return;
2207 if (EINA_DBL_EQ(obj->cur->scale, scale)) return; 2207 if (EINA_DBL_EQ(obj->cur->scale, scale)) return;
@@ -2216,7 +2216,7 @@ _efl_canvas_object_efl_gfx_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj
2216} 2216}
2217 2217
2218EOLIAN static double 2218EOLIAN static double
2219_efl_canvas_object_efl_gfx_scale_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) 2219_efl_canvas_object_efl_gfx_entity_scale_get(const Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
2220{ 2220{
2221 if (obj->delete_me) return 1.0; 2221 if (obj->delete_me) return 1.0;
2222 return obj->cur->scale; 2222 return obj->cur->scale;
@@ -2286,11 +2286,11 @@ _efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Dat
2286 Eina_Bool repeat_event; 2286 Eina_Bool repeat_event;
2287 Eina_Bool clipees_has; 2287 Eina_Bool clipees_has;
2288 2288
2289 visible = efl_gfx_visible_get(eo_obj); 2289 visible = efl_gfx_entity_visible_get(eo_obj);
2290 layer = efl_gfx_stack_layer_get(eo_obj); 2290 layer = efl_gfx_stack_layer_get(eo_obj);
2291 name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj); 2291 name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj);
2292 geom = efl_gfx_geometry_get(eo_obj); 2292 geom = efl_gfx_entity_geometry_get(eo_obj);
2293 scale = efl_gfx_scale_get(eo_obj); 2293 scale = efl_gfx_entity_scale_get(eo_obj);
2294 min = efl_gfx_size_hint_restricted_min_get(eo_obj); 2294 min = efl_gfx_size_hint_restricted_min_get(eo_obj);
2295 max = efl_gfx_size_hint_max_get(eo_obj); 2295 max = efl_gfx_size_hint_max_get(eo_obj);
2296 //efl_gfx_size_hint_request_get(eo_obj, &requestw, &requesth); 2296 //efl_gfx_size_hint_request_get(eo_obj, &requestw, &requesth);
@@ -2574,7 +2574,7 @@ _efl_canvas_object_event_animation_set(Eo *eo_obj,
2574 event_anim = calloc(1, sizeof(Event_Animation)); 2574 event_anim = calloc(1, sizeof(Event_Animation));
2575 2575
2576 //Set callback for Hide event 2576 //Set callback for Hide event
2577 if (desc == EFL_GFX_EVENT_HIDE) 2577 if (desc == EFL_GFX_ENTITY_EVENT_HIDE)
2578 { 2578 {
2579 evas_object_intercept_hide_callback_add(eo_obj, 2579 evas_object_intercept_hide_callback_add(eo_obj,
2580 _animation_intercept_hide, 2580 _animation_intercept_hide,
@@ -2731,13 +2731,13 @@ evas_object_evas_get(const Eo *eo_obj)
2731EAPI void 2731EAPI void
2732evas_object_scale_set(Evas_Object *obj, double scale) 2732evas_object_scale_set(Evas_Object *obj, double scale)
2733{ 2733{
2734 efl_gfx_scale_set(obj, scale); 2734 efl_gfx_entity_scale_set(obj, scale);
2735} 2735}
2736 2736
2737EAPI double 2737EAPI double
2738evas_object_scale_get(const Evas_Object *obj) 2738evas_object_scale_get(const Evas_Object *obj)
2739{ 2739{
2740 return efl_gfx_scale_get(obj); 2740 return efl_gfx_entity_scale_get(obj);
2741} 2741}
2742 2742
2743EAPI Eina_Bool 2743EAPI Eina_Bool
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index fe635e447f..c8c4441254 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -309,7 +309,7 @@ _efl_canvas_group_group_member_add(Eo *smart_obj, Evas_Smart_Data *o, Evas_Objec
309 EINA_SAFETY_ON_NULL_RETURN(clipper); 309 EINA_SAFETY_ON_NULL_RETURN(clipper);
310 efl_canvas_object_clip_set(eo_obj, clipper); 310 efl_canvas_object_clip_set(eo_obj, clipper);
311 if (!had_clippees && smart->cur->visible) 311 if (!had_clippees && smart->cur->visible)
312 efl_gfx_visible_set(clipper, 1); 312 efl_gfx_entity_visible_set(clipper, 1);
313 } 313 }
314 } 314 }
315 315
@@ -354,7 +354,7 @@ _efl_canvas_group_group_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUS
354 EINA_SAFETY_ON_NULL_RETURN(clipper); 354 EINA_SAFETY_ON_NULL_RETURN(clipper);
355 efl_canvas_object_clip_set(eo_obj, NULL); 355 efl_canvas_object_clip_set(eo_obj, NULL);
356 if (!efl_canvas_object_clipees_has(clipper)) 356 if (!efl_canvas_object_clipees_has(clipper))
357 efl_gfx_visible_set(clipper, 0); 357 efl_gfx_entity_visible_set(clipper, 0);
358 } 358 }
359 359
360 o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(obj)); 360 o->contained = eina_inlist_remove(o->contained, EINA_INLIST_GET(obj));
@@ -863,12 +863,12 @@ _efl_canvas_group_efl_gfx_color_color_set(Eo *eo_obj, Evas_Smart_Data *o, int r,
863} 863}
864 864
865EOLIAN static void 865EOLIAN static void
866_efl_canvas_group_efl_gfx_visible_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool vis) 866_efl_canvas_group_efl_gfx_entity_visible_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool vis)
867{ 867{
868 if (_evas_object_intercept_call(eo_obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis)) 868 if (_evas_object_intercept_call(eo_obj, EVAS_OBJECT_INTERCEPT_CB_VISIBLE, 0, vis))
869 return; 869 return;
870 870
871 efl_gfx_visible_set(efl_super(eo_obj, MY_CLASS), vis); 871 efl_gfx_entity_visible_set(efl_super(eo_obj, MY_CLASS), vis);
872 872
873 if (o->clipped) 873 if (o->clipped)
874 { 874 {
@@ -879,19 +879,19 @@ _efl_canvas_group_efl_gfx_visible_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Bool
879 if (vis && !evas_object_clipees_has(clipper)) 879 if (vis && !evas_object_clipees_has(clipper))
880 return; 880 return;
881 881
882 efl_gfx_visible_set(clipper, vis); 882 efl_gfx_entity_visible_set(clipper, vis);
883 } 883 }
884} 884}
885 885
886EOLIAN static void 886EOLIAN static void
887_efl_canvas_group_efl_gfx_position_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Position2D pos) 887_efl_canvas_group_efl_gfx_entity_position_set(Eo *eo_obj, Evas_Smart_Data *o, Eina_Position2D pos)
888{ 888{
889 if (_evas_object_intercept_call(eo_obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) 889 if (_evas_object_intercept_call(eo_obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
890 return; 890 return;
891 891
892 if (o->clipped) 892 if (o->clipped)
893 _evas_object_smart_clipped_smart_move_internal(eo_obj, pos.x, pos.y); 893 _evas_object_smart_clipped_smart_move_internal(eo_obj, pos.x, pos.y);
894 efl_gfx_position_set(efl_super(eo_obj, MY_CLASS), pos); 894 efl_gfx_entity_position_set(efl_super(eo_obj, MY_CLASS), pos);
895} 895}
896 896
897EOLIAN static void 897EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 2f71417907..74ee07b45e 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -268,7 +268,7 @@ _on_child_hints_changed(void *data, const Efl_Event *event EINA_UNUSED)
268 268
269EFL_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks, 269EFL_CALLBACKS_ARRAY_DEFINE(evas_object_table_callbacks,
270 { EFL_EVENT_DEL, _on_child_del }, 270 { EFL_EVENT_DEL, _on_child_del },
271 { EFL_GFX_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed } 271 { EFL_GFX_ENTITY_EVENT_CHANGE_SIZE_HINTS, _on_child_hints_changed }
272); 272);
273 273
274static void 274static void
@@ -934,22 +934,22 @@ _evas_table_efl_canvas_group_group_del(Eo *obj, Evas_Table_Data *priv)
934} 934}
935 935
936EOLIAN static void 936EOLIAN static void
937_evas_table_efl_gfx_size_set(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Eina_Size2D sz) 937_evas_table_efl_gfx_entity_size_set(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Eina_Size2D sz)
938{ 938{
939 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h)) 939 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_RESIZE, 0, sz.w, sz.h))
940 return; 940 return;
941 941
942 efl_gfx_size_set(efl_super(obj, MY_CLASS), sz); 942 efl_gfx_entity_size_set(efl_super(obj, MY_CLASS), sz);
943 evas_object_smart_changed(obj); 943 evas_object_smart_changed(obj);
944} 944}
945 945
946EOLIAN static void 946EOLIAN static void
947_evas_table_efl_gfx_position_set(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Eina_Position2D pos) 947_evas_table_efl_gfx_entity_position_set(Eo *obj, Evas_Table_Data *_pd EINA_UNUSED, Eina_Position2D pos)
948{ 948{
949 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y)) 949 if (_evas_object_intercept_call(obj, EVAS_OBJECT_INTERCEPT_CB_MOVE, 0, pos.x, pos.y))
950 return; 950 return;
951 951
952 efl_gfx_position_set(efl_super(obj, MY_CLASS), pos); 952 efl_gfx_entity_position_set(efl_super(obj, MY_CLASS), pos);
953 evas_object_smart_changed(obj); 953 evas_object_smart_changed(obj);
954} 954}
955 955
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 12a0895c2c..b487a64cf9 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -1006,7 +1006,7 @@ _evas_object_text_layout(Evas_Object *eo_obj, Evas_Text_Data *o, Eina_Unicode *t
1006} 1006}
1007 1007
1008EOLIAN static void 1008EOLIAN static void
1009_evas_text_efl_gfx_size_set(Eo *eo_obj, Evas_Text_Data *o, Eina_Size2D sz) 1009_evas_text_efl_gfx_entity_size_set(Eo *eo_obj, Evas_Text_Data *o, Eina_Size2D sz)
1010{ 1010{
1011 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 1011 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
1012 1012
@@ -1335,7 +1335,7 @@ _evas_text_style_set(Eo *eo_obj, Evas_Text_Data *o, Evas_Text_Style_Type style)
1335 if (o->items) w = obj->cur->geometry.w + (l - pl) + (r - pr); 1335 if (o->items) w = obj->cur->geometry.w + (l - pl) + (r - pr);
1336 h = obj->cur->geometry.h + (t - pt) + (b - pb); 1336 h = obj->cur->geometry.h + (t - pt) + (b - pb);
1337 1337
1338 efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(w, h)); 1338 efl_gfx_entity_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(w, h));
1339 evas_object_change(eo_obj, obj); 1339 evas_object_change(eo_obj, obj);
1340} 1340}
1341 1341
@@ -2215,14 +2215,14 @@ evas_object_text_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
2215} 2215}
2216 2216
2217EOLIAN static void 2217EOLIAN static void
2218_evas_text_efl_gfx_scale_set(Evas_Object *eo_obj, Evas_Text_Data *o, 2218_evas_text_efl_gfx_entity_scale_set(Evas_Object *eo_obj, Evas_Text_Data *o,
2219 double scale) 2219 double scale)
2220{ 2220{
2221 int size; 2221 int size;
2222 const char *font; 2222 const char *font;
2223 2223
2224 if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return; 2224 if (EINA_DBL_EQ(efl_gfx_entity_scale_get(eo_obj), scale)) return;
2225 efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale); 2225 efl_gfx_entity_scale_set(efl_super(eo_obj, MY_CLASS), scale);
2226 2226
2227 font = eina_stringshare_add(o->cur.font); 2227 font = eina_stringshare_add(o->cur.font);
2228 size = o->cur.size; 2228 size = o->cur.size;
@@ -2324,11 +2324,11 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
2324 int min; 2324 int min;
2325 2325
2326 min = w + l + r < obj->cur->geometry.w || obj->cur->geometry.w == 0 ? w + l + r : obj->cur->geometry.w; 2326 min = w + l + r < obj->cur->geometry.w || obj->cur->geometry.w == 0 ? w + l + r : obj->cur->geometry.w;
2327 efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(min, h + t + b)); 2327 efl_gfx_entity_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(min, h + t + b));
2328 } 2328 }
2329 else 2329 else
2330 { 2330 {
2331 efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(w + l + r, h + t + b)); 2331 efl_gfx_entity_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(w + l + r, h + t + b));
2332 } 2332 }
2333//// obj->cur->cache.geometry.validity = 0; 2333//// obj->cur->cache.geometry.validity = 0;
2334 } 2334 }
@@ -2336,7 +2336,7 @@ _evas_object_text_recalc(Evas_Object *eo_obj, Eina_Unicode *text)
2336 { 2336 {
2337 int t = 0, b = 0, l = 0, r = 0; 2337 int t = 0, b = 0, l = 0, r = 0;
2338 _evas_object_text_pad_get(eo_obj, o, &l, &r, &t, &b); 2338 _evas_object_text_pad_get(eo_obj, o, &l, &r, &t, &b);
2339 efl_gfx_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(0, o->max_ascent + o->max_descent + t + b)); 2339 efl_gfx_entity_size_set(efl_super(eo_obj, MY_CLASS), EINA_SIZE2D(0, o->max_ascent + o->max_descent + t + b));
2340//// obj->cur->cache.geometry.validity = 0; 2340//// obj->cur->cache.geometry.validity = 0;
2341 } 2341 }
2342 o->last_computed.w = obj->cur->geometry.w; 2342 o->last_computed.w = obj->cur->geometry.w;
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 2bddbcd833..7f5fa9c0f2 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -8183,8 +8183,8 @@ _obstacle_update(Evas_Textblock_Obstacle *obs, Eo *eo_obj)
8183 Eina_Rect tb_geom, obs_geom; 8183 Eina_Rect tb_geom, obs_geom;
8184 Eo *eo_obs = obs->eo_obs; 8184 Eo *eo_obs = obs->eo_obs;
8185 8185
8186 obs_geom = efl_gfx_geometry_get(eo_obs); 8186 obs_geom = efl_gfx_entity_geometry_get(eo_obs);
8187 tb_geom = efl_gfx_geometry_get(eo_obj); 8187 tb_geom = efl_gfx_entity_geometry_get(eo_obj);
8188 8188
8189 obs->x = obs_geom.x - tb_geom.x; 8189 obs->x = obs_geom.x - tb_geom.x;
8190 obs->y = obs_geom.y - tb_geom.y; 8190 obs->y = obs_geom.y - tb_geom.y;
@@ -8328,7 +8328,7 @@ _layout_item_obstacle_get(Ctxt *c, Evas_Object_Textblock_Item *it)
8328 EINA_LIST_FOREACH(c->o->obstacles, i, obs) 8328 EINA_LIST_FOREACH(c->o->obstacles, i, obs)
8329 { 8329 {
8330 Eina_Bool is_visible; 8330 Eina_Bool is_visible;
8331 is_visible = efl_gfx_visible_get(obs->eo_obs); 8331 is_visible = efl_gfx_entity_visible_get(obs->eo_obs);
8332 if (!is_visible) 8332 if (!is_visible)
8333 continue; 8333 continue;
8334 if ((obs->y < c->y + it->h) && 8334 if ((obs->y < c->y + it->h) &&
@@ -14317,7 +14317,7 @@ _efl_canvas_text_efl_gfx_filter_filter_data_get(const Eo *obj EINA_UNUSED, Efl_C
14317} 14317}
14318 14318
14319EOLIAN static void 14319EOLIAN static void
14320_efl_canvas_text_efl_gfx_filter_filter_source_set(Eo *eo_obj, Efl_Canvas_Text_Data *pd, const char *name, Efl_Gfx *eo_source) 14320_efl_canvas_text_efl_gfx_filter_filter_source_set(Eo *eo_obj, Efl_Canvas_Text_Data *pd, const char *name, Efl_Gfx_Entity *eo_source)
14321{ 14321{
14322 Evas_Object_Protected_Data *obj, *source; 14322 Evas_Object_Protected_Data *obj, *source;
14323 Evas_Filter_Proxy_Binding *pb; 14323 Evas_Filter_Proxy_Binding *pb;
@@ -14370,7 +14370,7 @@ _efl_canvas_text_efl_gfx_filter_filter_source_set(Eo *eo_obj, Efl_Canvas_Text_Da
14370 evas_object_change(eo_obj, obj); 14370 evas_object_change(eo_obj, obj);
14371} 14371}
14372 14372
14373EOLIAN static Efl_Gfx * 14373EOLIAN static Efl_Gfx_Entity *
14374_efl_canvas_text_efl_gfx_filter_filter_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *pd, const char *name) 14374_efl_canvas_text_efl_gfx_filter_filter_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *pd, const char *name)
14375{ 14375{
14376 return eina_hash_find(pd->gfx_filter.sources, name); 14376 return eina_hash_find(pd->gfx_filter.sources, name);
@@ -14618,12 +14618,12 @@ evas_object_textblock_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
14618} 14618}
14619 14619
14620EOLIAN static void 14620EOLIAN static void
14621_efl_canvas_text_efl_gfx_scale_set(Evas_Object *eo_obj, 14621_efl_canvas_text_efl_gfx_entity_scale_set(Evas_Object *eo_obj,
14622 Efl_Canvas_Text_Data *o, 14622 Efl_Canvas_Text_Data *o,
14623 double scale) 14623 double scale)
14624{ 14624{
14625 if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return; 14625 if (EINA_DBL_EQ(efl_gfx_entity_scale_get(eo_obj), scale)) return;
14626 efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale); 14626 efl_gfx_entity_scale_set(efl_super(eo_obj, MY_CLASS), scale);
14627 14627
14628 _evas_textblock_invalidate_all(o); 14628 _evas_textblock_invalidate_all(o);
14629 _evas_textblock_changed(o, eo_obj); 14629 _evas_textblock_changed(o, eo_obj);
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index 7bc13f35f3..0eea223132 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -872,14 +872,14 @@ evas_object_textgrid_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
872} 872}
873 873
874EOLIAN static void 874EOLIAN static void
875_evas_textgrid_efl_gfx_scale_set(Evas_Object *eo_obj, Evas_Textgrid_Data *o, 875_evas_textgrid_efl_gfx_entity_scale_set(Evas_Object *eo_obj, Evas_Textgrid_Data *o,
876 double scale) 876 double scale)
877{ 877{
878 int font_size; 878 int font_size;
879 const char *font_name; 879 const char *font_name;
880 880
881 if (EINA_DBL_EQ(efl_gfx_scale_get(eo_obj), scale)) return; 881 if (EINA_DBL_EQ(efl_gfx_entity_scale_get(eo_obj), scale)) return;
882 efl_gfx_scale_set(efl_super(eo_obj, MY_CLASS), scale); 882 efl_gfx_entity_scale_set(efl_super(eo_obj, MY_CLASS), scale);
883 883
884 font_name = eina_stringshare_add(o->cur.font_name); 884 font_name = eina_stringshare_add(o->cur.font_name);
885 font_size = o->cur.font_size; 885 font_size = o->cur.font_size;
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 7d5d0bc3a9..52ffd0e5d3 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -2882,7 +2882,7 @@ evas_render_pre(Evas *eo_e, Evas_Public_Data *evas)
2882 obj->legacy.finalized = EINA_TRUE; 2882 obj->legacy.finalized = EINA_TRUE;
2883 2883
2884 if (!obj->legacy.visible_set) 2884 if (!obj->legacy.visible_set)
2885 efl_gfx_visible_set(eo_obj, EINA_TRUE); 2885 efl_gfx_entity_visible_set(eo_obj, EINA_TRUE);
2886 2886
2887 // weight should be set during finalize() 2887 // weight should be set during finalize()
2888 if (EINA_UNLIKELY(!obj->legacy.weight_set)) 2888 if (EINA_UNLIKELY(!obj->legacy.weight_set))
diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo
index a4ed63a402..3c7acdb156 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -203,8 +203,8 @@ class Evas.Table (Efl.Canvas.Group)
203 implements { 203 implements {
204 class.constructor; 204 class.constructor;
205 Efl.Object.constructor; 205 Efl.Object.constructor;
206 Efl.Gfx.size { set; } 206 Efl.Gfx.Entity.size { set; }
207 Efl.Gfx.position { set; } 207 Efl.Gfx.Entity.position { set; }
208 Efl.Canvas.Group.group_calculate; 208 Efl.Canvas.Group.group_calculate;
209 Efl.Ui.Base.mirrored { get; set; } 209 Efl.Ui.Base.mirrored { get; set; }
210 } 210 }
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index b310c187d9..8825aa9f72 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -271,8 +271,8 @@ class Evas.Text (Efl.Canvas.Object, Efl.Text,
271 implements { 271 implements {
272 Efl.Object.constructor; 272 Efl.Object.constructor;
273 Efl.Object.destructor; 273 Efl.Object.destructor;
274 Efl.Gfx.size { set; } 274 Efl.Gfx.Entity.size { set; }
275 Efl.Gfx.scale { set; } 275 Efl.Gfx.Entity.scale { set; }
276 Efl.Text.text { get; set; } 276 Efl.Text.text { get; set; }
277 Efl.Text.Font.font { get; set; } 277 Efl.Text.Font.font { get; set; }
278 Efl.Text.Font.font_source { get; set; } 278 Efl.Text.Font.font_source { get; set; }
diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo
index 53934d5c0a..adb113759c 100644
--- a/src/lib/evas/canvas/evas_textgrid.eo
+++ b/src/lib/evas/canvas/evas_textgrid.eo
@@ -204,6 +204,6 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Font,
204 Efl.Text.Font.font { get; set; } 204 Efl.Text.Font.font { get; set; }
205 Efl.Text.Font.font_source { get; set; } 205 Efl.Text.Font.font_source { get; set; }
206 Efl.Text.Font.font_bitmap_scalable { get; set; } 206 Efl.Text.Font.font_bitmap_scalable { get; set; }
207 Efl.Gfx.scale { set; } 207 Efl.Gfx.Entity.scale { set; }
208 } 208 }
209} 209}
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index 36c2f5d4dc..295713ea68 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -85,7 +85,7 @@ _efl_canvas_vg_node_origin_get(const Eo *obj EINA_UNUSED,
85} 85}
86 86
87static void 87static void
88_efl_canvas_vg_node_efl_gfx_position_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd, Eina_Position2D pos) 88_efl_canvas_vg_node_efl_gfx_entity_position_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd, Eina_Position2D pos)
89{ 89{
90 pd->x = (double) pos.x; 90 pd->x = (double) pos.x;
91 pd->y = (double) pos.y; 91 pd->y = (double) pos.y;
@@ -94,14 +94,14 @@ _efl_canvas_vg_node_efl_gfx_position_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node
94} 94}
95 95
96static Eina_Position2D 96static Eina_Position2D
97_efl_canvas_vg_node_efl_gfx_position_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd) 97_efl_canvas_vg_node_efl_gfx_entity_position_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data *pd)
98{ 98{
99 // NOTE: This casts double to int! 99 // NOTE: This casts double to int!
100 return EINA_POSITION2D(pd->x, pd->y); 100 return EINA_POSITION2D(pd->x, pd->y);
101} 101}
102 102
103static void 103static void
104_efl_canvas_vg_node_efl_gfx_visible_set(Eo *obj EINA_UNUSED, 104_efl_canvas_vg_node_efl_gfx_entity_visible_set(Eo *obj EINA_UNUSED,
105 Efl_Canvas_Vg_Node_Data *pd, Eina_Bool v) 105 Efl_Canvas_Vg_Node_Data *pd, Eina_Bool v)
106{ 106{
107 pd->visibility = v; 107 pd->visibility = v;
@@ -111,7 +111,7 @@ _efl_canvas_vg_node_efl_gfx_visible_set(Eo *obj EINA_UNUSED,
111 111
112 112
113static Eina_Bool 113static Eina_Bool
114_efl_canvas_vg_node_efl_gfx_visible_get(const Eo *obj EINA_UNUSED, 114_efl_canvas_vg_node_efl_gfx_entity_visible_get(const Eo *obj EINA_UNUSED,
115 Efl_Canvas_Vg_Node_Data *pd) 115 Efl_Canvas_Vg_Node_Data *pd)
116{ 116{
117 return pd->visibility; 117 return pd->visibility;
@@ -185,7 +185,7 @@ _efl_canvas_vg_node_mask_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Node_Data
185} 185}
186 186
187static Eina_Size2D 187static Eina_Size2D
188_efl_canvas_vg_node_efl_gfx_size_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED) 188_efl_canvas_vg_node_efl_gfx_entity_size_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
189{ 189{
190 Eina_Rect r; 190 Eina_Rect r;
191 191
@@ -194,11 +194,11 @@ _efl_canvas_vg_node_efl_gfx_size_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd
194} 194}
195 195
196EOLIAN static Eina_Rect 196EOLIAN static Eina_Rect
197_efl_canvas_vg_node_efl_gfx_geometry_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED) 197_efl_canvas_vg_node_efl_gfx_entity_geometry_get(const Eo *obj, Efl_Canvas_Vg_Node_Data *pd EINA_UNUSED)
198{ 198{
199 Eina_Rect r; 199 Eina_Rect r;
200 r.pos = efl_gfx_position_get(obj); 200 r.pos = efl_gfx_entity_position_get(obj);
201 r.size = efl_gfx_size_get(obj); 201 r.size = efl_gfx_entity_size_get(obj);
202 return r; 202 return r;
203} 203}
204 204
@@ -756,13 +756,13 @@ _efl_canvas_vg_node_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Node_Da
756EAPI Eina_Bool 756EAPI Eina_Bool
757evas_vg_node_visible_get(Eo *obj) 757evas_vg_node_visible_get(Eo *obj)
758{ 758{
759 return efl_gfx_visible_get(obj); 759 return efl_gfx_entity_visible_get(obj);
760} 760}
761 761
762EAPI void 762EAPI void
763evas_vg_node_visible_set(Eo *obj, Eina_Bool v) 763evas_vg_node_visible_set(Eo *obj, Eina_Bool v)
764{ 764{
765 efl_gfx_visible_set(obj, v); 765 efl_gfx_entity_visible_set(obj, v);
766} 766}
767 767
768EAPI void 768EAPI void
@@ -781,8 +781,8 @@ EAPI void
781evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h) 781evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h)
782{ 782{
783 Eina_Rect r; 783 Eina_Rect r;
784 r.pos = efl_gfx_position_get(obj); 784 r.pos = efl_gfx_entity_position_get(obj);
785 r.size = efl_gfx_size_get(obj); 785 r.size = efl_gfx_entity_size_get(obj);
786 if (x) *x = r.x; 786 if (x) *x = r.x;
787 if (y) *y = r.y; 787 if (y) *y = r.y;
788 if (w) *w = r.w; 788 if (w) *w = r.w;
@@ -792,8 +792,8 @@ evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h)
792EAPI void 792EAPI void
793evas_vg_node_geometry_set(Eo *obj, int x, int y, int w, int h) 793evas_vg_node_geometry_set(Eo *obj, int x, int y, int w, int h)
794{ 794{
795 efl_gfx_position_set(obj, EINA_POSITION2D(x, y)); 795 efl_gfx_entity_position_set(obj, EINA_POSITION2D(x, y));
796 efl_gfx_size_set(obj, EINA_SIZE2D(w, h)); 796 efl_gfx_entity_size_set(obj, EINA_SIZE2D(w, h));
797} 797}
798 798
799EAPI void 799EAPI void
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 49c6b42432..a1dfa263f4 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1687,7 +1687,7 @@ void _efl_canvas_object_clip_prev_reset(Evas_Object_Protected_Data *obj, Eina_Bo
1687 1687
1688Eina_Bool _efl_canvas_object_clip_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip, Evas_Object_Protected_Data *clip); 1688Eina_Bool _efl_canvas_object_clip_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip, Evas_Object_Protected_Data *clip);
1689Eina_Bool _efl_canvas_object_clip_unset_block(Eo *eo_obj, Evas_Object_Protected_Data *obj); 1689Eina_Bool _efl_canvas_object_clip_unset_block(Eo *eo_obj, Evas_Object_Protected_Data *obj);
1690Eina_Bool _efl_canvas_object_efl_gfx_size_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h, Eina_Bool internal); 1690Eina_Bool _efl_canvas_object_efl_gfx_entity_size_set_block(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h, Eina_Bool internal);
1691 1691
1692void _evas_focus_device_del_cb(void *data, const Efl_Event *ev); 1692void _evas_focus_device_del_cb(void *data, const Efl_Event *ev);
1693 1693