#include <Eina.h>
#include "Eobj.h"
+#include "eobj_private.h"
#include "config.h"
typedef int Eobj_Class_Id;
-static int _eobj_log_dom = -1;
+int _eobj_log_dom = -1;
static Eobj_Class **_eobj_classes;
static Eobj_Class_Id _eobj_classes_last_id;
static Eina_Bool _eobj_init_count = 0;
static void _eobj_callback_remove_all(Eobj *obj);
-static void _eobj_generic_data_del_all(Eobj *obj);
static void eobj_class_constructor(Eobj *obj, const Eobj_Class *klass);
static void eobj_class_destructor(Eobj *obj, const Eobj_Class *klass);
static void eobj_constructor_error_unset(Eobj *obj);
-#ifdef CRITICAL
-#undef CRITICAL
-#endif
-#define CRITICAL(...) EINA_LOG_DOM_CRIT(_eobj_log_dom, __VA_ARGS__)
-
-#ifdef ERR
-#undef ERR
-#endif
-#define ERR(...) EINA_LOG_DOM_ERR(_eobj_log_dom, __VA_ARGS__)
-
-#ifdef WRN
-#undef WRN
-#endif
-#define WRN(...) EINA_LOG_DOM_WARN(_eobj_log_dom, __VA_ARGS__)
-
-#ifdef INF
-#undef INF
-#endif
-#define INF(...) EINA_LOG_DOM_INFO(_eobj_log_dom, __VA_ARGS__)
-
-#ifdef DBG
-#undef DBG
-#endif
-#define DBG(...) EINA_LOG_DOM_DBG(_eobj_log_dom, __VA_ARGS__)
-
typedef struct _Eobj_Callback_Description Eobj_Callback_Description;
struct _Eobj {
const Eobj_Class *klass;
void *data_blob;
int refcount;
+#ifndef NDEBUG
+ Eina_Inlist *xrefs;
+#endif
+
Eina_List *composite_objects;
Eina_Inlist *callbacks;
int walking_list;
- Eina_Inlist *generic_data;
-
Eina_Inlist *kls_itr;
Eina_Bool delete:1;
(Eobj_Class *) ((tmp <= _eobj_classes_last_id) && (tmp > 0)) ? \
(_eobj_classes[tmp - 1]) : NULL; \
})
+#define OP_SUB_ID_GET(op) ((op) & 0xffff)
+
+#define EOBJ_ALIGN_SIZE(size) \
+ ((size) + (sizeof(void *) - ((size) % sizeof(void *))))
/* Structure of Eobj_Op is:
* 16bit: class
const Eobj_Class *klass;
} Eobj_Extension_Node;
+typedef struct
+{
+ const Eobj_Class *klass;
+ size_t offset;
+} Eobj_Extension_Data_Offset;
+
struct _Eobj_Class
{
Eobj_Class_Id class_id;
Dich_Chain1 chain[DICH_CHAIN1_SIZE];
Eina_Inlist *extensions;
+ Eobj_Extension_Data_Offset *extn_data_off;
+ size_t extn_data_size;
+
const Eobj_Class **mro;
size_t data_offset; /* < Offset of the data within object data. */
/* END OF DICH */
+static const Eobj_Op_Description noop_desc =
+ EOBJ_OP_DESCRIPTION(EOBJ_NOOP, "", "No operation.");
+
+static const Eobj_Op_Description *
+_eobj_op_id_desc_get(Eobj_Op op)
+{
+ const Eobj_Class *klass = OP_CLASS_GET(op);
+ Eobj_Op sub_id = OP_SUB_ID_GET(op);
+
+ if (op == EOBJ_NOOP)
+ return &noop_desc;
+
+ if (klass && (sub_id < klass->desc->ops.count))
+ return klass->desc->ops.descs + sub_id;
+
+ return NULL;
+}
+
+static const char *
+_eobj_op_id_name_get(Eobj_Op op)
+{
+ const Eobj_Op_Description *desc = _eobj_op_id_desc_get(op);
+ return (desc) ? desc->name : NULL;
+}
+
typedef struct
{
EINA_INLIST;
}
static inline const Eobj_Class *
-_eobj_kls_itr_next(Eobj *obj)
+_eobj_kls_itr_next(Eobj *obj, Eobj_Op op)
{
Eobj_Kls_Itr_Node *node =
EINA_INLIST_CONTAINER_GET(obj->kls_itr, Eobj_Kls_Itr_Node);
+
+ if (!node || (node->op != op))
+ {
+ Eobj_Op node_op = (node) ? node->op : EOBJ_NOOP;
+ ERR("Called with op %d ('%s') while expecting: %d ('%s'). This probaly means you called eobj_*_super functions from a wrong place.",
+ op, _eobj_op_id_name_get(op),
+ node_op, _eobj_op_id_name_get(node_op));
+ return NULL;
+ }
+
const Eobj_Class **kls_itr = node->kls_itr;
if (*kls_itr)
{
return !(*kls_itr && *(kls_itr + 1));
}
-static const Eobj_Op_Description *
-_eobj_op_id_desc_get(Eobj_Op op)
-{
- const Eobj_Class *klass = OP_CLASS_GET(op);
-
- if (!klass || !klass->desc->ops.base_op_id) return NULL;
-
- Eobj_Op base_op_id = *klass->desc->ops.base_op_id;
-
- const Eobj_Op_Description *desc = klass->desc->ops.descs;
- size_t i;
- for (i = 0 ; i < klass->desc->ops.count ; i++, desc++)
- {
- if ((base_op_id + desc->sub_op) == op)
- return desc;
- }
-
- return NULL;
-}
-
static Eina_Bool
_eobj_op_internal(Eobj *obj, Eobj_Op op, va_list *p_list)
{
goto end;
}
- klass = _eobj_kls_itr_next(obj);
+ klass = _eobj_kls_itr_next(obj, op);
}
/* Try composite objects */
{
if (!_eobj_op_internal(obj, op, p_list))
{
- const Eobj_Op_Description *desc = _eobj_op_id_desc_get(op);
- const char *_id_name = (desc) ? desc->name : NULL;
const Eobj_Class *op_klass = OP_CLASS_GET(op);
const char *_dom_name = (op_klass) ? op_klass->desc->name : NULL;
ERR("Can't find func for op %x ('%s' of domain '%s') for class '%s'. Aborting.",
- op, _id_name, _dom_name,
+ op, _eobj_op_id_name_get(op), _dom_name,
obj->klass->desc->name);
ret = EINA_FALSE;
break;
}
EAPI Eina_Bool
-eobj_super_do(Eobj *obj, Eobj_Op op, ...)
+eobj_do_super(Eobj *obj, Eobj_Op op, ...)
{
const Eobj_Class *obj_klass;
Eina_Bool ret = EINA_TRUE;
va_list p_list;
- va_start(p_list, op);
-
/* Advance the kls itr. */
- obj_klass = _eobj_kls_itr_next(obj);
+ obj_klass = _eobj_kls_itr_next(obj, op);
+
+ if (!obj_klass)
+ {
+ return EINA_FALSE;
+ }
+
+ va_start(p_list, op);
if (!_eobj_op_internal(obj, op, &p_list))
{
- const Eobj_Op_Description *desc = _eobj_op_id_desc_get(op);
- const char *_id_name = (desc) ? desc->name : NULL;
const Eobj_Class *op_klass = OP_CLASS_GET(op);
const char *_dom_name = (op_klass) ? op_klass->desc->name : NULL;
ERR("Can't find func for op %x ('%s' of domain '%s') for class '%s'. Aborting.",
- op, _id_name, _dom_name,
+ op, _eobj_op_id_name_get(op), _dom_name,
(obj_klass) ? obj_klass->desc->name : NULL);
ret = EINA_FALSE;
}
static Eina_List *
_eobj_class_mro_add(Eina_List *mro, const Eobj_Class *klass)
{
+ Eina_List *extn_pos = NULL;
+ Eina_Bool check_consistency = !mro;
if (!klass)
return mro;
mro = eina_list_append(mro, klass);
+ /* Recursively add extenions. */
{
Eobj_Extension_Node *extn;
EINA_INLIST_FOREACH(klass->extensions, extn)
{
mro = _eobj_class_mro_add(mro, extn->klass);
+ if (!mro)
+ return NULL;
+
+ if (check_consistency)
+ {
+ extn_pos = eina_list_append(extn_pos, eina_list_last(mro));
+ }
+ }
+ }
+
+ /* Check if we can create a consistent mro. We only do it for the class
+ * we are working on (i.e no parents). */
+ if (check_consistency)
+ {
+ Eobj_Extension_Node *extn;
+
+ Eina_List *itr = extn_pos;
+ EINA_INLIST_FOREACH(klass->extensions, extn)
+ {
+ /* Get the first one after the extension. */
+ Eina_List *extn_list = eina_list_next(eina_list_data_get(itr));
+
+ /* If we found the extension again. */
+ if (eina_list_data_find_list(extn_list, extn->klass))
+ {
+ eina_list_free(mro);
+ ERR("Cannot create a consistent method resolution order for class '%s' because of '%s'.", klass->desc->name, extn->klass->desc->name);
+ return NULL;
+ }
+
+ itr = eina_list_next(itr);
}
}
+
mro = _eobj_class_mro_add(mro, klass->parent);
return mro;
}
-static void
+static Eina_Bool
_eobj_class_mro_init(Eobj_Class *klass)
{
Eina_List *mro = NULL;
DBG("Started creating MRO for class '%s'", klass->desc->name);
mro = _eobj_class_mro_add(mro, klass);
+ if (!mro)
+ return EINA_FALSE;
+
+ /* Remove duplicates and make them the right order. */
{
Eina_List *itr1, *itr2, *itr2n;
}
DBG("Finished creating MRO for class '%s'", klass->desc->name);
+
+ return EINA_TRUE;
}
static void
if (klass->desc->class_constructor)
klass->desc->class_constructor(klass);
-
- _eobj_class_mro_init(klass);
}
EAPI void
}
}
- free(klass->mro);
+ if (klass->mro)
+ free(klass->mro);
+
+ if (klass->extn_data_off)
+ free(klass->extn_data_off);
free(klass);
}
-EAPI Eobj_Class *
+/* DEVCHECK */
+static Eina_Bool
+_eobj_class_check_op_descs(const Eobj_Class *klass)
+{
+ const Eobj_Class_Description *desc = klass->desc;
+ const Eobj_Op_Description *itr;
+ size_t i;
+
+ if (desc->ops.count > 0)
+ {
+ if (!desc->ops.base_op_id)
+ {
+ ERR("Class '%s' has a non-zero ops count, but base_id is NULL.",
+ desc->name);
+ return EINA_FALSE;
+ }
+
+ if (!desc->ops.descs)
+ {
+ ERR("Class '%s' has a non-zero ops count, but there are no descs.",
+ desc->name);
+ return EINA_FALSE;
+ }
+ }
+
+ itr = desc->ops.descs;
+ for (i = 0 ; i < desc->ops.count ; i++, itr++)
+ {
+ if (itr->sub_op != i)
+ {
+ if (itr->name)
+ {
+ ERR("Wrong order in Ops description for class '%s'. Expected %d and got %d", desc->name, i, itr->sub_op);
+ }
+ else
+ {
+ ERR("Found too few Ops description for class '%s'. Expected %d descriptions, but found %d.", desc->name, desc->ops.count, i);
+ }
+ return EINA_FALSE;
+ }
+ }
+
+ if (itr && itr->name)
+ {
+ ERR("Found extra Ops description for class '%s'. Expected %d descriptions, but found more.", desc->name, desc->ops.count);
+ return EINA_FALSE;
+ }
+
+ return EINA_TRUE;
+}
+
+EAPI const Eobj_Class *
eobj_class_new(const Eobj_Class_Description *desc, const Eobj_Class *parent, ...)
{
Eobj_Class *klass;
{ \
if (!x) \
{ \
- ERR("%s can't be NULL! Aborting.", #x); \
+ ERR("%s must not be NULL! Aborting.", #x); \
return NULL; \
} \
} \
if ((klass->parent->desc->type != EOBJ_CLASS_TYPE_REGULAR) &&
(klass->parent->desc->type != EOBJ_CLASS_TYPE_REGULAR_NO_INSTANT))
{
- /* FIXME: Actually handle it. */
ERR("Regular classes ('%s') aren't allowed to inherit from non-regular classes ('%s').", klass->desc->name, klass->parent->desc->name);
goto cleanup;
}
break;
case EOBJ_CLASS_TYPE_INTERFACE:
case EOBJ_CLASS_TYPE_MIXIN:
- if ((klass->parent->desc->type != EOBJ_CLASS_TYPE_REGULAR) &&
- (klass->parent->desc->type != EOBJ_CLASS_TYPE_REGULAR_NO_INSTANT))
+ if ((klass->parent->desc->type != EOBJ_CLASS_TYPE_INTERFACE) &&
+ (klass->parent->desc->type != EOBJ_CLASS_TYPE_MIXIN))
{
- /* FIXME: Actually handle it. */
ERR("Non-regular classes ('%s') aren't allowed to inherit from regular classes ('%s').", klass->desc->name, klass->parent->desc->name);
goto cleanup;
}
/* Update the current offset. */
/* FIXME: Make sure this alignment is enough. */
klass->data_offset = klass->parent->data_offset +
- klass->parent->desc->data_size +
- (sizeof(void *) -
- (klass->parent->desc->data_size % sizeof(void *)));
+ EOBJ_ALIGN_SIZE(klass->parent->desc->data_size);
+ }
+
+ if (!_eobj_class_check_op_descs(klass))
+ {
+ goto cleanup;
+ }
+
+ if (!_eobj_class_mro_init(klass))
+ {
+ goto cleanup;
+ }
+
+ /* create MIXIN offset table. */
+ {
+ const Eobj_Class **mro_itr = klass->mro;
+ Eobj_Extension_Data_Offset *extn_data_itr;
+ size_t extn_num = 0;
+ size_t extn_data_off = klass->data_offset +
+ EOBJ_ALIGN_SIZE(klass->desc->data_size);
+
+ /* FIXME: Make faster... */
+ while (*mro_itr)
+ {
+ if (((*mro_itr)->desc->type == EOBJ_CLASS_TYPE_MIXIN) &&
+ ((*mro_itr)->desc->data_size > 0))
+ {
+ extn_num++;
+ }
+ mro_itr++;
+ }
+
+ klass->extn_data_off = calloc(extn_num + 1,
+ sizeof(*klass->extn_data_off));
+
+ extn_data_itr = klass->extn_data_off;
+ mro_itr = klass->mro;
+ while (*mro_itr)
+ {
+ if (((*mro_itr)->desc->type == EOBJ_CLASS_TYPE_MIXIN) &&
+ ((*mro_itr)->desc->data_size > 0))
+ {
+ extn_data_itr->klass = *mro_itr;
+ extn_data_itr->offset = extn_data_off;
+
+ extn_data_off += EOBJ_ALIGN_SIZE(extn_data_itr->klass->desc->data_size);
+ extn_data_itr++;
+ }
+ mro_itr++;
+ }
+
+ klass->extn_data_size = extn_data_off;
}
klass->class_id = ++_eobj_classes_last_id;
obj->refcount++;
- obj->data_blob = calloc(1, klass->data_offset + klass->desc->data_size);
+ obj->data_blob = calloc(1, klass->data_offset + klass->desc->data_size +
+ klass->extn_data_size);
_eobj_kls_itr_init(obj, EOBJ_NOOP);
eobj_constructor_error_unset(obj);
return NULL;
}
+typedef struct
+{
+ EINA_INLIST;
+ const Eobj *ref_obj;
+ const char *file;
+ int line;
+} Eobj_Xref_Node;
+
+EAPI Eobj *
+eobj_xref_internal(Eobj *obj, const Eobj *ref_obj, const char *file, int line)
+{
+ eobj_ref(obj);
+
+#ifndef NDEBUG
+ Eobj_Xref_Node *xref = calloc(1, sizeof(*xref));
+ xref->ref_obj = ref_obj;
+ xref->file = file;
+ xref->line = line;
+
+ /* FIXME: Make it sorted. */
+ obj->xrefs = eina_inlist_prepend(obj->xrefs, EINA_INLIST_GET(xref));
+#else
+ (void) ref_obj;
+ (void) file;
+ (void) line;
+#endif
+
+ return obj;
+}
+
+EAPI void
+eobj_xunref(Eobj *obj, const Eobj *ref_obj)
+{
+#ifndef NDEBUG
+ Eobj_Xref_Node *xref = NULL;
+ EINA_INLIST_FOREACH(obj->xrefs, xref)
+ {
+ if (xref->ref_obj == ref_obj)
+ break;
+ }
+
+ if (xref)
+ {
+ obj->xrefs = eina_inlist_remove(obj->xrefs, EINA_INLIST_GET(xref));
+ free(xref);
+ }
+ else
+ {
+ ERR("ref_obj (%p) does not reference obj (%p). Aborting unref.", ref_obj, obj);
+ return;
+ }
+#else
+ (void) ref_obj;
+#endif
+ eobj_unref(obj);
+}
+
EAPI Eobj *
eobj_ref(Eobj *obj)
{
{
if (--(obj->refcount) == 0)
{
+ /* We need that for the event callbacks that may ref/unref. */
+ obj->refcount++;
+
+ if (!obj->delete)
+ {
+ eobj_event_callback_call(obj, EOBJ_EV_DEL, NULL);
+ obj->delete = EINA_TRUE;
+ }
+ eobj_event_callback_call(obj, EOBJ_EV_FREE, NULL);
+
+ obj->refcount--;
+
const Eobj_Class *klass = eobj_class_get(obj);
_eobj_kls_itr_init(obj, EOBJ_NOOP);
eobj_constructor_error_unset(obj);
obj->kls_itr = nitr;
}
+#ifndef NDEBUG
+ /* If for some reason it's not empty, clear it. */
+ while (obj->xrefs)
+ {
+ WRN("obj->xrefs is not empty, possibly a bug, please report. - An error will be reported for each xref in the stack.");
+ Eina_Inlist *nitr = nitr->next;
+ free(EINA_INLIST_CONTAINER_GET(obj->xrefs, Eobj_Kls_Itr_Node));
+ obj->xrefs = nitr;
+ }
+#endif
+
Eina_List *itr, *itr_n;
Eobj *emb_obj;
EINA_LIST_FOREACH_SAFE(obj->composite_objects, itr, itr_n, emb_obj)
{
- /* FIXME: Should probably be unref. */
- eobj_del(emb_obj);
- obj->composite_objects =
- eina_list_remove_list(obj->composite_objects, itr);
+ eobj_composite_object_detach(obj, emb_obj);
}
_eobj_callback_remove_all(obj);
if (obj->data_blob)
free(obj->data_blob);
- _eobj_generic_data_del_all(obj);
-
free(obj);
}
}
return obj->refcount;
}
+/* Weak reference. */
+Eina_Bool
+_eobj_weak_ref_cb(void *data, Eobj *obj __UNUSED__, const Eobj_Event_Description *desc __UNUSED__, void *event_info __UNUSED__)
+{
+ Eobj_Weak_Ref *wref = data;
+ wref->obj = NULL;
+
+ return EINA_TRUE;
+}
+
+EAPI Eobj_Weak_Ref *
+eobj_weak_ref_new(const Eobj *_obj)
+{
+ Eobj *obj = (Eobj *) _obj;
+ Eobj_Weak_Ref *wref = calloc(1, sizeof(*wref));
+ wref->obj = obj;
+ eobj_event_callback_add(obj, EOBJ_EV_DEL, _eobj_weak_ref_cb, wref);
+
+ return wref;
+}
+
+EAPI void
+eobj_weak_ref_free(Eobj_Weak_Ref *wref)
+{
+ if (wref->obj)
+ {
+ eobj_event_callback_del_full(wref->obj, EOBJ_EV_DEL, _eobj_weak_ref_cb,
+ wref);
+ }
+ free(wref);
+}
+
+/* EOF Weak reference. */
+
EAPI void
eobj_del(Eobj *obj)
{
- obj->delete = EINA_TRUE;
+ if (!obj->delete)
+ {
+ eobj_event_callback_call(obj, EOBJ_EV_DEL, NULL);
+ obj->delete = EINA_TRUE;
+ }
eobj_unref(obj);
}
EAPI void
eobj_constructor_super(Eobj *obj)
{
- eobj_class_constructor(obj, _eobj_kls_itr_next(obj));
+ eobj_class_constructor(obj, _eobj_kls_itr_next(obj, EOBJ_NOOP));
}
EAPI void
eobj_destructor_super(Eobj *obj)
{
- eobj_class_destructor(obj, _eobj_kls_itr_next(obj));
+ eobj_class_destructor(obj, _eobj_kls_itr_next(obj, EOBJ_NOOP));
}
EAPI void *
/* FIXME: Add a check that this is of the right klass and we don't seg.
* Probably just return NULL. */
if (klass->desc->data_size > 0)
- return ((char *) obj->data_blob) + klass->data_offset;
- else
- return NULL;
-}
-
-typedef struct
-{
- EINA_INLIST;
- Eina_Stringshare *key;
- void *data;
-} Eobj_Generic_Data_Node;
-
-static void
-_eobj_generic_data_node_free(Eobj_Generic_Data_Node *node)
-{
- eina_stringshare_del(node->key);
- free(node);
-}
-
-static void
-_eobj_generic_data_del_all(Eobj *obj)
-{
- Eina_Inlist *nnode;
- Eobj_Generic_Data_Node *node;
-
- EINA_INLIST_FOREACH_SAFE(obj->generic_data, nnode, node)
{
- obj->generic_data = eina_inlist_remove(obj->generic_data,
- EINA_INLIST_GET(node));
-
- _eobj_generic_data_node_free(node);
- }
-}
-
-EAPI void *
-eobj_generic_data_set(Eobj *obj, const char *key, const void *data)
-{
- void *prev_data;
- Eobj_Generic_Data_Node *node;
-
- if (!key) return NULL;
- if (!data) return NULL;
-
- prev_data = eobj_generic_data_del(obj, key);
-
- node = malloc(sizeof(Eobj_Generic_Data_Node));
- node->key = eina_stringshare_add(key);
- node->data = (void *) data;
- obj->generic_data = eina_inlist_prepend(obj->generic_data,
- EINA_INLIST_GET(node));
-
- return prev_data;
-}
-
-EAPI void *
-eobj_generic_data_get(const Eobj *obj, const char *key)
-{
- Eobj_Generic_Data_Node *node;
-
- if (!key) return NULL;
-
- EINA_INLIST_FOREACH(obj->generic_data, node)
- {
- if (!strcmp(node->key, key))
+ if (klass->desc->type == EOBJ_CLASS_TYPE_MIXIN)
{
- ((Eobj *) obj)->generic_data =
- eina_inlist_promote(obj->generic_data, EINA_INLIST_GET(node));
- return node->data;
- }
- }
- return NULL;
-}
-
-EAPI void *
-eobj_generic_data_del(Eobj *obj, const char *key)
-{
- Eobj_Generic_Data_Node *node;
+ Eobj_Extension_Data_Offset *doff_itr =
+ eobj_class_get(obj)->extn_data_off;
- if (!key) return NULL;
+ if (!doff_itr)
+ return NULL;
- EINA_INLIST_FOREACH(obj->generic_data, node)
- {
- if (!strcmp(node->key, key))
+ while (doff_itr->klass)
+ {
+ if (doff_itr->klass == klass)
+ return ((char *) obj->data_blob) + doff_itr->offset;
+ doff_itr++;
+ }
+ }
+ else
{
- void *data;
-
- data = node->data;
- obj->generic_data = eina_inlist_remove(obj->generic_data,
- EINA_INLIST_GET(node));
- _eobj_generic_data_node_free(node);
- return data;
+ return ((char *) obj->data_blob) + klass->data_offset;
}
}
+
return NULL;
}
EAPI void
eobj_composite_object_attach(Eobj *obj, Eobj *emb_obj)
{
- eobj_ref(emb_obj);
+ eobj_xref(emb_obj, obj);
obj->composite_objects = eina_list_prepend(obj->composite_objects, emb_obj);
}
eobj_composite_object_detach(Eobj *obj, Eobj *emb_obj)
{
obj->composite_objects = eina_list_remove(obj->composite_objects, emb_obj);
- eobj_unref(emb_obj);
+ eobj_xunref(emb_obj, obj);
}
EAPI Eina_Bool
obj->callbacks = eina_inlist_sorted_insert(obj->callbacks,
EINA_INLIST_GET(cb), _callback_priority_cmp);
- eobj_event_callback_call(obj, EOBJ_SIG_CALLBACK_ADD, desc);
+ eobj_event_callback_call(obj, EOBJ_EV_CALLBACK_ADD, desc);
return EINA_TRUE;
}
return NULL;
found:
- eobj_event_callback_call(obj, EOBJ_SIG_CALLBACK_DEL, desc);
+ eobj_event_callback_call(obj, EOBJ_EV_CALLBACK_DEL, desc);
return ret;
}
return NULL;
found:
- eobj_event_callback_call(obj, EOBJ_SIG_CALLBACK_DEL, desc);
+ eobj_event_callback_call(obj, EOBJ_EV_CALLBACK_DEL, desc);
return ret;
}
EINA_INLIST_FOREACH(obj->callbacks, cb)
{
- if (!cb->delete_me && (cb->event == desc))
+ if (!cb->delete_me && (cb->event == desc))
{
/* Abort callback calling if the func says so. */
if (!cb->func((void *) cb->func_data, obj, desc,
return EINA_TRUE;
}
-/* EOBJ_CLASS_BASE stuff */
-static Eobj_Class *_my_class = NULL;
-
-/* FIXME: Set proper type descriptions. */
-EAPI const Eobj_Event_Description _EOBJ_SIG_CALLBACK_ADD =
- EOBJ_EVENT_DESCRIPTION("callback,add", "?", "Called when a callback was added.");
-EAPI const Eobj_Event_Description _EOBJ_SIG_CALLBACK_DEL =
- EOBJ_EVENT_DESCRIPTION("callback,del", "?", "Called when a callback was deleted.");
-
-static void
-_constructor(Eobj *obj, void *class_data __UNUSED__)
-{
- DBG("%p - %s.", obj, _my_class->desc->name);
-}
-
-static void
-_destructor(Eobj *obj, void *class_data __UNUSED__)
-{
- DBG("%p - %s.", obj, _my_class->desc->name);
-}
-
-EAPI const Eobj_Class *
-eobj_base_class_get(void)
-{
- if (_my_class) return _my_class;
-
- static const Eobj_Class_Description class_desc = {
- "Eobj Base",
- EOBJ_CLASS_TYPE_REGULAR_NO_INSTANT,
- EOBJ_CLASS_DESCRIPTION_OPS(NULL, NULL, 0),
- NULL,
- 0,
- _constructor,
- _destructor,
- NULL,
- NULL
- };
-
- return _my_class = eobj_class_new(&class_desc, NULL, NULL);
-}
-
projects / profile / ivi / eobj.git / blobdiff