summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-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 351cec9..d7496b7 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -1213,6 +1213,7 @@ enum
1213 */ 1213 */
1214#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) 1214#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)
1215 1215
1216#if 0
1216/** 1217/**
1217 * @def evas_obj_name_child_find 1218 * @def evas_obj_name_child_find
1218 * @since 1.8 1219 * @since 1.8
@@ -1225,6 +1226,7 @@ enum
1225 * @see evas_object_name_child_find 1226 * @see evas_object_name_child_find
1226 */ 1227 */
1227#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) 1228#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)
1229#endif
1228 1230
1229/** 1231/**
1230 * @def evas_canvas_object_top_at_xy_get 1232 * @def evas_canvas_object_top_at_xy_get
@@ -4448,6 +4450,8 @@ enum
4448 * @} 4450 * @}
4449 */ 4451 */
4450 4452
4453#include "canvas/evas_common_interface.eo.h"
4454#if 0
4451#define EVAS_COMMON_INTERFACE evas_common_class_get() 4455#define EVAS_COMMON_INTERFACE evas_common_class_get()
4452 4456
4453const Eo_Class *evas_common_class_get(void) EINA_CONST; 4457const Eo_Class *evas_common_class_get(void) EINA_CONST;
@@ -4475,6 +4479,10 @@ enum
4475 */ 4479 */
4476#define evas_common_evas_get(ret) EVAS_COMMON_ID(EVAS_COMMON_SUB_ID_EVAS_GET), EO_TYPECHECK(Evas **, ret) 4480#define evas_common_evas_get(ret) EVAS_COMMON_ID(EVAS_COMMON_SUB_ID_EVAS_GET), EO_TYPECHECK(Evas **, ret)
4477 4481
4482#endif
4483
4484#include "canvas/evas_object.eo.h"
4485#if 0
4478extern EAPI Eo_Op EVAS_OBJ_BASE_ID; 4486extern EAPI Eo_Op EVAS_OBJ_BASE_ID;
4479 4487
4480enum 4488enum
@@ -5623,6 +5631,7 @@ enum
5623#define EVAS_OBJ_CLASS evas_object_class_get() 5631#define EVAS_OBJ_CLASS evas_object_class_get()
5624 5632
5625const Eo_Class *evas_object_class_get(void) EINA_CONST; 5633const Eo_Class *evas_object_class_get(void) EINA_CONST;
5634#endif
5626 5635
5627#define EVAS_OBJ_IMAGE_CLASS evas_object_image_class_get() 5636#define EVAS_OBJ_IMAGE_CLASS evas_object_image_class_get()
5628const Eo_Class *evas_object_image_class_get(void) EINA_CONST; 5637const 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 19dcf2a..394dcfb 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
6255EAPI void evas_object_is_frame_object_set(Evas_Object *obj, Eina_Bool is_frame); 6255EAPI void evas_object_is_frame_object_set(Evas_Object *obj, Eina_Bool is_frame);
6256 6256
6257/* @since 1.2 */ 6257/* @since 1.2 */
6258EAPI Eina_Bool evas_object_is_frame_object_get(Evas_Object *obj); 6258EAPI Eina_Bool evas_object_is_frame_object_get(const Evas_Object *obj);
6259 6259
6260/** 6260/**
6261 * @} 6261 * @}
@@ -6853,7 +6853,7 @@ EAPI void evas_object_smart_move_children_relative(Evas_Object *obj, Eva
6853 * 6853 *
6854 * @see evas_object_smart_clipped_smart_add() 6854 * @see evas_object_smart_clipped_smart_add()
6855 */ 6855 */
6856EAPI Evas_Object *evas_object_smart_clipped_clipper_get(Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1); 6856EAPI Evas_Object *evas_object_smart_clipped_clipper_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
6857 6857
6858/** 6858/**
6859 * @} 6859 * @}
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 8f74dd6..918fe36 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
191/* public functions */ 191/* public functions */
192extern const char *o_rect_type; 192extern const char *o_rect_type;
193 193
194EAPI void 194EOLIAN void
195evas_object_clip_set( 195_evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip)
196 Evas_Object *eo_obj,
197 Evas_Object *clip)
198{
199 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
200 return;
201 MAGIC_CHECK_END();
202 eo_do(eo_obj, evas_obj_clip_set(clip));
203}
204
205void
206_clip_set(Eo *eo_obj, void *_pd, va_list *list)
207{ 196{
208 Evas_Object_Protected_Data *clip; 197 Evas_Object_Protected_Data *clip;
209 Evas_Object *eo_clip = va_arg(*list, Evas_Object *);
210 Evas_Object_Protected_Data *obj = _pd;
211 Evas_Public_Data *e; 198 Evas_Public_Data *e;
212 199
213 if (!eo_clip) 200 if (!eo_clip)
@@ -348,43 +335,17 @@ _clip_set(Eo *eo_obj, void *_pd, va_list *list)
348 evas_object_clip_across_check(eo_obj, obj); 335 evas_object_clip_across_check(eo_obj, obj);
349} 336}
350 337
351EAPI Evas_Object * 338EOLIAN Evas_Object *
352evas_object_clip_get(const Evas_Object *eo_obj) 339_evas_object_clip_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
353{ 340{
354 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
355 return NULL;
356 MAGIC_CHECK_END();
357 Evas_Object *clip = NULL;
358 eo_do((Eo *)eo_obj, evas_obj_clip_get(&clip));
359 return clip;
360}
361
362void
363_clip_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
364{
365 Evas_Object **clip = va_arg(*list, Evas_Object **);
366 const Evas_Object_Protected_Data *obj = _pd;
367
368 *clip = NULL;
369
370 if (obj->cur->clipper) 341 if (obj->cur->clipper)
371 *clip = obj->cur->clipper->object; 342 return obj->cur->clipper->object;
372} 343 return NULL;
373
374EAPI void
375evas_object_clip_unset(Evas_Object *eo_obj)
376{
377 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
378 return;
379 MAGIC_CHECK_END();
380 eo_do(eo_obj, evas_obj_clip_unset());
381} 344}
382 345
383void 346EOLIAN void
384_clip_unset(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) 347_evas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj)
385{ 348{
386 Evas_Object_Protected_Data *obj = _pd;
387
388 if (!obj->cur->clipper) return; 349 if (!obj->cur->clipper) return;
389 350
390 obj->clip.cache_clipees_answer = eina_list_free(obj->clip.cache_clipees_answer); 351 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)
445 evas_object_clip_across_check(eo_obj, obj); 406 evas_object_clip_across_check(eo_obj, obj);
446} 407}
447 408
448EAPI const Eina_List * 409EOLIAN Eina_List *
449evas_object_clipees_get(const Evas_Object *eo_obj) 410_evas_object_clipees_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
450{
451 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
452 return NULL;
453 MAGIC_CHECK_END();
454 const Eina_List *clipees = NULL;
455 eo_do((Eo *)eo_obj, evas_obj_clipees_get(&clipees));
456 return clipees;
457}
458
459void
460_clipees_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
461{ 411{
462 const Eina_List **clipees = va_arg(*list, const Eina_List **);
463 Evas_Object_Protected_Data *obj = _pd;
464 const Evas_Object_Protected_Data *tmp; 412 const Evas_Object_Protected_Data *tmp;
465 Eina_List *l; 413 Eina_List *l;
466 Eina_List *answer = NULL; 414 Eina_List *answer = NULL;
@@ -470,24 +418,13 @@ _clipees_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
470 EINA_LIST_FOREACH(obj->clip.clipees, l, tmp) 418 EINA_LIST_FOREACH(obj->clip.clipees, l, tmp)
471 answer = eina_list_append(answer, tmp); 419 answer = eina_list_append(answer, tmp);
472 420
473 *clipees = answer;
474 obj->clip.cache_clipees_answer = answer; 421 obj->clip.cache_clipees_answer = answer;
422 return answer;
475} 423}
476 424
477EAPI Eina_Bool 425EOLIAN Eina_Bool
478evas_object_clipees_has(const Evas_Object *eo_obj) 426_evas_object_clipees_has(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
479{ 427{
480 Eina_Bool r; 428 return (obj->clip.clipees ? EINA_TRUE : EINA_FALSE);
481
482 eo_do((Eo *)eo_obj, evas_obj_clipees_has(&r));
483 return r;
484} 429}
485 430
486void
487_clipees_has(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
488{
489 Eina_Bool *r = va_arg(*list, Eina_Bool *);
490 Evas_Object_Protected_Data *obj = _pd;
491
492 *r = obj->clip.clipees ? EINA_TRUE : EINA_FALSE;
493}
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 0000000..13c2b57
--- /dev/null
+++ b/src/lib/evas/canvas/evas_common_interface.eo
@@ -0,0 +1,18 @@
1interface Evas_Common_Interface ()
2{
3 eo_prefix: evas_common;
4 properties {
5 evas {
6 get {
7 /*@ No description supplied by the EAPI. */
8 }
9 values {
10 Evas *ret;
11 }
12 }
13 }
14 implements {
15 virtual::evas::get;
16 }
17
18} \ 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 808ffcf..bd2285e 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)
3062 _evas_object_event_new(); 3062 _evas_object_event_new();
3063} 3063}
3064 3064
3065EAPI void
3066evas_object_freeze_events_set(Evas_Object *eo_obj, Eina_Bool freeze)
3067{
3068 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
3069 return;
3070 MAGIC_CHECK_END();
3071 eo_do(eo_obj, evas_obj_freeze_events_set(freeze));
3072}
3073
3074static void 3065static void
3075_feed_mouse_move_eval_internal(Eo *eo_obj, Evas_Object_Protected_Data *obj) 3066_feed_mouse_move_eval_internal(Eo *eo_obj, Evas_Object_Protected_Data *obj)
3076{ 3067{
@@ -3089,11 +3080,9 @@ _feed_mouse_move_eval_internal(Eo *eo_obj, Evas_Object_Protected_Data *obj)
3089 NULL); 3080 NULL);
3090} 3081}
3091 3082
3092void 3083EOLIAN void
3093_freeze_events_set(Eo *eo_obj, void *_pd, va_list *list) 3084_evas_object_freeze_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool freeze)
3094{ 3085{
3095 Eina_Bool freeze = va_arg(*list, int);
3096 Evas_Object_Protected_Data *obj = _pd;
3097 freeze = !!freeze; 3086 freeze = !!freeze;
3098 if (obj->freeze_events == freeze) return; 3087 if (obj->freeze_events == freeze) return;
3099 obj->freeze_events = freeze; 3088 obj->freeze_events = freeze;
@@ -3103,39 +3092,15 @@ _freeze_events_set(Eo *eo_obj, void *_pd, va_list *list)
3103 _feed_mouse_move_eval_internal(eo_obj, obj); 3092 _feed_mouse_move_eval_internal(eo_obj, obj);
3104} 3093}
3105 3094
3106EAPI Eina_Bool 3095EOLIAN Eina_Bool
3107evas_object_freeze_events_get(const Evas_Object *eo_obj) 3096_evas_object_freeze_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
3108{
3109 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
3110 return EINA_FALSE;
3111 MAGIC_CHECK_END();
3112 Eina_Bool freeze_events = EINA_FALSE;
3113 eo_do((Eo *)eo_obj, evas_obj_freeze_events_get(&freeze_events));
3114 return freeze_events;
3115}
3116
3117void
3118_freeze_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
3119{ 3097{
3120 Eina_Bool *freeze_events = va_arg(*list, Eina_Bool *); 3098 return obj->freeze_events;
3121 const Evas_Object_Protected_Data *obj = _pd;
3122 if (freeze_events) *freeze_events = obj->freeze_events;
3123} 3099}
3124 3100
3125EAPI void 3101EOLIAN void
3126evas_object_pass_events_set(Evas_Object *eo_obj, Eina_Bool pass) 3102_evas_object_pass_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool pass)
3127{ 3103{
3128 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
3129 return;
3130 MAGIC_CHECK_END();
3131 eo_do(eo_obj, evas_obj_pass_events_set(pass));
3132}
3133
3134void
3135_pass_events_set(Eo *eo_obj, void *_pd, va_list *list)
3136{
3137 Eina_Bool pass = va_arg(*list, int);
3138 Evas_Object_Protected_Data *obj = _pd;
3139 pass = !!pass; 3104 pass = !!pass;
3140 if (obj->pass_events == pass) return; 3105 if (obj->pass_events == pass) return;
3141 obj->pass_events = pass; 3106 obj->pass_events = pass;
@@ -3143,134 +3108,49 @@ _pass_events_set(Eo *eo_obj, void *_pd, va_list *list)
3143 _feed_mouse_move_eval_internal(eo_obj, obj); 3108 _feed_mouse_move_eval_internal(eo_obj, obj);
3144} 3109}
3145 3110
3146EAPI Eina_Bool 3111EOLIAN Eina_Bool
3147evas_object_pass_events_get(const Evas_Object *eo_obj) 3112_evas_object_pass_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
3148{
3149 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
3150 return EINA_FALSE;
3151 MAGIC_CHECK_END();
3152 Eina_Bool pass_events = EINA_FALSE;
3153 eo_do((Eo *)eo_obj, evas_obj_pass_events_get(&pass_events));
3154 return pass_events;
3155}
3156
3157void
3158_pass_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
3159{ 3113{
3160 Eina_Bool *pass_events = va_arg(*list, Eina_Bool *); 3114 return obj->pass_events;
3161 const Evas_Object_Protected_Data *obj = _pd;
3162 if (pass_events) *pass_events = obj->pass_events;
3163} 3115}
3164 3116
3165EAPI void 3117EOLIAN void
3166evas_object_repeat_events_set(Evas_Object *eo_obj, Eina_Bool repeat) 3118_evas_object_repeat_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool repeat)
3167{
3168 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
3169 return;
3170 MAGIC_CHECK_END();
3171 eo_do(eo_obj, evas_obj_repeat_events_set(repeat));
3172}
3173
3174void
3175_repeat_events_set(Eo *eo_obj, void *_pd, va_list *list)
3176{ 3119{
3177 Eina_Bool repeat = va_arg(*list, int);
3178 Evas_Object_Protected_Data *obj = _pd;
3179 repeat = !!repeat; 3120 repeat = !!repeat;
3180 if (obj->repeat_events == repeat) return; 3121 if (obj->repeat_events == repeat) return;
3181 obj->repeat_events = repeat; 3122 obj->repeat_events = repeat;
3182 _feed_mouse_move_eval_internal(eo_obj, obj); 3123 _feed_mouse_move_eval_internal(eo_obj, obj);
3183} 3124}
3184 3125
3185EAPI Eina_Bool 3126EOLIAN Eina_Bool
3186evas_object_repeat_events_get(const Evas_Object *eo_obj) 3127_evas_object_repeat_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
3187{ 3128{
3188 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 3129 return obj->repeat_events;
3189 return EINA_FALSE;
3190 MAGIC_CHECK_END();
3191 Eina_Bool repeat_events = EINA_FALSE;
3192 eo_do((Eo *)eo_obj, evas_obj_repeat_events_get(&repeat_events));
3193 return repeat_events;
3194}
3195
3196void
3197_repeat_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
3198{
3199 Eina_Bool *repeat_events = va_arg(*list, Eina_Bool *);
3200 const Evas_Object_Protected_Data *obj = _pd;
3201 if (repeat_events) *repeat_events = obj->repeat_events;
3202} 3130}
3203 3131
3204EAPI void 3132EOLIAN void
3205evas_object_propagate_events_set(Evas_Object *eo_obj, Eina_Bool prop) 3133_evas_object_propagate_events_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool prop)
3206{ 3134{
3207 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
3208 return;
3209 MAGIC_CHECK_END();
3210 eo_do(eo_obj, evas_obj_propagate_events_set(prop));
3211}
3212
3213void
3214_propagate_events_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
3215{
3216 Eina_Bool prop = va_arg(*list, int);
3217 Evas_Object_Protected_Data *obj = _pd;
3218 obj->no_propagate = !prop; 3135 obj->no_propagate = !prop;
3219} 3136}
3220 3137
3221EAPI Eina_Bool 3138EOLIAN Eina_Bool
3222evas_object_propagate_events_get(const Evas_Object *eo_obj) 3139_evas_object_propagate_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
3223{
3224 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
3225 return EINA_FALSE;
3226 MAGIC_CHECK_END();
3227 Eina_Bool no_propagate = EINA_FALSE;
3228 eo_do((Eo *)eo_obj, evas_obj_propagate_events_get(&no_propagate));
3229 return no_propagate;
3230}
3231
3232void
3233_propagate_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
3234{ 3140{
3235 Eina_Bool *no_propagate = va_arg(*list, Eina_Bool *); 3141 return !(obj->no_propagate);
3236 const Evas_Object_Protected_Data *obj = _pd;
3237 if (no_propagate) *no_propagate = !(obj->no_propagate);
3238} 3142}
3239 3143
3240EAPI void 3144EOLIAN void
3241evas_object_pointer_mode_set(Evas_Object *eo_obj, Evas_Object_Pointer_Mode setting) 3145_evas_object_pointer_mode_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Object_Pointer_Mode setting)
3242{ 3146{
3243 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
3244 return;
3245 MAGIC_CHECK_END();
3246 eo_do(eo_obj, evas_obj_pointer_mode_set(setting));
3247}
3248
3249void
3250_pointer_mode_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
3251{
3252 Evas_Object_Pointer_Mode setting = va_arg(*list, Evas_Object_Pointer_Mode);
3253 Evas_Object_Protected_Data *obj = _pd;
3254 obj->pointer_mode = setting; 3147 obj->pointer_mode = setting;
3255} 3148}
3256 3149
3257EAPI Evas_Object_Pointer_Mode 3150EOLIAN Evas_Object_Pointer_Mode
3258evas_object_pointer_mode_get(const Evas_Object *eo_obj) 3151_evas_object_pointer_mode_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
3259{ 3152{
3260 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 3153 return obj->pointer_mode;
3261 return EVAS_OBJECT_POINTER_MODE_AUTOGRAB;
3262 MAGIC_CHECK_END();
3263 Evas_Object_Pointer_Mode setting = EVAS_OBJECT_POINTER_MODE_AUTOGRAB;
3264 eo_do((Eo *)eo_obj, evas_obj_pointer_mode_get(&setting));
3265 return setting;
3266}
3267
3268void
3269_pointer_mode_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
3270{
3271 Evas_Object_Pointer_Mode *setting = va_arg(*list, Evas_Object_Pointer_Mode *);
3272 const Evas_Object_Protected_Data *obj = _pd;
3273 if (setting) *setting = obj->pointer_mode;
3274} 3154}
3275 3155
3276EAPI void 3156EAPI void
@@ -3378,3 +3258,4 @@ _canvas_event_down_count_get(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
3378 const Evas_Public_Data *e = _pd; 3258 const Evas_Public_Data *e = _pd;
3379 *ret = e->pointer.downs; 3259 *ret = e->pointer.downs;
3380} 3260}
3261
diff --git a/src/lib/evas/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c
index cac96b6..2ea81b7 100644
--- a/src/lib/evas/canvas/evas_focus.c
+++ b/src/lib/evas/canvas/evas_focus.c
@@ -7,22 +7,14 @@
7 7
8/* public calls */ 8/* public calls */
9 9
10EAPI void 10EOLIAN void
11evas_object_focus_set(Evas_Object *eo_obj, Eina_Bool focus) 11_evas_object_focus_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool focus)
12{ 12{
13 eo_do(eo_obj, evas_obj_focus_set(focus));
14}
15
16void
17_focus_set(Eo *eo_obj, void *_pd, va_list *list)
18{
19 Eina_Bool focus = va_arg(*list, int);
20 13
21 int event_id = 0; 14 int event_id = 0;
22 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 15 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
23 return; 16 return;
24 MAGIC_CHECK_END(); 17 MAGIC_CHECK_END();
25 Evas_Object_Protected_Data *obj = _pd;
26 18
27 _evas_object_event_new(); 19 _evas_object_event_new();
28 20
@@ -54,24 +46,10 @@ _focus_set(Eo *eo_obj, void *_pd, va_list *list)
54 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas); 46 _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
55} 47}
56 48
57EAPI Eina_Bool 49EOLIAN Eina_Bool
58evas_object_focus_get(const Evas_Object *eo_obj) 50_evas_object_focus_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
59{ 51{
60 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 52 return obj->focused;
61 return 0;
62 MAGIC_CHECK_END();
63 Eina_Bool focus = 0;
64 eo_do((Eo *)eo_obj, evas_obj_focus_get(&focus));
65 return focus;
66}
67
68void
69_focus_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
70{
71 Eina_Bool *focus = va_arg(*list, Eina_Bool *);
72
73 const Evas_Object_Protected_Data *obj = _pd;
74 *focus = obj->focused;
75} 53}
76 54
77EAPI Evas_Object * 55EAPI Evas_Object *
diff --git a/src/lib/evas/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c
index 0104b96..b7c0d96 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
107 107
108/* public calls */ 108/* public calls */
109 109
110EAPI Eina_Bool 110EOLIAN Eina_Bool
111evas_object_key_grab(Evas_Object *eo_obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive) 111_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)
112{ 112{
113 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
114 return EINA_FALSE;
115 MAGIC_CHECK_END();
116 Eina_Bool ret = EINA_FALSE;
117 eo_do(eo_obj, evas_obj_key_grab(keyname, modifiers, not_modifiers, exclusive, &ret));
118 return ret;
119}
120
121void
122_key_grab(Eo *eo_obj, void *_pd, va_list *list)
123{
124 const char *keyname = va_arg(*list, const char *);
125 Evas_Modifier_Mask modifiers = va_arg(*list, Evas_Modifier_Mask);
126 Evas_Modifier_Mask not_modifiers = va_arg(*list, Evas_Modifier_Mask);
127 Eina_Bool exclusive = va_arg(*list, int);
128 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
129
130 /* MEM OK */ 113 /* MEM OK */
131 Evas_Key_Grab *g; 114 Evas_Key_Grab *g;
132 115
133 Evas_Object_Protected_Data *obj = _pd; 116 if (((modifiers == not_modifiers) && (modifiers != 0)) || (!keyname)) return EINA_FALSE;
134 if (((modifiers == not_modifiers) && (modifiers != 0)) || (!keyname))
135 {
136 *ret = EINA_FALSE;
137 return;
138 }
139 if (exclusive) 117 if (exclusive)
140 { 118 {
141 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 119 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers,
142 exclusive); 120 exclusive);
143 if (g) 121 if (g) return EINA_FALSE;
144 {
145 *ret = EINA_FALSE;
146 return;
147 }
148 } 122 }
149 g = evas_key_grab_new(eo_obj, obj, keyname, modifiers, not_modifiers, exclusive); 123 g = evas_key_grab_new(eo_obj, obj, keyname, modifiers, not_modifiers, exclusive);
150 *ret = (!g) ? EINA_FALSE : EINA_TRUE; 124 return ((!g) ? EINA_FALSE : EINA_TRUE);
151} 125}
152 126
153EAPI void 127EOLIAN void
154evas_object_key_ungrab(Evas_Object *eo_obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers) 128_evas_object_key_ungrab(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers)
155{ 129{
156 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
157 return;
158 MAGIC_CHECK_END();
159 eo_do(eo_obj, evas_obj_key_ungrab(keyname, modifiers, not_modifiers));
160}
161
162void
163_key_ungrab(Eo *eo_obj, void *_pd, va_list *list)
164{
165 const char *keyname = va_arg(*list, const char *);
166 Evas_Modifier_Mask modifiers = va_arg(*list, Evas_Modifier_Mask);
167 Evas_Modifier_Mask not_modifiers = va_arg(*list, Evas_Modifier_Mask);
168
169 /* MEM OK */ 130 /* MEM OK */
170 Evas_Key_Grab *g; 131 Evas_Key_Grab *g;
171 132
172 if (!keyname) return; 133 if (!keyname) return;
173 Evas_Object_Protected_Data *obj = _pd;
174 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0); 134 g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0);
175 if (!g) return; 135 if (!g) return;
176 Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); 136 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)
185 else 145 else
186 evas_key_grab_free(g->object, g_object, keyname, modifiers, not_modifiers); 146 evas_key_grab_free(g->object, g_object, keyname, modifiers, not_modifiers);
187} 147}
148
diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c
index a52391e..036f2e0 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)
174 174
175/* public functions */ 175/* public functions */
176 176
177EAPI void 177EOLIAN void
178evas_object_layer_set(Evas_Object *eo_obj, short l) 178_evas_object_layer_set(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, short l)
179{ 179{
180 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
181 return;
182 MAGIC_CHECK_END();
183 eo_do(eo_obj, evas_obj_layer_set(l));
184}
185
186void
187_layer_set(Eo *eo_obj, void *_obj, va_list *list)
188{
189 short l = va_arg(*list, int);
190
191 Evas *eo_e; 180 Evas *eo_e;
192 Evas_Object_Protected_Data *obj = _obj;
193 181
194 if (obj->delete_me) return; 182 if (obj->delete_me) return;
195 if (evas_object_intercept_call_layer_set(eo_obj, obj, l)) return; 183 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)
243 evas_object_inform_call_restack(eo_obj); 231 evas_object_inform_call_restack(eo_obj);
244} 232}
245 233
246EAPI short 234EOLIAN short
247evas_object_layer_get(const Evas_Object *eo_obj) 235_evas_object_layer_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
248{ 236{
249 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
250 return 0;
251 MAGIC_CHECK_END();
252 short layer = 0;
253 eo_do((Eo *)eo_obj, evas_obj_layer_get(&layer));
254 return layer;
255}
256
257void
258_layer_get(Eo *eo_obj EINA_UNUSED, void *_obj, va_list *list)
259{
260 short *layer = va_arg(*list, short *);
261 const Evas_Object_Protected_Data *obj = _obj;
262 if (obj->smart.parent) 237 if (obj->smart.parent)
263 { 238 {
264 Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); 239 Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS);
265 *layer = smart_parent_obj->cur->layer; 240 return smart_parent_obj->cur->layer;
266 } 241 }
267 *layer = obj->cur->layer; 242 return obj->cur->layer;
268} 243}
244
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 8fb03ca..07a5f19 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 = {
1243 NULL 1243 NULL
1244}; 1244};
1245 1245
1246EO_DEFINE_CLASS(evas_class_get, &class_desc, EO_BASE_CLASS, EVAS_COMMON_INTERFACE, NULL); 1246EO_DEFINE_CLASS(evas_class_get, &class_desc, EO_BASE_CLASS, EVAS_COMMON_CLASS, NULL);
1247 1247
diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c
index 4c85a4e..d7cd29d 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)
427 return EINA_TRUE; 427 return EINA_TRUE;
428} 428}
429 429
430EAPI void 430EOLIAN void
431evas_object_map_enable_set(Evas_Object *eo_obj, Eina_Bool enabled) 431_evas_object_map_enable_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool enabled)
432{
433 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
434 return;
435 MAGIC_CHECK_END();
436 eo_do(eo_obj, evas_obj_map_enable_set(enabled));
437}
438
439void
440_map_enable_set(Eo *eo_obj, void *_pd, va_list *list)
441{ 432{
442 Eina_Bool enabled = va_arg(*list, int);
443
444 Evas_Object_Protected_Data *obj = _pd;
445 Eina_Bool pchange = EINA_FALSE; 433 Eina_Bool pchange = EINA_FALSE;
446 434
447 enabled = !!enabled; 435 enabled = !!enabled;
@@ -507,40 +495,15 @@ _map_enable_set(Eo *eo_obj, void *_pd, va_list *list)
507 } 495 }
508} 496}
509 497
510EAPI Eina_Bool 498EOLIAN Eina_Bool
511evas_object_map_enable_get(const Evas_Object *eo_obj) 499_evas_object_map_enable_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
512{
513 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
514 return EINA_FALSE;
515 MAGIC_CHECK_END();
516 Eina_Bool enabled = EINA_FALSE;
517 eo_do((Eo *)eo_obj, evas_obj_map_enable_get(&enabled));
518 return enabled;
519}
520
521void
522_map_enable_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
523{ 500{
524 Eina_Bool *enabled = va_arg(*list, Eina_Bool *); 501 return obj->map->cur.usemap;
525 const Evas_Object_Protected_Data *obj = _pd;
526 *enabled = obj->map->cur.usemap;
527} 502}
528 503
529EAPI void 504EOLIAN void
530evas_object_map_set(Evas_Object *eo_obj, const Evas_Map *map) 505_evas_object_map_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const Evas_Map *map)
531{ 506{
532 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
533 return;
534 MAGIC_CHECK_END();
535 eo_do(eo_obj, evas_obj_map_set(map));
536}
537
538void
539_map_set(Eo *eo_obj, void *_pd, va_list *list)
540{
541 const Evas_Map *map = va_arg(*list, const Evas_Map *);
542 Evas_Object_Protected_Data *obj = _pd;
543
544 if ((!map) || (map->count < 4)) 507 if ((!map) || (map->count < 4))
545 { 508 {
546 if (obj->map->surface) 509 if (obj->map->surface)
@@ -629,24 +592,10 @@ _map_set(Eo *eo_obj, void *_pd, va_list *list)
629 _evas_map_calc_map_geometry(eo_obj); 592 _evas_map_calc_map_geometry(eo_obj);
630} 593}
631 594
632EAPI const Evas_Map * 595EOLIAN Evas_Map *
633evas_object_map_get(const Evas_Object *eo_obj) 596_evas_object_map_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
634{ 597{
635 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 598 return obj->map->cur.map;
636 return NULL;
637 MAGIC_CHECK_END();
638 const Evas_Map *map = NULL;
639 eo_do((Eo *)eo_obj, evas_obj_map_get(&map));
640 return map;
641}
642
643void
644_map_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
645{
646 const Evas_Map **map = va_arg(*list, const Evas_Map **);
647 const Evas_Object_Protected_Data *obj = _pd;
648
649 *map = obj->map->cur.map;
650} 599}
651 600
652EAPI Evas_Map * 601EAPI Evas_Map *
@@ -1328,3 +1277,4 @@ evas_object_map_update(Evas_Object *eo_obj,
1328 1277
1329 return obj->changed_pchange; 1278 return obj->changed_pchange;
1330} 1279}
1280
diff --git a/src/lib/evas/canvas/evas_name.c b/src/lib/evas/canvas/evas_name.c
index 454fb89..5972ae4 100644
--- a/src/lib/evas/canvas/evas_name.c
+++ b/src/lib/evas/canvas/evas_name.c
@@ -1,21 +1,9 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4EAPI void 4EOLIAN void
5evas_object_name_set(Evas_Object *eo_obj, const char *name) 5_evas_object_name_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *name)
6{ 6{
7 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
8 return;
9 MAGIC_CHECK_END();
10 eo_do(eo_obj, evas_obj_name_set(name));
11}
12
13void
14_name_set(Eo *eo_obj, void *_pd, va_list *list)
15{
16 const char *name = va_arg(*list, const char *);
17
18 Evas_Object_Protected_Data *obj = _pd;
19 if (obj->name) 7 if (obj->name)
20 { 8 {
21 if (obj->layer && obj->layer->evas && obj->layer->evas->name_hash) 9 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)
30 } 18 }
31} 19}
32 20
33EAPI const char * 21EOLIAN const char *
34evas_object_name_get(const Evas_Object *eo_obj) 22_evas_object_name_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
35{
36 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
37 return NULL;
38 MAGIC_CHECK_END();
39 const char *name = NULL;
40 eo_do((Eo *)eo_obj, evas_obj_name_get(&name));
41 return name;
42}
43
44void
45_name_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
46{ 23{
47 const char **name = va_arg(*list, const char **); 24 return obj->name;
48 const Evas_Object_Protected_Data *obj = _pd;
49 *name = obj->name;
50} 25}
51 26
52EAPI Evas_Object * 27EAPI Evas_Object *
@@ -71,7 +46,7 @@ _canvas_object_name_find(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
71} 46}
72 47
73static Evas_Object * 48static Evas_Object *
74_evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, int recurse) 49_priv_evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, int recurse)
75{ 50{
76 const Eina_Inlist *lst; 51 const Eina_Inlist *lst;
77 Evas_Object_Protected_Data *child; 52 Evas_Object_Protected_Data *child;
@@ -85,29 +60,16 @@ _evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, int re
85 if (!strcmp(name, child->name)) return child->object; 60 if (!strcmp(name, child->name)) return child->object;
86 if (recurse != 0) 61 if (recurse != 0)
87 { 62 {
88 if ((eo_obj = _evas_object_name_child_find(child->object, name, recurse - 1))) 63 if ((eo_obj = _priv_evas_object_name_child_find(child->object, name, recurse - 1)))
89 return (Evas_Object *)eo_obj; 64 return (Evas_Object *)eo_obj;
90 } 65 }
91 } 66 }
92 return NULL; 67 return NULL;
93} 68}
94 69
95EAPI Evas_Object * 70EOLIAN Evas_Object *
96evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, int recurse) 71_evas_object_name_child_find(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *name, int recurse)
97{ 72{
98 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 73 return (!name ? NULL : _priv_evas_object_name_child_find(eo_obj, name, recurse));
99 return NULL;
100 MAGIC_CHECK_END();
101 Evas_Object *child = NULL;
102 eo_do((Eo *)eo_obj, evas_obj_name_child_find(name, recurse, &child));
103 return child;
104} 74}
105 75
106void
107_name_child_find(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
108{
109 const char *name = va_arg(*list, const char *);
110 int recurse = va_arg(*list, int);
111 Evas_Object **child = va_arg(*list, Evas_Object **);
112 *child = (!name ? NULL : _evas_object_name_child_find(eo_obj, name, recurse));
113}
diff --git a/src/lib/evas/canvas/evas_object.eo b/src/lib/evas/canvas/evas_object.eo
index 8b67c06..b7166ed 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -1,6 +1,7 @@
1abstract Evas_Object (Eo_Base, Evas_Common_Interface) 1abstract Evas_Object (Eo_Base, Evas_Common_Interface)
2{ 2{
3 eo_prefix: evas_obj; 3 eo_prefix: evas_obj;
4 data: Evas_Object_Protected_Data;
4 properties { 5 properties {
5 size_hint_max { 6 size_hint_max {
6 set { 7 set {
@@ -76,9 +77,11 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
76 visibility { 77 visibility {
77 set { 78 set {
78 /*@ Makes the given Evas object visible or invisible. */ 79 /*@ Makes the given Evas object visible or invisible. */
80 legacy null;
79 } 81 }
80 get { 82 get {
81 /*@ Retrieves whether or not the given Evas object is visible. */ 83 /*@ Retrieves whether or not the given Evas object is visible. */
84 legacy evas_object_visible_get;
82 } 85 }
83 values { 86 values {
84 Eina_Bool v; /*@ @c EINA_TRUE if to make the object visible, @c EINA_FALSE otherwise */ 87 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)
117 See the full @ref Example_Evas_Object_Manipulation "example". */ 120 See the full @ref Example_Evas_Object_Manipulation "example". */
118 } 121 }
119 values { 122 values {
120 const char* type; /*@ in */ 123 const char *type; /*@ in */
121 } 124 }
122 } 125 }
123 size_hint_min { 126 size_hint_min {
@@ -304,7 +307,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
304 @see evas_object_map_set() */ 307 @see evas_object_map_set() */
305 } 308 }
306 values { 309 values {
307 const Evas_Map* map; /*@ new map to use */ 310 const Evas_Map *map; /*@ new map to use */
308 } 311 }
309 } 312 }
310 size_hint_aspect { 313 size_hint_aspect {
@@ -480,7 +483,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
480 See the full @ref Example_Evas_Object_Manipulation "example". */ 483 See the full @ref Example_Evas_Object_Manipulation "example". */
481 } 484 }
482 values { 485 values {
483 Evas_Object* clip; /*@ The object to clip @p obj by */ 486 Evas_Object *clip @nonull; /*@ The object to clip @p obj by */
484 } 487 }
485 } 488 }
486 size_hint_padding { 489 size_hint_padding {
@@ -656,7 +659,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
656 See the full @ref Example_Evas_Events "example". */ 659 See the full @ref Example_Evas_Events "example". */
657 } 660 }
658 values { 661 values {
659 const char* name; /*@ The given name. */ 662 const char *name; /*@ The given name. */
660 } 663 }
661 } 664 }
662 scale { 665 scale {
@@ -725,6 +728,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
725 size { 728 size {
726 set { 729 set {
727 /*@ Changes the size of the given Evas object. */ 730 /*@ Changes the size of the given Evas object. */
731 legacy evas_object_resize;
728 } 732 }
729 get { 733 get {
730 /*@ Retrieves the (rectangular) size of the given Evas object. */ 734 /*@ Retrieves the (rectangular) size of the given Evas object. */
@@ -786,8 +790,10 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
786 } 790 }
787 is_frame_object { 791 is_frame_object {
788 set { 792 set {
793 /*@ @since 1.2 */
789 } 794 }
790 get { 795 get {
796 /*@ @since 1.2 */
791 } 797 }
792 values { 798 values {
793 Eina_Bool is_frame; /*@ in */ 799 Eina_Bool is_frame; /*@ in */
@@ -1007,6 +1013,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1007 position { 1013 position {
1008 set { 1014 set {
1009 /*@ Move the given Evas object to the given location inside its canvas' viewport. */ 1015 /*@ Move the given Evas object to the given location inside its canvas' viewport. */
1016 legacy evas_object_move;
1010 } 1017 }
1011 get { 1018 get {
1012 /*@ Retrieves the position of the given Evas object. */ 1019 /*@ Retrieves the position of the given Evas object. */
@@ -1093,7 +1100,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1093 @see evas_object_smart_data_set() 1100 @see evas_object_smart_data_set()
1094 1101
1095 @ingroup Evas_Smart_Object_Group */ 1102 @ingroup Evas_Smart_Object_Group */
1096 return void*; 1103 return void * @warn_unused;
1097 } 1104 }
1098 } 1105 }
1099 smart_clipped_clipper { 1106 smart_clipped_clipper {
@@ -1107,7 +1114,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1107 properties, like colors. 1114 properties, like colors.
1108 1115
1109 @see evas_object_smart_clipped_smart_add() */ 1116 @see evas_object_smart_clipped_smart_add() */
1110 return Evas_Object*; 1117 return Evas_Object * @warn_unused;
1111 } 1118 }
1112 } 1119 }
1113 below { 1120 below {
@@ -1124,7 +1131,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1124 @see evas_object_layer_get() 1131 @see evas_object_layer_get()
1125 @see evas_object_layer_set() 1132 @see evas_object_layer_set()
1126 @see evas_object_below_get() */ 1133 @see evas_object_below_get() */
1127 return Evas_Object*; 1134 return Evas_Object * @warn_unused;
1128 } 1135 }
1129 } 1136 }
1130 clipees { 1137 clipees {
@@ -1166,7 +1173,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1166 evas_object_show(obj_tmp); 1173 evas_object_show(obj_tmp);
1167 } 1174 }
1168 @endcode */ 1175 @endcode */
1169 return const Eina_List*; 1176 return const Eina_List * @warn_unused;
1170 } 1177 }
1171 } 1178 }
1172 smart_parent { 1179 smart_parent {
@@ -1178,7 +1185,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1178 obj is not a smart member of any 1185 obj is not a smart member of any
1179 1186
1180 @ingroup Evas_Smart_Object_Group */ 1187 @ingroup Evas_Smart_Object_Group */
1181 return Evas_Object*; 1188 return Evas_Object * @warn_unused;
1182 } 1189 }
1183 } 1190 }
1184 above { 1191 above {
@@ -1195,7 +1202,28 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1195 @see evas_object_layer_get() 1202 @see evas_object_layer_get()
1196 @see evas_object_layer_set() 1203 @see evas_object_layer_set()
1197 @see evas_object_below_get() */ 1204 @see evas_object_below_get() */
1198 return Evas_Object*; 1205 return Evas_Object * @warn_unused;
1206 }
1207 }
1208 size_hint_display_mode {
1209 get {
1210 /*@
1211 Retrieves the hints for an object's display mode
1212
1213 These are hints on the display mode @p obj. This is
1214 not a size enforcement in any way, it's just a hint that can be
1215 used whenever appropriate.
1216 This mode can be used object's display mode like commpress or expand */
1217 }
1218 set {
1219 /*@
1220 Sets the hints for an object's disply mode
1221
1222 This is not a size enforcement in any way, it's just a hint that
1223 can be used whenever appropriate.*/
1224 }
1225 values {
1226 Evas_Display_Mode dispmode; /*@ display mode hint */
1199 } 1227 }
1200 } 1228 }
1201 } 1229 }
@@ -1206,8 +1234,9 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1206 1234
1207 @return EINA_TRUE if @p obj clip any object. 1235 @return EINA_TRUE if @p obj clip any object.
1208 @since 1.8 */ 1236 @since 1.8 */
1237
1209 const; 1238 const;
1210 return Eina_Bool; 1239 return Eina_Bool @warn_unused;
1211 } 1240 }
1212 key_grab { 1241 key_grab {
1213 /*@ 1242 /*@
@@ -1249,9 +1278,10 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1249 @see evas_object_focus_get 1278 @see evas_object_focus_get
1250 @see evas_focus_get 1279 @see evas_focus_get
1251 @see evas_key_modifier_add */ 1280 @see evas_key_modifier_add */
1252 return Eina_Bool; 1281
1282 return Eina_Bool @warn_unused;
1253 params { 1283 params {
1254 @in const char* keyname; /*@ the key to request events for. */ 1284 @in const char *keyname @nonull; /*@ the key to request events for. */
1255 @in Evas_Modifier_Mask modifiers; /*@ a mask of modifiers that must be present to 1285 @in Evas_Modifier_Mask modifiers; /*@ a mask of modifiers that must be present to
1256 trigger the event. */ 1286 trigger the event. */
1257 @in Evas_Modifier_Mask not_modifiers; /*@ a mask of modifiers that must @b not be present 1287 @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)
1283 @see evas_object_layer_get() 1313 @see evas_object_layer_get()
1284 @see evas_object_layer_set() 1314 @see evas_object_layer_set()
1285 @see evas_object_stack_below() */ 1315 @see evas_object_stack_below() */
1316
1286 params { 1317 params {
1287 @in Evas_Object* below; /*@ the object below which to stack */ 1318 @in Evas_Object *below @nonull; /*@ the object below which to stack */
1288 } 1319 }
1289 } 1320 }
1290 raise { 1321 raise {
@@ -1297,6 +1328,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1297 @see evas_object_stack_above() 1328 @see evas_object_stack_above()
1298 @see evas_object_stack_below() 1329 @see evas_object_stack_below()
1299 @see evas_object_lower() */ 1330 @see evas_object_lower() */
1331
1300 } 1332 }
1301 stack_above { 1333 stack_above {
1302 /*@ 1334 /*@
@@ -1321,8 +1353,9 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1321 @see evas_object_layer_get() 1353 @see evas_object_layer_get()
1322 @see evas_object_layer_set() 1354 @see evas_object_layer_set()
1323 @see evas_object_stack_below() */ 1355 @see evas_object_stack_below() */
1356
1324 params { 1357 params {
1325 @in Evas_Object* above; /*@ the object above which to stack */ 1358 @in Evas_Object *above @nonull; /*@ the object above which to stack */
1326 } 1359 }
1327 } 1360 }
1328 smart_type_check { 1361 smart_type_check {
@@ -1349,10 +1382,11 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1349 @see eo_isa 1382 @see eo_isa
1350 1383
1351 @ingroup Evas_Smart_Object_Group */ 1384 @ingroup Evas_Smart_Object_Group */
1385
1352 const; 1386 const;
1353 return Eina_Bool; 1387 return Eina_Bool @warn_unused;
1354 params { 1388 params {
1355 @in const char* type; /*@ The @b name (type) of the smart class to check for */ 1389 @in const char *type @nonull; /*@ The @b name (type) of the smart class to check for */
1356 } 1390 }
1357 } 1391 }
1358 name_child_find { 1392 name_child_find {
@@ -1371,10 +1405,11 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1371 @since 1.2 1405 @since 1.2
1372 1406
1373 @ingroup Evas_Object_Group_Find */ 1407 @ingroup Evas_Object_Group_Find */
1408
1374 const; 1409 const;
1375 return Evas_Object*; 1410 return Evas_Object * @warn_unused;
1376 params { 1411 params {
1377 @in const char* name; /*@ The given name. */ 1412 @in const char *name; /*@ The given name. */
1378 @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.). */ 1413 @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.). */
1379 } 1414 }
1380 } 1415 }
@@ -1396,8 +1431,9 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1396 @see evas_object_focus_set 1431 @see evas_object_focus_set
1397 @see evas_object_focus_get 1432 @see evas_object_focus_get
1398 @see evas_focus_get */ 1433 @see evas_focus_get */
1434
1399 params { 1435 params {
1400 @in const char* keyname; /*@ the key the grab is set for. */ 1436 @in const char *keyname @nonull; /*@ the key the grab is set for. */
1401 @in Evas_Modifier_Mask modifiers; /*@ a mask of modifiers that must be present to 1437 @in Evas_Modifier_Mask modifiers; /*@ a mask of modifiers that must be present to
1402 trigger the event. */ 1438 trigger the event. */
1403 @in Evas_Modifier_Mask not_modifiers; /*@ a mask of modifiers that must not not be 1439 @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)
1414 @see evas_object_stack_above() 1450 @see evas_object_stack_above()
1415 @see evas_object_stack_below() 1451 @see evas_object_stack_below()
1416 @see evas_object_raise() */ 1452 @see evas_object_raise() */
1453
1417 } 1454 }
1418 clip_unset { 1455 clip_unset {
1419 /*@ 1456 /*@
@@ -1426,6 +1463,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1426 1463
1427 See also evas_object_clip_set() (for an example), 1464 See also evas_object_clip_set() (for an example),
1428 evas_object_clipees_get() and evas_object_clip_get(). */ 1465 evas_object_clipees_get() and evas_object_clip_get(). */
1466
1429 } 1467 }
1430 smart_move_children_relative { 1468 smart_move_children_relative {
1431 /*@ 1469 /*@
@@ -1439,6 +1477,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1439 1477
1440 @note Clipped smart objects already make use of this function on 1478 @note Clipped smart objects already make use of this function on
1441 their @c move() smart function definition. */ 1479 their @c move() smart function definition. */
1480
1442 params { 1481 params {
1443 @in Evas_Coord dx; /*@ horizontal offset (delta). */ 1482 @in Evas_Coord dx; /*@ horizontal offset (delta). */
1444 @in Evas_Coord dy; /*@ vertical offset (delta). */ 1483 @in Evas_Coord dy; /*@ vertical offset (delta). */
@@ -1456,10 +1495,11 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1456 @see eo_isa 1495 @see eo_isa
1457 1496
1458 @ingroup Evas_Smart_Object_Group */ 1497 @ingroup Evas_Smart_Object_Group */
1498
1459 const; 1499 const;
1460 return Eina_Bool; 1500 return Eina_Bool @warn_unused;
1461 params { 1501 params {
1462 @in const char* type; /*@ The type (name string) to check for. Must be the name */ 1502 @in const char *type @nonull; /*@ The type (name string) to check for. Must be the name */
1463 } 1503 }
1464 } 1504 }
1465 } 1505 }
@@ -1469,4 +1509,5 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
1469 Eo_Base::dbg_info_get; 1509 Eo_Base::dbg_info_get;
1470 Evas_Common_Interface::evas::get; 1510 Evas_Common_Interface::evas::get;
1471 } 1511 }
1512
1472} 1513}
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index cc6c59c..a8edc7c 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);
9 9
10#define MY_CLASS_NAME "Evas_Object" 10#define MY_CLASS_NAME "Evas_Object"
11 11
12EAPI Eo_Op EVAS_OBJ_BASE_ID = EO_NOOP;
13
14static void 12static void
15_show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj); 13_show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj);
16static void 14static void
@@ -64,16 +62,13 @@ _init_cow(void)
64 return EINA_TRUE; 62 return EINA_TRUE;
65} 63}
66 64
67static void 65EOLIAN static void
68_constructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) 66_evas_object_constructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
69{ 67{
70 Evas_Object_Protected_Data *obj;
71
72 eo_do_super(eo_obj, MY_CLASS, eo_constructor()); 68 eo_do_super(eo_obj, MY_CLASS, eo_constructor());
73 eo_do(eo_obj, evas_obj_type_set(MY_CLASS_NAME)); 69 eo_do(eo_obj, evas_obj_type_set(MY_CLASS_NAME));
74 eo_manual_free_set(eo_obj, EINA_TRUE); 70 eo_manual_free_set(eo_obj, EINA_TRUE);
75 71
76 obj = _pd;
77 if (!obj || !_init_cow()) 72 if (!obj || !_init_cow())
78 { 73 {
79 eo_error_set(eo_obj); 74 eo_error_set(eo_obj);
@@ -614,13 +609,12 @@ evas_object_del(Evas_Object *eo_obj)
614// eo_del(eo_obj); 609// eo_del(eo_obj);
615} 610}
616 611
617static void 612EOLIAN static void
618_destructor(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED) 613_evas_object_destructor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
619{ 614{
620 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 615 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
621 return; 616 return;
622 MAGIC_CHECK_END(); 617 MAGIC_CHECK_END();
623 Evas_Object_Protected_Data *obj = _pd;
624 Evas_Object *proxy; 618 Evas_Object *proxy;
625 Eina_List *l, *l2; 619 Eina_List *l, *l2;
626 620
@@ -696,22 +690,9 @@ evas_object_geometry_set(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y, Evas_C
696 evas_obj_size_set(w, h)); 690 evas_obj_size_set(w, h));
697} 691}
698 692
699EAPI void 693EOLIAN static void
700evas_object_move(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y) 694_evas_object_position_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord x, Evas_Coord y)
701{
702 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
703 return;
704 MAGIC_CHECK_END();
705 eo_do(eo_obj, evas_obj_position_set(x, y));
706}
707
708static void
709_position_set(Eo *eo_obj, void *_pd, va_list *list)
710{ 695{
711 Evas_Object_Protected_Data *obj = _pd;
712
713 Evas_Coord x = va_arg(*list, Evas_Coord);
714 Evas_Coord y = va_arg(*list, Evas_Coord);
715 696
716 Eina_Bool is, was = EINA_FALSE; 697 Eina_Bool is, was = EINA_FALSE;
717 Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE; 698 Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
@@ -783,22 +764,9 @@ _position_set(Eo *eo_obj, void *_pd, va_list *list)
783 evas_object_inform_call_move(eo_obj, obj); 764 evas_object_inform_call_move(eo_obj, obj);
784} 765}
785 766
786EAPI void 767EOLIAN static void
787evas_object_resize(Evas_Object *eo_obj, Evas_Coord w, Evas_Coord h) 768_evas_object_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h)
788{
789 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
790 return;
791 MAGIC_CHECK_END();
792 eo_do(eo_obj, evas_obj_size_set(w, h));
793}
794
795static void
796_size_set(Eo *eo_obj, void *_pd, va_list *list)
797{ 769{
798 Evas_Object_Protected_Data *obj = _pd;
799
800 Evas_Coord w = va_arg(*list, Evas_Coord);
801 Evas_Coord h = va_arg(*list, Evas_Coord);
802 Eina_Bool is, was = EINA_FALSE; 770 Eina_Bool is, was = EINA_FALSE;
803 Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE; 771 Eina_Bool pass = EINA_FALSE, freeze = EINA_FALSE;
804 Eina_Bool source_invisible = EINA_FALSE; 772 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
883 eo_do((Eo *)eo_obj, evas_obj_position_get(x, y), evas_obj_size_get(w, h)); 851 eo_do((Eo *)eo_obj, evas_obj_position_get(x, y), evas_obj_size_get(w, h));
884} 852}
885 853
886static void 854EOLIAN static void
887_position_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list) 855_evas_object_position_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *x, Evas_Coord *y)
888{ 856{
889 const Evas_Object_Protected_Data *obj = _pd;
890
891 Evas_Coord *x = va_arg(*list, Evas_Coord *);
892 Evas_Coord *y = va_arg(*list, Evas_Coord *);
893
894 if ((obj->delete_me) || (!obj->layer)) 857 if ((obj->delete_me) || (!obj->layer))
895 { 858 {
896 if (x) *x = 0; if (y) *y = 0; 859 if (x) *x = 0; if (y) *y = 0;
@@ -901,14 +864,9 @@ _position_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
901 if (y) *y = obj->cur->geometry.y; 864 if (y) *y = obj->cur->geometry.y;
902} 865}
903 866
904static void 867EOLIAN static void
905_size_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list) 868_evas_object_size_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h)
906{ 869{
907 const Evas_Object_Protected_Data *obj = _pd;
908
909 Evas_Coord *w = va_arg(*list, Evas_Coord *);
910 Evas_Coord *h = va_arg(*list, Evas_Coord *);
911
912 if (obj->delete_me) 870 if (obj->delete_me)
913 { 871 {
914 if (w) *w = 0; if (h) *h = 0; 872 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
935 obj->size_hints->dispmode = EVAS_DISPLAY_MODE_NONE; 893 obj->size_hints->dispmode = EVAS_DISPLAY_MODE_NONE;
936} 894}
937 895
938EAPI Evas_Display_Mode 896EOLIAN static Evas_Display_Mode
939evas_object_size_hint_display_mode_get(const Evas_Object *eo_obj) 897_evas_object_size_hint_display_mode_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
940{ 898{
941 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
942 return EVAS_DISPLAY_MODE_NONE;
943 MAGIC_CHECK_END();
944 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
945 if (!obj) return EVAS_DISPLAY_MODE_NONE; 899 if (!obj) return EVAS_DISPLAY_MODE_NONE;
946 if ((!obj->size_hints) || obj->delete_me) 900 if ((!obj->size_hints) || obj->delete_me)
947 return EVAS_DISPLAY_MODE_NONE; 901 return EVAS_DISPLAY_MODE_NONE;
948 return obj->size_hints->dispmode; 902 return obj->size_hints->dispmode;
949} 903}
950 904
951EAPI void 905EOLIAN static void
952evas_object_size_hint_display_mode_set(Evas_Object *eo_obj, Evas_Display_Mode dispmode) 906_evas_object_size_hint_display_mode_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Display_Mode dispmode)
953{ 907{
954 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
955 return;
956 MAGIC_CHECK_END();
957 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, MY_CLASS);
958 if (!obj) return; 908 if (!obj) return;
959 if (obj->delete_me) return; 909 if (obj->delete_me) return;
960 _evas_object_size_hint_alloc(eo_obj, obj); 910 _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
964 evas_object_inform_call_changed_size_hints(eo_obj); 914 evas_object_inform_call_changed_size_hints(eo_obj);
965} 915}
966 916
967EAPI void 917EOLIAN static void
968evas_object_size_hint_min_get(const Evas_Object *eo_obj, Evas_Coord *w, Evas_Coord *h) 918_evas_object_size_hint_min_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h)
969{ 919{
970 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
971 if (w) *w = 0; if (h) *h = 0;
972 return;
973 MAGIC_CHECK_END();
974 eo_do((Eo *)eo_obj, evas_obj_size_hint_min_get(w, h));
975}
976
977static void
978_size_hint_min_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
979{
980 const Evas_Object_Protected_Data *obj = _pd;
981
982 Evas_Coord *w = va_arg(*list, Evas_Coord *);
983 Evas_Coord *h = va_arg(*list, Evas_Coord *);
984
985 if ((!obj->size_hints) || obj->delete_me) 920 if ((!obj->size_hints) || obj->delete_me)
986 { 921 {
987 if (w) *w = 0; if (h) *h = 0; 922 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)
991 if (h) *h = obj->size_hints->min.h; 926 if (h) *h = obj->size_hints->min.h;
992} 927}
993 928
994EAPI void 929EOLIAN static void
995evas_object_size_hint_min_set(Evas_Object *eo_obj, Evas_Coord w, Evas_Coord h) 930_evas_object_size_hint_min_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h)
996{
997 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
998 return;
999 MAGIC_CHECK_END();
1000 eo_do(eo_obj, evas_obj_size_hint_min_set(w, h));
1001}
1002
1003static void
1004_size_hint_min_set(Eo *eo_obj, void *_pd, va_list *list)
1005{ 931{
1006 Evas_Object_Protected_Data *obj = _pd;
1007
1008 Evas_Coord w = va_arg(*list, Evas_Coord);
1009 Evas_Coord h = va_arg(*list, Evas_Coord);
1010
1011 if (obj->delete_me) 932 if (obj->delete_me)
1012 return; 933 return;
1013 _evas_object_size_hint_alloc(eo_obj, obj); 934 _evas_object_size_hint_alloc(eo_obj, obj);
@@ -1018,24 +939,9 @@ _size_hint_min_set(Eo *eo_obj, void *_pd, va_list *list)
1018 evas_object_inform_call_changed_size_hints(eo_obj); 939 evas_object_inform_call_changed_size_hints(eo_obj);
1019} 940}
1020 941
1021EAPI void 942EOLIAN static void
1022evas_object_size_hint_max_get(const Evas_Object *eo_obj, Evas_Coord *w, Evas_Coord *h) 943_evas_object_size_hint_max_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h)
1023{ 944{
1024 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1025 if (w) *w = -1; if (h) *h = -1;
1026 return;
1027 MAGIC_CHECK_END();
1028 eo_do((Eo *)eo_obj, evas_obj_size_hint_max_get(w, h));
1029}
1030
1031static void
1032_size_hint_max_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
1033{
1034 const Evas_Object_Protected_Data *obj = _pd;
1035
1036 Evas_Coord *w = va_arg(*list, Evas_Coord *);
1037 Evas_Coord *h = va_arg(*list, Evas_Coord *);
1038
1039 if ((!obj->size_hints) || obj->delete_me) 945 if ((!obj->size_hints) || obj->delete_me)
1040 { 946 {
1041 if (w) *w = -1; if (h) *h = -1; 947 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)
1045 if (h) *h = obj->size_hints->max.h; 951 if (h) *h = obj->size_hints->max.h;
1046} 952}
1047 953
1048EAPI void 954EOLIAN static void
1049evas_object_size_hint_max_set(Evas_Object *eo_obj, Evas_Coord w, Evas_Coord h) 955_evas_object_size_hint_max_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h)
1050{
1051 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1052 return;
1053 MAGIC_CHECK_END();
1054 eo_do(eo_obj, evas_obj_size_hint_max_set(w, h));
1055}
1056
1057static void
1058_size_hint_max_set(Eo *eo_obj, void *_pd, va_list *list)
1059{ 956{
1060 Evas_Object_Protected_Data *obj = _pd;
1061
1062 Evas_Coord w = va_arg(*list, Evas_Coord);
1063 Evas_Coord h = va_arg(*list, Evas_Coord);
1064
1065 if (obj->delete_me) 957 if (obj->delete_me)
1066 return; 958 return;
1067 _evas_object_size_hint_alloc(eo_obj, obj); 959 _evas_object_size_hint_alloc(eo_obj, obj);
@@ -1072,24 +964,9 @@ _size_hint_max_set(Eo *eo_obj, void *_pd, va_list *list)
1072 evas_object_inform_call_changed_size_hints(eo_obj); 964 evas_object_inform_call_changed_size_hints(eo_obj);
1073} 965}
1074 966
1075EAPI void 967EOLIAN static void
1076evas_object_size_hint_request_get(const Evas_Object *eo_obj, Evas_Coord *w, Evas_Coord *h) 968_evas_object_size_hint_request_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Coord *w, Evas_Coord *h)
1077{
1078 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1079 if (w) *w = 0; if (h) *h = 0;
1080 return;
1081 MAGIC_CHECK_END();
1082 eo_do((Eo *)eo_obj, evas_obj_size_hint_request_get(w, h));
1083}
1084
1085static void
1086_size_hint_request_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
1087{ 969{
1088 const Evas_Object_Protected_Data *obj = _pd;
1089
1090 Evas_Coord *w = va_arg(*list, Evas_Coord *);
1091 Evas_Coord *h = va_arg(*list, Evas_Coord *);
1092
1093 if ((!obj->size_hints) || obj->delete_me) 970 if ((!obj->size_hints) || obj->delete_me)
1094 { 971 {
1095 if (w) *w = 0; if (h) *h = 0; 972 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)
1099 if (h) *h = obj->size_hints->request.h; 976 if (h) *h = obj->size_hints->request.h;
1100} 977}
1101 978
1102EAPI void 979EOLIAN static void
1103evas_object_size_hint_request_set(Evas_Object *eo_obj, Evas_Coord w, Evas_Coord h) 980_evas_object_size_hint_request_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Coord w, Evas_Coord h)
1104{
1105 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1106 return;
1107 MAGIC_CHECK_END();
1108 eo_do(eo_obj, evas_obj_size_hint_request_set(w, h));
1109}
1110
1111static void
1112_size_hint_request_set(Eo *eo_obj, void *_pd, va_list *list)
1113{ 981{
1114 Evas_Object_Protected_Data *obj = _pd;
1115
1116 Evas_Coord w = va_arg(*list, Evas_Coord);
1117 Evas_Coord h = va_arg(*list, Evas_Coord);
1118
1119 if (obj->delete_me) 982 if (obj->delete_me)
1120 return; 983 return;
1121 _evas_object_size_hint_alloc(eo_obj, obj); 984 _evas_object_size_hint_alloc(eo_obj, obj);
@@ -1126,26 +989,9 @@ _size_hint_request_set(Eo *eo_obj, void *_pd, va_list *list)
1126 evas_object_inform_call_changed_size_hints(eo_obj); 989 evas_object_inform_call_changed_size_hints(eo_obj);
1127} 990}
1128 991
1129EAPI void 992EOLIAN static void
1130evas_object_size_hint_aspect_get(const Evas_Object *eo_obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h) 993_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)
1131{
1132 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1133 if (aspect) *aspect = EVAS_ASPECT_CONTROL_NONE;
1134 if (w) *w = 0; if (h) *h = 0;
1135 return;
1136 MAGIC_CHECK_END();
1137 eo_do((Eo *)eo_obj, evas_obj_size_hint_aspect_get(aspect, w, h));
1138}
1139
1140static void
1141_size_hint_aspect_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
1142{ 994{
1143 const Evas_Object_Protected_Data *obj = _pd;
1144
1145 Evas_Aspect_Control *aspect = va_arg(*list, Evas_Aspect_Control*);
1146 Evas_Coord *w = va_arg(*list, Evas_Coord *);
1147 Evas_Coord *h = va_arg(*list, Evas_Coord *);
1148
1149 if ((!obj->size_hints) || obj->delete_me) 995 if ((!obj->size_hints) || obj->delete_me)
1150 { 996 {
1151 if (aspect) *aspect = EVAS_ASPECT_CONTROL_NONE; 997 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)
1157 if (h) *h = obj->size_hints->aspect.size.h; 1003 if (h) *h = obj->size_hints->aspect.size.h;
1158} 1004}
1159 1005
1160EAPI void 1006EOLIAN static void
1161evas_object_size_hint_aspect_set(Evas_Object *eo_obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h) 1007_evas_object_size_hint_aspect_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h)
1162{
1163 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1164 return;
1165 MAGIC_CHECK_END();
1166 eo_do(eo_obj, evas_obj_size_hint_aspect_set(aspect, w, h));
1167}
1168
1169static void
1170_size_hint_aspect_set(Eo *eo_obj, void *_pd, va_list *list)
1171{ 1008{
1172 Evas_Object_Protected_Data *obj = _pd;
1173
1174 Evas_Aspect_Control aspect = va_arg(*list, Evas_Aspect_Control);
1175 Evas_Coord w = va_arg(*list, Evas_Coord);
1176 Evas_Coord h = va_arg(*list, Evas_Coord);
1177
1178 if (obj->delete_me) 1009 if (obj->delete_me)
1179 return; 1010 return;
1180 _evas_object_size_hint_alloc(eo_obj, obj); 1011 _evas_object_size_hint_alloc(eo_obj, obj);
@@ -1186,24 +1017,9 @@ _size_hint_aspect_set(Eo *eo_obj, void *_pd, va_list *list)
1186 evas_object_inform_call_changed_size_hints(eo_obj); 1017 evas_object_inform_call_changed_size_hints(eo_obj);
1187} 1018}
1188 1019
1189EAPI void 1020EOLIAN static void
1190evas_object_size_hint_align_get(const Evas_Object *eo_obj, double *x, double *y) 1021_evas_object_size_hint_align_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y)
1191{ 1022{
1192 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1193 if (x) *x = 0.5; if (y) *y = 0.5;
1194 return;
1195 MAGIC_CHECK_END();
1196 eo_do((Eo *)eo_obj, evas_obj_size_hint_align_get(x, y));
1197}
1198
1199static void
1200_size_hint_align_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
1201{
1202 const Evas_Object_Protected_Data *obj = _pd;
1203
1204 double *x = va_arg(*list, double *);
1205 double *y = va_arg(*list, double *);
1206
1207 if ((!obj->size_hints) || obj->delete_me) 1023 if ((!obj->size_hints) || obj->delete_me)
1208 { 1024 {
1209 if (x) *x = 0.5; if (y) *y = 0.5; 1025 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)
1213 if (y) *y = obj->size_hints->align.y; 1029 if (y) *y = obj->size_hints->align.y;
1214} 1030}
1215 1031
1216EAPI void 1032EOLIAN static void
1217evas_object_size_hint_align_set(Evas_Object *eo_obj, double x, double y) 1033_evas_object_size_hint_align_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y)
1218{
1219 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1220 return;
1221 MAGIC_CHECK_END();
1222 eo_do(eo_obj, evas_obj_size_hint_align_set(x, y));
1223}
1224
1225static void
1226_size_hint_align_set(Eo *eo_obj, void *_pd, va_list *list)
1227{ 1034{
1228 Evas_Object_Protected_Data *obj = _pd;
1229
1230 double x = va_arg(*list, double);
1231 double y = va_arg(*list, double);
1232
1233 if (obj->delete_me) 1035 if (obj->delete_me)
1234 return; 1036 return;
1235 _evas_object_size_hint_alloc(eo_obj, obj); 1037 _evas_object_size_hint_alloc(eo_obj, obj);
@@ -1240,24 +1042,9 @@ _size_hint_align_set(Eo *eo_obj, void *_pd, va_list *list)
1240 evas_object_inform_call_changed_size_hints(eo_obj); 1042 evas_object_inform_call_changed_size_hints(eo_obj);
1241} 1043}
1242 1044
1243EAPI void 1045EOLIAN static void
1244evas_object_size_hint_weight_get(const Evas_Object *eo_obj, double *x, double *y) 1046_evas_object_size_hint_weight_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, double *x, double *y)
1245{ 1047{
1246 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1247 if (x) *x = 0.0; if (y) *y = 0.0;
1248 return;
1249 MAGIC_CHECK_END();
1250 eo_do((Eo *)eo_obj, evas_obj_size_hint_weight_get(x, y));
1251}
1252
1253static void
1254_size_hint_weight_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
1255{
1256 const Evas_Object_Protected_Data *obj = _pd;
1257
1258 double *x = va_arg(*list, double *);
1259 double *y = va_arg(*list, double *);
1260
1261 if ((!obj->size_hints) || obj->delete_me) 1048 if ((!obj->size_hints) || obj->delete_me)
1262 { 1049 {
1263 if (x) *x = 0.0; if (y) *y = 0.0; 1050 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)
1267 if (y) *y = obj->size_hints->weight.y; 1054 if (y) *y = obj->size_hints->weight.y;
1268} 1055}
1269 1056
1270EAPI void 1057EOLIAN static void
1271evas_object_size_hint_weight_set(Evas_Object *eo_obj, double x, double y) 1058_evas_object_size_hint_weight_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double x, double y)
1272{ 1059{
1273 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1274 return;
1275 MAGIC_CHECK_END();
1276 eo_do(eo_obj, evas_obj_size_hint_weight_set(x, y));
1277}
1278
1279static void
1280_size_hint_weight_set(Eo *eo_obj, void *_pd, va_list *list)
1281{
1282 Evas_Object_Protected_Data *obj = _pd;
1283
1284 double x = va_arg(*list, double);
1285 double y = va_arg(*list, double);
1286
1287 if (obj->delete_me) 1060 if (obj->delete_me)
1288 return; 1061 return;
1289 _evas_object_size_hint_alloc(eo_obj, obj); 1062 _evas_object_size_hint_alloc(eo_obj, obj);
@@ -1294,27 +1067,9 @@ _size_hint_weight_set(Eo *eo_obj, void *_pd, va_list *list)
1294 evas_object_inform_call_changed_size_hints(eo_obj); 1067 evas_object_inform_call_changed_size_hints(eo_obj);
1295} 1068}
1296 1069
1297EAPI void 1070EOLIAN static void
1298evas_object_size_hint_padding_get(const Evas_Object *eo_obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) 1071_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)
1299{
1300 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1301 if (l) *l = 0; if (r) *r = 0;
1302 if (t) *t = 0; if (b) *b = 0;
1303 return;
1304 MAGIC_CHECK_END();
1305 eo_do((Eo *)eo_obj, evas_obj_size_hint_padding_get(l, r, t, b));
1306}
1307
1308static void
1309_size_hint_padding_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
1310{ 1072{
1311 const Evas_Object_Protected_Data *obj = _pd;
1312
1313 Evas_Coord *l = va_arg(*list, Evas_Coord *);
1314 Evas_Coord *r = va_arg(*list, Evas_Coord *);
1315 Evas_Coord *t = va_arg(*list, Evas_Coord *);
1316 Evas_Coord *b = va_arg(*list, Evas_Coord *);
1317
1318 if ((!obj->size_hints) || obj->delete_me) 1073 if ((!obj->size_hints) || obj->delete_me)
1319 { 1074 {
1320 if (l) *l = 0; if (r) *r = 0; 1075 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)
1327 if (b) *b = obj->size_hints->padding.b; 1082 if (b) *b = obj->size_hints->padding.b;
1328} 1083}
1329 1084
1330EAPI void 1085EOLIAN static void
1331evas_object_size_hint_padding_set(Evas_Object *eo_obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b) 1086_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)
1332{
1333 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1334 return;
1335 MAGIC_CHECK_END();
1336 eo_do(eo_obj, evas_obj_size_hint_padding_set(l, r, t, b));
1337}
1338
1339static void
1340_size_hint_padding_set(Eo *eo_obj, void *_pd, va_list *list)
1341{ 1087{
1342 Evas_Object_Protected_Data *obj = _pd;
1343
1344 Evas_Coord l = va_arg(*list, Evas_Coord);
1345 Evas_Coord r = va_arg(*list, Evas_Coord);
1346 Evas_Coord t = va_arg(*list, Evas_Coord);
1347 Evas_Coord b = va_arg(*list, Evas_Coord);
1348
1349 if (obj->delete_me) 1088 if (obj->delete_me)
1350 return; 1089 return;
1351 _evas_object_size_hint_alloc(eo_obj, obj); 1090 _evas_object_size_hint_alloc(eo_obj, obj);
@@ -1375,10 +1114,8 @@ evas_object_hide(Evas_Object *eo_obj)
1375} 1114}
1376 1115
1377static void 1116static void
1378_visible_set(Eo *eo_obj, void *_pd, va_list *list) 1117_evas_object_visibility_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool visible)
1379{ 1118{
1380 Evas_Object_Protected_Data *obj = _pd;
1381 Eina_Bool visible = va_arg(*list, int);
1382 if (visible) _show(eo_obj, obj); 1119 if (visible) _show(eo_obj, obj);
1383 else _hide(eo_obj, obj); 1120 else _hide(eo_obj, obj);
1384} 1121}
@@ -1530,50 +1267,16 @@ _hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
1530 evas_object_inform_call_hide(eo_obj); 1267 evas_object_inform_call_hide(eo_obj);
1531} 1268}
1532 1269
1533EAPI Eina_Bool 1270static Eina_Bool
1534evas_object_visible_get(const Evas_Object *eo_obj) 1271_evas_object_visibility_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
1535{
1536 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1537 return 0;
1538 MAGIC_CHECK_END();
1539 Eina_Bool visible = EINA_FALSE;
1540 eo_do((Eo *)eo_obj, evas_obj_visibility_get(&visible));
1541 return visible;
1542}
1543
1544static void
1545_visible_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
1546{
1547 Eina_Bool* visible = va_arg(*list, Eina_Bool *);
1548 const Evas_Object_Protected_Data *obj = _pd;
1549 if (obj->delete_me)
1550 {
1551 if (visible) *visible = EINA_FALSE;
1552 return;
1553 }
1554
1555 if (visible) *visible = obj->cur->visible;
1556}
1557
1558EAPI void
1559evas_object_color_set(Evas_Object *eo_obj, int r, int g, int b, int a)
1560{ 1272{
1561 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 1273 if (obj->delete_me) return EINA_FALSE;
1562 return; 1274 return obj->cur->visible;
1563 MAGIC_CHECK_END();
1564 eo_do(eo_obj, evas_obj_color_set(r, g, b, a));
1565} 1275}
1566 1276
1567static void 1277EOLIAN static void
1568_color_set(Eo *eo_obj, void *_pd, va_list *list) 1278_evas_object_color_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, int r, int g, int b, int a)
1569{ 1279{
1570 Evas_Object_Protected_Data *obj = _pd;
1571
1572 int r = va_arg(*list, int);
1573 int g = va_arg(*list, int);
1574 int b = va_arg(*list, int);
1575 int a = va_arg(*list, int);
1576
1577 if (obj->delete_me) return; 1280 if (obj->delete_me) return;
1578 if (r > 255) r = 255; if (r < 0) r = 0; 1281 if (r > 255) r = 255; if (r < 0) r = 0;
1579 if (g > 255) g = 255; if (g < 0) g = 0; 1282 if (g > 255) g = 255; if (g < 0) g = 0;
@@ -1626,25 +1329,9 @@ _color_set(Eo *eo_obj, void *_pd, va_list *list)
1626 evas_object_change(eo_obj, obj); 1329 evas_object_change(eo_obj, obj);
1627} 1330}
1628 1331
1629EAPI void 1332EOLIAN static void
1630evas_object_color_get(const Evas_Object *eo_obj, int *r, int *g, int *b, int *a) 1333_evas_object_color_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, int *r, int *g, int *b, int *a)
1631{ 1334{
1632 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1633 if (r) *r = 0; if (g) *g = 0; if (b) *b = 0; if (a) *a = 0;
1634 return;
1635 MAGIC_CHECK_END();
1636 eo_do((Eo *)eo_obj, evas_obj_color_get(r, g, b, a));
1637}
1638
1639static void
1640_color_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
1641{
1642 const Evas_Object_Protected_Data *obj = _pd;
1643
1644 int* r = va_arg(*list, int *);
1645 int* g = va_arg(*list, int *);
1646 int* b = va_arg(*list, int *);
1647 int* a = va_arg(*list, int *);
1648 if (obj->delete_me) 1335 if (obj->delete_me)
1649 { 1336 {
1650 if (r) *r = 0; if (g) *g = 0; if (b) *b = 0; if (a) *a = 0; 1337 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)
1656 if (a) *a = obj->cur->color.a; 1343 if (a) *a = obj->cur->color.a;
1657} 1344}
1658 1345
1659EAPI void 1346EOLIAN static void
1660evas_object_anti_alias_set(Evas_Object *eo_obj, Eina_Bool anti_alias) 1347_evas_object_anti_alias_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool anti_alias)
1661{
1662 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1663 return;
1664 MAGIC_CHECK_END();
1665 eo_do(eo_obj, evas_obj_anti_alias_set(anti_alias));
1666}
1667
1668static void
1669_anti_alias_set(Eo *eo_obj, void *_pd, va_list *list)
1670{ 1348{
1671 Evas_Object_Protected_Data *obj = _pd;
1672 Eina_Bool anti_alias = va_arg(*list, int);
1673
1674 if (obj->delete_me) return; 1349 if (obj->delete_me) return;
1675 anti_alias = !!anti_alias; 1350 anti_alias = !!anti_alias;
1676 if (obj->cur->anti_alias == anti_alias)return; 1351 if (obj->cur->anti_alias == anti_alias)return;
@@ -1684,47 +1359,16 @@ _anti_alias_set(Eo *eo_obj, void *_pd, va_list *list)
1684 evas_object_change(eo_obj, obj); 1359 evas_object_change(eo_obj, obj);
1685} 1360}
1686 1361
1687EAPI Eina_Bool 1362EOLIAN static Eina_Bool
1688evas_object_anti_alias_get(const Evas_Object *eo_obj) 1363_evas_object_anti_alias_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
1689{ 1364{
1690 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 1365 if (obj->delete_me) return EINA_FALSE;
1691 return 0; 1366 return obj->cur->anti_alias;
1692 MAGIC_CHECK_END();
1693 Eina_Bool anti_alias = EINA_FALSE;
1694 eo_do((Eo *)eo_obj, evas_obj_anti_alias_get(&anti_alias));
1695 return anti_alias;
1696} 1367}
1697 1368
1698static void 1369EOLIAN static void
1699_anti_alias_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list) 1370_evas_object_scale_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, double scale)
1700{ 1371{
1701 Eina_Bool* anti_alias = va_arg(*list, Eina_Bool *);
1702
1703 const Evas_Object_Protected_Data *obj = _pd;
1704 if (obj->delete_me)
1705 {
1706 if (anti_alias) *anti_alias = EINA_FALSE;
1707 return;
1708 }
1709
1710 if (anti_alias) *anti_alias = obj->cur->anti_alias;
1711}
1712
1713EAPI void
1714evas_object_scale_set(Evas_Object *eo_obj, double scale)
1715{
1716 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1717 return;
1718 MAGIC_CHECK_END();
1719 eo_do(eo_obj, evas_obj_scale_set(scale));
1720}
1721
1722static void
1723_scale_set(Eo *eo_obj, void *_pd, va_list *list)
1724{
1725 Evas_Object_Protected_Data *obj = _pd;
1726
1727 double scale = va_arg(*list, double);
1728 if (obj->delete_me) return; 1372 if (obj->delete_me) return;
1729 if (obj->cur->scale == scale) return; 1373 if (obj->cur->scale == scale) return;
1730 1374
@@ -1738,46 +1382,16 @@ _scale_set(Eo *eo_obj, void *_pd, va_list *list)
1738 if (obj->func->scale_update) obj->func->scale_update(eo_obj, obj, obj->private_data); 1382 if (obj->func->scale_update) obj->func->scale_update(eo_obj, obj, obj->private_data);
1739} 1383}
1740 1384
1741EAPI double 1385EOLIAN static double
1742evas_object_scale_get(const Evas_Object *eo_obj) 1386_evas_object_scale_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
1743{ 1387{
1744 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 1388 if (obj->delete_me) return 1.0;
1745 return 0; 1389 return obj->cur->scale;
1746 MAGIC_CHECK_END();
1747 double scale = 1.0;
1748 eo_do((Eo *)eo_obj, evas_obj_scale_get(&scale));
1749 return scale;
1750}
1751
1752static void
1753_scale_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
1754{
1755 const Evas_Object_Protected_Data *obj = _pd;
1756
1757 double* scale = va_arg(*list, double*);
1758 if (obj->delete_me)
1759 {
1760 if (scale) *scale = 1.0;
1761 return;
1762 }
1763 if (scale) *scale = obj->cur->scale;
1764} 1390}
1765 1391
1766EAPI void 1392EOLIAN static void
1767evas_object_render_op_set(Evas_Object *eo_obj, Evas_Render_Op render_op) 1393_evas_object_render_op_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Render_Op render_op)
1768{ 1394{
1769 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1770 return;
1771 MAGIC_CHECK_END();
1772 eo_do(eo_obj, evas_obj_render_op_set(render_op));
1773}
1774
1775static void
1776_render_op_set(Eo *eo_obj, void *_pd, va_list *list)
1777{
1778 Evas_Object_Protected_Data *obj = _pd;
1779
1780 Evas_Render_Op render_op = va_arg(*list, Evas_Render_Op);
1781 if (obj->delete_me) return; 1395 if (obj->delete_me) return;
1782 if (obj->cur->render_op == render_op) return; 1396 if (obj->cur->render_op == render_op) return;
1783 1397
@@ -1790,29 +1404,11 @@ _render_op_set(Eo *eo_obj, void *_pd, va_list *list)
1790 evas_object_change(eo_obj, obj); 1404 evas_object_change(eo_obj, obj);
1791} 1405}
1792 1406
1793EAPI Evas_Render_Op 1407EOLIAN static Evas_Render_Op
1794evas_object_render_op_get(const Evas_Object *eo_obj) 1408_evas_object_render_op_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
1795{
1796 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1797 return 0;
1798 MAGIC_CHECK_END();
1799 Evas_Render_Op render_op = EVAS_RENDER_BLEND;
1800 eo_do((Eo *)eo_obj, evas_obj_render_op_get(&render_op));
1801 return render_op;
1802}
1803
1804static void
1805_render_op_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
1806{ 1409{
1807 const Evas_Object_Protected_Data *obj = _pd; 1410 if (obj->delete_me) return EVAS_RENDER_BLEND;
1808 Evas_Render_Op* render_op = va_arg(*list, Evas_Render_Op *); 1411 return obj->cur->render_op;
1809
1810 if (obj->delete_me)
1811 {
1812 if (render_op) *render_op = EVAS_RENDER_BLEND;
1813 return;
1814 }
1815 if (render_op) *render_op = obj->cur->render_op;
1816} 1412}
1817 1413
1818EAPI Evas * 1414EAPI Evas *
@@ -1826,10 +1422,9 @@ evas_object_evas_get(const Evas_Object *eo_obj)
1826 return eo_evas; 1422 return eo_evas;
1827} 1423}
1828 1424
1829static void 1425EOLIAN static void
1830_dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) 1426_evas_object_eo_base_dbg_info_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Eo_Dbg_Info *root)
1831{ 1427{
1832 Eo_Dbg_Info *root = (Eo_Dbg_Info *) va_arg(*list, Eo_Dbg_Info *);
1833 eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root)); 1428 eo_do_super(eo_obj, MY_CLASS, eo_dbg_info_get(root));
1834 Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME); 1429 Eo_Dbg_Info *group = EO_DBG_INFO_LIST_APPEND(root, MY_CLASS_NAME);
1835 Eo_Dbg_Info *node; 1430 Eo_Dbg_Info *node;
@@ -1977,18 +1572,11 @@ _dbg_info_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
1977 } 1572 }
1978} 1573}
1979 1574
1980static void 1575static Evas *
1981_evas_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list) 1576_evas_object_evas_common_interface_evas_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
1982{ 1577{
1983 const Evas_Object_Protected_Data *obj = _pd; 1578 if ((obj->delete_me) || (!obj->layer)) return NULL;
1984 Evas **evas = va_arg(*list, Evas **); 1579 return obj->layer->evas->evas;
1985
1986 if ((obj->delete_me) || (!obj->layer))
1987 {
1988 *evas = NULL;
1989 return;
1990 }
1991 *evas = obj->layer->evas->evas;
1992} 1580}
1993 1581
1994EAPI Evas_Object * 1582EAPI Evas_Object *
@@ -2240,117 +1828,41 @@ _canvas_objects_in_rectangle_get(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
2240 *ret = in; 1828 *ret = in;
2241} 1829}
2242 1830
2243EAPI const char * 1831EOLIAN static const char *
2244evas_object_type_get(const Evas_Object *eo_obj) 1832_evas_object_type_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
2245{
2246 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
2247 return NULL;
2248 MAGIC_CHECK_END();
2249 const char *type = NULL;
2250 eo_do((Eo *)eo_obj, evas_obj_type_get(&type));
2251 return type;
2252}
2253
2254static void
2255_type_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
2256{ 1833{
2257 const Evas_Object_Protected_Data *obj = _pd; 1834 if (obj->delete_me) return "";
2258 const char **type = va_arg(*list, const char **); 1835 return obj->type;
2259 if (obj->delete_me)
2260 {
2261 *type = "";
2262 return;
2263 }
2264 *type = obj->type;
2265} 1836}
2266 1837
2267static void 1838EOLIAN static void
2268_type_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list) 1839_evas_object_type_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, const char *type)
2269{ 1840{
2270 Evas_Object_Protected_Data *obj = _pd;
2271 const char *type = va_arg(*list, const char *);
2272 obj->type = type; // Store it as the top type of this class 1841 obj->type = type; // Store it as the top type of this class
2273} 1842}
2274 1843
2275EAPI void 1844EOLIAN static void
2276evas_object_precise_is_inside_set(Evas_Object *eo_obj, Eina_Bool precise) 1845_evas_object_precise_is_inside_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool precise)
2277{ 1846{
2278 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
2279 return;
2280 MAGIC_CHECK_END();
2281 eo_do(eo_obj, evas_obj_precise_is_inside_set(precise));
2282}
2283
2284static void
2285_precise_is_inside_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
2286{
2287 Evas_Object_Protected_Data *obj = _pd;
2288 Eina_Bool precise = va_arg(*list, int);
2289 obj->precise_is_inside = precise; 1847 obj->precise_is_inside = precise;
2290} 1848}
2291 1849
2292EAPI Eina_Bool 1850EOLIAN static Eina_Bool
2293evas_object_precise_is_inside_get(const Evas_Object *eo_obj) 1851_evas_object_precise_is_inside_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
2294{ 1852{
2295 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 1853 return obj->precise_is_inside;
2296 return 0;
2297 MAGIC_CHECK_END();
2298 Eina_Bool precise = EINA_FALSE;
2299 eo_do((Eo *)eo_obj, evas_obj_precise_is_inside_get(&precise));
2300 return precise;
2301} 1854}
2302 1855
2303static void 1856EOLIAN static void
2304_precise_is_inside_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list) 1857_evas_object_static_clip_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool is_static_clip)
2305{
2306 const Evas_Object_Protected_Data *obj = _pd;
2307 Eina_Bool *precise = va_arg(*list, Eina_Bool *);
2308 if (precise) *precise = obj->precise_is_inside;
2309}
2310
2311EAPI void
2312evas_object_static_clip_set(Evas_Object *eo_obj, Eina_Bool is_static_clip)
2313{ 1858{
2314 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
2315 return;
2316 MAGIC_CHECK_END();
2317 eo_do(eo_obj, evas_obj_static_clip_set(is_static_clip));
2318}
2319
2320static void
2321_static_clip_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
2322{
2323 Evas_Object_Protected_Data *obj = _pd;
2324 Eina_Bool is_static_clip = va_arg(*list, int);
2325 obj->is_static_clip = is_static_clip; 1859 obj->is_static_clip = is_static_clip;
2326} 1860}
2327 1861
2328EAPI Eina_Bool 1862EOLIAN static Eina_Bool
2329evas_object_static_clip_get(const Evas_Object *eo_obj) 1863_evas_object_static_clip_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
2330{ 1864{
2331 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 1865 return obj->is_static_clip;
2332 return 0;
2333 MAGIC_CHECK_END();
2334 Eina_Bool is_static_clip = EINA_FALSE;
2335 eo_do((Eo *)eo_obj, evas_obj_static_clip_get(&is_static_clip));
2336 return is_static_clip;
2337}
2338
2339static void
2340_static_clip_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
2341{
2342 const Evas_Object_Protected_Data *obj = _pd;
2343 Eina_Bool *is_static_clip = va_arg(*list, Eina_Bool *);
2344 if (is_static_clip) *is_static_clip = obj->is_static_clip;
2345}
2346
2347EAPI void
2348evas_object_is_frame_object_set(Evas_Object *eo_obj, Eina_Bool is_frame)
2349{
2350 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
2351 return;
2352 MAGIC_CHECK_END();
2353 eo_do(eo_obj, evas_obj_is_frame_object_set(is_frame));
2354} 1866}
2355 1867
2356static void 1868static void
@@ -2367,11 +1879,9 @@ _is_frame_flag_set(Evas_Object_Protected_Data *obj, Eina_Bool is_frame)
2367 _is_frame_flag_set(child, is_frame); 1879 _is_frame_flag_set(child, is_frame);
2368} 1880}
2369 1881
2370static void 1882EOLIAN static void
2371_is_frame_object_set(Eo *eo_obj, void *_pd, va_list *list) 1883_evas_object_is_frame_object_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool is_frame)
2372{ 1884{
2373 Eina_Bool is_frame = va_arg(*list, int);
2374 Evas_Object_Protected_Data *obj = _pd;
2375 Evas_Coord x, y; 1885 Evas_Coord x, y;
2376 1886
2377 evas_object_geometry_get(eo_obj, &x, &y, NULL, NULL); 1887 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)
2381 evas_object_move(eo_obj, x, y); 1891 evas_object_move(eo_obj, x, y);
2382} 1892}
2383 1893
2384EAPI Eina_Bool 1894EOLIAN static Eina_Bool
2385evas_object_is_frame_object_get(Evas_Object *eo_obj) 1895_evas_object_is_frame_object_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
2386{ 1896{
2387 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 1897 return obj->is_frame;
2388 return EINA_FALSE;
2389 MAGIC_CHECK_END();
2390 Eina_Bool is_frame = EINA_FALSE;
2391 eo_do(eo_obj, evas_obj_is_frame_object_get(&is_frame));
2392 return is_frame;
2393} 1898}
2394 1899
2395static void 1900EOLIAN static Evas_Object *
2396_is_frame_object_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list) 1901_evas_object_smart_parent_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
2397{ 1902{
2398 const Evas_Object_Protected_Data *obj = _pd; 1903 if (!obj) return NULL;
2399 Eina_Bool *is_frame = va_arg(*list, Eina_Bool *); 1904 return obj->smart.parent;
2400 if (is_frame) *is_frame = obj->is_frame;
2401} 1905}
2402 1906
2403static void 1907EOLIAN static void *
2404_smart_parent_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list) 1908_evas_object_smart_data_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED)
2405{ 1909{
2406 Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); 1910 return NULL;
2407 if (!obj) return;
2408 Evas_Object **smart_parent = va_arg(*list, Evas_Object **);
2409 if (smart_parent) *smart_parent = obj->smart.parent;
2410}
2411
2412static void
2413_smart_data_get(Eo *eo_obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
2414{
2415 void **data = va_arg(*list, void **);
2416 *data = NULL;
2417} 1911}
2418 1912
2419static void 1913EOLIAN static Eina_Bool
2420_smart_type_check(Eo *eo_obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) 1914_evas_object_smart_type_check(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *type EINA_UNUSED)
2421{ 1915{
2422 va_arg(*list, const char *); 1916 return EINA_FALSE;
2423 Eina_Bool *type_check = va_arg(*list, Eina_Bool *);
2424 *type_check = EINA_FALSE;
2425 return;
2426} 1917}
2427 1918
2428static void 1919EOLIAN static Eina_Bool
2429_smart_type_check_ptr(Eo *eo_obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) 1920_evas_object_smart_type_check_ptr(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *type EINA_UNUSED)
2430{ 1921{
2431 va_arg(*list, const char *); 1922 return EINA_FALSE;
2432 Eina_Bool *type_check = va_arg(*list, Eina_Bool *);
2433 *type_check = EINA_FALSE;
2434 return;
2435} 1923}
2436 1924
2437static void 1925#include "canvas/evas_object.eo.c"
2438_class_constructor(Eo_Class *klass)
2439{
2440 const Eo_Op_Func_Description func_desc[] = {
2441 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
2442 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DESTRUCTOR), _destructor),
2443 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_DBG_INFO_GET), _dbg_info_get),
2444 EO_OP_FUNC(EVAS_COMMON_ID(EVAS_COMMON_SUB_ID_EVAS_GET), _evas_get),
2445 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POSITION_SET), _position_set),
2446 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POSITION_GET), _position_get),
2447 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_SET), _size_set),
2448 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_GET), _size_get),
2449 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_MIN_SET), _size_hint_min_set),
2450 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_MIN_GET), _size_hint_min_get),
2451 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_MAX_SET), _size_hint_max_set),
2452 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_MAX_GET), _size_hint_max_get),
2453 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_REQUEST_SET), _size_hint_request_set),
2454 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_REQUEST_GET), _size_hint_request_get),
2455 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_ASPECT_SET), _size_hint_aspect_set),
2456 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_ASPECT_GET), _size_hint_aspect_get),
2457 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_ALIGN_SET), _size_hint_align_set),
2458 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_ALIGN_GET), _size_hint_align_get),
2459 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_WEIGHT_SET), _size_hint_weight_set),
2460 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_WEIGHT_GET), _size_hint_weight_get),
2461 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_PADDING_SET), _size_hint_padding_set),
2462 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SIZE_HINT_PADDING_GET), _size_hint_padding_get),
2463 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_VISIBILITY_SET), _visible_set),
2464 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_VISIBILITY_GET), _visible_get),
2465 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_COLOR_SET), _color_set),
2466 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_COLOR_GET), _color_get),
2467 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_ANTI_ALIAS_SET), _anti_alias_set),
2468 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_ANTI_ALIAS_GET), _anti_alias_get),
2469 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SCALE_SET), _scale_set),
2470 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SCALE_GET), _scale_get),
2471 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_RENDER_OP_SET), _render_op_set),
2472 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_RENDER_OP_GET), _render_op_get),
2473 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_TYPE_SET), _type_set),
2474 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_TYPE_GET), _type_get),
2475 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_PRECISE_IS_INSIDE_SET), _precise_is_inside_set),
2476 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_PRECISE_IS_INSIDE_GET), _precise_is_inside_get),
2477 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_STATIC_CLIP_SET), _static_clip_set),
2478 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_STATIC_CLIP_GET), _static_clip_get),
2479 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_IS_FRAME_OBJECT_SET), _is_frame_object_set),
2480 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_IS_FRAME_OBJECT_GET), _is_frame_object_get),
2481 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_FREEZE_EVENTS_SET), _freeze_events_set),
2482 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_FREEZE_EVENTS_GET), _freeze_events_get),
2483 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_PASS_EVENTS_SET), _pass_events_set),
2484 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_PASS_EVENTS_GET), _pass_events_get),
2485 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_REPEAT_EVENTS_SET), _repeat_events_set),
2486 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_REPEAT_EVENTS_GET), _repeat_events_get),
2487 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_PROPAGATE_EVENTS_SET), _propagate_events_set),
2488 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_PROPAGATE_EVENTS_GET), _propagate_events_get),
2489 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POINTER_MODE_SET), _pointer_mode_set),
2490 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_POINTER_MODE_GET), _pointer_mode_get),
2491 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_KEY_GRAB), _key_grab),
2492 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_KEY_UNGRAB), _key_ungrab),
2493 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_FOCUS_SET), _focus_set),
2494 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_FOCUS_GET), _focus_get),
2495 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_NAME_SET), _name_set),
2496 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_NAME_GET), _name_get),
2497 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_NAME_CHILD_FIND), _name_child_find),
2498 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_LAYER_SET), _layer_set),
2499 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_LAYER_GET), _layer_get),
2500 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_CLIP_SET), _clip_set),
2501 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_CLIP_GET), _clip_get),
2502 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_CLIP_UNSET), _clip_unset),
2503 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_CLIPEES_GET), _clipees_get),
2504 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_CLIPEES_HAS), _clipees_has),
2505 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_MAP_ENABLE_SET), _map_enable_set),
2506 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_MAP_ENABLE_GET), _map_enable_get),
2507 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_MAP_SET), _map_set),
2508 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_MAP_GET), _map_get),
2509 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SMART_PARENT_GET), _smart_parent_get),
2510 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SMART_DATA_GET), _smart_data_get),
2511 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SMART_TYPE_CHECK), _smart_type_check),
2512 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SMART_TYPE_CHECK_PTR), _smart_type_check_ptr),
2513 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SMART_MOVE_CHILDREN_RELATIVE), _smart_move_children_relative),
2514 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_SMART_CLIPPED_CLIPPER_GET), _smart_clipped_clipper_get),
2515 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_RAISE), _raise),
2516 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_LOWER), _lower),
2517 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_STACK_ABOVE), _stack_above),
2518 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_STACK_BELOW), _stack_below),
2519 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_ABOVE_GET), _above_get),
2520 EO_OP_FUNC(EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_BELOW_GET), _below_get),
2521 EO_OP_FUNC_SENTINEL
2522 };
2523
2524 eo_class_funcs_set(klass, func_desc);
2525}
2526
2527static const Eo_Op_Description op_desc[] = {
2528 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_POSITION_SET, "Set the position of an evas object."),
2529 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_POSITION_GET, "Get the position of an evas object."),
2530 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_SET, "Set the size of an evas object."),
2531 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_GET, "Get the size of an evas object."),
2532 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_MIN_SET, "Sets the hints for an object's minimum size."),
2533 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_MIN_GET, "Retrieves the hints for an object's minimum size."),
2534 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_MAX_SET, "Sets the hints for an object's maximum size."),
2535 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_MAX_GET, "Retrieves the hints for an object's maximum size."),
2536 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_REQUEST_SET, "Sets the hints for an object's optimum size."),
2537 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_REQUEST_GET, "Retrieves the hints for an object's optimum size."),
2538 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_ASPECT_SET, "Sets the hints for an object's aspect ratio."),
2539 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_ASPECT_GET, "Retrieves the hints for an object's aspect ratio."),
2540 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_ALIGN_SET, "Sets the hints for an object's alignment."),
2541 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_ALIGN_GET, "Retrieves the hints for on object's alignment."),
2542 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_WEIGHT_SET, "Sets the hints for an object's weight."),
2543 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_WEIGHT_GET, "Retrieves the hints for an object's weight."),
2544 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_PADDING_SET, "Sets the hints for an object's padding space."),
2545 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SIZE_HINT_PADDING_GET, "Retrieves the hints for an object's padding space."),
2546 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_VISIBILITY_SET, "Makes the given Evas object visible/invisible."),
2547 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_VISIBILITY_GET, "Retrieves whether or not the given Evas object is visible."),
2548 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_COLOR_SET, "Sets the general/main color of the given Evas object to the given"),
2549 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_COLOR_GET, "Retrieves the general/main color of the given Evas object."),
2550 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_ANTI_ALIAS_SET, "Sets whether or not the given Evas object is to be drawn anti-aliased."),
2551 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_ANTI_ALIAS_GET, "Retrieves whether or not the given Evas object is to be drawn anti_aliased."),
2552 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SCALE_SET, "Sets the scaling factor for an Evas object. Does not affect all"),
2553 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SCALE_GET, "Retrieves the scaling factor for the given Evas object."),
2554 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_RENDER_OP_SET, "Sets the render_op to be used for rendering the Evas object."),
2555 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_RENDER_OP_GET, "Retrieves the current value of the operation used for rendering the Evas object."),
2556 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_TYPE_SET, "Sets the type of the given Evas object."),
2557 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_TYPE_GET, "Retrieves the type of the given Evas object."),
2558 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_PRECISE_IS_INSIDE_SET, "Set whether to use precise (usually expensive) point collision"),
2559 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_PRECISE_IS_INSIDE_GET, "Determine whether an object is set to use precise point collision"),
2560 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."),
2561 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_STATIC_CLIP_GET, "Get the static clipper hint flag for a given Evas object."),
2562 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_IS_FRAME_OBJECT_SET, "Set whether an object is a frame object"),
2563 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_IS_FRAME_OBJECT_GET, "Determine whether an object is a frame object"),
2564 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_FREEZE_EVENTS_SET, "Set whether an Evas object is to freeze (discard) events."),
2565 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_FREEZE_EVENTS_GET, "Determine whether an object is set to freeze (discard) events."),
2566 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_PASS_EVENTS_SET, "Set whether an Evas object is to pass (ignore) events."),
2567 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_PASS_EVENTS_GET, "Determine whether an object is set to pass (ignore) events."),
2568 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_REPEAT_EVENTS_SET, "Set whether an Evas object is to repeat events."),
2569 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_REPEAT_EVENTS_GET, "Determine whether an object is set to repeat events."),
2570 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_PROPAGATE_EVENTS_SET, "Set whether events on a smart object's member should get propagated"),
2571 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_PROPAGATE_EVENTS_GET, "Retrieve whether an Evas object is set to propagate events."),
2572 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_POINTER_MODE_SET, "Set pointer behavior."),
2573 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_POINTER_MODE_GET, "Determine how pointer will behave."),
2574 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_KEY_GRAB, "Requests keyname key events be directed to obj."),
2575 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_KEY_UNGRAB, "Removes the grab on @p keyname key events by obj."),
2576 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_FOCUS_SET, "Sets or unsets a given object as the currently focused one on its"),
2577 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_FOCUS_GET, "Retrieve whether an object has the focus."),
2578 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_NAME_SET, "Sets the name of the given Evas object to the given name."),
2579 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_NAME_GET, "Retrieves the name of the given Evas object."),
2580 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_NAME_CHILD_FIND, "Retrieves the object from children of the given object with the given name."),
2581 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_LAYER_SET, "Sets the layer of its canvas that the given object will be part of."),
2582 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_LAYER_GET, "Retrieves the layer of its canvas that the given object is part of."),
2583 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_CLIP_SET, "Clip one object to another."),
2584 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_CLIP_GET, "Get the object clipping obj (if any)."),
2585 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_CLIP_UNSET, "Disable/cease clipping on a clipped obj object."),
2586 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_CLIPEES_GET, "Return a list of objects currently clipped by obj."),
2587 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_CLIPEES_HAS, "Return EINA_TRUE if there is any object is clipped by obj."),
2588 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_MAP_ENABLE_SET, "Enable or disable the map that is set."),
2589 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_MAP_ENABLE_GET, "Get the map enabled state"),
2590 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_MAP_SET, "Set current object transformation map."),
2591 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_MAP_GET, "Get current object transformation map."),
2592 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SMART_PARENT_GET, "Get the smart parent"),
2593 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SMART_DATA_GET, "Get the smart data of obj"),
2594 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SMART_TYPE_CHECK, "Checks whether a given smart object or any of its smart object"),
2595 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SMART_TYPE_CHECK_PTR, "Checks whether a given smart object or any of its smart object"),
2596 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"),
2597 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_SMART_CLIPPED_CLIPPER_GET, "Get the clipper object for the given clipped smart object."),
2598 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_RAISE, "Raise obj to the top of its layer."),
2599 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_LOWER, "Lower obj to the bottom of its layer."),
2600 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_STACK_ABOVE, "Stack obj immediately above above"),
2601 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_STACK_BELOW, "Stack obj immediately below below"),
2602 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_ABOVE_GET, "Get the Evas object stacked right above obj"),
2603 EO_OP_DESCRIPTION(EVAS_OBJ_SUB_ID_BELOW_GET, "Get the Evas object stacked right below obj"),
2604 EO_OP_DESCRIPTION_SENTINEL
2605};
2606
2607static const Eo_Class_Description class_desc = {
2608 EO_VERSION,
2609 MY_CLASS_NAME,
2610 EO_CLASS_TYPE_REGULAR_NO_INSTANT,
2611 EO_CLASS_DESCRIPTION_OPS(&EVAS_OBJ_BASE_ID, op_desc, EVAS_OBJ_SUB_ID_LAST),
2612 NULL,
2613 sizeof(Evas_Object_Protected_Data),
2614 _class_constructor,
2615 NULL
2616};
2617
2618EO_DEFINE_CLASS(evas_object_class_get, &class_desc, EO_BASE_CLASS, EVAS_COMMON_INTERFACE, NULL)
2619
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index 0301056..33b1eb0 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)
122 eo_data_ref(eo_obj, NULL); 122 eo_data_ref(eo_obj, NULL);
123} 123}
124 124
125EAPI void * 125EOLIAN static void *
126evas_object_smart_data_get(const Evas_Object *eo_obj)
127{
128 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
129 return NULL;
130 MAGIC_CHECK_END();
131 void *data = NULL;
132 eo_do((Eo *)eo_obj, evas_obj_smart_data_get(&data));
133 return data;
134}
135
136EOLIAN static void*
137_evas_smart_evas_object_smart_data_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o) 126_evas_smart_evas_object_smart_data_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o)
138{ 127{
139 return o->data; 128 return o->data;
@@ -320,28 +309,6 @@ _evas_smart_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Obj
320 evas_object_mapped_clip_across_mark(eo_obj, obj); 309 evas_object_mapped_clip_across_mark(eo_obj, obj);
321} 310}
322 311
323EAPI Evas_Object *
324evas_object_smart_parent_get(const Evas_Object *eo_obj)
325{
326 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
327 return NULL;
328 MAGIC_CHECK_END();
329 Evas_Object *smart_parent = NULL;
330 eo_do((Eo *)eo_obj, evas_obj_smart_parent_get(&smart_parent));
331 return smart_parent;
332}
333
334EAPI Eina_Bool
335evas_object_smart_type_check(const Evas_Object *eo_obj, const char *type)
336{
337 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
338 return EINA_FALSE;
339 MAGIC_CHECK_END();
340 Eina_Bool type_check = EINA_FALSE;
341 eo_do((Eo *)eo_obj, evas_obj_smart_type_check(type, &type_check));
342 return type_check;
343}
344
345EOLIAN static Eina_Bool 312EOLIAN static Eina_Bool
346_evas_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char *type) 313_evas_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char *type)
347{ 314{
@@ -372,17 +339,6 @@ _evas_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNU
372 return type_check; 339 return type_check;
373} 340}
374 341
375EAPI Eina_Bool
376evas_object_smart_type_check_ptr(const Evas_Object *eo_obj, const char *type)
377{
378 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
379 return EINA_FALSE;
380 MAGIC_CHECK_END();
381 Eina_Bool type_check_ptr = EINA_FALSE;
382 eo_do((Eo *)eo_obj, evas_obj_smart_type_check_ptr(type, &type_check_ptr));
383 return type_check_ptr;
384}
385
386EOLIAN static Eina_Bool 342EOLIAN static Eina_Bool
387_evas_smart_evas_object_smart_type_check_ptr(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char* type) 343_evas_smart_evas_object_smart_type_check_ptr(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char* type)
388{ 344{
diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index d7305e9..2cf5b19 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 @@
12 CSO_DATA_GET(eo_obj, ptr) \ 12 CSO_DATA_GET(eo_obj, ptr) \
13 if (!ptr) return; 13 if (!ptr) return;
14 14
15EAPI void 15EOLIAN void
16evas_object_smart_move_children_relative(Evas_Object *eo_obj, Evas_Coord dx, Evas_Coord dy) 16_evas_object_smart_move_children_relative(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Evas_Coord dx, Evas_Coord dy)
17{ 17{
18 eo_do(eo_obj, evas_obj_smart_move_children_relative(dx, dy));
19}
20
21void
22_smart_move_children_relative(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
23{
24 Evas_Coord dx = va_arg(*list, Evas_Coord);
25 Evas_Coord dy = va_arg(*list, Evas_Coord);
26 18
27 const Eina_Inlist *lst; 19 const Eina_Inlist *lst;
28 Evas_Object_Protected_Data *child; 20 Evas_Object_Protected_Data *child;
@@ -43,23 +35,12 @@ _smart_move_children_relative(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
43 } 35 }
44} 36}
45 37
46EAPI Evas_Object * 38EOLIAN Evas_Object *
47evas_object_smart_clipped_clipper_get(Evas_Object *eo_obj) 39_evas_object_smart_clipped_clipper_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED)
48{ 40{
49 Evas_Object *ret = NULL;
50 eo_do((Eo *)eo_obj, evas_obj_smart_clipped_clipper_get(&ret));
51 return ret;
52}
53
54void
55_smart_clipped_clipper_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
56{
57 Evas_Object **ret = va_arg(*list, Evas_Object **);
58 CSO_DATA_GET(eo_obj, cso) 41 CSO_DATA_GET(eo_obj, cso)
59 if (!cso) 42 if (!cso) return NULL;
60 *ret = NULL; 43 else return cso->clipper;
61 else
62 *ret = cso->clipper;
63} 44}
64 45
65static void 46static void
@@ -87,7 +68,7 @@ evas_object_smart_clipped_smart_add(Evas_Object *eo_obj)
87} 68}
88 69
89EOLIAN static void 70EOLIAN static void
90_evas_smart_clipped_evas_smart_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED) 71_evas_smart_clipped_evas_smart_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
91{ 72{
92 evas_object_smart_clipped_smart_add(eo_obj); 73 evas_object_smart_clipped_smart_add(eo_obj);
93} 74}
@@ -114,7 +95,7 @@ evas_object_smart_clipped_smart_del(Evas_Object *eo_obj)
114} 95}
115 96
116EOLIAN static void 97EOLIAN static void
117_evas_smart_clipped_evas_smart_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED) 98_evas_smart_clipped_evas_smart_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
118{ 99{
119 evas_object_smart_clipped_smart_del(eo_obj); 100 evas_object_smart_clipped_smart_del(eo_obj);
120} 101}
@@ -129,7 +110,7 @@ evas_object_smart_clipped_smart_move(Evas_Object *eo_obj, Evas_Coord x, Evas_Coo
129} 110}
130 111
131EOLIAN static void 112EOLIAN static void
132_evas_smart_clipped_evas_smart_move(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y) 113_evas_smart_clipped_evas_smart_move(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Coord x, Evas_Coord y)
133{ 114{
134 evas_object_smart_clipped_smart_move(eo_obj, x, y); 115 evas_object_smart_clipped_smart_move(eo_obj, x, y);
135} 116}
@@ -143,7 +124,7 @@ evas_object_smart_clipped_smart_show(Evas_Object *eo_obj)
143} 124}
144 125
145EOLIAN static void 126EOLIAN static void
146_evas_smart_clipped_evas_smart_show(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED) 127_evas_smart_clipped_evas_smart_show(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
147{ 128{
148 evas_object_smart_clipped_smart_show(eo_obj); 129 evas_object_smart_clipped_smart_show(eo_obj);
149} 130}
@@ -156,7 +137,7 @@ evas_object_smart_clipped_smart_hide(Evas_Object *eo_obj)
156} 137}
157 138
158EOLIAN static void 139EOLIAN static void
159_evas_smart_clipped_evas_smart_hide(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED) 140_evas_smart_clipped_evas_smart_hide(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
160{ 141{
161 evas_object_smart_clipped_smart_hide(eo_obj); 142 evas_object_smart_clipped_smart_hide(eo_obj);
162} 143}
@@ -169,7 +150,7 @@ evas_object_smart_clipped_smart_color_set(Evas_Object *eo_obj, int r, int g, int
169} 150}
170 151
171EOLIAN static void 152EOLIAN static void
172_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) 153_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)
173{ 154{
174 evas_object_smart_clipped_smart_color_set(eo_obj, r, g, b, a); 155 evas_object_smart_clipped_smart_color_set(eo_obj, r, g, b, a);
175} 156}
@@ -182,7 +163,7 @@ evas_object_smart_clipped_smart_clip_set(Evas_Object *eo_obj, Evas_Object *clip)
182} 163}
183 164
184EOLIAN static void 165EOLIAN static void
185_evas_smart_clipped_evas_smart_clip_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED, Evas_Object *clip) 166_evas_smart_clipped_evas_smart_clip_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *clip)
186{ 167{
187 evas_object_smart_clipped_smart_clip_set(eo_obj, clip); 168 evas_object_smart_clipped_smart_clip_set(eo_obj, clip);
188} 169}
@@ -195,7 +176,7 @@ evas_object_smart_clipped_smart_clip_unset(Evas_Object *eo_obj)
195} 176}
196 177
197EOLIAN static void 178EOLIAN static void
198_evas_smart_clipped_evas_smart_clip_unset(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED) 179_evas_smart_clipped_evas_smart_clip_unset(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
199{ 180{
200 evas_object_smart_clipped_smart_clip_unset(eo_obj); 181 evas_object_smart_clipped_smart_clip_unset(eo_obj);
201} 182}
@@ -212,7 +193,7 @@ evas_object_smart_clipped_smart_member_add(Evas_Object *eo_obj, Evas_Object *mem
212} 193}
213 194
214EOLIAN static void 195EOLIAN static void
215_evas_smart_clipped_evas_smart_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED, Evas_Object *member) 196_evas_smart_clipped_evas_smart_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
216{ 197{
217 eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_add(member)); 198 eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_add(member));
218 evas_object_smart_clipped_smart_member_add(eo_obj, member); 199 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
230} 211}
231 212
232EOLIAN static void 213EOLIAN static void
233_evas_smart_clipped_evas_smart_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED, Evas_Object *member) 214_evas_smart_clipped_evas_smart_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
234{ 215{
235 evas_object_smart_clipped_smart_member_del(eo_obj, member); 216 evas_object_smart_clipped_smart_member_del(eo_obj, member);
236 eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_del(member)); 217 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
276} 257}
277 258
278#include "canvas/evas_smart_clipped.eo.c" 259#include "canvas/evas_smart_clipped.eo.c"
260
diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c
index 6fbc78c..4d6d270 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)
37 return NULL; 37 return NULL;
38} 38}
39 39
40EAPI void 40EOLIAN void
41evas_object_raise(Evas_Object *eo_obj) 41_evas_object_raise(Eo *eo_obj, Evas_Object_Protected_Data *obj)
42{ 42{
43 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
44 return;
45 MAGIC_CHECK_END();
46 eo_do(eo_obj, evas_obj_raise());
47}
48
49void
50_raise(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
51{
52 Evas_Object_Protected_Data *obj = _pd;
53
54 if (evas_object_intercept_call_raise(eo_obj, obj)) return; 43 if (evas_object_intercept_call_raise(eo_obj, obj)) return;
55 44
56 if (!((EINA_INLIST_GET(obj))->next)) 45 if (!((EINA_INLIST_GET(obj))->next))
@@ -94,20 +83,9 @@ _raise(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
94 } 83 }
95} 84}
96 85
97EAPI void 86EOLIAN void
98evas_object_lower(Evas_Object *eo_obj) 87_evas_object_lower(Eo *eo_obj, Evas_Object_Protected_Data *obj)
99{
100 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
101 return;
102 MAGIC_CHECK_END();
103 eo_do(eo_obj, evas_obj_lower());
104}
105
106void
107_lower(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
108{ 88{
109 Evas_Object_Protected_Data *obj = _pd;
110
111 if (evas_object_intercept_call_lower(eo_obj, obj)) return; 89 if (evas_object_intercept_call_lower(eo_obj, obj)) return;
112 90
113 if (!((EINA_INLIST_GET(obj))->prev)) 91 if (!((EINA_INLIST_GET(obj))->prev))
@@ -152,21 +130,9 @@ _lower(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
152 } 130 }
153} 131}
154 132
155EAPI void 133EOLIAN void
156evas_object_stack_above(Evas_Object *eo_obj, Evas_Object *above) 134_evas_object_stack_above(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_above)
157{ 135{
158 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
159 return;
160 MAGIC_CHECK_END();
161 eo_do(eo_obj, evas_obj_stack_above(above));
162}
163
164void
165_stack_above(Eo *eo_obj, void *_pd, va_list *list)
166{
167 Evas_Object_Protected_Data *obj = _pd;
168 Evas_Object *eo_above = va_arg(*list, Evas_Object *);
169
170 if (!eo_above) return; 136 if (!eo_above) return;
171 if (eo_obj == eo_above) return; 137 if (eo_obj == eo_above) return;
172 if (evas_object_intercept_call_stack_above(eo_obj, obj, eo_above)) return; 138 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)
240 } 206 }
241} 207}
242 208
243EAPI void 209EOLIAN void
244evas_object_stack_below(Evas_Object *eo_obj, Evas_Object *eo_below) 210_evas_object_stack_below(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_below)
245{ 211{
246 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
247 return;
248 MAGIC_CHECK_END();
249 eo_do(eo_obj, evas_obj_stack_below(eo_below));
250}
251
252void
253_stack_below(Eo *eo_obj, void *_pd, va_list *list)
254{
255 Evas_Object *eo_below = va_arg(*list, Evas_Object *);
256 Evas_Object_Protected_Data *obj = _pd;
257
258 if (!eo_below) return; 212 if (!eo_below) return;
259 if (eo_obj == eo_below) return; 213 if (eo_obj == eo_below) return;
260 if (evas_object_intercept_call_stack_below(eo_obj, obj, eo_below)) return; 214 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)
328 } 282 }
329} 283}
330 284
331EAPI Evas_Object * 285EOLIAN Evas_Object *
332evas_object_above_get(const Evas_Object *eo_obj) 286_evas_object_above_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
333{ 287{
334 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
335 return NULL;
336 MAGIC_CHECK_END();
337 Evas_Object *ret = NULL;
338 eo_do((Eo *)eo_obj, evas_obj_above_get(&ret));
339 return ret;
340}
341
342void
343_above_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
344{
345 const Evas_Object_Protected_Data *obj = _pd;
346 Evas_Object **ret = va_arg(*list, Evas_Object **);
347
348 if (obj->smart.parent) 288 if (obj->smart.parent)
349 { 289 {
350 do 290 do
351 { 291 {
352 obj = (Evas_Object_Protected_Data *)((EINA_INLIST_GET(obj))->next); 292 obj = (Evas_Object_Protected_Data *)((EINA_INLIST_GET(obj))->next);
353 if ((obj) && (!obj->delete_me)) 293 if ((obj) && (!obj->delete_me)) return obj->object;
354 {
355 *ret = obj->object;
356 return;
357 }
358 } 294 }
359 while (obj); 295 while (obj);
360 *ret = NULL; 296 return NULL;
361 return;
362 } 297 }
363 obj = evas_object_above_get_internal(obj); 298 obj = evas_object_above_get_internal(obj);
364 while (obj) 299 while (obj)
365 { 300 {
366 if (!obj->delete_me) 301 if (!obj->delete_me) return obj->object;
367 {
368 *ret = obj->object;
369 return;
370 }
371 obj = evas_object_above_get_internal(obj); 302 obj = evas_object_above_get_internal(obj);
372 } 303 }
373 *ret = NULL;
374}
375
376EAPI Evas_Object *
377evas_object_below_get(const Evas_Object *eo_obj)
378{
379 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
380 return NULL; 304 return NULL;
381 MAGIC_CHECK_END();
382 Evas_Object *ret = NULL;
383 eo_do((Eo *)eo_obj, evas_obj_below_get(&ret));
384 return ret;
385} 305}
386 306
387void 307EOLIAN Evas_Object *
388_below_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list) 308_evas_object_below_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
389{ 309{
390 const Evas_Object_Protected_Data *obj = _pd;
391 Evas_Object **ret = va_arg(*list, Evas_Object **);
392 *ret = NULL;
393 if (obj->smart.parent) 310 if (obj->smart.parent)
394 { 311 {
395 do 312 do
396 { 313 {
397 obj = (Evas_Object_Protected_Data *)((EINA_INLIST_GET(obj))->prev); 314 obj = (Evas_Object_Protected_Data *)((EINA_INLIST_GET(obj))->prev);
398 if ((obj) && (!obj->delete_me)) 315 if ((obj) && (!obj->delete_me)) return obj->object;
399 {
400 *ret = obj->object;
401 return;
402 }
403 } 316 }
404 while (obj); 317 while (obj);
405 return; 318 return NULL;
406 } 319 }
407 obj = evas_object_below_get_internal(obj); 320 obj = evas_object_below_get_internal(obj);
408 while (obj) 321 while (obj)
409 { 322 {
410 if (!obj->delete_me) 323 if (!obj->delete_me) return obj->object;
411 {
412 *ret = obj->object;
413 return;
414 }
415 obj = evas_object_below_get_internal(obj); 324 obj = evas_object_below_get_internal(obj);
416 } 325 }
326 return NULL;
417} 327}
418 328
419
420
421EAPI Evas_Object * 329EAPI Evas_Object *
422evas_object_bottom_get(const Evas *e) 330evas_object_bottom_get(const Evas *e)
423{ 331{
@@ -497,3 +405,4 @@ _canvas_object_top_get(Eo *eo_e EINA_UNUSED, void *_pd, va_list *params_list)
497 405
498 *ret = obj->object; 406 *ret = obj->object;
499} 407}
408