aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/evas
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2014-03-11 13:51:35 +0200
committerDaniel Zaoui <daniel.zaoui@samsung.com>2014-03-12 10:57:28 +0200
commitf22bd9e6eeee337df7c35223743dff2d941bdad7 (patch)
treef942477d8640839f9bd41619f513f4868e8fc799 /src/lib/evas
parentecore-evas: Predefine Ecore_X_Atom and Ecore_X_Icon (diff)
downloadefl-f22bd9e6eeee337df7c35223743dff2d941bdad7.tar.gz
Eolian: Integration of Evas Object.
const have been added in object parameter of two legacy APIs to fit Eolian generated files. Since these functions retrieve information from object, it is logic that the object would be const.
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/Evas_Eo.h9
-rw-r--r--src/lib/evas/Evas_Legacy.h4
-rw-r--r--src/lib/evas/canvas/evas_clip.c91
-rw-r--r--src/lib/evas/canvas/evas_common_interface.eo18
-rw-r--r--src/lib/evas/canvas/evas_events.c171
-rw-r--r--src/lib/evas/canvas/evas_focus.c32
-rw-r--r--src/lib/evas/canvas/evas_key_grab.c55
-rw-r--r--src/lib/evas/canvas/evas_layer.c38
-rw-r--r--src/lib/evas/canvas/evas_main.c2
-rw-r--r--src/lib/evas/canvas/evas_map.c72
-rw-r--r--src/lib/evas/canvas/evas_name.c58
-rw-r--r--src/lib/evas/canvas/evas_object.eo85
-rw-r--r--src/lib/evas/canvas/evas_object_main.c918
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c46
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c52
-rw-r--r--src/lib/evas/canvas/evas_stack.c131
16 files changed, 324 insertions, 1458 deletions
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 351cec93c7..d7496b720e 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -1213,6 +1213,7 @@ enum
*/
#define evas_canvas_object_name_find(name, ret) EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_OBJECT_NAME_FIND),EO_TYPECHECK(const char *, name), EO_TYPECHECK(Evas_Object **, ret)
+#if 0
/**
* @def evas_obj_name_child_find
* @since 1.8
@@ -1225,6 +1226,7 @@ enum
* @see evas_object_name_child_find
*/
#define evas_obj_name_child_find(name, recurse, child) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_NAME_CHILD_FIND), EO_TYPECHECK(const char *, name), EO_TYPECHECK(int, recurse), EO_TYPECHECK(Evas_Object **, child)
+#endif
/**
* @def evas_canvas_object_top_at_xy_get
@@ -4448,6 +4450,8 @@ enum
* @}
*/
+#include "canvas/evas_common_interface.eo.h"
+#if 0
#define EVAS_COMMON_INTERFACE evas_common_class_get()
const Eo_Class *evas_common_class_get(void) EINA_CONST;
@@ -4475,6 +4479,10 @@ enum
*/
#define evas_common_evas_get(ret) EVAS_COMMON_ID(EVAS_COMMON_SUB_ID_EVAS_GET), EO_TYPECHECK(Evas **, ret)
+#endif
+
+#include "canvas/evas_object.eo.h"
+#if 0
extern EAPI Eo_Op EVAS_OBJ_BASE_ID;
enum
@@ -5623,6 +5631,7 @@ enum
#define EVAS_OBJ_CLASS evas_object_class_get()
const Eo_Class *evas_object_class_get(void) EINA_CONST;
+#endif
#define EVAS_OBJ_IMAGE_CLASS evas_object_image_class_get()
const Eo_Class *evas_object_image_class_get(void) EINA_CONST;
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 19dcf2ae2f..394dcfbf39 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -6255,7 +6255,7 @@ EAPI void evas_object_polygon_points_clear(Evas_Object *obj) EINA_ARG_NO
EAPI void evas_object_is_frame_object_set(Evas_Object *obj, Eina_Bool is_frame);
/* @since 1.2 */
-EAPI Eina_Bool evas_object_is_frame_object_get(Evas_Object *obj);
+EAPI Eina_Bool evas_object_is_frame_object_get(const Evas_Object *obj);
/**
* @}
@@ -6853,7 +6853,7 @@ EAPI void evas_object_smart_move_children_relative(Evas_Object *obj, Eva
*
* @see evas_object_smart_clipped_smart_add()
*/
-EAPI Evas_Object *evas_object_smart_clipped_clipper_get(Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EAPI Evas_Object *evas_object_smart_clipped_clipper_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
/**
* @}
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 8f74dd6695..918fe363a7 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -191,23 +191,10 @@ evas_object_mapped_clip_across_mark(Evas_Object *eo_obj, Evas_Object_Protected_D
/* public functions */
extern const char *o_rect_type;
-EAPI void
-evas_object_clip_set(
- Evas_Object *eo_obj,
- Evas_Object *clip)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_clip_set(clip));
-}
-
-void
-_clip_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN void
+_evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip)
{
Evas_Object_Protected_Data *clip;
- Evas_Object *eo_clip = va_arg(*list, Evas_Object *);
- Evas_Object_Protected_Data *obj = _pd;
Evas_Public_Data *e;
if (!eo_clip)
@@ -348,43 +335,17 @@ _clip_set(Eo *eo_obj, void *_pd, va_list *list)
evas_object_clip_across_check(eo_obj, obj);
}
-EAPI Evas_Object *
-evas_object_clip_get(const Evas_Object *eo_obj)
+EOLIAN Evas_Object *
+_evas_object_clip_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return NULL;
- MAGIC_CHECK_END();
- Evas_Object *clip = NULL;
- eo_do((Eo *)eo_obj, evas_obj_clip_get(&clip));
- return clip;
-}
-
-void
-_clip_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- Evas_Object **clip = va_arg(*list, Evas_Object **);
- const Evas_Object_Protected_Data *obj = _pd;
-
- *clip = NULL;
-
if (obj->cur->clipper)
- *clip = obj->cur->clipper->object;
-}
-
-EAPI void
-evas_object_clip_unset(Evas_Object *eo_obj)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_clip_unset());
+ return obj->cur->clipper->object;
+ return NULL;
}
-void
-_clip_unset(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
+EOLIAN void
+_evas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj)
{
- Evas_Object_Protected_Data *obj = _pd;
-
if (!obj->cur->clipper) return;
obj->clip.cache_clipees_answer = eina_list_free(obj->clip.cache_clipees_answer);
@@ -445,22 +406,9 @@ _clip_unset(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
evas_object_clip_across_check(eo_obj, obj);
}
-EAPI const Eina_List *
-evas_object_clipees_get(const Evas_Object *eo_obj)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return NULL;
- MAGIC_CHECK_END();
- const Eina_List *clipees = NULL;
- eo_do((Eo *)eo_obj, evas_obj_clipees_get(&clipees));
- return clipees;
-}
-
-void
-_clipees_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN Eina_List *
+_evas_object_clipees_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- const Eina_List **clipees = va_arg(*list, const Eina_List **);
- Evas_Object_Protected_Data *obj = _pd;
const Evas_Object_Protected_Data *tmp;
Eina_List *l;
Eina_List *answer = NULL;
@@ -470,24 +418,13 @@ _clipees_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
EINA_LIST_FOREACH(obj->clip.clipees, l, tmp)
answer = eina_list_append(answer, tmp);
- *clipees = answer;
obj->clip.cache_clipees_answer = answer;
+ return answer;
}
-EAPI Eina_Bool
-evas_object_clipees_has(const Evas_Object *eo_obj)
+EOLIAN Eina_Bool
+_evas_object_clipees_has(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- Eina_Bool r;
-
- eo_do((Eo *)eo_obj, evas_obj_clipees_has(&r));
- return r;
+ return (obj->clip.clipees ? EINA_TRUE : EINA_FALSE);
}
-void
-_clipees_has(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- Eina_Bool *r = va_arg(*list, Eina_Bool *);
- Evas_Object_Protected_Data *obj = _pd;
-
- *r = obj->clip.clipees ? EINA_TRUE : EINA_FALSE;
-}
diff --git a/src/lib/evas/canvas/evas_common_interface.eo b/src/lib/evas/canvas/evas_common_interface.eo
new file mode 100644
index 0000000000..13c2b57476
--- /dev/null
+++ b/src/lib/evas/canvas/evas_common_interface.eo
@@ -0,0 +1,18 @@
+interface Evas_Common_Interface ()
+{
+ eo_prefix: evas_common;
+ properties {
+ evas {
+ get {
+ /*@ No description supplied by the EAPI. */
+ }
+ values {
+ Evas *ret;
+ }
+ }
+ }
+ implements {
+ virtual::evas::get;
+ }
+
+} \ No newline at end of file
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 808ffcfd0e..bd2285e721 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -3062,15 +3062,6 @@ _canvas_event_feed_hold(Eo *eo_e, void *_pd, va_list *list)
_evas_object_event_new();
}
-EAPI void
-evas_object_freeze_events_set(Evas_Object *eo_obj, Eina_Bool freeze)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_freeze_events_set(freeze));
-}
-
static void
_feed_mouse_move_eval_internal(Eo *eo_obj, Evas_Object_Protected_Data *obj)
{
@@ -3089,11 +3080,9 @@ _feed_mouse_move_eval_internal(Eo *eo_obj, Evas_Object_Protected_Data *obj)
NULL);
}
-void
-_freeze_events_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN void
+_evas_object_freeze_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool freeze)
{
- Eina_Bool freeze = va_arg(*list, int);
- Evas_Object_Protected_Data *obj = _pd;
freeze = !!freeze;
if (obj->freeze_events == freeze) return;
obj->freeze_events = freeze;
@@ -3103,39 +3092,15 @@ _freeze_events_set(Eo *eo_obj, void *_pd, va_list *list)
_feed_mouse_move_eval_internal(eo_obj, obj);
}
-EAPI Eina_Bool
-evas_object_freeze_events_get(const Evas_Object *eo_obj)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return EINA_FALSE;
- MAGIC_CHECK_END();
- Eina_Bool freeze_events = EINA_FALSE;
- eo_do((Eo *)eo_obj, evas_obj_freeze_events_get(&freeze_events));
- return freeze_events;
-}
-
-void
-_freeze_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN Eina_Bool
+_evas_object_freeze_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- Eina_Bool *freeze_events = va_arg(*list, Eina_Bool *);
- const Evas_Object_Protected_Data *obj = _pd;
- if (freeze_events) *freeze_events = obj->freeze_events;
+ return obj->freeze_events;
}
-EAPI void
-evas_object_pass_events_set(Evas_Object *eo_obj, Eina_Bool pass)
+EOLIAN void
+_evas_object_pass_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool pass)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_pass_events_set(pass));
-}
-
-void
-_pass_events_set(Eo *eo_obj, void *_pd, va_list *list)
-{
- Eina_Bool pass = va_arg(*list, int);
- Evas_Object_Protected_Data *obj = _pd;
pass = !!pass;
if (obj->pass_events == pass) return;
obj->pass_events = pass;
@@ -3143,134 +3108,49 @@ _pass_events_set(Eo *eo_obj, void *_pd, va_list *list)
_feed_mouse_move_eval_internal(eo_obj, obj);
}
-EAPI Eina_Bool
-evas_object_pass_events_get(const Evas_Object *eo_obj)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return EINA_FALSE;
- MAGIC_CHECK_END();
- Eina_Bool pass_events = EINA_FALSE;
- eo_do((Eo *)eo_obj, evas_obj_pass_events_get(&pass_events));
- return pass_events;
-}
-
-void
-_pass_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN Eina_Bool
+_evas_object_pass_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- Eina_Bool *pass_events = va_arg(*list, Eina_Bool *);
- const Evas_Object_Protected_Data *obj = _pd;
- if (pass_events) *pass_events = obj->pass_events;
+ return obj->pass_events;
}
-EAPI void
-evas_object_repeat_events_set(Evas_Object *eo_obj, Eina_Bool repeat)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_repeat_events_set(repeat));
-}
-
-void
-_repeat_events_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN void
+_evas_object_repeat_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool repeat)
{
- Eina_Bool repeat = va_arg(*list, int);
- Evas_Object_Protected_Data *obj = _pd;
repeat = !!repeat;
if (obj->repeat_events == repeat) return;
obj->repeat_events = repeat;
_feed_mouse_move_eval_internal(eo_obj, obj);
}
-EAPI Eina_Bool
-evas_object_repeat_events_get(const Evas_Object *eo_obj)
+EOLIAN Eina_Bool
+_evas_object_repeat_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return EINA_FALSE;
- MAGIC_CHECK_END();
- Eina_Bool repeat_events = EINA_FALSE;
- eo_do((Eo *)eo_obj, evas_obj_repeat_events_get(&repeat_events));
- return repeat_events;
-}
-
-void
-_repeat_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- Eina_Bool *repeat_events = va_arg(*list, Eina_Bool *);
- const Evas_Object_Protected_Data *obj = _pd;
- if (repeat_events) *repeat_events = obj->repeat_events;
+ return obj->repeat_events;
}
-EAPI void
-evas_object_propagate_events_set(Evas_Object *eo_obj, Eina_Bool prop)
+EOLIAN void
+_evas_object_propagate_events_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool prop)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_propagate_events_set(prop));
-}
-
-void
-_propagate_events_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- Eina_Bool prop = va_arg(*list, int);
- Evas_Object_Protected_Data *obj = _pd;
obj->no_propagate = !prop;
}
-EAPI Eina_Bool
-evas_object_propagate_events_get(const Evas_Object *eo_obj)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return EINA_FALSE;
- MAGIC_CHECK_END();
- Eina_Bool no_propagate = EINA_FALSE;
- eo_do((Eo *)eo_obj, evas_obj_propagate_events_get(&no_propagate));
- return no_propagate;
-}
-
-void
-_propagate_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN Eina_Bool
+_evas_object_propagate_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- Eina_Bool *no_propagate = va_arg(*list, Eina_Bool *);
- const Evas_Object_Protected_Data *obj = _pd;
- if (no_propagate) *no_propagate = !(obj->no_propagate);
+ return !(obj->no_propagate);
}
-EAPI void
-evas_object_pointer_mode_set(Evas_Object *eo_obj, Evas_Object_Pointer_Mode setting)
+EOLIAN void
+_evas_object_pointer_mode_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Object_Pointer_Mode setting)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_pointer_mode_set(setting));
-}
-
-void
-_pointer_mode_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- Evas_Object_Pointer_Mode setting = va_arg(*list, Evas_Object_Pointer_Mode);
- Evas_Object_Protected_Data *obj = _pd;
obj->pointer_mode = setting;
}
-EAPI Evas_Object_Pointer_Mode
-evas_object_pointer_mode_get(const Evas_Object *eo_obj)
+EOLIAN Evas_Object_Pointer_Mode
+_evas_object_pointer_mode_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return EVAS_OBJECT_POINTER_MODE_AUTOGRAB;
- MAGIC_CHECK_END();
- Evas_Object_Pointer_Mode setting = EVAS_OBJECT_POINTER_MODE_AUTOGRAB;
- eo_do((Eo *)eo_obj, evas_obj_pointer_mode_get(&setting));
- return setting;
-}
-
-void
-_pointer_mode_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- Evas_Object_Pointer_Mode *setting = va_arg(*list, Evas_Object_Pointer_Mode *);
- const Evas_Object_Protected_Data *obj = _pd;
- if (setting) *setting = obj->pointer_mode;
+ return obj->pointer_mode;
}
EAPI void
@@ -3378,3 +3258,4 @@ _canvas_event_down_count_get(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
const Evas_Public_Data *e = _pd;
*ret = e->pointer.downs;
}
+
diff --git a/src/lib/evas/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c
index cac96b6303..2ea81b7a96 100644
--- a/src/lib/evas/canvas/evas_focus.c
+++ b/src/lib/evas/canvas/evas_focus.c
@@ -7,22 +7,14 @@
/* public calls */
-EAPI void
-evas_object_focus_set(Evas_Object *eo_obj, Eina_Bool focus)
+EOLIAN void
+_evas_object_focus_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool focus)
{
- eo_do(eo_obj, evas_obj_focus_set(focus));
-}
-
-void
-_focus_set(Eo *eo_obj, void *_pd, va_list *list)
-{
- Eina_Bool focus = va_arg(*list, int);
int event_id = 0;
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
- Evas_Object_Protected_Data *obj = _pd;
_evas_object_event_new();
@@ -54,24 +46,10 @@ _focus_set(Eo *eo_obj, void *_pd, va_list *list)
_evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
}
-EAPI Eina_Bool
-evas_object_focus_get(const Evas_Object *eo_obj)
+EOLIAN Eina_Bool
+_evas_object_focus_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return 0;
- MAGIC_CHECK_END();
- Eina_Bool focus = 0;
- eo_do((Eo *)eo_obj, evas_obj_focus_get(&focus));
- return focus;
-}
-
-void
-_focus_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- Eina_Bool *focus = va_arg(*list, Eina_Bool *);
-
- const Evas_Object_Protected_Data *obj = _pd;
- *focus = obj->focused;
+ return obj->focused;
}
EAPI Evas_Object *
diff --git a/src/lib/evas/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c
index 0104b9670b..b7c0d96a46 100644
--- a/src/lib/evas/canvas/evas_key_grab.c
+++ b/src/lib/evas/canvas/evas_key_grab.c
@@ -107,70 +107,30 @@ evas_key_grab_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, const c
/* public calls */
-EAPI Eina_Bool
-evas_object_key_grab(Evas_Object *eo_obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive)
+EOLIAN Eina_Bool
+_evas_object_key_grab(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return EINA_FALSE;
- MAGIC_CHECK_END();
- Eina_Bool ret = EINA_FALSE;
- eo_do(eo_obj, evas_obj_key_grab(keyname, modifiers, not_modifiers, exclusive, &ret));
- return ret;
-}
-
-void
-_key_grab(Eo *eo_obj, void *_pd, va_list *list)
-{
- const char *keyname = va_arg(*list, const char *);
- Evas_Modifier_Mask modifiers = va_arg(*list, Evas_Modifier_Mask);
- Evas_Modifier_Mask not_modifiers = va_arg(*list, Evas_Modifier_Mask);
- Eina_Bool exclusive = va_arg(*list, int);
- Eina_Bool *ret = va_arg(*list, Eina_Bool *);
-
/* MEM OK */
Evas_Key_Grab *g;
- Evas_Object_Protected_Data *obj = _pd;
- if (((modifiers == not_modifiers) && (modifiers != 0)) || (!keyname))
- {
- *ret = EINA_FALSE;
- return;
- }
+ if (((modifiers == not_modifiers) && (modifiers != 0)) || (!keyname)) return EINA_FALSE;
if (exclusive)
{
g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers,
exclusive);
- if (g)
- {
- *ret = EINA_FALSE;
- return;
- }
+ if (g) return EINA_FALSE;
}
g = evas_key_grab_new(eo_obj, obj, keyname, modifiers, not_modifiers, exclusive);
- *ret = (!g) ? EINA_FALSE : EINA_TRUE;
+ return ((!g) ? EINA_FALSE : EINA_TRUE);
}
-EAPI void
-evas_object_key_ungrab(Evas_Object *eo_obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers)
+EOLIAN void
+_evas_object_key_ungrab(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_key_ungrab(keyname, modifiers, not_modifiers));
-}
-
-void
-_key_ungrab(Eo *eo_obj, void *_pd, va_list *list)
-{
- const char *keyname = va_arg(*list, const char *);
- Evas_Modifier_Mask modifiers = va_arg(*list, Evas_Modifier_Mask);
- Evas_Modifier_Mask not_modifiers = va_arg(*list, Evas_Modifier_Mask);
-
/* MEM OK */
Evas_Key_Grab *g;
if (!keyname) return;
- Evas_Object_Protected_Data *obj = _pd;
g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0);
if (!g) return;
Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJ_CLASS);
@@ -185,3 +145,4 @@ _key_ungrab(Eo *eo_obj, void *_pd, va_list *list)
else
evas_key_grab_free(g->object, g_object, keyname, modifiers, not_modifiers);
}
+
diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c
index a52391e5ef..036f2e069f 100644
--- a/src/lib/evas/canvas/evas_layer.c
+++ b/src/lib/evas/canvas/evas_layer.c
@@ -174,22 +174,10 @@ _evas_object_layer_set_child(Evas_Object *eo_obj, Evas_Object *par, short l)
/* public functions */
-EAPI void
-evas_object_layer_set(Evas_Object *eo_obj, short l)
+EOLIAN void
+_evas_object_layer_set(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, short l)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_layer_set(l));
-}
-
-void
-_layer_set(Eo *eo_obj, void *_obj, va_list *list)
-{
- short l = va_arg(*list, int);
-
Evas *eo_e;
- Evas_Object_Protected_Data *obj = _obj;
if (obj->delete_me) return;
if (evas_object_intercept_call_layer_set(eo_obj, obj, l)) return;
@@ -243,26 +231,14 @@ _layer_set(Eo *eo_obj, void *_obj, va_list *list)
evas_object_inform_call_restack(eo_obj);
}
-EAPI short
-evas_object_layer_get(const Evas_Object *eo_obj)
+EOLIAN short
+_evas_object_layer_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return 0;
- MAGIC_CHECK_END();
- short layer = 0;
- eo_do((Eo *)eo_obj, evas_obj_layer_get(&layer));
- return layer;
-}
-
-void
-_layer_get(Eo *eo_obj EINA_UNUSED, void *_obj, va_list *list)
-{
- short *layer = va_arg(*list, short *);
- const Evas_Object_Protected_Data *obj = _obj;
if (obj->smart.parent)
{
Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS);
- *layer = smart_parent_obj->cur->layer;
+ return smart_parent_obj->cur->layer;
}
- *layer = obj->cur->layer;
+ return obj->cur->layer;
}
+
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 8fb03caff4..07a5f19277 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -1243,5 +1243,5 @@ static const Eo_Class_Description class_desc = {
NULL
};
-EO_DEFINE_CLASS(evas_class_get, &class_desc, EO_BASE_CLASS, EVAS_COMMON_INTERFACE, NULL);
+EO_DEFINE_CLASS(evas_class_get, &class_desc, EO_BASE_CLASS, EVAS_COMMON_CLASS, NULL);
diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c
index 4c85a4ebdd..d7cd29d7f6 100644
--- a/src/lib/evas/canvas/evas_map.c
+++ b/src/lib/evas/canvas/evas_map.c
@@ -427,21 +427,9 @@ _evas_object_map_parent_check(Evas_Object *eo_parent)
return EINA_TRUE;
}
-EAPI void
-evas_object_map_enable_set(Evas_Object *eo_obj, Eina_Bool enabled)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_map_enable_set(enabled));
-}
-
-void
-_map_enable_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN void
+_evas_object_map_enable_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool enabled)
{
- Eina_Bool enabled = va_arg(*list, int);
-
- Evas_Object_Protected_Data *obj = _pd;
Eina_Bool pchange = EINA_FALSE;
enabled = !!enabled;
@@ -507,40 +495,15 @@ _map_enable_set(Eo *eo_obj, void *_pd, va_list *list)
}
}
-EAPI Eina_Bool
-evas_object_map_enable_get(const Evas_Object *eo_obj)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return EINA_FALSE;
- MAGIC_CHECK_END();
- Eina_Bool enabled = EINA_FALSE;
- eo_do((Eo *)eo_obj, evas_obj_map_enable_get(&enabled));
- return enabled;
-}
-
-void
-_map_enable_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN Eina_Bool
+_evas_object_map_enable_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- Eina_Bool *enabled = va_arg(*list, Eina_Bool *);
- const Evas_Object_Protected_Data *obj = _pd;
- *enabled = obj->map->cur.usemap;
+ return obj->map->cur.usemap;
}
-EAPI void
-evas_object_map_set(Evas_Object *eo_obj, const Evas_Map *map)
+EOLIAN void
+_evas_object_map_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const Evas_Map *map)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_map_set(map));
-}
-
-void
-_map_set(Eo *eo_obj, void *_pd, va_list *list)
-{
- const Evas_Map *map = va_arg(*list, const Evas_Map *);
- Evas_Object_Protected_Data *obj = _pd;
-
if ((!map) || (map->count < 4))
{
if (obj->map->surface)
@@ -629,24 +592,10 @@ _map_set(Eo *eo_obj, void *_pd, va_list *list)
_evas_map_calc_map_geometry(eo_obj);
}
-EAPI const Evas_Map *
-evas_object_map_get(const Evas_Object *eo_obj)
+EOLIAN Evas_Map *
+_evas_object_map_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return NULL;
- MAGIC_CHECK_END();
- const Evas_Map *map = NULL;
- eo_do((Eo *)eo_obj, evas_obj_map_get(&map));
- return map;
-}
-
-void
-_map_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- const Evas_Map **map = va_arg(*list, const Evas_Map **);
- const Evas_Object_Protected_Data *obj = _pd;
-
- *map = obj->map->cur.map;
+ return obj->map->cur.map;
}
EAPI Evas_Map *
@@ -1328,3 +1277,4 @@ evas_object_map_update(Evas_Object *eo_obj,
return obj->changed_pchange;
}
+
diff --git a/src/lib/evas/canvas/evas_name.c b/src/lib/evas/canvas/evas_name.c
index 454fb89066..5972ae4e61 100644
--- a/src/lib/evas/canvas/evas_name.c
+++ b/src/lib/evas/canvas/evas_name.c
@@ -1,21 +1,9 @@
#include "evas_common_private.h"
#include "evas_private.h"
-EAPI void
-evas_object_name_set(Evas_Object *eo_obj, const char *name)
+EOLIAN void
+_evas_object_name_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *name)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_name_set(name));
-}
-
-void
-_name_set(Eo *eo_obj, void *_pd, va_list *list)
-{
- const char *name = va_arg(*list, const char *);
-
- Evas_Object_Protected_Data *obj = _pd;
if (obj->name)
{
if (obj->layer && obj->layer->evas && obj->layer->evas->name_hash)
@@ -30,23 +18,10 @@ _name_set(Eo *eo_obj, void *_pd, va_list *list)
}
}
-EAPI const char *
-evas_object_name_get(const Evas_Object *eo_obj)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return NULL;
- MAGIC_CHECK_END();
- const char *name = NULL;
- eo_do((Eo *)eo_obj, evas_obj_name_get(&name));
- return name;
-}
-
-void
-_name_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN const char *
+_evas_object_name_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- const char **name = va_arg(*list, const char **);
- const Evas_Object_Protected_Data *obj = _pd;
- *name = obj->name;
+ return obj->name;
}
EAPI Evas_Object *
@@ -71,7 +46,7 @@ _canvas_object_name_find(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
}
static Evas_Object *
-_evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, int recurse)
+_priv_evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, int recurse)
{
const Eina_Inlist *lst;
Evas_Object_Protected_Data *child;
@@ -85,29 +60,16 @@ _evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, int re
if (!strcmp(name, child->name)) return child->object;
if (recurse != 0)
{
- if ((eo_obj = _evas_object_name_child_find(child->object, name, recurse - 1)))
+ if ((eo_obj = _priv_evas_object_name_child_find(child->object, name, recurse - 1)))
return (Evas_Object *)eo_obj;
}
}
return NULL;
}
-EAPI Evas_Object *
-evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, int recurse)
+EOLIAN Evas_Object *
+_evas_object_name_child_find(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *name, int recurse)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return NULL;
- MAGIC_CHECK_END();
- Evas_Object *child = NULL;
- eo_do((Eo *)eo_obj, evas_obj_name_child_find(name, recurse, &child));
- return child;
+ return (!name ? NULL : _priv_evas_object_name_child_find(eo_obj, name, recurse));
}
-void
-_name_child_find(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
-{
- const char *name = va_arg(*list, const char *);
- int recurse = va_arg(*list, int);
- Evas_Object **child = va_arg(*list, Evas_Object **);
- *child = (!name ? NULL : _evas_object_name_child_find(eo_obj, name, recurse));
-}
diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo
index 8b67c06ea3..b7166ed025 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -1,6 +1,7 @@
abstract Evas_Object (Eo_Base, Evas_Common_Interface)
{
eo_prefix: evas_obj;
+ data: Evas_Object_Protected_Data;
properties {
size_hint_max {
set {
@@ -76,9 +77,11 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
visibility {
set {
/*@ Makes the given Evas object visible or invisible. */
+ legacy null;
}
get {
/*@ Retrieves whether or not the given Evas object is visible. */
+ legacy evas_object_visible_get;
}
values {
Eina_Bool v; /*@ @c EINA_TRUE if to make the object visible, @c EINA_FALSE otherwise */
@@ -117,7 +120,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
See the full @ref Example_Evas_Object_Manipulation "example". */
}
values {
- const char* type; /*@ in */
+ const char *type; /*@ in */
}
}
size_hint_min {
@@ -304,7 +307,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@see evas_object_map_set() */
}
values {
- const Evas_Map* map; /*@ new map to use */
+ const Evas_Map *map; /*@ new map to use */
}
}
size_hint_aspect {
@@ -480,7 +483,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
See the full @ref Example_Evas_Object_Manipulation "example". */
}
values {
- Evas_Object* clip; /*@ The object to clip @p obj by */
+ Evas_Object *clip @nonull; /*@ The object to clip @p obj by */
}
}
size_hint_padding {
@@ -656,7 +659,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
See the full @ref Example_Evas_Events "example". */
}
values {
- const char* name; /*@ The given name. */
+ const char *name; /*@ The given name. */
}
}
scale {
@@ -725,6 +728,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
size {
set {
/*@ Changes the size of the given Evas object. */
+ legacy evas_object_resize;
}
get {
/*@ Retrieves the (rectangular) size of the given Evas object. */
@@ -786,8 +790,10 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
}
is_frame_object {
set {
+ /*@ @since 1.2 */
}
get {
+ /*@ @since 1.2 */
}
values {
Eina_Bool is_frame; /*@ in */
@@ -1007,6 +1013,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
position {
set {
/*@ Move the given Evas object to the given location inside its canvas' viewport. */
+ legacy evas_object_move;
}
get {
/*@ Retrieves the position of the given Evas object. */
@@ -1093,7 +1100,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@see evas_object_smart_data_set()
@ingroup Evas_Smart_Object_Group */
- return void*;
+ return void * @warn_unused;
}
}
smart_clipped_clipper {
@@ -1107,7 +1114,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
properties, like colors.
@see evas_object_smart_clipped_smart_add() */
- return Evas_Object*;
+ return Evas_Object * @warn_unused;
}
}
below {
@@ -1124,7 +1131,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@see evas_object_layer_get()
@see evas_object_layer_set()
@see evas_object_below_get() */
- return Evas_Object*;
+ return Evas_Object * @warn_unused;
}
}
clipees {
@@ -1166,7 +1173,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
evas_object_show(obj_tmp);
}
@endcode */
- return const Eina_List*;
+ return const Eina_List * @warn_unused;
}
}
smart_parent {
@@ -1178,7 +1185,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
obj is not a smart member of any
@ingroup Evas_Smart_Object_Group */
- return Evas_Object*;
+ return Evas_Object * @warn_unused;
}
}
above {
@@ -1195,7 +1202,28 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@see evas_object_layer_get()
@see evas_object_layer_set()
@see evas_object_below_get() */
- return Evas_Object*;
+ return Evas_Object * @warn_unused;
+ }
+ }
+ size_hint_display_mode {
+ get {
+ /*@
+ Retrieves the hints for an object's display mode
+
+ These are hints on the display mode @p obj. This is
+ not a size enforcement in any way, it's just a hint that can be
+ used whenever appropriate.
+ This mode can be used object's display mode like commpress or expand */
+ }
+ set {
+ /*@
+ Sets the hints for an object's disply mode
+
+ This is not a size enforcement in any way, it's just a hint that
+ can be used whenever appropriate.*/
+ }
+ values {
+ Evas_Display_Mode dispmode; /*@ display mode hint */
}
}
}
@@ -1206,8 +1234,9 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@return EINA_TRUE if @p obj clip any object.
@since 1.8 */
+
const;
- return Eina_Bool;
+ return Eina_Bool @warn_unused;
}
key_grab {
/*@
@@ -1249,9 +1278,10 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@see evas_object_focus_get
@see evas_focus_get
@see evas_key_modifier_add */
- return Eina_Bool;
+
+ return Eina_Bool @warn_unused;
params {
- @in const char* keyname; /*@ the key to request events for. */
+ @in const char *keyname @nonull; /*@ the key to request events for. */
@in Evas_Modifier_Mask modifiers; /*@ a mask of modifiers that must be present to
trigger the event. */
@in Evas_Modifier_Mask not_modifiers; /*@ a mask of modifiers that must @b not be present
@@ -1283,8 +1313,9 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@see evas_object_layer_get()
@see evas_object_layer_set()
@see evas_object_stack_below() */
+
params {
- @in Evas_Object* below; /*@ the object below which to stack */
+ @in Evas_Object *below @nonull; /*@ the object below which to stack */
}
}
raise {
@@ -1297,6 +1328,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@see evas_object_stack_above()
@see evas_object_stack_below()
@see evas_object_lower() */
+
}
stack_above {
/*@
@@ -1321,8 +1353,9 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@see evas_object_layer_get()
@see evas_object_layer_set()
@see evas_object_stack_below() */
+
params {
- @in Evas_Object* above; /*@ the object above which to stack */
+ @in Evas_Object *above @nonull; /*@ the object above which to stack */
}
}
smart_type_check {
@@ -1349,10 +1382,11 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@see eo_isa
@ingroup Evas_Smart_Object_Group */
+
const;
- return Eina_Bool;
+ return Eina_Bool @warn_unused;
params {
- @in const char* type; /*@ The @b name (type) of the smart class to check for */
+ @in const char *type @nonull; /*@ The @b name (type) of the smart class to check for */
}
}
name_child_find {
@@ -1371,10 +1405,11 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@since 1.2
@ingroup Evas_Object_Group_Find */
+
const;
- return Evas_Object*;
+ return Evas_Object * @warn_unused;
params {
- @in const char* name; /*@ The given name. */
+ @in const char *name; /*@ The given name. */
@in int recurse; /*@ Set to the number of child levels to recurse (0 == don't recurse, 1 == only look at the children of @p obj or their immediate children, but no further etc.). */
}
}
@@ -1396,8 +1431,9 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@see evas_object_focus_set
@see evas_object_focus_get
@see evas_focus_get */
+
params {
- @in const char* keyname; /*@ the key the grab is set for. */
+ @in const char *keyname @nonull; /*@ the key the grab is set for. */
@in Evas_Modifier_Mask modifiers; /*@ a mask of modifiers that must be present to
trigger the event. */
@in Evas_Modifier_Mask not_modifiers; /*@ a mask of modifiers that must not not be
@@ -1414,6 +1450,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@see evas_object_stack_above()
@see evas_object_stack_below()
@see evas_object_raise() */
+
}
clip_unset {
/*@
@@ -1426,6 +1463,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
See also evas_object_clip_set() (for an example),
evas_object_clipees_get() and evas_object_clip_get(). */
+
}
smart_move_children_relative {
/*@
@@ -1439,6 +1477,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@note Clipped smart objects already make use of this function on
their @c move() smart function definition. */
+
params {
@in Evas_Coord dx; /*@ horizontal offset (delta). */
@in Evas_Coord dy; /*@ vertical offset (delta). */
@@ -1456,10 +1495,11 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
@see eo_isa
@ingroup Evas_Smart_Object_Group */
+
const;
- return Eina_Bool;
+ return Eina_Bool @warn_unused;
params {
- @in const char* type; /*@ The type (name string) to check for. Must be the name */
+ @in const char *type @nonull; /*@ The type (name string) to check for. Must be the name */
}
}
}
@@ -1469,4 +1509,5 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
Eo_Base::dbg_info_get;
Evas_Common_Interface::evas::get;
}
+
}
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index cc6c59c2d4..a8edc7cb61 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -9,8 +9,6 @@ EVAS_MEMPOOL(_mp_sh);
#define MY_CLASS_NAME "Evas_Object"
-EAPI Eo_Op EVAS_OBJ_BASE_ID = EO_NOOP;
-
static void
_show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj);
static void
@@ -64,16 +62,13 @@ _init_cow(void)
return EINA_TRUE;
}
-static void
-_constructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
+EOLIAN static void
+_evas_object_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
{
- Evas_Object_Protected_Data *obj;
-
eo_do_super(eo_obj, MY_CLASS, eo_constructor());
eo_do(eo_obj, evas_obj_type_set(MY_CLASS_NAME));
eo_manual_free_set(eo_obj, EINA_TRUE);
- obj = _pd;
if (!obj || !_init_cow())
{
eo_error_set(eo_obj);
@@ -614,13 +609,12 @@ evas_object_del(Evas_Object *eo_obj)
// eo_del(eo_obj);
}
-static void
-_destructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
+EOLIAN static void
+_evas_object_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
{
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
- Evas_Object_Protected_Data *obj = _pd;
Evas_Object *proxy;
Eina_List *l, *l2;
@@ -696,22 +690,9 @@ evas_object_geometry_set(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y, Evas_C
evas_obj_size_set(w, h));
}
-EAPI void
-evas_object_move(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_position_set(x, y));
-}
-
-static void
-_position_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord x, Evas_Coord y)
{
- Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Coord x = va_arg(*list, Evas_Coord);
- Evas_Coord y = va_arg(*list, Evas_Coord);
Eina_Bool is, was = EINA_FALSE;
Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
@@ -783,22 +764,9 @@ _position_set(Eo *eo_obj, void *_pd, va_list *list)
evas_object_inform_call_move(eo_obj, obj);
}
-EAPI void
-evas_object_resize(Evas_Object *eo_obj, Evas_Coord w, Evas_Coord h)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_size_set(w, h));
-}
-
-static void
-_size_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h)
{
- Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Coord w = va_arg(*list, Evas_Coord);
- Evas_Coord h = va_arg(*list, Evas_Coord);
Eina_Bool is, was = EINA_FALSE;
Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
Eina_Bool source_invisible = EINA_FALSE;
@@ -883,14 +851,9 @@ evas_object_geometry_get(const Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y
eo_do((Eo *)eo_obj, evas_obj_position_get(x, y), evas_obj_size_get(w, h));
}
-static void
-_position_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_position_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *x, Evas_Coord *y)
{
- const Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Coord *x = va_arg(*list, Evas_Coord *);
- Evas_Coord *y = va_arg(*list, Evas_Coord *);
-
if ((obj->delete_me) || (!obj->layer))
{
if (x) *x = 0; if (y) *y = 0;
@@ -901,14 +864,9 @@ _position_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
if (y) *y = obj->cur->geometry.y;
}
-static void
-_size_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_size_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h)
{
- const Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Coord *w = va_arg(*list, Evas_Coord *);
- Evas_Coord *h = va_arg(*list, Evas_Coord *);
-
if (obj->delete_me)
{
if (w) *w = 0; if (h) *h = 0;
@@ -935,26 +893,18 @@ _evas_object_size_hint_alloc(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protec
obj->size_hints->dispmode = EVAS_DISPLAY_MODE_NONE;
}
-EAPI Evas_Display_Mode
-evas_object_size_hint_display_mode_get(const Evas_Object *eo_obj)
+EOLIAN static Evas_Display_Mode
+_evas_object_size_hint_display_mode_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return EVAS_DISPLAY_MODE_NONE;
- MAGIC_CHECK_END();
- Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
if (!obj) return EVAS_DISPLAY_MODE_NONE;
if ((!obj->size_hints) || obj->delete_me)
return EVAS_DISPLAY_MODE_NONE;
return obj->size_hints->dispmode;
}
-EAPI void
-evas_object_size_hint_display_mode_set(Evas_Object *eo_obj, Evas_Display_Mode dispmode)
+EOLIAN static void
+_evas_object_size_hint_display_mode_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Display_Mode dispmode)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
if (!obj) return;
if (obj->delete_me) return;
_evas_object_size_hint_alloc(eo_obj, obj);
@@ -964,24 +914,9 @@ evas_object_size_hint_display_mode_set(Evas_Object *eo_obj, Evas_Display_Mode di
evas_object_inform_call_changed_size_hints(eo_obj);
}
-EAPI void
-evas_object_size_hint_min_get(const Evas_Object *eo_obj, Evas_Coord *w, Evas_Coord *h)
+EOLIAN static void
+_evas_object_size_hint_min_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- if (w) *w = 0; if (h) *h = 0;
- return;
- MAGIC_CHECK_END();
- eo_do((Eo *)eo_obj, evas_obj_size_hint_min_get(w, h));
-}
-
-static void
-_size_hint_min_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- const Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Coord *w = va_arg(*list, Evas_Coord *);
- Evas_Coord *h = va_arg(*list, Evas_Coord *);
-
if ((!obj->size_hints) || obj->delete_me)
{
if (w) *w = 0; if (h) *h = 0;
@@ -991,23 +926,9 @@ _size_hint_min_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
if (h) *h = obj->size_hints->min.h;
}
-EAPI void
-evas_object_size_hint_min_set(Evas_Object *eo_obj, Evas_Coord w, Evas_Coord h)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_size_hint_min_set(w, h));
-}
-
-static void
-_size_hint_min_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_size_hint_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h)
{
- Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Coord w = va_arg(*list, Evas_Coord);
- Evas_Coord h = va_arg(*list, Evas_Coord);
-
if (obj->delete_me)
return;
_evas_object_size_hint_alloc(eo_obj, obj);
@@ -1018,24 +939,9 @@ _size_hint_min_set(Eo *eo_obj, void *_pd, va_list *list)
evas_object_inform_call_changed_size_hints(eo_obj);
}
-EAPI void
-evas_object_size_hint_max_get(const Evas_Object *eo_obj, Evas_Coord *w, Evas_Coord *h)
+EOLIAN static void
+_evas_object_size_hint_max_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- if (w) *w = -1; if (h) *h = -1;
- return;
- MAGIC_CHECK_END();
- eo_do((Eo *)eo_obj, evas_obj_size_hint_max_get(w, h));
-}
-
-static void
-_size_hint_max_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- const Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Coord *w = va_arg(*list, Evas_Coord *);
- Evas_Coord *h = va_arg(*list, Evas_Coord *);
-
if ((!obj->size_hints) || obj->delete_me)
{
if (w) *w = -1; if (h) *h = -1;
@@ -1045,23 +951,9 @@ _size_hint_max_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
if (h) *h = obj->size_hints->max.h;
}
-EAPI void
-evas_object_size_hint_max_set(Evas_Object *eo_obj, Evas_Coord w, Evas_Coord h)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_size_hint_max_set(w, h));
-}
-
-static void
-_size_hint_max_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_size_hint_max_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h)
{
- Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Coord w = va_arg(*list, Evas_Coord);
- Evas_Coord h = va_arg(*list, Evas_Coord);
-
if (obj->delete_me)
return;
_evas_object_size_hint_alloc(eo_obj, obj);
@@ -1072,24 +964,9 @@ _size_hint_max_set(Eo *eo_obj, void *_pd, va_list *list)
evas_object_inform_call_changed_size_hints(eo_obj);
}
-EAPI void
-evas_object_size_hint_request_get(const Evas_Object *eo_obj, Evas_Coord *w, Evas_Coord *h)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- if (w) *w = 0; if (h) *h = 0;
- return;
- MAGIC_CHECK_END();
- eo_do((Eo *)eo_obj, evas_obj_size_hint_request_get(w, h));
-}
-
-static void
-_size_hint_request_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_size_hint_request_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h)
{
- const Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Coord *w = va_arg(*list, Evas_Coord *);
- Evas_Coord *h = va_arg(*list, Evas_Coord *);
-
if ((!obj->size_hints) || obj->delete_me)
{
if (w) *w = 0; if (h) *h = 0;
@@ -1099,23 +976,9 @@ _size_hint_request_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
if (h) *h = obj->size_hints->request.h;
}
-EAPI void
-evas_object_size_hint_request_set(Evas_Object *eo_obj, Evas_Coord w, Evas_Coord h)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_size_hint_request_set(w, h));
-}
-
-static void
-_size_hint_request_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_size_hint_request_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h)
{
- Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Coord w = va_arg(*list, Evas_Coord);
- Evas_Coord h = va_arg(*list, Evas_Coord);
-
if (obj->delete_me)
return;
_evas_object_size_hint_alloc(eo_obj, obj);
@@ -1126,26 +989,9 @@ _size_hint_request_set(Eo *eo_obj, void *_pd, va_list *list)
evas_object_inform_call_changed_size_hints(eo_obj);
}
-EAPI void
-evas_object_size_hint_aspect_get(const Evas_Object *eo_obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- if (aspect) *aspect = EVAS_ASPECT_CONTROL_NONE;
- if (w) *w = 0; if (h) *h = 0;
- return;
- MAGIC_CHECK_END();
- eo_do((Eo *)eo_obj, evas_obj_size_hint_aspect_get(aspect, w, h));
-}
-
-static void
-_size_hint_aspect_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_size_hint_aspect_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h)
{
- const Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Aspect_Control *aspect = va_arg(*list, Evas_Aspect_Control*);
- Evas_Coord *w = va_arg(*list, Evas_Coord *);
- Evas_Coord *h = va_arg(*list, Evas_Coord *);
-
if ((!obj->size_hints) || obj->delete_me)
{
if (aspect) *aspect = EVAS_ASPECT_CONTROL_NONE;
@@ -1157,24 +1003,9 @@ _size_hint_aspect_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
if (h) *h = obj->size_hints->aspect.size.h;
}
-EAPI void
-evas_object_size_hint_aspect_set(Evas_Object *eo_obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_size_hint_aspect_set(aspect, w, h));
-}
-
-static void
-_size_hint_aspect_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_size_hint_aspect_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h)
{
- Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Aspect_Control aspect = va_arg(*list, Evas_Aspect_Control);
- Evas_Coord w = va_arg(*list, Evas_Coord);
- Evas_Coord h = va_arg(*list, Evas_Coord);
-
if (obj->delete_me)
return;
_evas_object_size_hint_alloc(eo_obj, obj);
@@ -1186,24 +1017,9 @@ _size_hint_aspect_set(Eo *eo_obj, void *_pd, va_list *list)
evas_object_inform_call_changed_size_hints(eo_obj);
}
-EAPI void
-evas_object_size_hint_align_get(const Evas_Object *eo_obj, double *x, double *y)
+EOLIAN static void
+_evas_object_size_hint_align_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- if (x) *x = 0.5; if (y) *y = 0.5;
- return;
- MAGIC_CHECK_END();
- eo_do((Eo *)eo_obj, evas_obj_size_hint_align_get(x, y));
-}
-
-static void
-_size_hint_align_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- const Evas_Object_Protected_Data *obj = _pd;
-
- double *x = va_arg(*list, double *);
- double *y = va_arg(*list, double *);
-
if ((!obj->size_hints) || obj->delete_me)
{
if (x) *x = 0.5; if (y) *y = 0.5;
@@ -1213,23 +1029,9 @@ _size_hint_align_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
if (y) *y = obj->size_hints->align.y;
}
-EAPI void
-evas_object_size_hint_align_set(Evas_Object *eo_obj, double x, double y)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_size_hint_align_set(x, y));
-}
-
-static void
-_size_hint_align_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_size_hint_align_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y)
{
- Evas_Object_Protected_Data *obj = _pd;
-
- double x = va_arg(*list, double);
- double y = va_arg(*list, double);
-
if (obj->delete_me)
return;
_evas_object_size_hint_alloc(eo_obj, obj);
@@ -1240,24 +1042,9 @@ _size_hint_align_set(Eo *eo_obj, void *_pd, va_list *list)
evas_object_inform_call_changed_size_hints(eo_obj);
}
-EAPI void
-evas_object_size_hint_weight_get(const Evas_Object *eo_obj, double *x, double *y)
+EOLIAN static void
+_evas_object_size_hint_weight_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- if (x) *x = 0.0; if (y) *y = 0.0;
- return;
- MAGIC_CHECK_END();
- eo_do((Eo *)eo_obj, evas_obj_size_hint_weight_get(x, y));
-}
-
-static void
-_size_hint_weight_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- const Evas_Object_Protected_Data *obj = _pd;
-
- double *x = va_arg(*list, double *);
- double *y = va_arg(*list, double *);
-
if ((!obj->size_hints) || obj->delete_me)
{
if (x) *x = 0.0; if (y) *y = 0.0;
@@ -1267,23 +1054,9 @@ _size_hint_weight_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
if (y) *y = obj->size_hints->weight.y;
}
-EAPI void
-evas_object_size_hint_weight_set(Evas_Object *eo_obj, double x, double y)
+EOLIAN static void
+_evas_object_size_hint_weight_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_size_hint_weight_set(x, y));
-}
-
-static void
-_size_hint_weight_set(Eo *eo_obj, void *_pd, va_list *list)
-{
- Evas_Object_Protected_Data *obj = _pd;
-
- double x = va_arg(*list, double);
- double y = va_arg(*list, double);
-
if (obj->delete_me)
return;
_evas_object_size_hint_alloc(eo_obj, obj);
@@ -1294,27 +1067,9 @@ _size_hint_weight_set(Eo *eo_obj, void *_pd, va_list *list)
evas_object_inform_call_changed_size_hints(eo_obj);
}
-EAPI void
-evas_object_size_hint_padding_get(const Evas_Object *eo_obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- if (l) *l = 0; if (r) *r = 0;
- if (t) *t = 0; if (b) *b = 0;
- return;
- MAGIC_CHECK_END();
- eo_do((Eo *)eo_obj, evas_obj_size_hint_padding_get(l, r, t, b));
-}
-
-static void
-_size_hint_padding_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_size_hint_padding_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b)
{
- const Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Coord *l = va_arg(*list, Evas_Coord *);
- Evas_Coord *r = va_arg(*list, Evas_Coord *);
- Evas_Coord *t = va_arg(*list, Evas_Coord *);
- Evas_Coord *b = va_arg(*list, Evas_Coord *);
-
if ((!obj->size_hints) || obj->delete_me)
{
if (l) *l = 0; if (r) *r = 0;
@@ -1327,25 +1082,9 @@ _size_hint_padding_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
if (b) *b = obj->size_hints->padding.b;
}
-EAPI void
-evas_object_size_hint_padding_set(Evas_Object *eo_obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_size_hint_padding_set(l, r, t, b));
-}
-
-static void
-_size_hint_padding_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_size_hint_padding_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b)
{
- Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Coord l = va_arg(*list, Evas_Coord);
- Evas_Coord r = va_arg(*list, Evas_Coord);
- Evas_Coord t = va_arg(*list, Evas_Coord);
- Evas_Coord b = va_arg(*list, Evas_Coord);
-
if (obj->delete_me)
return;
_evas_object_size_hint_alloc(eo_obj, obj);
@@ -1375,10 +1114,8 @@ evas_object_hide(Evas_Object *eo_obj)
}
static void
-_visible_set(Eo *eo_obj, void *_pd, va_list *list)
+_evas_object_visibility_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool visible)
{
- Evas_Object_Protected_Data *obj = _pd;
- Eina_Bool visible = va_arg(*list, int);
if (visible) _show(eo_obj, obj);
else _hide(eo_obj, obj);
}
@@ -1530,50 +1267,16 @@ _hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
evas_object_inform_call_hide(eo_obj);
}
-EAPI Eina_Bool
-evas_object_visible_get(const Evas_Object *eo_obj)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return 0;
- MAGIC_CHECK_END();
- Eina_Bool visible = EINA_FALSE;
- eo_do((Eo *)eo_obj, evas_obj_visibility_get(&visible));
- return visible;
-}
-
-static void
-_visible_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- Eina_Bool* visible = va_arg(*list, Eina_Bool *);
- const Evas_Object_Protected_Data *obj = _pd;
- if (obj->delete_me)
- {
- if (visible) *visible = EINA_FALSE;
- return;
- }
-
- if (visible) *visible = obj->cur->visible;
-}
-
-EAPI void
-evas_object_color_set(Evas_Object *eo_obj, int r, int g, int b, int a)
+static Eina_Bool
+_evas_object_visibility_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_color_set(r, g, b, a));
+ if (obj->delete_me) return EINA_FALSE;
+ return obj->cur->visible;
}
-static void
-_color_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, int r, int g, int b, int a)
{
- Evas_Object_Protected_Data *obj = _pd;
-
- int r = va_arg(*list, int);
- int g = va_arg(*list, int);
- int b = va_arg(*list, int);
- int a = va_arg(*list, int);
-
if (obj->delete_me) return;
if (r > 255) r = 255; if (r < 0) r = 0;
if (g > 255) g = 255; if (g < 0) g = 0;
@@ -1626,25 +1329,9 @@ _color_set(Eo *eo_obj, void *_pd, va_list *list)
evas_object_change(eo_obj, obj);
}
-EAPI void
-evas_object_color_get(const Evas_Object *eo_obj, int *r, int *g, int *b, int *a)
+EOLIAN static void
+_evas_object_color_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, int *r, int *g, int *b, int *a)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- if (r) *r = 0; if (g) *g = 0; if (b) *b = 0; if (a) *a = 0;
- return;
- MAGIC_CHECK_END();
- eo_do((Eo *)eo_obj, evas_obj_color_get(r, g, b, a));
-}
-
-static void
-_color_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- const Evas_Object_Protected_Data *obj = _pd;
-
- int* r = va_arg(*list, int *);
- int* g = va_arg(*list, int *);
- int* b = va_arg(*list, int *);
- int* a = va_arg(*list, int *);
if (obj->delete_me)
{
if (r) *r = 0; if (g) *g = 0; if (b) *b = 0; if (a) *a = 0;
@@ -1656,21 +1343,9 @@ _color_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
if (a) *a = obj->cur->color.a;
}
-EAPI void
-evas_object_anti_alias_set(Evas_Object *eo_obj, Eina_Bool anti_alias)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_anti_alias_set(anti_alias));
-}
-
-static void
-_anti_alias_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_anti_alias_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool anti_alias)
{
- Evas_Object_Protected_Data *obj = _pd;
- Eina_Bool anti_alias = va_arg(*list, int);
-
if (obj->delete_me) return;
anti_alias = !!anti_alias;
if (obj->cur->anti_alias == anti_alias)return;
@@ -1684,47 +1359,16 @@ _anti_alias_set(Eo *eo_obj, void *_pd, va_list *list)
evas_object_change(eo_obj, obj);
}
-EAPI Eina_Bool
-evas_object_anti_alias_get(const Evas_Object *eo_obj)
+EOLIAN static Eina_Bool
+_evas_object_anti_alias_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return 0;
- MAGIC_CHECK_END();
- Eina_Bool anti_alias = EINA_FALSE;
- eo_do((Eo *)eo_obj, evas_obj_anti_alias_get(&anti_alias));
- return anti_alias;
+ if (obj->delete_me) return EINA_FALSE;
+ return obj->cur->anti_alias;
}
-static void
-_anti_alias_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double scale)
{
- Eina_Bool* anti_alias = va_arg(*list, Eina_Bool *);
-
- const Evas_Object_Protected_Data *obj = _pd;
- if (obj->delete_me)
- {
- if (anti_alias) *anti_alias = EINA_FALSE;
- return;
- }
-
- if (anti_alias) *anti_alias = obj->cur->anti_alias;
-}
-
-EAPI void
-evas_object_scale_set(Evas_Object *eo_obj, double scale)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_scale_set(scale));
-}
-
-static void
-_scale_set(Eo *eo_obj, void *_pd, va_list *list)
-{
- Evas_Object_Protected_Data *obj = _pd;
-
- double scale = va_arg(*list, double);
if (obj->delete_me) return;
if (obj->cur->scale == scale) return;
@@ -1738,46 +1382,16 @@ _scale_set(Eo *eo_obj, void *_pd, va_list *list)
if (obj->func->scale_update) obj->func->scale_update(eo_obj, obj, obj->private_data);
}
-EAPI double
-evas_object_scale_get(const Evas_Object *eo_obj)
+EOLIAN static double
+_evas_object_scale_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return 0;
- MAGIC_CHECK_END();
- double scale = 1.0;
- eo_do((Eo *)eo_obj, evas_obj_scale_get(&scale));
- return scale;
-}
-
-static void
-_scale_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- const Evas_Object_Protected_Data *obj = _pd;
-
- double* scale = va_arg(*list, double*);
- if (obj->delete_me)
- {
- if (scale) *scale = 1.0;
- return;
- }
- if (scale) *scale = obj->cur->scale;
+ if (obj->delete_me) return 1.0;
+ return obj->cur->scale;
}
-EAPI void
-evas_object_render_op_set(Evas_Object *eo_obj, Evas_Render_Op render_op)
+EOLIAN static void
+_evas_object_render_op_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Render_Op render_op)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_render_op_set(render_op));
-}
-
-static void
-_render_op_set(Eo *eo_obj, void *_pd, va_list *list)
-{
- Evas_Object_Protected_Data *obj = _pd;
-
- Evas_Render_Op render_op = va_arg(*list, Evas_Render_Op);
if (obj->delete_me) return;
if (obj->cur->render_op == render_op) return;
@@ -1790,29 +1404,11 @@ _render_op_set(Eo *eo_obj, void *_pd, va_list *list)
evas_object_change(eo_obj, obj);
}
-EAPI Evas_Render_Op
-evas_object_render_op_get(const Evas_Object *eo_obj)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return 0;
- MAGIC_CHECK_END();
- Evas_Render_Op render_op = EVAS_RENDER_BLEND;
- eo_do((Eo *)eo_obj, evas_obj_render_op_get(&render_op));
- return render_op;
-}
-
-static void
-_render_op_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static Evas_Render_Op
+_evas_object_render_op_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- const Evas_Object_Protected_Data *obj = _pd;
- Evas_Render_Op* render_op = va_arg(*list, Evas_Render_Op *);
-
- if (obj->delete_me)
- {
- if (render_op) *render_op = EVAS_RENDER_BLEND;
- return;
- }
- if (render_op) *render_op = obj->cur->render_op;
+ if (obj->delete_me) return EVAS_RENDER_BLEND;
+ return obj->cur->render_op;
}
EAPI Evas *
@@ -1826,10 +1422,9 @@ evas_object_evas_get(const Evas_Object *eo_obj)
return eo_evas;
}
-static void
-_dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
+EOLIAN static void
+_evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Eo_Dbg_Info *root)
{
- Eo_Dbg_Info *root = (Eo_Dbg_Info *) va_arg(*list, Eo_Dbg_Info *);
eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
Eo_Dbg_Info *node;
@@ -1977,18 +1572,11 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
}
}
-static void
-_evas_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+static Evas *
+_evas_object_evas_common_interface_evas_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- const Evas_Object_Protected_Data *obj = _pd;
- Evas **evas = va_arg(*list, Evas **);
-
- if ((obj->delete_me) || (!obj->layer))
- {
- *evas = NULL;
- return;
- }
- *evas = obj->layer->evas->evas;
+ if ((obj->delete_me) || (!obj->layer)) return NULL;
+ return obj->layer->evas->evas;
}
EAPI Evas_Object *
@@ -2240,117 +1828,41 @@ _canvas_objects_in_rectangle_get(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
*ret = in;
}
-EAPI const char *
-evas_object_type_get(const Evas_Object *eo_obj)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return NULL;
- MAGIC_CHECK_END();
- const char *type = NULL;
- eo_do((Eo *)eo_obj, evas_obj_type_get(&type));
- return type;
-}
-
-static void
-_type_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static const char *
+_evas_object_type_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- const Evas_Object_Protected_Data *obj = _pd;
- const char **type = va_arg(*list, const char **);
- if (obj->delete_me)
- {
- *type = "";
- return;
- }
- *type = obj->type;
+ if (obj->delete_me) return "";
+ return obj->type;
}
-static void
-_type_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_type_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const char *type)
{
- Evas_Object_Protected_Data *obj = _pd;
- const char *type = va_arg(*list, const char *);
obj->type = type; // Store it as the top type of this class
}
-EAPI void
-evas_object_precise_is_inside_set(Evas_Object *eo_obj, Eina_Bool precise)
+EOLIAN static void
+_evas_object_precise_is_inside_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool precise)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_precise_is_inside_set(precise));
-}
-
-static void
-_precise_is_inside_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- Evas_Object_Protected_Data *obj = _pd;
- Eina_Bool precise = va_arg(*list, int);
obj->precise_is_inside = precise;
}
-EAPI Eina_Bool
-evas_object_precise_is_inside_get(const Evas_Object *eo_obj)
+EOLIAN static Eina_Bool
+_evas_object_precise_is_inside_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return 0;
- MAGIC_CHECK_END();
- Eina_Bool precise = EINA_FALSE;
- eo_do((Eo *)eo_obj, evas_obj_precise_is_inside_get(&precise));
- return precise;
+ return obj->precise_is_inside;
}
-static void
-_precise_is_inside_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- const Evas_Object_Protected_Data *obj = _pd;
- Eina_Bool *precise = va_arg(*list, Eina_Bool *);
- if (precise) *precise = obj->precise_is_inside;
-}
-
-EAPI void
-evas_object_static_clip_set(Evas_Object *eo_obj, Eina_Bool is_static_clip)
+EOLIAN static void
+_evas_object_static_clip_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool is_static_clip)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_static_clip_set(is_static_clip));
-}
-
-static void
-_static_clip_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- Evas_Object_Protected_Data *obj = _pd;
- Eina_Bool is_static_clip = va_arg(*list, int);
obj->is_static_clip = is_static_clip;
}
-EAPI Eina_Bool
-evas_object_static_clip_get(const Evas_Object *eo_obj)
+EOLIAN static Eina_Bool
+_evas_object_static_clip_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return 0;
- MAGIC_CHECK_END();
- Eina_Bool is_static_clip = EINA_FALSE;
- eo_do((Eo *)eo_obj, evas_obj_static_clip_get(&is_static_clip));
- return is_static_clip;
-}
-
-static void
-_static_clip_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- const Evas_Object_Protected_Data *obj = _pd;
- Eina_Bool *is_static_clip = va_arg(*list, Eina_Bool *);
- if (is_static_clip) *is_static_clip = obj->is_static_clip;
-}
-
-EAPI void
-evas_object_is_frame_object_set(Evas_Object *eo_obj, Eina_Bool is_frame)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_is_frame_object_set(is_frame));
+ return obj->is_static_clip;
}
static void
@@ -2367,11 +1879,9 @@ _is_frame_flag_set(Evas_Object_Protected_Data *obj, Eina_Bool is_frame)
_is_frame_flag_set(child, is_frame);
}
-static void
-_is_frame_object_set(Eo *eo_obj, void *_pd, va_list *list)
+EOLIAN static void
+_evas_object_is_frame_object_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool is_frame)
{
- Eina_Bool is_frame = va_arg(*list, int);
- Evas_Object_Protected_Data *obj = _pd;
Evas_Coord x, y;
evas_object_geometry_get(eo_obj, &x, &y, NULL, NULL);
@@ -2381,239 +1891,35 @@ _is_frame_object_set(Eo *eo_obj, void *_pd, va_list *list)
evas_object_move(eo_obj, x, y);
}
-EAPI Eina_Bool
-evas_object_is_frame_object_get(Evas_Object *eo_obj)
+EOLIAN static Eina_Bool
+_evas_object_is_frame_object_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return EINA_FALSE;
- MAGIC_CHECK_END();
- Eina_Bool is_frame = EINA_FALSE;
- eo_do(eo_obj, evas_obj_is_frame_object_get(&is_frame));
- return is_frame;
+ return obj->is_frame;
}
-static void
-_is_frame_object_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN static Evas_Object *
+_evas_object_smart_parent_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- const Evas_Object_Protected_Data *obj = _pd;
- Eina_Bool *is_frame = va_arg(*list, Eina_Bool *);
- if (is_frame) *is_frame = obj->is_frame;
+ if (!obj) return NULL;
+ return obj->smart.parent;
}
-static void
-_smart_parent_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
+EOLIAN static void *
+_evas_object_smart_data_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED)
{
- Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
- if (!obj) return;
- Evas_Object **smart_parent = va_arg(*list, Evas_Object **);
- if (smart_parent) *smart_parent = obj->smart.parent;
-}
-
-static void
-_smart_data_get(Eo *eo_obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
-{
- void **data = va_arg(*list, void **);
- *data = NULL;
+ return NULL;
}
-static void
-_smart_type_check(Eo *eo_obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
+EOLIAN static Eina_Bool
+_evas_object_smart_type_check(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *type EINA_UNUSED)
{
- va_arg(*list, const char *);
- Eina_Bool *type_check = va_arg(*list, Eina_Bool *);
- *type_check = EINA_FALSE;
- return;
+ return EINA_FALSE;
}
-static void
-_smart_type_check_ptr(Eo *eo_obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
+EOLIAN static Eina_Bool
+_evas_object_smart_type_check_ptr(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *type EINA_UNUSED)
{
- va_arg(*list, const char *);
- Eina_Bool *type_check = va_arg(*list, Eina_Bool *);
- *type_check = EINA_FALSE;
- return;
+ return EINA_FALSE;
}
-static void
-_class_constructor(Eo_Class *klass)
-{
- const Eo_Op_Func_Description func_desc[] = {
- EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
- EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
- EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DBG_INFO_GET), _dbg_info_get),
- EO_OP_FUNC(EVAS_COMMON_ID(EVAS_COMMON_SUB_ID_EVAS_GET), _evas_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POSITION_SET), _position_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POSITION_GET), _position_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_SET), _size_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_GET), _size_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_MIN_SET), _size_hint_min_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_MIN_GET), _size_hint_min_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_MAX_SET), _size_hint_max_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_MAX_GET), _size_hint_max_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_REQUEST_SET), _size_hint_request_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_REQUEST_GET), _size_hint_request_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_ASPECT_SET), _size_hint_aspect_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_ASPECT_GET), _size_hint_aspect_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_ALIGN_SET), _size_hint_align_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_ALIGN_GET), _size_hint_align_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_WEIGHT_SET), _size_hint_weight_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_WEIGHT_GET), _size_hint_weight_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_PADDING_SET), _size_hint_padding_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_PADDING_GET), _size_hint_padding_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_VISIBILITY_SET), _visible_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_VISIBILITY_GET), _visible_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_COLOR_SET), _color_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_COLOR_GET), _color_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_ANTI_ALIAS_SET), _anti_alias_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_ANTI_ALIAS_GET), _anti_alias_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SCALE_SET), _scale_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SCALE_GET), _scale_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_RENDER_OP_SET), _render_op_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_RENDER_OP_GET), _render_op_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_TYPE_SET), _type_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_TYPE_GET), _type_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_PRECISE_IS_INSIDE_SET), _precise_is_inside_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_PRECISE_IS_INSIDE_GET), _precise_is_inside_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_STATIC_CLIP_SET), _static_clip_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_STATIC_CLIP_GET), _static_clip_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_IS_FRAME_OBJECT_SET), _is_frame_object_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_IS_FRAME_OBJECT_GET), _is_frame_object_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_FREEZE_EVENTS_SET), _freeze_events_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_FREEZE_EVENTS_GET), _freeze_events_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_PASS_EVENTS_SET), _pass_events_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_PASS_EVENTS_GET), _pass_events_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_REPEAT_EVENTS_SET), _repeat_events_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_REPEAT_EVENTS_GET), _repeat_events_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_PROPAGATE_EVENTS_SET), _propagate_events_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_PROPAGATE_EVENTS_GET), _propagate_events_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POINTER_MODE_SET), _pointer_mode_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POINTER_MODE_GET), _pointer_mode_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_KEY_GRAB), _key_grab),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_KEY_UNGRAB), _key_ungrab),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_FOCUS_SET), _focus_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_FOCUS_GET), _focus_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_NAME_SET), _name_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_NAME_GET), _name_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_NAME_CHILD_FIND), _name_child_find),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_LAYER_SET), _layer_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_LAYER_GET), _layer_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_CLIP_SET), _clip_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_CLIP_GET), _clip_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_CLIP_UNSET), _clip_unset),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_CLIPEES_GET), _clipees_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_CLIPEES_HAS), _clipees_has),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_MAP_ENABLE_SET), _map_enable_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_MAP_ENABLE_GET), _map_enable_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_MAP_SET), _map_set),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_MAP_GET), _map_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SMART_PARENT_GET), _smart_parent_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SMART_DATA_GET), _smart_data_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SMART_TYPE_CHECK), _smart_type_check),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SMART_TYPE_CHECK_PTR), _smart_type_check_ptr),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SMART_MOVE_CHILDREN_RELATIVE), _smart_move_children_relative),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SMART_CLIPPED_CLIPPER_GET), _smart_clipped_clipper_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_RAISE), _raise),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_LOWER), _lower),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_STACK_ABOVE), _stack_above),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_STACK_BELOW), _stack_below),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_ABOVE_GET), _above_get),
- EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_BELOW_GET), _below_get),
- EO_OP_FUNC_SENTINEL
- };
-
- eo_class_funcs_set(klass, func_desc);
-}
-
-static const Eo_Op_Description op_desc[] = {
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_POSITION_SET, "Set the position of an evas object."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_POSITION_GET, "Get the position of an evas object."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_SET, "Set the size of an evas object."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_GET, "Get the size of an evas object."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_MIN_SET, "Sets the hints for an object's minimum size."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_MIN_GET, "Retrieves the hints for an object's minimum size."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_MAX_SET, "Sets the hints for an object's maximum size."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_MAX_GET, "Retrieves the hints for an object's maximum size."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_REQUEST_SET, "Sets the hints for an object's optimum size."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_REQUEST_GET, "Retrieves the hints for an object's optimum size."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_ASPECT_SET, "Sets the hints for an object's aspect ratio."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_ASPECT_GET, "Retrieves the hints for an object's aspect ratio."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_ALIGN_SET, "Sets the hints for an object's alignment."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_ALIGN_GET, "Retrieves the hints for on object's alignment."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_WEIGHT_SET, "Sets the hints for an object's weight."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_WEIGHT_GET, "Retrieves the hints for an object's weight."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_PADDING_SET, "Sets the hints for an object's padding space."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_PADDING_GET, "Retrieves the hints for an object's padding space."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_VISIBILITY_SET, "Makes the given Evas object visible/invisible."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_VISIBILITY_GET, "Retrieves whether or not the given Evas object is visible."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_COLOR_SET, "Sets the general/main color of the given Evas object to the given"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_COLOR_GET, "Retrieves the general/main color of the given Evas object."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_ANTI_ALIAS_SET, "Sets whether or not the given Evas object is to be drawn anti-aliased."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_ANTI_ALIAS_GET, "Retrieves whether or not the given Evas object is to be drawn anti_aliased."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SCALE_SET, "Sets the scaling factor for an Evas object. Does not affect all"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SCALE_GET, "Retrieves the scaling factor for the given Evas object."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_RENDER_OP_SET, "Sets the render_op to be used for rendering the Evas object."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_RENDER_OP_GET, "Retrieves the current value of the operation used for rendering the Evas object."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_TYPE_SET, "Sets the type of the given Evas object."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_TYPE_GET, "Retrieves the type of the given Evas object."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_PRECISE_IS_INSIDE_SET, "Set whether to use precise (usually expensive) point collision"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_PRECISE_IS_INSIDE_GET, "Determine whether an object is set to use precise point collision"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_STATIC_CLIP_SET, "Set a hint flag on the given Evas object that it's used as a static clipper."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_STATIC_CLIP_GET, "Get the static clipper hint flag for a given Evas object."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_IS_FRAME_OBJECT_SET, "Set whether an object is a frame object"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_IS_FRAME_OBJECT_GET, "Determine whether an object is a frame object"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_FREEZE_EVENTS_SET, "Set whether an Evas object is to freeze (discard) events."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_FREEZE_EVENTS_GET, "Determine whether an object is set to freeze (discard) events."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_PASS_EVENTS_SET, "Set whether an Evas object is to pass (ignore) events."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_PASS_EVENTS_GET, "Determine whether an object is set to pass (ignore) events."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_REPEAT_EVENTS_SET, "Set whether an Evas object is to repeat events."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_REPEAT_EVENTS_GET, "Determine whether an object is set to repeat events."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_PROPAGATE_EVENTS_SET, "Set whether events on a smart object's member should get propagated"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_PROPAGATE_EVENTS_GET, "Retrieve whether an Evas object is set to propagate events."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_POINTER_MODE_SET, "Set pointer behavior."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_POINTER_MODE_GET, "Determine how pointer will behave."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_KEY_GRAB, "Requests keyname key events be directed to obj."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_KEY_UNGRAB, "Removes the grab on @p keyname key events by obj."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_FOCUS_SET, "Sets or unsets a given object as the currently focused one on its"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_FOCUS_GET, "Retrieve whether an object has the focus."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_NAME_SET, "Sets the name of the given Evas object to the given name."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_NAME_GET, "Retrieves the name of the given Evas object."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_NAME_CHILD_FIND, "Retrieves the object from children of the given object with the given name."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_LAYER_SET, "Sets the layer of its canvas that the given object will be part of."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_LAYER_GET, "Retrieves the layer of its canvas that the given object is part of."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_CLIP_SET, "Clip one object to another."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_CLIP_GET, "Get the object clipping obj (if any)."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_CLIP_UNSET, "Disable/cease clipping on a clipped obj object."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_CLIPEES_GET, "Return a list of objects currently clipped by obj."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_CLIPEES_HAS, "Return EINA_TRUE if there is any object is clipped by obj."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_MAP_ENABLE_SET, "Enable or disable the map that is set."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_MAP_ENABLE_GET, "Get the map enabled state"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_MAP_SET, "Set current object transformation map."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_MAP_GET, "Get current object transformation map."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SMART_PARENT_GET, "Get the smart parent"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SMART_DATA_GET, "Get the smart data of obj"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SMART_TYPE_CHECK, "Checks whether a given smart object or any of its smart object"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SMART_TYPE_CHECK_PTR, "Checks whether a given smart object or any of its smart object"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SMART_MOVE_CHILDREN_RELATIVE, "Moves all children objects of a given smart object relative to a given offset"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SMART_CLIPPED_CLIPPER_GET, "Get the clipper object for the given clipped smart object."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_RAISE, "Raise obj to the top of its layer."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_LOWER, "Lower obj to the bottom of its layer."),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_STACK_ABOVE, "Stack obj immediately above above"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_STACK_BELOW, "Stack obj immediately below below"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_ABOVE_GET, "Get the Evas object stacked right above obj"),
- EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_BELOW_GET, "Get the Evas object stacked right below obj"),
- EO_OP_DESCRIPTION_SENTINEL
-};
-
-static const Eo_Class_Description class_desc = {
- EO_VERSION,
- MY_CLASS_NAME,
- EO_CLASS_TYPE_REGULAR_NO_INSTANT,
- EO_CLASS_DESCRIPTION_OPS(&EVAS_OBJ_BASE_ID, op_desc, EVAS_OBJ_SUB_ID_LAST),
- NULL,
- sizeof(Evas_Object_Protected_Data),
- _class_constructor,
- NULL
-};
-
-EO_DEFINE_CLASS(evas_object_class_get, &class_desc, EO_BASE_CLASS, EVAS_COMMON_INTERFACE, NULL)
-
+#include "canvas/evas_object.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 0301056e33..33b1eb01b4 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -122,18 +122,7 @@ _evas_smart_data_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o, void *data)
eo_data_ref(eo_obj, NULL);
}
-EAPI void *
-evas_object_smart_data_get(const Evas_Object *eo_obj)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return NULL;
- MAGIC_CHECK_END();
- void *data = NULL;
- eo_do((Eo *)eo_obj, evas_obj_smart_data_get(&data));
- return data;
-}
-
-EOLIAN static void*
+EOLIAN static void *
_evas_smart_evas_object_smart_data_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o)
{
return o->data;
@@ -320,28 +309,6 @@ _evas_smart_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Obj
evas_object_mapped_clip_across_mark(eo_obj, obj);
}
-EAPI Evas_Object *
-evas_object_smart_parent_get(const Evas_Object *eo_obj)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return NULL;
- MAGIC_CHECK_END();
- Evas_Object *smart_parent = NULL;
- eo_do((Eo *)eo_obj, evas_obj_smart_parent_get(&smart_parent));
- return smart_parent;
-}
-
-EAPI Eina_Bool
-evas_object_smart_type_check(const Evas_Object *eo_obj, const char *type)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return EINA_FALSE;
- MAGIC_CHECK_END();
- Eina_Bool type_check = EINA_FALSE;
- eo_do((Eo *)eo_obj, evas_obj_smart_type_check(type, &type_check));
- return type_check;
-}
-
EOLIAN static Eina_Bool
_evas_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char *type)
{
@@ -372,17 +339,6 @@ _evas_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNU
return type_check;
}
-EAPI Eina_Bool
-evas_object_smart_type_check_ptr(const Evas_Object *eo_obj, const char *type)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return EINA_FALSE;
- MAGIC_CHECK_END();
- Eina_Bool type_check_ptr = EINA_FALSE;
- eo_do((Eo *)eo_obj, evas_obj_smart_type_check_ptr(type, &type_check_ptr));
- return type_check_ptr;
-}
-
EOLIAN static Eina_Bool
_evas_smart_evas_object_smart_type_check_ptr(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char* type)
{
diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index d7305e9d60..2cf5b194ba 100644
--- a/src/lib/evas/canvas/evas_object_smart_clipped.c
+++ b/src/lib/evas/canvas/evas_object_smart_clipped.c
@@ -12,17 +12,9 @@
CSO_DATA_GET(eo_obj, ptr) \
if (!ptr) return;
-EAPI void
-evas_object_smart_move_children_relative(Evas_Object *eo_obj, Evas_Coord dx, Evas_Coord dy)
+EOLIAN void
+_evas_object_smart_move_children_relative(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Evas_Coord dx, Evas_Coord dy)
{
- eo_do(eo_obj, evas_obj_smart_move_children_relative(dx, dy));
-}
-
-void
-_smart_move_children_relative(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
-{
- Evas_Coord dx = va_arg(*list, Evas_Coord);
- Evas_Coord dy = va_arg(*list, Evas_Coord);
const Eina_Inlist *lst;
Evas_Object_Protected_Data *child;
@@ -43,23 +35,12 @@ _smart_move_children_relative(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
}
}
-EAPI Evas_Object *
-evas_object_smart_clipped_clipper_get(Evas_Object *eo_obj)
+EOLIAN Evas_Object *
+_evas_object_smart_clipped_clipper_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED)
{
- Evas_Object *ret = NULL;
- eo_do((Eo *)eo_obj, evas_obj_smart_clipped_clipper_get(&ret));
- return ret;
-}
-
-void
-_smart_clipped_clipper_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
-{
- Evas_Object **ret = va_arg(*list, Evas_Object **);
CSO_DATA_GET(eo_obj, cso)
- if (!cso)
- *ret = NULL;
- else
- *ret = cso->clipper;
+ if (!cso) return NULL;
+ else return cso->clipper;
}
static void
@@ -87,7 +68,7 @@ evas_object_smart_clipped_smart_add(Evas_Object *eo_obj)
}
EOLIAN static void
-_evas_smart_clipped_evas_smart_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED)
+_evas_smart_clipped_evas_smart_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
{
evas_object_smart_clipped_smart_add(eo_obj);
}
@@ -114,7 +95,7 @@ evas_object_smart_clipped_smart_del(Evas_Object *eo_obj)
}
EOLIAN static void
-_evas_smart_clipped_evas_smart_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED)
+_evas_smart_clipped_evas_smart_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
{
evas_object_smart_clipped_smart_del(eo_obj);
}
@@ -129,7 +110,7 @@ evas_object_smart_clipped_smart_move(Evas_Object *eo_obj, Evas_Coord x, Evas_Coo
}
EOLIAN static void
-_evas_smart_clipped_evas_smart_move(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
+_evas_smart_clipped_evas_smart_move(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Coord x, Evas_Coord y)
{
evas_object_smart_clipped_smart_move(eo_obj, x, y);
}
@@ -143,7 +124,7 @@ evas_object_smart_clipped_smart_show(Evas_Object *eo_obj)
}
EOLIAN static void
-_evas_smart_clipped_evas_smart_show(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED)
+_evas_smart_clipped_evas_smart_show(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
{
evas_object_smart_clipped_smart_show(eo_obj);
}
@@ -156,7 +137,7 @@ evas_object_smart_clipped_smart_hide(Evas_Object *eo_obj)
}
EOLIAN static void
-_evas_smart_clipped_evas_smart_hide(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED)
+_evas_smart_clipped_evas_smart_hide(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
{
evas_object_smart_clipped_smart_hide(eo_obj);
}
@@ -169,7 +150,7 @@ evas_object_smart_clipped_smart_color_set(Evas_Object *eo_obj, int r, int g, int
}
EOLIAN static void
-_evas_smart_clipped_evas_smart_color_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED, int r, int g, int b, int a)
+_evas_smart_clipped_evas_smart_color_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, int r, int g, int b, int a)
{
evas_object_smart_clipped_smart_color_set(eo_obj, r, g, b, a);
}
@@ -182,7 +163,7 @@ evas_object_smart_clipped_smart_clip_set(Evas_Object *eo_obj, Evas_Object *clip)
}
EOLIAN static void
-_evas_smart_clipped_evas_smart_clip_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED, Evas_Object *clip)
+_evas_smart_clipped_evas_smart_clip_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *clip)
{
evas_object_smart_clipped_smart_clip_set(eo_obj, clip);
}
@@ -195,7 +176,7 @@ evas_object_smart_clipped_smart_clip_unset(Evas_Object *eo_obj)
}
EOLIAN static void
-_evas_smart_clipped_evas_smart_clip_unset(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED)
+_evas_smart_clipped_evas_smart_clip_unset(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
{
evas_object_smart_clipped_smart_clip_unset(eo_obj);
}
@@ -212,7 +193,7 @@ evas_object_smart_clipped_smart_member_add(Evas_Object *eo_obj, Evas_Object *mem
}
EOLIAN static void
-_evas_smart_clipped_evas_smart_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED, Evas_Object *member)
+_evas_smart_clipped_evas_smart_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
{
eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_add(member));
evas_object_smart_clipped_smart_member_add(eo_obj, member);
@@ -230,7 +211,7 @@ evas_object_smart_clipped_smart_member_del(Evas_Object *eo_obj, Evas_Object *mem
}
EOLIAN static void
-_evas_smart_clipped_evas_smart_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED, Evas_Object *member)
+_evas_smart_clipped_evas_smart_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
{
evas_object_smart_clipped_smart_member_del(eo_obj, member);
eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_del(member));
@@ -276,3 +257,4 @@ _evas_smart_clipped_constructor(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *clas
}
#include "canvas/evas_smart_clipped.eo.c"
+
diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c
index 6fbc78c53a..4d6d270bbb 100644
--- a/src/lib/evas/canvas/evas_stack.c
+++ b/src/lib/evas/canvas/evas_stack.c
@@ -37,20 +37,9 @@ evas_object_below_get_internal(const Evas_Object_Protected_Data *obj)
return NULL;
}
-EAPI void
-evas_object_raise(Evas_Object *eo_obj)
+EOLIAN void
+_evas_object_raise(Eo *eo_obj, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_raise());
-}
-
-void
-_raise(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
-{
- Evas_Object_Protected_Data *obj = _pd;
-
if (evas_object_intercept_call_raise(eo_obj, obj)) return;
if (!((EINA_INLIST_GET(obj))->next))
@@ -94,20 +83,9 @@ _raise(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
}
}
-EAPI void
-evas_object_lower(Evas_Object *eo_obj)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_lower());
-}
-
-void
-_lower(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
+EOLIAN void
+_evas_object_lower(Eo *eo_obj, Evas_Object_Protected_Data *obj)
{
- Evas_Object_Protected_Data *obj = _pd;
-
if (evas_object_intercept_call_lower(eo_obj, obj)) return;
if (!((EINA_INLIST_GET(obj))->prev))
@@ -152,21 +130,9 @@ _lower(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
}
}
-EAPI void
-evas_object_stack_above(Evas_Object *eo_obj, Evas_Object *above)
+EOLIAN void
+_evas_object_stack_above(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_above)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_stack_above(above));
-}
-
-void
-_stack_above(Eo *eo_obj, void *_pd, va_list *list)
-{
- Evas_Object_Protected_Data *obj = _pd;
- Evas_Object *eo_above = va_arg(*list, Evas_Object *);
-
if (!eo_above) return;
if (eo_obj == eo_above) return;
if (evas_object_intercept_call_stack_above(eo_obj, obj, eo_above)) return;
@@ -240,21 +206,9 @@ _stack_above(Eo *eo_obj, void *_pd, va_list *list)
}
}
-EAPI void
-evas_object_stack_below(Evas_Object *eo_obj, Evas_Object *eo_below)
+EOLIAN void
+_evas_object_stack_below(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_below)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return;
- MAGIC_CHECK_END();
- eo_do(eo_obj, evas_obj_stack_below(eo_below));
-}
-
-void
-_stack_below(Eo *eo_obj, void *_pd, va_list *list)
-{
- Evas_Object *eo_below = va_arg(*list, Evas_Object *);
- Evas_Object_Protected_Data *obj = _pd;
-
if (!eo_below) return;
if (eo_obj == eo_below) return;
if (evas_object_intercept_call_stack_below(eo_obj, obj, eo_below)) return;
@@ -328,96 +282,50 @@ _stack_below(Eo *eo_obj, void *_pd, va_list *list)
}
}
-EAPI Evas_Object *
-evas_object_above_get(const Evas_Object *eo_obj)
+EOLIAN Evas_Object *
+_evas_object_above_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
- return NULL;
- MAGIC_CHECK_END();
- Evas_Object *ret = NULL;
- eo_do((Eo *)eo_obj, evas_obj_above_get(&ret));
- return ret;
-}
-
-void
-_above_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
-{
- const Evas_Object_Protected_Data *obj = _pd;
- Evas_Object **ret = va_arg(*list, Evas_Object **);
-
if (obj->smart.parent)
{
do
{
obj = (Evas_Object_Protected_Data *)((EINA_INLIST_GET(obj))->next);
- if ((obj) && (!obj->delete_me))
- {
- *ret = obj->object;
- return;
- }
+ if ((obj) && (!obj->delete_me)) return obj->object;
}
while (obj);
- *ret = NULL;
- return;
+ return NULL;
}
obj = evas_object_above_get_internal(obj);
while (obj)
{
- if (!obj->delete_me)
- {
- *ret = obj->object;
- return;
- }
+ if (!obj->delete_me) return obj->object;
obj = evas_object_above_get_internal(obj);
}
- *ret = NULL;
-}
-
-EAPI Evas_Object *
-evas_object_below_get(const Evas_Object *eo_obj)
-{
- MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return NULL;
- MAGIC_CHECK_END();
- Evas_Object *ret = NULL;
- eo_do((Eo *)eo_obj, evas_obj_below_get(&ret));
- return ret;
}
-void
-_below_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
+EOLIAN Evas_Object *
+_evas_object_below_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
{
- const Evas_Object_Protected_Data *obj = _pd;
- Evas_Object **ret = va_arg(*list, Evas_Object **);
- *ret = NULL;
if (obj->smart.parent)
{
do
{
obj = (Evas_Object_Protected_Data *)((EINA_INLIST_GET(obj))->prev);
- if ((obj) && (!obj->delete_me))
- {
- *ret = obj->object;
- return;
- }
+ if ((obj) && (!obj->delete_me)) return obj->object;
}
while (obj);
- return;
+ return NULL;
}
obj = evas_object_below_get_internal(obj);
while (obj)
{
- if (!obj->delete_me)
- {
- *ret = obj->object;
- return;
- }
+ if (!obj->delete_me) return obj->object;
obj = evas_object_below_get_internal(obj);
}
+ return NULL;
}
-
-
EAPI Evas_Object *
evas_object_bottom_get(const Evas *e)
{
@@ -497,3 +405,4 @@ _canvas_object_top_get(Eo *eo_e EINA_UNUSED, void *_pd, va_list *params_list)
*ret = obj->object;
}
+