kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Eo: Support mixing legacy and non-legacy callbacks.

This commit is contained in:
Tom Hacohen 2014-05-19 15:28:49 +01:00
parent c58b3401c3
commit 50a6e371a1
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib/eo/eo_base_class.c
View File

@ -669,6 +669,31 @@ EAPI EO_VOID_FUNC_BODYV(eo_event_callback_array_del,
const Eo_Callback_Array_Item *array,
const void *user_data);
static Eina_Bool
_cb_desc_match(const Eo_Event_Description *a, const Eo_Event_Description *b)
{
if (!a)
return EINA_FALSE;
/* If either is legacy, fallback to string comparison. */
if ((a->doc == _legacy_event_desc) || (b->doc == _legacy_event_desc))
{
/* Take stringshare shortcut if both are legacy */
if (a->doc == b->doc)
{
return (a->name == b->name);
}
else
{
return !strcmp(a->name, b->name);
}
}
else
{
return (a == b);
}
}
static Eina_Bool
_ev_cb_call(Eo *obj_id, void *class_data,
const Eo_Event_Description *desc,
@ -695,7 +720,7 @@ _ev_cb_call(Eo *obj_id, void *class_data,
for (it = cb->items.item_array; it->func; it++)
{
if (it->desc != desc)
if (!_cb_desc_match(it->desc, desc))
continue;
if (!it->desc->unfreezable &&
(event_freeze_count || pd->event_freeze_count))
@ -712,7 +737,7 @@ _ev_cb_call(Eo *obj_id, void *class_data,
}
else
{
if (cb->items.item.desc != desc)
if (!_cb_desc_match(cb->items.item.desc, desc))
continue;
if ((!cb->items.item.desc
|| !cb->items.item.desc->unfreezable) &&