summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_object_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/evas/canvas/evas_object_main.c')
-rw-r--r--src/lib/evas/canvas/evas_object_main.c60
1 files changed, 30 insertions, 30 deletions
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index f1421fa..43d3fc9 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -91,14 +91,14 @@ _animator_repeater(void *data, const Eo_Event *event)
91{ 91{
92 Evas_Object_Protected_Data *obj = data; 92 Evas_Object_Protected_Data *obj = data;
93 93
94 eo_event_callback_call(obj->object, EFL_EVENT_ANIMATOR_TICK, event->info); 94 efl_event_callback_call(obj->object, EFL_EVENT_ANIMATOR_TICK, event->info);
95 DBG("Emitting animator tick on %p.", obj->object); 95 DBG("Emitting animator tick on %p.", obj->object);
96} 96}
97 97
98static void 98static void
99_check_event_catcher_add(void *data, const Eo_Event *event) 99_check_event_catcher_add(void *data, const Eo_Event *event)
100{ 100{
101 const Eo_Callback_Array_Item *array = event->info; 101 const Efl_Callback_Array_Item *array = event->info;
102 Evas_Object_Protected_Data *obj = data; 102 Evas_Object_Protected_Data *obj = data;
103 int i; 103 int i;
104 104
@@ -108,7 +108,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
108 { 108 {
109 if (obj->animator_ref++ > 0) break; 109 if (obj->animator_ref++ > 0) break;
110 110
111 eo_event_callback_add(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj); 111 efl_event_callback_add(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
112 INF("Registering an animator tick on canvas %p for object %p.", 112 INF("Registering an animator tick on canvas %p for object %p.",
113 obj->layer->evas->evas, obj->object); 113 obj->layer->evas->evas, obj->object);
114 } 114 }
@@ -122,7 +122,7 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
122static void 122static void
123_check_event_catcher_del(void *data, const Eo_Event *event) 123_check_event_catcher_del(void *data, const Eo_Event *event)
124{ 124{
125 const Eo_Callback_Array_Item *array = event->info; 125 const Efl_Callback_Array_Item *array = event->info;
126 Evas_Object_Protected_Data *obj = data; 126 Evas_Object_Protected_Data *obj = data;
127 int i; 127 int i;
128 128
@@ -132,7 +132,7 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
132 { 132 {
133 if ((--obj->animator_ref) > 0) break; 133 if ((--obj->animator_ref) > 0) break;
134 134
135 eo_event_callback_del(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj); 135 efl_event_callback_del(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
136 INF("Unregistering an animator tick on canvas %p for object %p.", 136 INF("Unregistering an animator tick on canvas %p for object %p.",
137 obj->layer->evas->evas, obj->object); 137 obj->layer->evas->evas, obj->object);
138 } 138 }
@@ -144,20 +144,20 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
144} 144}
145 145
146EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch, 146EO_CALLBACKS_ARRAY_DEFINE(event_catcher_watch,
147 { EO_EVENT_CALLBACK_ADD, _check_event_catcher_add }, 147 { EFL_EVENT_CALLBACK_ADD, _check_event_catcher_add },
148 { EO_EVENT_CALLBACK_DEL, _check_event_catcher_del }); 148 { EFL_EVENT_CALLBACK_DEL, _check_event_catcher_del });
149 149
150EOLIAN static Eo * 150EOLIAN static Eo *
151_efl_canvas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) 151_efl_canvas_object_efl_object_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
152{ 152{
153 Eo *parent = NULL; 153 Eo *parent = NULL;
154 Evas *evas; 154 Evas *evas;
155 155
156 eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); 156 eo_obj = efl_constructor(eo_super(eo_obj, MY_CLASS));
157 efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME); 157 efl_canvas_object_type_set(eo_obj, MY_CLASS_NAME);
158 eo_manual_free_set(eo_obj, EINA_TRUE); 158 eo_manual_free_set(eo_obj, EINA_TRUE);
159 159
160 parent = eo_parent_get(eo_obj); 160 parent = efl_parent_get(eo_obj);
161 evas = evas_object_evas_get(parent); 161 evas = evas_object_evas_get(parent);
162 162
163 if (!obj || !_init_cow() || !evas) 163 if (!obj || !_init_cow() || !evas)
@@ -177,7 +177,7 @@ _efl_canvas_object_eo_base_constructor(Eo *eo_obj, Evas_Object_Protected_Data *o
177 177
178 evas_object_inject(eo_obj, obj, evas); 178 evas_object_inject(eo_obj, obj, evas);
179 179
180 eo_event_callback_array_add(eo_obj, event_catcher_watch(), obj); 180 efl_event_callback_array_add(eo_obj, event_catcher_watch(), obj);
181 181
182 return eo_obj; 182 return eo_obj;
183} 183}
@@ -727,20 +727,20 @@ evas_object_del(Evas_Object *eo_obj)
727 727
728 if (!obj) return; 728 if (!obj) return;
729 evas_object_async_block(obj); 729 evas_object_async_block(obj);
730 if (obj->delete_me || obj->eo_del_called) return; 730 if (obj->delete_me || obj->efl_del_called) return;
731 if (obj->ref > 0) 731 if (obj->ref > 0)
732 { 732 {
733 obj->del_ref = EINA_TRUE; 733 obj->del_ref = EINA_TRUE;
734 return; 734 return;
735 } 735 }
736 evas_object_hide(eo_obj); 736 evas_object_hide(eo_obj);
737 obj->eo_del_called = EINA_TRUE; 737 obj->efl_del_called = EINA_TRUE;
738 738
739 eo_del(eo_obj); 739 efl_del(eo_obj);
740} 740}
741 741
742EOLIAN static void 742EOLIAN static void
743_efl_canvas_object_eo_base_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj) 743_efl_canvas_object_efl_object_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
744{ 744{
745 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 745 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
746 return; 746 return;
@@ -830,7 +830,7 @@ end:
830 evas_object_event_callback_all_del(eo_obj); 830 evas_object_event_callback_all_del(eo_obj);
831 evas_object_event_callback_cleanup(eo_obj); 831 evas_object_event_callback_cleanup(eo_obj);
832 832
833 eo_destructor(eo_super(eo_obj, MY_CLASS)); 833 efl_destructor(eo_super(eo_obj, MY_CLASS));
834} 834}
835 835
836EOLIAN static void 836EOLIAN static void
@@ -1771,11 +1771,11 @@ evas_object_render_op_get(const Evas_Object *eo_obj)
1771} 1771}
1772 1772
1773EOLIAN static void 1773EOLIAN static void
1774_efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Eo_Dbg_Info *root) 1774_efl_canvas_object_efl_object_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Efl_Dbg_Info *root)
1775{ 1775{
1776 eo_dbg_info_get(eo_super(eo_obj, MY_CLASS), root); 1776 efl_dbg_info_get(eo_super(eo_obj, MY_CLASS), root);
1777 Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); 1777 Efl_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
1778 Eo_Dbg_Info *node; 1778 Efl_Dbg_Info *node;
1779 const char *name; 1779 const char *name;
1780 double dblw, dblh; 1780 double dblw, dblh;
1781 double dblx, dbly; 1781 double dblx, dbly;
@@ -1797,7 +1797,7 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *
1797 1797
1798 visible = efl_gfx_visible_get(eo_obj); 1798 visible = efl_gfx_visible_get(eo_obj);
1799 layer = efl_gfx_stack_layer_get(eo_obj); 1799 layer = efl_gfx_stack_layer_get(eo_obj);
1800 name = eo_name_get(eo_obj); // evas_object_name_get(eo_obj); 1800 name = efl_name_get(eo_obj); // evas_object_name_get(eo_obj);
1801 efl_gfx_position_get(eo_obj, &x, &y); 1801 efl_gfx_position_get(eo_obj, &x, &y);
1802 efl_gfx_size_get(eo_obj, &w, &h); 1802 efl_gfx_size_get(eo_obj, &w, &h);
1803 scale = efl_canvas_object_scale_get(eo_obj); 1803 scale = efl_canvas_object_scale_get(eo_obj);
@@ -1895,14 +1895,14 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *
1895 { /* Save map coords count info if object has map */ 1895 { /* Save map coords count info if object has map */
1896 node = EO_DBG_INFO_LIST_APPEND(group, "Evas Map"); 1896 node = EO_DBG_INFO_LIST_APPEND(group, "Evas Map");
1897 int points_count = evas_map_count_get(map); 1897 int points_count = evas_map_count_get(map);
1898 Eo_Dbg_Info *points = EO_DBG_INFO_LIST_APPEND(node, "Points"); 1898 Efl_Dbg_Info *points = EO_DBG_INFO_LIST_APPEND(node, "Points");
1899 Eo_Dbg_Info *pointsuv = EO_DBG_INFO_LIST_APPEND(node, "Image UV"); 1899 Efl_Dbg_Info *pointsuv = EO_DBG_INFO_LIST_APPEND(node, "Image UV");
1900 for (int i = 0 ; i < points_count; i++) 1900 for (int i = 0 ; i < points_count; i++)
1901 { 1901 {
1902 { 1902 {
1903 Evas_Coord px, py, pz; 1903 Evas_Coord px, py, pz;
1904 evas_map_point_coord_get(map, i, &px, &py, &pz); 1904 evas_map_point_coord_get(map, i, &px, &py, &pz);
1905 Eo_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(points, "Points"); 1905 Efl_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(points, "Points");
1906 EO_DBG_INFO_APPEND(point, "x", EINA_VALUE_TYPE_INT, px); 1906 EO_DBG_INFO_APPEND(point, "x", EINA_VALUE_TYPE_INT, px);
1907 EO_DBG_INFO_APPEND(point, "y", EINA_VALUE_TYPE_INT, py); 1907 EO_DBG_INFO_APPEND(point, "y", EINA_VALUE_TYPE_INT, py);
1908 EO_DBG_INFO_APPEND(point, "z", EINA_VALUE_TYPE_INT, pz); 1908 EO_DBG_INFO_APPEND(point, "z", EINA_VALUE_TYPE_INT, pz);
@@ -1911,7 +1911,7 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *
1911 { 1911 {
1912 double pu, pv; 1912 double pu, pv;
1913 evas_map_point_image_uv_get(map, i, &pu, &pv); 1913 evas_map_point_image_uv_get(map, i, &pu, &pv);
1914 Eo_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(pointsuv, "Image UV"); 1914 Efl_Dbg_Info *point = EO_DBG_INFO_LIST_APPEND(pointsuv, "Image UV");
1915 EO_DBG_INFO_APPEND(point, "u", EINA_VALUE_TYPE_DOUBLE, pu); 1915 EO_DBG_INFO_APPEND(point, "u", EINA_VALUE_TYPE_DOUBLE, pu);
1916 EO_DBG_INFO_APPEND(point, "v", EINA_VALUE_TYPE_DOUBLE, pv); 1916 EO_DBG_INFO_APPEND(point, "v", EINA_VALUE_TYPE_DOUBLE, pv);
1917 } 1917 }
@@ -1920,14 +1920,14 @@ _efl_canvas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *
1920} 1920}
1921 1921
1922EOLIAN static Eo * 1922EOLIAN static Eo *
1923_efl_canvas_object_eo_base_provider_find(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Eo_Class *klass) 1923_efl_canvas_object_efl_object_provider_find(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const Efl_Class *klass)
1924{ 1924{
1925 if (klass == EVAS_CANVAS_CLASS) 1925 if (klass == EVAS_CANVAS_CLASS)
1926 { 1926 {
1927 if ((obj->delete_me) || (!obj->layer)) return NULL; 1927 if ((obj->delete_me) || (!obj->layer)) return NULL;
1928 return obj->layer->evas->evas; 1928 return obj->layer->evas->evas;
1929 } 1929 }
1930 return eo_provider_find(eo_super(eo_obj, MY_CLASS), klass); 1930 return efl_provider_find(eo_super(eo_obj, MY_CLASS), klass);
1931} 1931}
1932 1932
1933EOLIAN Evas_Object* 1933EOLIAN Evas_Object*
@@ -2106,7 +2106,7 @@ _evas_canvas_objects_in_rectangle_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e,
2106EOLIAN static void 2106EOLIAN static void
2107_efl_canvas_object_type_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *type) 2107_efl_canvas_object_type_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *type)
2108{ 2108{
2109 if (eo_finalized_get(eo_obj)) 2109 if (efl_finalized_get(eo_obj))
2110 { 2110 {
2111 ERR("This function is only allowed during construction."); 2111 ERR("This function is only allowed during construction.");
2112 return; 2112 return;
@@ -2182,7 +2182,7 @@ _efl_canvas_object_paragraph_direction_get(Eo *eo_obj EINA_UNUSED, Evas_Object_P
2182EOLIAN static void 2182EOLIAN static void
2183_efl_canvas_object_legacy_ctor(Eo *eo_obj, Evas_Object_Protected_Data *obj) 2183_efl_canvas_object_legacy_ctor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
2184{ 2184{
2185 EINA_SAFETY_ON_FALSE_RETURN(!eo_finalized_get(eo_obj)); 2185 EINA_SAFETY_ON_FALSE_RETURN(!efl_finalized_get(eo_obj));
2186 obj->legacy = EINA_TRUE; 2186 obj->legacy = EINA_TRUE;
2187} 2187}
2188 2188
@@ -2299,7 +2299,7 @@ evas_object_size_hint_align_get(const Evas_Object *obj, double *x, double *y)
2299EAPI Evas * 2299EAPI Evas *
2300evas_object_evas_get(const Eo *eo_obj) 2300evas_object_evas_get(const Eo *eo_obj)
2301{ 2301{
2302 return eo_provider_find((Eo *) eo_obj, EVAS_CANVAS_CLASS); 2302 return efl_provider_find((Eo *) eo_obj, EVAS_CANVAS_CLASS);
2303} 2303}
2304 2304
2305EAPI void 2305EAPI void