Eolian: Integration of Evas Object.
const have been added in object parameter of two legacy APIs to fit Eolian generated files. Since these functions retrieve information from object, it is logic that the object would be const.
This commit is contained in:
parent
cd28854fdf
commit
f22bd9e6ee
|
@ -21,7 +21,11 @@ BUILT_SOURCES += \
|
|||
lib/evas/canvas/evas_smart_clipped.eo.c \
|
||||
lib/evas/canvas/evas_smart_clipped.eo.h \
|
||||
lib/evas/canvas/evas_table.eo.c \
|
||||
lib/evas/canvas/evas_table.eo.h
|
||||
lib/evas/canvas/evas_table.eo.h \
|
||||
lib/evas/canvas/evas_common_interface.eo.c \
|
||||
lib/evas/canvas/evas_common_interface.eo.h \
|
||||
lib/evas/canvas/evas_object.eo.c \
|
||||
lib/evas/canvas/evas_object.eo.h
|
||||
|
||||
EXTRA_DIST += \
|
||||
lib/evas/canvas/evas_object.eo \
|
||||
|
@ -34,7 +38,8 @@ EXTRA_DIST += \
|
|||
lib/evas/canvas/evas_signal_interface.eo \
|
||||
lib/evas/canvas/evas_smart.eo \
|
||||
lib/evas/canvas/evas_smart_clipped.eo \
|
||||
lib/evas/canvas/evas_table.eo
|
||||
lib/evas/canvas/evas_table.eo \
|
||||
lib/evas/canvas/evas_common_interface.eo
|
||||
|
||||
lib_LTLIBRARIES += lib/evas/libevas.la
|
||||
noinst_LTLIBRARIES =
|
||||
|
@ -59,7 +64,9 @@ nodist_installed_evascanvasheaders_DATA = \
|
|||
lib/evas/canvas/evas_signal_interface.eo.h \
|
||||
lib/evas/canvas/evas_smart.eo.h \
|
||||
lib/evas/canvas/evas_smart_clipped.eo.h \
|
||||
lib/evas/canvas/evas_table.eo.h
|
||||
lib/evas/canvas/evas_table.eo.h \
|
||||
lib/evas/canvas/evas_common_interface.eo.h \
|
||||
lib/evas/canvas/evas_object.eo.h
|
||||
|
||||
noinst_HEADERS = \
|
||||
lib/evas/include/evas_inline.x \
|
||||
|
|
|
@ -1213,6 +1213,7 @@ enum
|
|||
*/
|
||||
#define evas_canvas_object_name_find(name, ret) EVAS_CANVAS_ID(EVAS_CANVAS_SUB_ID_OBJECT_NAME_FIND),EO_TYPECHECK(const char *, name), EO_TYPECHECK(Evas_Object **, ret)
|
||||
|
||||
#if 0
|
||||
/**
|
||||
* @def evas_obj_name_child_find
|
||||
* @since 1.8
|
||||
|
@ -1225,6 +1226,7 @@ enum
|
|||
* @see evas_object_name_child_find
|
||||
*/
|
||||
#define evas_obj_name_child_find(name, recurse, child) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_NAME_CHILD_FIND), EO_TYPECHECK(const char *, name), EO_TYPECHECK(int, recurse), EO_TYPECHECK(Evas_Object **, child)
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @def evas_canvas_object_top_at_xy_get
|
||||
|
@ -4448,6 +4450,8 @@ enum
|
|||
* @}
|
||||
*/
|
||||
|
||||
#include "canvas/evas_common_interface.eo.h"
|
||||
#if 0
|
||||
#define EVAS_COMMON_INTERFACE evas_common_class_get()
|
||||
|
||||
const Eo_Class *evas_common_class_get(void) EINA_CONST;
|
||||
|
@ -4475,6 +4479,10 @@ enum
|
|||
*/
|
||||
#define evas_common_evas_get(ret) EVAS_COMMON_ID(EVAS_COMMON_SUB_ID_EVAS_GET), EO_TYPECHECK(Evas **, ret)
|
||||
|
||||
#endif
|
||||
|
||||
#include "canvas/evas_object.eo.h"
|
||||
#if 0
|
||||
extern EAPI Eo_Op EVAS_OBJ_BASE_ID;
|
||||
|
||||
enum
|
||||
|
@ -5623,6 +5631,7 @@ enum
|
|||
#define EVAS_OBJ_CLASS evas_object_class_get()
|
||||
|
||||
const Eo_Class *evas_object_class_get(void) EINA_CONST;
|
||||
#endif
|
||||
|
||||
#define EVAS_OBJ_IMAGE_CLASS evas_object_image_class_get()
|
||||
const Eo_Class *evas_object_image_class_get(void) EINA_CONST;
|
||||
|
|
|
@ -6255,7 +6255,7 @@ EAPI void evas_object_polygon_points_clear(Evas_Object *obj) EINA_ARG_NO
|
|||
EAPI void evas_object_is_frame_object_set(Evas_Object *obj, Eina_Bool is_frame);
|
||||
|
||||
/* @since 1.2 */
|
||||
EAPI Eina_Bool evas_object_is_frame_object_get(Evas_Object *obj);
|
||||
EAPI Eina_Bool evas_object_is_frame_object_get(const Evas_Object *obj);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
@ -6853,7 +6853,7 @@ EAPI void evas_object_smart_move_children_relative(Evas_Object *obj, Eva
|
|||
*
|
||||
* @see evas_object_smart_clipped_smart_add()
|
||||
*/
|
||||
EAPI Evas_Object *evas_object_smart_clipped_clipper_get(Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
|
||||
EAPI Evas_Object *evas_object_smart_clipped_clipper_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
|
|
@ -191,23 +191,10 @@ evas_object_mapped_clip_across_mark(Evas_Object *eo_obj, Evas_Object_Protected_D
|
|||
/* public functions */
|
||||
extern const char *o_rect_type;
|
||||
|
||||
EAPI void
|
||||
evas_object_clip_set(
|
||||
Evas_Object *eo_obj,
|
||||
Evas_Object *clip)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_clip_set(clip));
|
||||
}
|
||||
|
||||
void
|
||||
_clip_set(Eo *eo_obj, void *_pd, va_list *list)
|
||||
EOLIAN void
|
||||
_evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_clip)
|
||||
{
|
||||
Evas_Object_Protected_Data *clip;
|
||||
Evas_Object *eo_clip = va_arg(*list, Evas_Object *);
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
Evas_Public_Data *e;
|
||||
|
||||
if (!eo_clip)
|
||||
|
@ -348,43 +335,17 @@ _clip_set(Eo *eo_obj, void *_pd, va_list *list)
|
|||
evas_object_clip_across_check(eo_obj, obj);
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
evas_object_clip_get(const Evas_Object *eo_obj)
|
||||
EOLIAN Evas_Object *
|
||||
_evas_object_clip_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return NULL;
|
||||
MAGIC_CHECK_END();
|
||||
Evas_Object *clip = NULL;
|
||||
eo_do((Eo *)eo_obj, evas_obj_clip_get(&clip));
|
||||
return clip;
|
||||
}
|
||||
|
||||
void
|
||||
_clip_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
{
|
||||
Evas_Object **clip = va_arg(*list, Evas_Object **);
|
||||
const Evas_Object_Protected_Data *obj = _pd;
|
||||
|
||||
*clip = NULL;
|
||||
|
||||
if (obj->cur->clipper)
|
||||
*clip = obj->cur->clipper->object;
|
||||
return obj->cur->clipper->object;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_clip_unset(Evas_Object *eo_obj)
|
||||
EOLIAN void
|
||||
_evas_object_clip_unset(Eo *eo_obj, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_clip_unset());
|
||||
}
|
||||
|
||||
void
|
||||
_clip_unset(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
|
||||
if (!obj->cur->clipper) return;
|
||||
|
||||
obj->clip.cache_clipees_answer = eina_list_free(obj->clip.cache_clipees_answer);
|
||||
|
@ -445,22 +406,9 @@ _clip_unset(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
evas_object_clip_across_check(eo_obj, obj);
|
||||
}
|
||||
|
||||
EAPI const Eina_List *
|
||||
evas_object_clipees_get(const Evas_Object *eo_obj)
|
||||
EOLIAN Eina_List *
|
||||
_evas_object_clipees_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return NULL;
|
||||
MAGIC_CHECK_END();
|
||||
const Eina_List *clipees = NULL;
|
||||
eo_do((Eo *)eo_obj, evas_obj_clipees_get(&clipees));
|
||||
return clipees;
|
||||
}
|
||||
|
||||
void
|
||||
_clipees_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
{
|
||||
const Eina_List **clipees = va_arg(*list, const Eina_List **);
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
const Evas_Object_Protected_Data *tmp;
|
||||
Eina_List *l;
|
||||
Eina_List *answer = NULL;
|
||||
|
@ -470,24 +418,13 @@ _clipees_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
|||
EINA_LIST_FOREACH(obj->clip.clipees, l, tmp)
|
||||
answer = eina_list_append(answer, tmp);
|
||||
|
||||
*clipees = answer;
|
||||
obj->clip.cache_clipees_answer = answer;
|
||||
return answer;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_clipees_has(const Evas_Object *eo_obj)
|
||||
EOLIAN Eina_Bool
|
||||
_evas_object_clipees_has(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
Eina_Bool r;
|
||||
|
||||
eo_do((Eo *)eo_obj, evas_obj_clipees_has(&r));
|
||||
return r;
|
||||
return (obj->clip.clipees ? EINA_TRUE : EINA_FALSE);
|
||||
}
|
||||
|
||||
void
|
||||
_clipees_has(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
{
|
||||
Eina_Bool *r = va_arg(*list, Eina_Bool *);
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
|
||||
*r = obj->clip.clipees ? EINA_TRUE : EINA_FALSE;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
interface Evas_Common_Interface ()
|
||||
{
|
||||
eo_prefix: evas_common;
|
||||
properties {
|
||||
evas {
|
||||
get {
|
||||
/*@ No description supplied by the EAPI. */
|
||||
}
|
||||
values {
|
||||
Evas *ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
implements {
|
||||
virtual::evas::get;
|
||||
}
|
||||
|
||||
}
|
|
@ -3062,15 +3062,6 @@ _canvas_event_feed_hold(Eo *eo_e, void *_pd, va_list *list)
|
|||
_evas_object_event_new();
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_freeze_events_set(Evas_Object *eo_obj, Eina_Bool freeze)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_freeze_events_set(freeze));
|
||||
}
|
||||
|
||||
static void
|
||||
_feed_mouse_move_eval_internal(Eo *eo_obj, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
|
@ -3089,11 +3080,9 @@ _feed_mouse_move_eval_internal(Eo *eo_obj, Evas_Object_Protected_Data *obj)
|
|||
NULL);
|
||||
}
|
||||
|
||||
void
|
||||
_freeze_events_set(Eo *eo_obj, void *_pd, va_list *list)
|
||||
EOLIAN void
|
||||
_evas_object_freeze_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool freeze)
|
||||
{
|
||||
Eina_Bool freeze = va_arg(*list, int);
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
freeze = !!freeze;
|
||||
if (obj->freeze_events == freeze) return;
|
||||
obj->freeze_events = freeze;
|
||||
|
@ -3103,39 +3092,15 @@ _freeze_events_set(Eo *eo_obj, void *_pd, va_list *list)
|
|||
_feed_mouse_move_eval_internal(eo_obj, obj);
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_freeze_events_get(const Evas_Object *eo_obj)
|
||||
EOLIAN Eina_Bool
|
||||
_evas_object_freeze_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return EINA_FALSE;
|
||||
MAGIC_CHECK_END();
|
||||
Eina_Bool freeze_events = EINA_FALSE;
|
||||
eo_do((Eo *)eo_obj, evas_obj_freeze_events_get(&freeze_events));
|
||||
return freeze_events;
|
||||
return obj->freeze_events;
|
||||
}
|
||||
|
||||
void
|
||||
_freeze_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
EOLIAN void
|
||||
_evas_object_pass_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool pass)
|
||||
{
|
||||
Eina_Bool *freeze_events = va_arg(*list, Eina_Bool *);
|
||||
const Evas_Object_Protected_Data *obj = _pd;
|
||||
if (freeze_events) *freeze_events = obj->freeze_events;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_pass_events_set(Evas_Object *eo_obj, Eina_Bool pass)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_pass_events_set(pass));
|
||||
}
|
||||
|
||||
void
|
||||
_pass_events_set(Eo *eo_obj, void *_pd, va_list *list)
|
||||
{
|
||||
Eina_Bool pass = va_arg(*list, int);
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
pass = !!pass;
|
||||
if (obj->pass_events == pass) return;
|
||||
obj->pass_events = pass;
|
||||
|
@ -3143,134 +3108,49 @@ _pass_events_set(Eo *eo_obj, void *_pd, va_list *list)
|
|||
_feed_mouse_move_eval_internal(eo_obj, obj);
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_pass_events_get(const Evas_Object *eo_obj)
|
||||
EOLIAN Eina_Bool
|
||||
_evas_object_pass_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return EINA_FALSE;
|
||||
MAGIC_CHECK_END();
|
||||
Eina_Bool pass_events = EINA_FALSE;
|
||||
eo_do((Eo *)eo_obj, evas_obj_pass_events_get(&pass_events));
|
||||
return pass_events;
|
||||
return obj->pass_events;
|
||||
}
|
||||
|
||||
void
|
||||
_pass_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
EOLIAN void
|
||||
_evas_object_repeat_events_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool repeat)
|
||||
{
|
||||
Eina_Bool *pass_events = va_arg(*list, Eina_Bool *);
|
||||
const Evas_Object_Protected_Data *obj = _pd;
|
||||
if (pass_events) *pass_events = obj->pass_events;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_repeat_events_set(Evas_Object *eo_obj, Eina_Bool repeat)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_repeat_events_set(repeat));
|
||||
}
|
||||
|
||||
void
|
||||
_repeat_events_set(Eo *eo_obj, void *_pd, va_list *list)
|
||||
{
|
||||
Eina_Bool repeat = va_arg(*list, int);
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
repeat = !!repeat;
|
||||
if (obj->repeat_events == repeat) return;
|
||||
obj->repeat_events = repeat;
|
||||
_feed_mouse_move_eval_internal(eo_obj, obj);
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_repeat_events_get(const Evas_Object *eo_obj)
|
||||
EOLIAN Eina_Bool
|
||||
_evas_object_repeat_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return EINA_FALSE;
|
||||
MAGIC_CHECK_END();
|
||||
Eina_Bool repeat_events = EINA_FALSE;
|
||||
eo_do((Eo *)eo_obj, evas_obj_repeat_events_get(&repeat_events));
|
||||
return repeat_events;
|
||||
return obj->repeat_events;
|
||||
}
|
||||
|
||||
void
|
||||
_repeat_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
EOLIAN void
|
||||
_evas_object_propagate_events_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Eina_Bool prop)
|
||||
{
|
||||
Eina_Bool *repeat_events = va_arg(*list, Eina_Bool *);
|
||||
const Evas_Object_Protected_Data *obj = _pd;
|
||||
if (repeat_events) *repeat_events = obj->repeat_events;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_propagate_events_set(Evas_Object *eo_obj, Eina_Bool prop)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_propagate_events_set(prop));
|
||||
}
|
||||
|
||||
void
|
||||
_propagate_events_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
{
|
||||
Eina_Bool prop = va_arg(*list, int);
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
obj->no_propagate = !prop;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_propagate_events_get(const Evas_Object *eo_obj)
|
||||
EOLIAN Eina_Bool
|
||||
_evas_object_propagate_events_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return EINA_FALSE;
|
||||
MAGIC_CHECK_END();
|
||||
Eina_Bool no_propagate = EINA_FALSE;
|
||||
eo_do((Eo *)eo_obj, evas_obj_propagate_events_get(&no_propagate));
|
||||
return no_propagate;
|
||||
return !(obj->no_propagate);
|
||||
}
|
||||
|
||||
void
|
||||
_propagate_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
EOLIAN void
|
||||
_evas_object_pointer_mode_set(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, Evas_Object_Pointer_Mode setting)
|
||||
{
|
||||
Eina_Bool *no_propagate = va_arg(*list, Eina_Bool *);
|
||||
const Evas_Object_Protected_Data *obj = _pd;
|
||||
if (no_propagate) *no_propagate = !(obj->no_propagate);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_pointer_mode_set(Evas_Object *eo_obj, Evas_Object_Pointer_Mode setting)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_pointer_mode_set(setting));
|
||||
}
|
||||
|
||||
void
|
||||
_pointer_mode_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
{
|
||||
Evas_Object_Pointer_Mode setting = va_arg(*list, Evas_Object_Pointer_Mode);
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
obj->pointer_mode = setting;
|
||||
}
|
||||
|
||||
EAPI Evas_Object_Pointer_Mode
|
||||
evas_object_pointer_mode_get(const Evas_Object *eo_obj)
|
||||
EOLIAN Evas_Object_Pointer_Mode
|
||||
_evas_object_pointer_mode_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return EVAS_OBJECT_POINTER_MODE_AUTOGRAB;
|
||||
MAGIC_CHECK_END();
|
||||
Evas_Object_Pointer_Mode setting = EVAS_OBJECT_POINTER_MODE_AUTOGRAB;
|
||||
eo_do((Eo *)eo_obj, evas_obj_pointer_mode_get(&setting));
|
||||
return setting;
|
||||
}
|
||||
|
||||
void
|
||||
_pointer_mode_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
{
|
||||
Evas_Object_Pointer_Mode *setting = va_arg(*list, Evas_Object_Pointer_Mode *);
|
||||
const Evas_Object_Protected_Data *obj = _pd;
|
||||
if (setting) *setting = obj->pointer_mode;
|
||||
return obj->pointer_mode;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
|
@ -3378,3 +3258,4 @@ _canvas_event_down_count_get(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
|
|||
const Evas_Public_Data *e = _pd;
|
||||
*ret = e->pointer.downs;
|
||||
}
|
||||
|
||||
|
|
|
@ -7,22 +7,14 @@
|
|||
|
||||
/* public calls */
|
||||
|
||||
EAPI void
|
||||
evas_object_focus_set(Evas_Object *eo_obj, Eina_Bool focus)
|
||||
EOLIAN void
|
||||
_evas_object_focus_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool focus)
|
||||
{
|
||||
eo_do(eo_obj, evas_obj_focus_set(focus));
|
||||
}
|
||||
|
||||
void
|
||||
_focus_set(Eo *eo_obj, void *_pd, va_list *list)
|
||||
{
|
||||
Eina_Bool focus = va_arg(*list, int);
|
||||
|
||||
int event_id = 0;
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
|
||||
_evas_object_event_new();
|
||||
|
||||
|
@ -54,24 +46,10 @@ _focus_set(Eo *eo_obj, void *_pd, va_list *list)
|
|||
_evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas);
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_focus_get(const Evas_Object *eo_obj)
|
||||
EOLIAN Eina_Bool
|
||||
_evas_object_focus_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return 0;
|
||||
MAGIC_CHECK_END();
|
||||
Eina_Bool focus = 0;
|
||||
eo_do((Eo *)eo_obj, evas_obj_focus_get(&focus));
|
||||
return focus;
|
||||
}
|
||||
|
||||
void
|
||||
_focus_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
{
|
||||
Eina_Bool *focus = va_arg(*list, Eina_Bool *);
|
||||
|
||||
const Evas_Object_Protected_Data *obj = _pd;
|
||||
*focus = obj->focused;
|
||||
return obj->focused;
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
|
|
|
@ -107,70 +107,30 @@ evas_key_grab_free(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, const c
|
|||
|
||||
/* public calls */
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_key_grab(Evas_Object *eo_obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive)
|
||||
EOLIAN Eina_Bool
|
||||
_evas_object_key_grab(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return EINA_FALSE;
|
||||
MAGIC_CHECK_END();
|
||||
Eina_Bool ret = EINA_FALSE;
|
||||
eo_do(eo_obj, evas_obj_key_grab(keyname, modifiers, not_modifiers, exclusive, &ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
void
|
||||
_key_grab(Eo *eo_obj, void *_pd, va_list *list)
|
||||
{
|
||||
const char *keyname = va_arg(*list, const char *);
|
||||
Evas_Modifier_Mask modifiers = va_arg(*list, Evas_Modifier_Mask);
|
||||
Evas_Modifier_Mask not_modifiers = va_arg(*list, Evas_Modifier_Mask);
|
||||
Eina_Bool exclusive = va_arg(*list, int);
|
||||
Eina_Bool *ret = va_arg(*list, Eina_Bool *);
|
||||
|
||||
/* MEM OK */
|
||||
Evas_Key_Grab *g;
|
||||
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
if (((modifiers == not_modifiers) && (modifiers != 0)) || (!keyname))
|
||||
{
|
||||
*ret = EINA_FALSE;
|
||||
return;
|
||||
}
|
||||
if (((modifiers == not_modifiers) && (modifiers != 0)) || (!keyname)) return EINA_FALSE;
|
||||
if (exclusive)
|
||||
{
|
||||
g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers,
|
||||
exclusive);
|
||||
if (g)
|
||||
{
|
||||
*ret = EINA_FALSE;
|
||||
return;
|
||||
}
|
||||
if (g) return EINA_FALSE;
|
||||
}
|
||||
g = evas_key_grab_new(eo_obj, obj, keyname, modifiers, not_modifiers, exclusive);
|
||||
*ret = (!g) ? EINA_FALSE : EINA_TRUE;
|
||||
return ((!g) ? EINA_FALSE : EINA_TRUE);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_key_ungrab(Evas_Object *eo_obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers)
|
||||
EOLIAN void
|
||||
_evas_object_key_ungrab(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_key_ungrab(keyname, modifiers, not_modifiers));
|
||||
}
|
||||
|
||||
void
|
||||
_key_ungrab(Eo *eo_obj, void *_pd, va_list *list)
|
||||
{
|
||||
const char *keyname = va_arg(*list, const char *);
|
||||
Evas_Modifier_Mask modifiers = va_arg(*list, Evas_Modifier_Mask);
|
||||
Evas_Modifier_Mask not_modifiers = va_arg(*list, Evas_Modifier_Mask);
|
||||
|
||||
/* MEM OK */
|
||||
Evas_Key_Grab *g;
|
||||
|
||||
if (!keyname) return;
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
g = evas_key_grab_find(eo_obj, obj, keyname, modifiers, not_modifiers, 0);
|
||||
if (!g) return;
|
||||
Evas_Object_Protected_Data *g_object = eo_data_scope_get(g->object, EVAS_OBJ_CLASS);
|
||||
|
@ -185,3 +145,4 @@ _key_ungrab(Eo *eo_obj, void *_pd, va_list *list)
|
|||
else
|
||||
evas_key_grab_free(g->object, g_object, keyname, modifiers, not_modifiers);
|
||||
}
|
||||
|
||||
|
|
|
@ -174,22 +174,10 @@ _evas_object_layer_set_child(Evas_Object *eo_obj, Evas_Object *par, short l)
|
|||
|
||||
/* public functions */
|
||||
|
||||
EAPI void
|
||||
evas_object_layer_set(Evas_Object *eo_obj, short l)
|
||||
EOLIAN void
|
||||
_evas_object_layer_set(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, short l)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_layer_set(l));
|
||||
}
|
||||
|
||||
void
|
||||
_layer_set(Eo *eo_obj, void *_obj, va_list *list)
|
||||
{
|
||||
short l = va_arg(*list, int);
|
||||
|
||||
Evas *eo_e;
|
||||
Evas_Object_Protected_Data *obj = _obj;
|
||||
|
||||
if (obj->delete_me) return;
|
||||
if (evas_object_intercept_call_layer_set(eo_obj, obj, l)) return;
|
||||
|
@ -243,26 +231,14 @@ _layer_set(Eo *eo_obj, void *_obj, va_list *list)
|
|||
evas_object_inform_call_restack(eo_obj);
|
||||
}
|
||||
|
||||
EAPI short
|
||||
evas_object_layer_get(const Evas_Object *eo_obj)
|
||||
EOLIAN short
|
||||
_evas_object_layer_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return 0;
|
||||
MAGIC_CHECK_END();
|
||||
short layer = 0;
|
||||
eo_do((Eo *)eo_obj, evas_obj_layer_get(&layer));
|
||||
return layer;
|
||||
}
|
||||
|
||||
void
|
||||
_layer_get(Eo *eo_obj EINA_UNUSED, void *_obj, va_list *list)
|
||||
{
|
||||
short *layer = va_arg(*list, short *);
|
||||
const Evas_Object_Protected_Data *obj = _obj;
|
||||
if (obj->smart.parent)
|
||||
{
|
||||
Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS);
|
||||
*layer = smart_parent_obj->cur->layer;
|
||||
return smart_parent_obj->cur->layer;
|
||||
}
|
||||
*layer = obj->cur->layer;
|
||||
return obj->cur->layer;
|
||||
}
|
||||
|
||||
|
|
|
@ -1243,5 +1243,5 @@ static const Eo_Class_Description class_desc = {
|
|||
NULL
|
||||
};
|
||||
|
||||
EO_DEFINE_CLASS(evas_class_get, &class_desc, EO_BASE_CLASS, EVAS_COMMON_INTERFACE, NULL);
|
||||
EO_DEFINE_CLASS(evas_class_get, &class_desc, EO_BASE_CLASS, EVAS_COMMON_CLASS, NULL);
|
||||
|
||||
|
|
|
@ -427,21 +427,9 @@ _evas_object_map_parent_check(Evas_Object *eo_parent)
|
|||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_map_enable_set(Evas_Object *eo_obj, Eina_Bool enabled)
|
||||
EOLIAN void
|
||||
_evas_object_map_enable_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Eina_Bool enabled)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_map_enable_set(enabled));
|
||||
}
|
||||
|
||||
void
|
||||
_map_enable_set(Eo *eo_obj, void *_pd, va_list *list)
|
||||
{
|
||||
Eina_Bool enabled = va_arg(*list, int);
|
||||
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
Eina_Bool pchange = EINA_FALSE;
|
||||
|
||||
enabled = !!enabled;
|
||||
|
@ -507,40 +495,15 @@ _map_enable_set(Eo *eo_obj, void *_pd, va_list *list)
|
|||
}
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_map_enable_get(const Evas_Object *eo_obj)
|
||||
EOLIAN Eina_Bool
|
||||
_evas_object_map_enable_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return EINA_FALSE;
|
||||
MAGIC_CHECK_END();
|
||||
Eina_Bool enabled = EINA_FALSE;
|
||||
eo_do((Eo *)eo_obj, evas_obj_map_enable_get(&enabled));
|
||||
return enabled;
|
||||
return obj->map->cur.usemap;
|
||||
}
|
||||
|
||||
void
|
||||
_map_enable_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
EOLIAN void
|
||||
_evas_object_map_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const Evas_Map *map)
|
||||
{
|
||||
Eina_Bool *enabled = va_arg(*list, Eina_Bool *);
|
||||
const Evas_Object_Protected_Data *obj = _pd;
|
||||
*enabled = obj->map->cur.usemap;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_map_set(Evas_Object *eo_obj, const Evas_Map *map)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_map_set(map));
|
||||
}
|
||||
|
||||
void
|
||||
_map_set(Eo *eo_obj, void *_pd, va_list *list)
|
||||
{
|
||||
const Evas_Map *map = va_arg(*list, const Evas_Map *);
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
|
||||
if ((!map) || (map->count < 4))
|
||||
{
|
||||
if (obj->map->surface)
|
||||
|
@ -629,24 +592,10 @@ _map_set(Eo *eo_obj, void *_pd, va_list *list)
|
|||
_evas_map_calc_map_geometry(eo_obj);
|
||||
}
|
||||
|
||||
EAPI const Evas_Map *
|
||||
evas_object_map_get(const Evas_Object *eo_obj)
|
||||
EOLIAN Evas_Map *
|
||||
_evas_object_map_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return NULL;
|
||||
MAGIC_CHECK_END();
|
||||
const Evas_Map *map = NULL;
|
||||
eo_do((Eo *)eo_obj, evas_obj_map_get(&map));
|
||||
return map;
|
||||
}
|
||||
|
||||
void
|
||||
_map_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
{
|
||||
const Evas_Map **map = va_arg(*list, const Evas_Map **);
|
||||
const Evas_Object_Protected_Data *obj = _pd;
|
||||
|
||||
*map = obj->map->cur.map;
|
||||
return obj->map->cur.map;
|
||||
}
|
||||
|
||||
EAPI Evas_Map *
|
||||
|
@ -1328,3 +1277,4 @@ evas_object_map_update(Evas_Object *eo_obj,
|
|||
|
||||
return obj->changed_pchange;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,21 +1,9 @@
|
|||
#include "evas_common_private.h"
|
||||
#include "evas_private.h"
|
||||
|
||||
EAPI void
|
||||
evas_object_name_set(Evas_Object *eo_obj, const char *name)
|
||||
EOLIAN void
|
||||
_evas_object_name_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, const char *name)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_name_set(name));
|
||||
}
|
||||
|
||||
void
|
||||
_name_set(Eo *eo_obj, void *_pd, va_list *list)
|
||||
{
|
||||
const char *name = va_arg(*list, const char *);
|
||||
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
if (obj->name)
|
||||
{
|
||||
if (obj->layer && obj->layer->evas && obj->layer->evas->name_hash)
|
||||
|
@ -30,23 +18,10 @@ _name_set(Eo *eo_obj, void *_pd, va_list *list)
|
|||
}
|
||||
}
|
||||
|
||||
EAPI const char *
|
||||
evas_object_name_get(const Evas_Object *eo_obj)
|
||||
EOLIAN const char *
|
||||
_evas_object_name_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return NULL;
|
||||
MAGIC_CHECK_END();
|
||||
const char *name = NULL;
|
||||
eo_do((Eo *)eo_obj, evas_obj_name_get(&name));
|
||||
return name;
|
||||
}
|
||||
|
||||
void
|
||||
_name_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
{
|
||||
const char **name = va_arg(*list, const char **);
|
||||
const Evas_Object_Protected_Data *obj = _pd;
|
||||
*name = obj->name;
|
||||
return obj->name;
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
|
@ -71,7 +46,7 @@ _canvas_object_name_find(Eo *eo_e EINA_UNUSED, void *_pd, va_list *list)
|
|||
}
|
||||
|
||||
static Evas_Object *
|
||||
_evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, int recurse)
|
||||
_priv_evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, int recurse)
|
||||
{
|
||||
const Eina_Inlist *lst;
|
||||
Evas_Object_Protected_Data *child;
|
||||
|
@ -85,29 +60,16 @@ _evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, int re
|
|||
if (!strcmp(name, child->name)) return child->object;
|
||||
if (recurse != 0)
|
||||
{
|
||||
if ((eo_obj = _evas_object_name_child_find(child->object, name, recurse - 1)))
|
||||
if ((eo_obj = _priv_evas_object_name_child_find(child->object, name, recurse - 1)))
|
||||
return (Evas_Object *)eo_obj;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
evas_object_name_child_find(const Evas_Object *eo_obj, const char *name, int recurse)
|
||||
EOLIAN Evas_Object *
|
||||
_evas_object_name_child_find(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, const char *name, int recurse)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return NULL;
|
||||
MAGIC_CHECK_END();
|
||||
Evas_Object *child = NULL;
|
||||
eo_do((Eo *)eo_obj, evas_obj_name_child_find(name, recurse, &child));
|
||||
return child;
|
||||
return (!name ? NULL : _priv_evas_object_name_child_find(eo_obj, name, recurse));
|
||||
}
|
||||
|
||||
void
|
||||
_name_child_find(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
|
||||
{
|
||||
const char *name = va_arg(*list, const char *);
|
||||
int recurse = va_arg(*list, int);
|
||||
Evas_Object **child = va_arg(*list, Evas_Object **);
|
||||
*child = (!name ? NULL : _evas_object_name_child_find(eo_obj, name, recurse));
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
||||
{
|
||||
eo_prefix: evas_obj;
|
||||
data: Evas_Object_Protected_Data;
|
||||
properties {
|
||||
size_hint_max {
|
||||
set {
|
||||
|
@ -76,9 +77,11 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
visibility {
|
||||
set {
|
||||
/*@ Makes the given Evas object visible or invisible. */
|
||||
legacy null;
|
||||
}
|
||||
get {
|
||||
/*@ Retrieves whether or not the given Evas object is visible. */
|
||||
legacy evas_object_visible_get;
|
||||
}
|
||||
values {
|
||||
Eina_Bool v; /*@ @c EINA_TRUE if to make the object visible, @c EINA_FALSE otherwise */
|
||||
|
@ -117,7 +120,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
See the full @ref Example_Evas_Object_Manipulation "example". */
|
||||
}
|
||||
values {
|
||||
const char* type; /*@ in */
|
||||
const char *type; /*@ in */
|
||||
}
|
||||
}
|
||||
size_hint_min {
|
||||
|
@ -304,7 +307,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
@see evas_object_map_set() */
|
||||
}
|
||||
values {
|
||||
const Evas_Map* map; /*@ new map to use */
|
||||
const Evas_Map *map; /*@ new map to use */
|
||||
}
|
||||
}
|
||||
size_hint_aspect {
|
||||
|
@ -480,7 +483,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
See the full @ref Example_Evas_Object_Manipulation "example". */
|
||||
}
|
||||
values {
|
||||
Evas_Object* clip; /*@ The object to clip @p obj by */
|
||||
Evas_Object *clip @nonull; /*@ The object to clip @p obj by */
|
||||
}
|
||||
}
|
||||
size_hint_padding {
|
||||
|
@ -656,7 +659,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
See the full @ref Example_Evas_Events "example". */
|
||||
}
|
||||
values {
|
||||
const char* name; /*@ The given name. */
|
||||
const char *name; /*@ The given name. */
|
||||
}
|
||||
}
|
||||
scale {
|
||||
|
@ -725,6 +728,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
size {
|
||||
set {
|
||||
/*@ Changes the size of the given Evas object. */
|
||||
legacy evas_object_resize;
|
||||
}
|
||||
get {
|
||||
/*@ Retrieves the (rectangular) size of the given Evas object. */
|
||||
|
@ -786,8 +790,10 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
}
|
||||
is_frame_object {
|
||||
set {
|
||||
/*@ @since 1.2 */
|
||||
}
|
||||
get {
|
||||
/*@ @since 1.2 */
|
||||
}
|
||||
values {
|
||||
Eina_Bool is_frame; /*@ in */
|
||||
|
@ -1007,6 +1013,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
position {
|
||||
set {
|
||||
/*@ Move the given Evas object to the given location inside its canvas' viewport. */
|
||||
legacy evas_object_move;
|
||||
}
|
||||
get {
|
||||
/*@ Retrieves the position of the given Evas object. */
|
||||
|
@ -1093,7 +1100,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
@see evas_object_smart_data_set()
|
||||
|
||||
@ingroup Evas_Smart_Object_Group */
|
||||
return void*;
|
||||
return void * @warn_unused;
|
||||
}
|
||||
}
|
||||
smart_clipped_clipper {
|
||||
|
@ -1107,7 +1114,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
properties, like colors.
|
||||
|
||||
@see evas_object_smart_clipped_smart_add() */
|
||||
return Evas_Object*;
|
||||
return Evas_Object * @warn_unused;
|
||||
}
|
||||
}
|
||||
below {
|
||||
|
@ -1124,7 +1131,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
@see evas_object_layer_get()
|
||||
@see evas_object_layer_set()
|
||||
@see evas_object_below_get() */
|
||||
return Evas_Object*;
|
||||
return Evas_Object * @warn_unused;
|
||||
}
|
||||
}
|
||||
clipees {
|
||||
|
@ -1166,7 +1173,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
evas_object_show(obj_tmp);
|
||||
}
|
||||
@endcode */
|
||||
return const Eina_List*;
|
||||
return const Eina_List * @warn_unused;
|
||||
}
|
||||
}
|
||||
smart_parent {
|
||||
|
@ -1178,7 +1185,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
obj is not a smart member of any
|
||||
|
||||
@ingroup Evas_Smart_Object_Group */
|
||||
return Evas_Object*;
|
||||
return Evas_Object * @warn_unused;
|
||||
}
|
||||
}
|
||||
above {
|
||||
|
@ -1195,7 +1202,28 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
@see evas_object_layer_get()
|
||||
@see evas_object_layer_set()
|
||||
@see evas_object_below_get() */
|
||||
return Evas_Object*;
|
||||
return Evas_Object * @warn_unused;
|
||||
}
|
||||
}
|
||||
size_hint_display_mode {
|
||||
get {
|
||||
/*@
|
||||
Retrieves the hints for an object's display mode
|
||||
|
||||
These are hints on the display mode @p obj. This is
|
||||
not a size enforcement in any way, it's just a hint that can be
|
||||
used whenever appropriate.
|
||||
This mode can be used object's display mode like commpress or expand */
|
||||
}
|
||||
set {
|
||||
/*@
|
||||
Sets the hints for an object's disply mode
|
||||
|
||||
This is not a size enforcement in any way, it's just a hint that
|
||||
can be used whenever appropriate.*/
|
||||
}
|
||||
values {
|
||||
Evas_Display_Mode dispmode; /*@ display mode hint */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1206,8 +1234,9 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
|
||||
@return EINA_TRUE if @p obj clip any object.
|
||||
@since 1.8 */
|
||||
|
||||
const;
|
||||
return Eina_Bool;
|
||||
return Eina_Bool @warn_unused;
|
||||
}
|
||||
key_grab {
|
||||
/*@
|
||||
|
@ -1249,9 +1278,10 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
@see evas_object_focus_get
|
||||
@see evas_focus_get
|
||||
@see evas_key_modifier_add */
|
||||
return Eina_Bool;
|
||||
|
||||
return Eina_Bool @warn_unused;
|
||||
params {
|
||||
@in const char* keyname; /*@ the key to request events for. */
|
||||
@in const char *keyname @nonull; /*@ the key to request events for. */
|
||||
@in Evas_Modifier_Mask modifiers; /*@ a mask of modifiers that must be present to
|
||||
trigger the event. */
|
||||
@in Evas_Modifier_Mask not_modifiers; /*@ a mask of modifiers that must @b not be present
|
||||
|
@ -1283,8 +1313,9 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
@see evas_object_layer_get()
|
||||
@see evas_object_layer_set()
|
||||
@see evas_object_stack_below() */
|
||||
|
||||
params {
|
||||
@in Evas_Object* below; /*@ the object below which to stack */
|
||||
@in Evas_Object *below @nonull; /*@ the object below which to stack */
|
||||
}
|
||||
}
|
||||
raise {
|
||||
|
@ -1297,6 +1328,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
@see evas_object_stack_above()
|
||||
@see evas_object_stack_below()
|
||||
@see evas_object_lower() */
|
||||
|
||||
}
|
||||
stack_above {
|
||||
/*@
|
||||
|
@ -1321,8 +1353,9 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
@see evas_object_layer_get()
|
||||
@see evas_object_layer_set()
|
||||
@see evas_object_stack_below() */
|
||||
|
||||
params {
|
||||
@in Evas_Object* above; /*@ the object above which to stack */
|
||||
@in Evas_Object *above @nonull; /*@ the object above which to stack */
|
||||
}
|
||||
}
|
||||
smart_type_check {
|
||||
|
@ -1349,10 +1382,11 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
@see eo_isa
|
||||
|
||||
@ingroup Evas_Smart_Object_Group */
|
||||
|
||||
const;
|
||||
return Eina_Bool;
|
||||
return Eina_Bool @warn_unused;
|
||||
params {
|
||||
@in const char* type; /*@ The @b name (type) of the smart class to check for */
|
||||
@in const char *type @nonull; /*@ The @b name (type) of the smart class to check for */
|
||||
}
|
||||
}
|
||||
name_child_find {
|
||||
|
@ -1371,10 +1405,11 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
@since 1.2
|
||||
|
||||
@ingroup Evas_Object_Group_Find */
|
||||
|
||||
const;
|
||||
return Evas_Object*;
|
||||
return Evas_Object * @warn_unused;
|
||||
params {
|
||||
@in const char* name; /*@ The given name. */
|
||||
@in const char *name; /*@ The given name. */
|
||||
@in int recurse; /*@ Set to the number of child levels to recurse (0 == don't recurse, 1 == only look at the children of @p obj or their immediate children, but no further etc.). */
|
||||
}
|
||||
}
|
||||
|
@ -1396,8 +1431,9 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
@see evas_object_focus_set
|
||||
@see evas_object_focus_get
|
||||
@see evas_focus_get */
|
||||
|
||||
params {
|
||||
@in const char* keyname; /*@ the key the grab is set for. */
|
||||
@in const char *keyname @nonull; /*@ the key the grab is set for. */
|
||||
@in Evas_Modifier_Mask modifiers; /*@ a mask of modifiers that must be present to
|
||||
trigger the event. */
|
||||
@in Evas_Modifier_Mask not_modifiers; /*@ a mask of modifiers that must not not be
|
||||
|
@ -1414,6 +1450,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
@see evas_object_stack_above()
|
||||
@see evas_object_stack_below()
|
||||
@see evas_object_raise() */
|
||||
|
||||
}
|
||||
clip_unset {
|
||||
/*@
|
||||
|
@ -1426,6 +1463,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
|
||||
See also evas_object_clip_set() (for an example),
|
||||
evas_object_clipees_get() and evas_object_clip_get(). */
|
||||
|
||||
}
|
||||
smart_move_children_relative {
|
||||
/*@
|
||||
|
@ -1439,6 +1477,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
|
||||
@note Clipped smart objects already make use of this function on
|
||||
their @c move() smart function definition. */
|
||||
|
||||
params {
|
||||
@in Evas_Coord dx; /*@ horizontal offset (delta). */
|
||||
@in Evas_Coord dy; /*@ vertical offset (delta). */
|
||||
|
@ -1456,10 +1495,11 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
@see eo_isa
|
||||
|
||||
@ingroup Evas_Smart_Object_Group */
|
||||
|
||||
const;
|
||||
return Eina_Bool;
|
||||
return Eina_Bool @warn_unused;
|
||||
params {
|
||||
@in const char* type; /*@ The type (name string) to check for. Must be the name */
|
||||
@in const char *type @nonull; /*@ The type (name string) to check for. Must be the name */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1469,4 +1509,5 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
|
|||
Eo_Base::dbg_info_get;
|
||||
Evas_Common_Interface::evas::get;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -122,18 +122,7 @@ _evas_smart_data_set(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o, void *data)
|
|||
eo_data_ref(eo_obj, NULL);
|
||||
}
|
||||
|
||||
EAPI void *
|
||||
evas_object_smart_data_get(const Evas_Object *eo_obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return NULL;
|
||||
MAGIC_CHECK_END();
|
||||
void *data = NULL;
|
||||
eo_do((Eo *)eo_obj, evas_obj_smart_data_get(&data));
|
||||
return data;
|
||||
}
|
||||
|
||||
EOLIAN static void*
|
||||
EOLIAN static void *
|
||||
_evas_smart_evas_object_smart_data_get(Eo *eo_obj EINA_UNUSED, Evas_Smart_Data *o)
|
||||
{
|
||||
return o->data;
|
||||
|
@ -320,28 +309,6 @@ _evas_smart_member_del(Eo *smart_obj, Evas_Smart_Data *_pd EINA_UNUSED, Evas_Obj
|
|||
evas_object_mapped_clip_across_mark(eo_obj, obj);
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
evas_object_smart_parent_get(const Evas_Object *eo_obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return NULL;
|
||||
MAGIC_CHECK_END();
|
||||
Evas_Object *smart_parent = NULL;
|
||||
eo_do((Eo *)eo_obj, evas_obj_smart_parent_get(&smart_parent));
|
||||
return smart_parent;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_smart_type_check(const Evas_Object *eo_obj, const char *type)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return EINA_FALSE;
|
||||
MAGIC_CHECK_END();
|
||||
Eina_Bool type_check = EINA_FALSE;
|
||||
eo_do((Eo *)eo_obj, evas_obj_smart_type_check(type, &type_check));
|
||||
return type_check;
|
||||
}
|
||||
|
||||
EOLIAN static Eina_Bool
|
||||
_evas_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char *type)
|
||||
{
|
||||
|
@ -372,17 +339,6 @@ _evas_smart_evas_object_smart_type_check(Eo *eo_obj, Evas_Smart_Data *o EINA_UNU
|
|||
return type_check;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_smart_type_check_ptr(const Evas_Object *eo_obj, const char *type)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return EINA_FALSE;
|
||||
MAGIC_CHECK_END();
|
||||
Eina_Bool type_check_ptr = EINA_FALSE;
|
||||
eo_do((Eo *)eo_obj, evas_obj_smart_type_check_ptr(type, &type_check_ptr));
|
||||
return type_check_ptr;
|
||||
}
|
||||
|
||||
EOLIAN static Eina_Bool
|
||||
_evas_smart_evas_object_smart_type_check_ptr(Eo *eo_obj, Evas_Smart_Data *o EINA_UNUSED, const char* type)
|
||||
{
|
||||
|
|
|
@ -12,17 +12,9 @@
|
|||
CSO_DATA_GET(eo_obj, ptr) \
|
||||
if (!ptr) return;
|
||||
|
||||
EAPI void
|
||||
evas_object_smart_move_children_relative(Evas_Object *eo_obj, Evas_Coord dx, Evas_Coord dy)
|
||||
EOLIAN void
|
||||
_evas_object_smart_move_children_relative(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED, Evas_Coord dx, Evas_Coord dy)
|
||||
{
|
||||
eo_do(eo_obj, evas_obj_smart_move_children_relative(dx, dy));
|
||||
}
|
||||
|
||||
void
|
||||
_smart_move_children_relative(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
|
||||
{
|
||||
Evas_Coord dx = va_arg(*list, Evas_Coord);
|
||||
Evas_Coord dy = va_arg(*list, Evas_Coord);
|
||||
|
||||
const Eina_Inlist *lst;
|
||||
Evas_Object_Protected_Data *child;
|
||||
|
@ -43,23 +35,12 @@ _smart_move_children_relative(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
|
|||
}
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
evas_object_smart_clipped_clipper_get(Evas_Object *eo_obj)
|
||||
EOLIAN Evas_Object *
|
||||
_evas_object_smart_clipped_clipper_get(Eo *eo_obj, Evas_Object_Protected_Data *obj EINA_UNUSED)
|
||||
{
|
||||
Evas_Object *ret = NULL;
|
||||
eo_do((Eo *)eo_obj, evas_obj_smart_clipped_clipper_get(&ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
void
|
||||
_smart_clipped_clipper_get(Eo *eo_obj, void *_pd EINA_UNUSED, va_list *list)
|
||||
{
|
||||
Evas_Object **ret = va_arg(*list, Evas_Object **);
|
||||
CSO_DATA_GET(eo_obj, cso)
|
||||
if (!cso)
|
||||
*ret = NULL;
|
||||
else
|
||||
*ret = cso->clipper;
|
||||
if (!cso) return NULL;
|
||||
else return cso->clipper;
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -87,7 +68,7 @@ evas_object_smart_clipped_smart_add(Evas_Object *eo_obj)
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_evas_smart_clipped_evas_smart_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED)
|
||||
_evas_smart_clipped_evas_smart_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
|
||||
{
|
||||
evas_object_smart_clipped_smart_add(eo_obj);
|
||||
}
|
||||
|
@ -114,7 +95,7 @@ evas_object_smart_clipped_smart_del(Evas_Object *eo_obj)
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_evas_smart_clipped_evas_smart_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED)
|
||||
_evas_smart_clipped_evas_smart_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
|
||||
{
|
||||
evas_object_smart_clipped_smart_del(eo_obj);
|
||||
}
|
||||
|
@ -129,7 +110,7 @@ evas_object_smart_clipped_smart_move(Evas_Object *eo_obj, Evas_Coord x, Evas_Coo
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_evas_smart_clipped_evas_smart_move(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED, Evas_Coord x, Evas_Coord y)
|
||||
_evas_smart_clipped_evas_smart_move(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Coord x, Evas_Coord y)
|
||||
{
|
||||
evas_object_smart_clipped_smart_move(eo_obj, x, y);
|
||||
}
|
||||
|
@ -143,7 +124,7 @@ evas_object_smart_clipped_smart_show(Evas_Object *eo_obj)
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_evas_smart_clipped_evas_smart_show(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED)
|
||||
_evas_smart_clipped_evas_smart_show(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
|
||||
{
|
||||
evas_object_smart_clipped_smart_show(eo_obj);
|
||||
}
|
||||
|
@ -156,7 +137,7 @@ evas_object_smart_clipped_smart_hide(Evas_Object *eo_obj)
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_evas_smart_clipped_evas_smart_hide(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED)
|
||||
_evas_smart_clipped_evas_smart_hide(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
|
||||
{
|
||||
evas_object_smart_clipped_smart_hide(eo_obj);
|
||||
}
|
||||
|
@ -169,7 +150,7 @@ evas_object_smart_clipped_smart_color_set(Evas_Object *eo_obj, int r, int g, int
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_evas_smart_clipped_evas_smart_color_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED, int r, int g, int b, int a)
|
||||
_evas_smart_clipped_evas_smart_color_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, int r, int g, int b, int a)
|
||||
{
|
||||
evas_object_smart_clipped_smart_color_set(eo_obj, r, g, b, a);
|
||||
}
|
||||
|
@ -182,7 +163,7 @@ evas_object_smart_clipped_smart_clip_set(Evas_Object *eo_obj, Evas_Object *clip)
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_evas_smart_clipped_evas_smart_clip_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED, Evas_Object *clip)
|
||||
_evas_smart_clipped_evas_smart_clip_set(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *clip)
|
||||
{
|
||||
evas_object_smart_clipped_smart_clip_set(eo_obj, clip);
|
||||
}
|
||||
|
@ -195,7 +176,7 @@ evas_object_smart_clipped_smart_clip_unset(Evas_Object *eo_obj)
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_evas_smart_clipped_evas_smart_clip_unset(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED)
|
||||
_evas_smart_clipped_evas_smart_clip_unset(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED)
|
||||
{
|
||||
evas_object_smart_clipped_smart_clip_unset(eo_obj);
|
||||
}
|
||||
|
@ -212,7 +193,7 @@ evas_object_smart_clipped_smart_member_add(Evas_Object *eo_obj, Evas_Object *mem
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_evas_smart_clipped_evas_smart_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED, Evas_Object *member)
|
||||
_evas_smart_clipped_evas_smart_member_add(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
|
||||
{
|
||||
eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_add(member));
|
||||
evas_object_smart_clipped_smart_member_add(eo_obj, member);
|
||||
|
@ -230,7 +211,7 @@ evas_object_smart_clipped_smart_member_del(Evas_Object *eo_obj, Evas_Object *mem
|
|||
}
|
||||
|
||||
EOLIAN static void
|
||||
_evas_smart_clipped_evas_smart_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *_pd EINA_UNUSED, Evas_Object *member)
|
||||
_evas_smart_clipped_evas_smart_member_del(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *obj EINA_UNUSED, Evas_Object *member)
|
||||
{
|
||||
evas_object_smart_clipped_smart_member_del(eo_obj, member);
|
||||
eo_do_super(eo_obj, MY_CLASS, evas_obj_smart_member_del(member));
|
||||
|
@ -276,3 +257,4 @@ _evas_smart_clipped_constructor(Eo *eo_obj, Evas_Object_Smart_Clipped_Data *clas
|
|||
}
|
||||
|
||||
#include "canvas/evas_smart_clipped.eo.c"
|
||||
|
||||
|
|
|
@ -37,20 +37,9 @@ evas_object_below_get_internal(const Evas_Object_Protected_Data *obj)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_raise(Evas_Object *eo_obj)
|
||||
EOLIAN void
|
||||
_evas_object_raise(Eo *eo_obj, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_raise());
|
||||
}
|
||||
|
||||
void
|
||||
_raise(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
|
||||
if (evas_object_intercept_call_raise(eo_obj, obj)) return;
|
||||
|
||||
if (!((EINA_INLIST_GET(obj))->next))
|
||||
|
@ -94,20 +83,9 @@ _raise(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
}
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_lower(Evas_Object *eo_obj)
|
||||
EOLIAN void
|
||||
_evas_object_lower(Eo *eo_obj, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_lower());
|
||||
}
|
||||
|
||||
void
|
||||
_lower(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
|
||||
if (evas_object_intercept_call_lower(eo_obj, obj)) return;
|
||||
|
||||
if (!((EINA_INLIST_GET(obj))->prev))
|
||||
|
@ -152,21 +130,9 @@ _lower(Eo *eo_obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
}
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_stack_above(Evas_Object *eo_obj, Evas_Object *above)
|
||||
EOLIAN void
|
||||
_evas_object_stack_above(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_above)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_stack_above(above));
|
||||
}
|
||||
|
||||
void
|
||||
_stack_above(Eo *eo_obj, void *_pd, va_list *list)
|
||||
{
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
Evas_Object *eo_above = va_arg(*list, Evas_Object *);
|
||||
|
||||
if (!eo_above) return;
|
||||
if (eo_obj == eo_above) return;
|
||||
if (evas_object_intercept_call_stack_above(eo_obj, obj, eo_above)) return;
|
||||
|
@ -240,21 +206,9 @@ _stack_above(Eo *eo_obj, void *_pd, va_list *list)
|
|||
}
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_stack_below(Evas_Object *eo_obj, Evas_Object *eo_below)
|
||||
EOLIAN void
|
||||
_evas_object_stack_below(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object *eo_below)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return;
|
||||
MAGIC_CHECK_END();
|
||||
eo_do(eo_obj, evas_obj_stack_below(eo_below));
|
||||
}
|
||||
|
||||
void
|
||||
_stack_below(Eo *eo_obj, void *_pd, va_list *list)
|
||||
{
|
||||
Evas_Object *eo_below = va_arg(*list, Evas_Object *);
|
||||
Evas_Object_Protected_Data *obj = _pd;
|
||||
|
||||
if (!eo_below) return;
|
||||
if (eo_obj == eo_below) return;
|
||||
if (evas_object_intercept_call_stack_below(eo_obj, obj, eo_below)) return;
|
||||
|
@ -328,96 +282,50 @@ _stack_below(Eo *eo_obj, void *_pd, va_list *list)
|
|||
}
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
evas_object_above_get(const Evas_Object *eo_obj)
|
||||
EOLIAN Evas_Object *
|
||||
_evas_object_above_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return NULL;
|
||||
MAGIC_CHECK_END();
|
||||
Evas_Object *ret = NULL;
|
||||
eo_do((Eo *)eo_obj, evas_obj_above_get(&ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
void
|
||||
_above_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
{
|
||||
const Evas_Object_Protected_Data *obj = _pd;
|
||||
Evas_Object **ret = va_arg(*list, Evas_Object **);
|
||||
|
||||
if (obj->smart.parent)
|
||||
{
|
||||
do
|
||||
{
|
||||
obj = (Evas_Object_Protected_Data *)((EINA_INLIST_GET(obj))->next);
|
||||
if ((obj) && (!obj->delete_me))
|
||||
{
|
||||
*ret = obj->object;
|
||||
return;
|
||||
}
|
||||
if ((obj) && (!obj->delete_me)) return obj->object;
|
||||
}
|
||||
while (obj);
|
||||
*ret = NULL;
|
||||
return;
|
||||
return NULL;
|
||||
}
|
||||
obj = evas_object_above_get_internal(obj);
|
||||
while (obj)
|
||||
{
|
||||
if (!obj->delete_me)
|
||||
{
|
||||
*ret = obj->object;
|
||||
return;
|
||||
}
|
||||
if (!obj->delete_me) return obj->object;
|
||||
obj = evas_object_above_get_internal(obj);
|
||||
}
|
||||
*ret = NULL;
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
evas_object_below_get(const Evas_Object *eo_obj)
|
||||
{
|
||||
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
|
||||
return NULL;
|
||||
MAGIC_CHECK_END();
|
||||
Evas_Object *ret = NULL;
|
||||
eo_do((Eo *)eo_obj, evas_obj_below_get(&ret));
|
||||
return ret;
|
||||
}
|
||||
|
||||
void
|
||||
_below_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
|
||||
EOLIAN Evas_Object *
|
||||
_evas_object_below_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
|
||||
{
|
||||
const Evas_Object_Protected_Data *obj = _pd;
|
||||
Evas_Object **ret = va_arg(*list, Evas_Object **);
|
||||
*ret = NULL;
|
||||
if (obj->smart.parent)
|
||||
{
|
||||
do
|
||||
{
|
||||
obj = (Evas_Object_Protected_Data *)((EINA_INLIST_GET(obj))->prev);
|
||||
if ((obj) && (!obj->delete_me))
|
||||
{
|
||||
*ret = obj->object;
|
||||
return;
|
||||
}
|
||||
if ((obj) && (!obj->delete_me)) return obj->object;
|
||||
}
|
||||
while (obj);
|
||||
return;
|
||||
return NULL;
|
||||
}
|
||||
obj = evas_object_below_get_internal(obj);
|
||||
while (obj)
|
||||
{
|
||||
if (!obj->delete_me)
|
||||
{
|
||||
*ret = obj->object;
|
||||
return;
|
||||
}
|
||||
if (!obj->delete_me) return obj->object;
|
||||
obj = evas_object_below_get_internal(obj);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
|
||||
EAPI Evas_Object *
|
||||
evas_object_bottom_get(const Evas *e)
|
||||
{
|
||||
|
@ -497,3 +405,4 @@ _canvas_object_top_get(Eo *eo_e EINA_UNUSED, void *_pd, va_list *params_list)
|
|||
|
||||
*ret = obj->object;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue