jackdanielz pushed a commit to branch master.
commit 3d5136e4cc02d43ec45acd5b6e1bf674500e21ae
Author: Daniel Zaoui <[email protected]>
Date: Thu Apr 11 22:08:24 2013 +0300
Efl: adapt legacy Evas callbacks to Eo callbacks mechanism.
---
src/lib/evas/canvas/evas_callbacks.c | 354 +++++++++++----------------------
src/lib/evas/canvas/evas_main.c | 7 -
src/lib/evas/canvas/evas_object_main.c | 2 +
src/lib/evas/include/evas_private.h | 24 +--
4 files changed, 123 insertions(+), 264 deletions(-)
diff --git a/src/lib/evas/canvas/evas_callbacks.c
b/src/lib/evas/canvas/evas_callbacks.c
index 34bceae..b482913 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -1,12 +1,8 @@
#include "evas_common.h"
#include "evas_private.h"
-static void evas_object_event_callback_clear(Evas_Object_Protected_Data *obj);
-static void evas_event_callback_clear(Evas_Public_Data *e);
int _evas_event_counter = 0;
-EVAS_MEMPOOL(_mp_fn);
-EVAS_MEMPOOL(_mp_cb);
EVAS_MEMPOOL(_mp_pc);
extern Eina_Hash* signals_hash_table;
@@ -117,7 +113,39 @@ static const Eo_Event_Description
*_legacy_evas_callback_table[EVAS_CALLBACK_LAS
EVAS_EVENT_RENDER_PRE,
EVAS_EVENT_RENDER_POST
};
-
+
+typedef struct
+{
+ EINA_INLIST;
+ Evas_Object_Event_Cb func;
+ void *data;
+ Evas_Callback_Type type;
+} _eo_evas_object_cb_info;
+
+static Eina_Bool
+_eo_evas_object_cb(void *data, Eo *eo_obj, const Eo_Event_Description *desc
EINA_UNUSED, void *event_info)
+{
+ _eo_evas_object_cb_info *info = data;
+ if (info->func) info->func(info->data, evas_object_evas_get(eo_obj),
eo_obj, event_info);
+ return EINA_TRUE;
+}
+
+typedef struct
+{
+ EINA_INLIST;
+ Evas_Event_Cb func;
+ void *data;
+ Evas_Callback_Type type;
+} _eo_evas_cb_info;
+
+static Eina_Bool
+_eo_evas_cb(void *data, Eo *eo_obj, const Eo_Event_Description *desc
EINA_UNUSED, void *event_info)
+{
+ _eo_evas_cb_info *info = data;
+ if (info->func) info->func(info->data, eo_obj, event_info);
+ return EINA_TRUE;
+}
+
void
_evas_post_event_callback_call(Evas *eo_e, Evas_Public_Data *e)
{
@@ -150,143 +178,68 @@ _evas_post_event_callback_free(Evas *eo_e)
}
void
-evas_event_callback_list_post_free(Eina_Inlist **list)
+evas_object_event_callback_all_del(Evas_Object *eo_obj)
{
- Eina_Inlist *l;
-
- /* MEM OK */
- for (l = *list; l;)
- {
- Evas_Func_Node *fn;
-
- fn = (Evas_Func_Node *)l;
- l = l->next;
- if (fn->delete_me)
- {
- *list = eina_inlist_remove(*list, EINA_INLIST_GET(fn));
- EVAS_MEMPOOL_FREE(_mp_fn, fn);
- }
- }
-}
+ _eo_evas_object_cb_info *info;
+ Eina_Inlist *itr;
+ Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
-static void
-evas_object_event_callback_clear(Evas_Object_Protected_Data *obj)
-{
if (!obj) return;
if (!obj->callbacks) return;
- if (!obj->callbacks->deletions_waiting) return;
- obj->callbacks->deletions_waiting = 0;
- evas_event_callback_list_post_free(&obj->callbacks->callbacks);
- if (!obj->callbacks->callbacks)
+ EINA_INLIST_FOREACH_SAFE(obj->callbacks, itr, info)
{
- EVAS_MEMPOOL_FREE(_mp_cb, obj->callbacks);
- obj->callbacks = NULL;
- }
-}
+ eo_do(eo_obj, eo_event_callback_del(
+ _legacy_evas_callback_table[info->type], _eo_evas_object_cb,
info));
-static void
-evas_event_callback_clear(Evas_Public_Data *e)
-{
- if (!e) return;
- if (!e->callbacks) return;
- if (!e->callbacks->deletions_waiting) return;
- e->callbacks->deletions_waiting = 0;
- evas_event_callback_list_post_free(&e->callbacks->callbacks);
- if (!e->callbacks->callbacks)
- {
- EVAS_MEMPOOL_FREE(_mp_cb, e->callbacks);
- e->callbacks = NULL;
+ obj->callbacks =
+ eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info));
+ free(info);
}
}
void
-evas_object_event_callback_all_del(Evas_Object *eo_obj)
-{
- Evas_Func_Node *fn;
- Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
-
- if (!obj) return;
- if (!obj->callbacks) return;
- EINA_INLIST_FOREACH(obj->callbacks->callbacks, fn)
- fn->delete_me = 1;
-}
-
-void
evas_object_event_callback_cleanup(Evas_Object *eo_obj)
{
- /* MEM OK */
- Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
- if (!obj) return;
- if (!obj->callbacks) return;
- evas_event_callback_list_post_free(&obj->callbacks->callbacks);
- EVAS_MEMPOOL_FREE(_mp_cb, obj->callbacks);
- obj->callbacks = NULL;
+ evas_object_event_callback_all_del(eo_obj);
}
void
evas_event_callback_all_del(Evas *eo_e)
{
+ _eo_evas_object_cb_info *info;
+ Eina_Inlist *itr;
Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
- Evas_Func_Node *fn;
if (!e) return;
if (!e->callbacks) return;
- EINA_INLIST_FOREACH(e->callbacks->callbacks, fn)
- fn->delete_me = 1;
+
+ EINA_INLIST_FOREACH_SAFE(e->callbacks, itr, info)
+ {
+ eo_do(eo_e, eo_event_callback_del(
+ _legacy_evas_callback_table[info->type], _eo_evas_cb, info));
+
+ e->callbacks =
+ eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info));
+ free(info);
+ }
}
void
evas_event_callback_cleanup(Evas *eo_e)
{
- Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
- /* MEM OK */
- if (!e) return;
- if (!e->callbacks) return;
- evas_event_callback_list_post_free(&e->callbacks->callbacks);
- EVAS_MEMPOOL_FREE(_mp_cb, e->callbacks);
- e->callbacks = NULL;
+ evas_event_callback_all_del(eo_e);
}
void
evas_event_callback_call(Evas *eo_e, Evas_Callback_Type type, void *event_info)
{
- Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
- Eina_Inlist **l_mod = NULL, *l;
-
- if (!e) return;
- _evas_walk(e);
- if (e->callbacks)
- {
- l_mod = &e->callbacks->callbacks;
- e->callbacks->walking_list++;
- for (l = *l_mod; l; l = l->next)
- {
- Evas_Func_Node *fn;
-
- fn = (Evas_Func_Node *)l;
- if ((fn->type == type) && (!fn->delete_me))
- {
- Evas_Event_Cb func = fn->func;
- if (func)
- func(fn->data, eo_e, event_info);
- }
- if (e->delete_me) break;
- }
- e->callbacks->walking_list--;
- if (!e->callbacks->walking_list)
- {
- evas_event_callback_clear(e);
- l_mod = NULL;
- }
- }
- _evas_unwalk(e);
+ eo_do(eo_e, eo_event_callback_call(_legacy_evas_callback_table[type],
event_info, NULL));
}
void
evas_object_event_callback_call(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj, Evas_Callback_Type type, void *event_info, int
event_id)
{
/* MEM OK */
- Eina_Inlist **l_mod = NULL, *l;
Evas_Button_Flags flags = EVAS_BUTTON_NONE;
Evas_Public_Data *e;
@@ -308,9 +261,7 @@ evas_object_event_callback_call(Evas_Object *eo_obj,
Evas_Object_Protected_Data
if (!(e = obj->layer->evas)) return;
_evas_walk(e);
- if (obj->callbacks)
{
- l_mod = &obj->callbacks->callbacks;
switch (type)
{
case EVAS_CALLBACK_MOUSE_DOWN:
@@ -342,30 +293,8 @@ evas_object_event_callback_call(Evas_Object *eo_obj,
Evas_Object_Protected_Data
default:
break;
}
- obj->callbacks->walking_list++;
- for (l = *l_mod; l; l = l->next)
- {
- Evas_Func_Node *fn;
-
- fn = (Evas_Func_Node *)l;
- if ((fn->type == type) && (!fn->delete_me))
- {
- Evas_Object_Event_Cb func = fn->func;
- if (func)
- func(fn->data, obj->layer->evas->evas, eo_obj, event_info);
- }
- if (obj->delete_me) break;
- }
- obj->callbacks->walking_list--;
- if (!obj->callbacks->walking_list)
- {
- evas_object_event_callback_clear(obj);
- l_mod = NULL;
- }
- const Eo_Event_Description *event_desc =
eina_hash_find(signals_hash_table, _legacy_evas_callback_table[type]->name);
- if (event_desc)
- eo_do(eo_obj,
eo_event_callback_call(_legacy_evas_callback_table[type], event_info, NULL));
+ eo_do(eo_obj,
eo_event_callback_call(_legacy_evas_callback_table[type], event_info, NULL));
if (type == EVAS_CALLBACK_MOUSE_DOWN)
{
@@ -379,33 +308,18 @@ evas_object_event_callback_call(Evas_Object *eo_obj,
Evas_Object_Protected_Data
}
}
- if (!((obj->no_propagate) && (l_mod) && (*l_mod)))
+ if (!obj->no_propagate)
{
- if (!obj->no_propagate)
+ if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) &&
+ (type <= EVAS_CALLBACK_KEY_UP))
{
- if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) &&
- (type <= EVAS_CALLBACK_KEY_UP))
- {
- Evas_Object_Protected_Data *smart_parent =
eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS);
- evas_object_event_callback_call(obj->smart.parent,
smart_parent, type, event_info, event_id);
- }
+ Evas_Object_Protected_Data *smart_parent =
eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS);
+ evas_object_event_callback_call(obj->smart.parent, smart_parent,
type, event_info, event_id);
}
}
_evas_unwalk(e);
}
-static int
-_callback_priority_cmp(const void *_a, const void *_b)
-{
- const Evas_Func_Node *a, *b;
- a = EINA_INLIST_CONTAINER_GET(_a, Evas_Func_Node);
- b = EINA_INLIST_CONTAINER_GET(_b, Evas_Func_Node);
- if (a->priority < b->priority)
- return -1;
- else
- return 1;
-}
-
EAPI void
evas_object_event_callback_add(Evas_Object *eo_obj, Evas_Callback_Type type,
Evas_Object_Event_Cb func, const void *data)
{
@@ -417,43 +331,29 @@ EAPI void
evas_object_event_callback_priority_add(Evas_Object *eo_obj,
Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb
func, const void *data)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS);
- /* MEM OK */
- Evas_Func_Node *fn;
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
- if (!obj) return;
if (!func) return;
- if (!obj->callbacks)
- {
- EVAS_MEMPOOL_INIT(_mp_cb, "evas_callbacks", Evas_Callbacks, 64, );
- obj->callbacks = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Callbacks);
- if (!obj->callbacks) return;
- EVAS_MEMPOOL_PREP(_mp_cb, obj->callbacks, Evas_Callbacks);
- }
+ _eo_evas_object_cb_info *cb_info = calloc(1, sizeof(*cb_info));
+ cb_info->func = func;
+ cb_info->data = (void *)data;
+ cb_info->type = type;
- EVAS_MEMPOOL_INIT(_mp_fn, "evas_func_node", Evas_Func_Node, 128, );
- fn = EVAS_MEMPOOL_ALLOC(_mp_fn, Evas_Func_Node);
- if (!fn) return;
- EVAS_MEMPOOL_PREP(_mp_fn, fn, Evas_Func_Node);
- fn->func = func;
- fn->data = (void *)data;
- fn->type = type;
- fn->priority = priority;
-
- obj->callbacks->callbacks =
- eina_inlist_sorted_insert(obj->callbacks->callbacks, EINA_INLIST_GET(fn),
- _callback_priority_cmp);
+ const Eo_Event_Description *desc = _legacy_evas_callback_table[type];
+ eo_do(eo_obj, eo_event_callback_priority_add(desc, priority,
_eo_evas_object_cb, cb_info));
+
+ obj->callbacks =
+ eina_inlist_append(obj->callbacks, EINA_INLIST_GET(cb_info));
}
EAPI void *
evas_object_event_callback_del(Evas_Object *eo_obj, Evas_Callback_Type type,
Evas_Object_Event_Cb func)
{
- /* MEM OK */
- Evas_Func_Node *fn;
+ _eo_evas_object_cb_info *info;
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return NULL;
@@ -465,17 +365,17 @@ evas_object_event_callback_del(Evas_Object *eo_obj,
Evas_Callback_Type type, Eva
if (!obj->callbacks) return NULL;
- EINA_INLIST_FOREACH(obj->callbacks->callbacks, fn)
+ EINA_INLIST_FOREACH(obj->callbacks, info)
{
- if ((fn->func == func) && (fn->type == type) && (!fn->delete_me))
+ if ((info->func == func) && (info->type == type))
{
- void *tmp;
+ void *tmp = info->data;
+ eo_do(eo_obj, eo_event_callback_del(
+ _legacy_evas_callback_table[type], _eo_evas_object_cb,
info));
- tmp = fn->data;
- fn->delete_me = 1;
- obj->callbacks->deletions_waiting = 1;
- if (!obj->callbacks->walking_list)
- evas_object_event_callback_clear(obj);
+ obj->callbacks =
+ eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info));
+ free(info);
return tmp;
}
}
@@ -485,8 +385,7 @@ evas_object_event_callback_del(Evas_Object *eo_obj,
Evas_Callback_Type type, Eva
EAPI void *
evas_object_event_callback_del_full(Evas_Object *eo_obj, Evas_Callback_Type
type, Evas_Object_Event_Cb func, const void *data)
{
- /* MEM OK */
- Evas_Func_Node *fn;
+ _eo_evas_object_cb_info *info;
MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
return NULL;
@@ -498,17 +397,17 @@ evas_object_event_callback_del_full(Evas_Object *eo_obj,
Evas_Callback_Type type
if (!obj->callbacks) return NULL;
- EINA_INLIST_FOREACH(obj->callbacks->callbacks, fn)
+ EINA_INLIST_FOREACH(obj->callbacks, info)
{
- if ((fn->func == func) && (fn->type == type) && (fn->data == data) &&
(!fn->delete_me))
+ if ((info->func == func) && (info->type == type) && info->data == data)
{
- void *tmp;
+ void *tmp = info->data;
+ eo_do(eo_obj, eo_event_callback_del(
+ _legacy_evas_callback_table[type], _eo_evas_object_cb,
info));
- tmp = fn->data;
- fn->delete_me = 1;
- obj->callbacks->deletions_waiting = 1;
- if (!obj->callbacks->walking_list)
- evas_object_event_callback_clear(obj);
+ obj->callbacks =
+ eina_inlist_remove(obj->callbacks, EINA_INLIST_GET(info));
+ free(info);
return tmp;
}
}
@@ -526,43 +425,29 @@ EAPI void
evas_event_callback_priority_add(Evas *eo_e, Evas_Callback_Type type,
Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data)
{
Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
- /* MEM OK */
- Evas_Func_Node *fn;
MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
- if (!e) return;
if (!func) return;
- if (!e->callbacks)
- {
- EVAS_MEMPOOL_INIT(_mp_cb, "evas_callbacks", Evas_Callbacks, 64, );
- e->callbacks = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Callbacks);
- if (!e->callbacks) return;
- EVAS_MEMPOOL_PREP(_mp_cb, e->callbacks, Evas_Callbacks);
- }
+ _eo_evas_cb_info *cb_info = calloc(1, sizeof(*cb_info));
+ cb_info->func = func;
+ cb_info->data = (void *)data;
+ cb_info->type = type;
- EVAS_MEMPOOL_INIT(_mp_fn, "evas_func_node", Evas_Func_Node, 128, );
- fn = EVAS_MEMPOOL_ALLOC(_mp_fn, Evas_Func_Node);
- if (!fn) return;
- EVAS_MEMPOOL_PREP(_mp_fn, fn, Evas_Func_Node);
- fn->func = func;
- fn->data = (void *)data;
- fn->type = type;
- fn->priority = priority;
-
- e->callbacks->callbacks = eina_inlist_sorted_insert(e->callbacks->callbacks,
- EINA_INLIST_GET(fn),
_callback_priority_cmp);
+ const Eo_Event_Description *desc = _legacy_evas_callback_table[type];
+ eo_do(eo_e, eo_event_callback_priority_add(desc, priority, _eo_evas_cb,
cb_info));
+
+ e->callbacks = eina_inlist_append(e->callbacks, EINA_INLIST_GET(cb_info));
}
EAPI void *
evas_event_callback_del(Evas *eo_e, Evas_Callback_Type type, Evas_Event_Cb
func)
{
Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS);
- /* MEM OK */
- Evas_Func_Node *fn;
+ _eo_evas_cb_info *info;
MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
return NULL;
@@ -573,18 +458,18 @@ evas_event_callback_del(Evas *eo_e, Evas_Callback_Type
type, Evas_Event_Cb func)
if (!e->callbacks) return NULL;
- EINA_INLIST_FOREACH(e->callbacks->callbacks, fn)
+ EINA_INLIST_FOREACH(e->callbacks, info)
{
- if ((fn->func == func) && (fn->type == type) && (!fn->delete_me))
+ if ((info->func == func) && (info->type == type))
{
- void *data;
-
- data = fn->data;
- fn->delete_me = 1;
- e->callbacks->deletions_waiting = 1;
- if (!e->callbacks->walking_list)
- evas_event_callback_clear(e);
- return data;
+ void *tmp = info->data;
+ eo_do(eo_e, eo_event_callback_del(
+ _legacy_evas_callback_table[type], _eo_evas_cb, info));
+
+ e->callbacks =
+ eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info));
+ free(info);
+ return tmp;
}
}
return NULL;
@@ -593,8 +478,7 @@ evas_event_callback_del(Evas *eo_e, Evas_Callback_Type
type, Evas_Event_Cb func)
EAPI void *
evas_event_callback_del_full(Evas *eo_e, Evas_Callback_Type type,
Evas_Event_Cb func, const void *data)
{
- /* MEM OK */
- Evas_Func_Node *fn;
+ _eo_evas_cb_info *info;
MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS);
return NULL;
@@ -606,17 +490,17 @@ evas_event_callback_del_full(Evas *eo_e,
Evas_Callback_Type type, Evas_Event_Cb
if (!e->callbacks) return NULL;
- EINA_INLIST_FOREACH(e->callbacks->callbacks, fn)
+ EINA_INLIST_FOREACH(e->callbacks, info)
{
- if ((fn->func == func) && (fn->type == type) && (fn->data == data) &&
(!fn->delete_me))
+ if ((info->func == func) && (info->type == type) && (info->data ==
data))
{
- void *tmp;
+ void *tmp = info->data;
+ eo_do(eo_e, eo_event_callback_del(
+ _legacy_evas_callback_table[type], _eo_evas_cb, info));
- tmp = fn->data;
- fn->delete_me = 1;
- e->callbacks->deletions_waiting = 1;
- if (!e->callbacks->walking_list)
- evas_event_callback_clear(e);
+ e->callbacks =
+ eina_inlist_remove(e->callbacks, EINA_INLIST_GET(info));
+ free(info);
return tmp;
}
}
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index ce630e3..cabd48f 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -215,13 +215,6 @@ _destructor(Eo *eo_e, void *_pd, va_list *list EINA_UNUSED)
EINA_INLIST_FOREACH(lay->objects, o)
{
- if ((o->callbacks) && (o->callbacks->walking_list))
- {
- /* Defer free */
- e->delete_me = 1;
- e->walking_list--;
- return;
- }
if (!o->delete_me)
del = 1;
}
diff --git a/src/lib/evas/canvas/evas_object_main.c
b/src/lib/evas/canvas/evas_object_main.c
index 1ee41bb..f1ba18f 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -662,6 +662,8 @@ _destructor(Eo *eo_obj, void *_pd, va_list *list
EINA_UNUSED)
obj->delete_me = 1;
evas_object_change(eo_obj, obj);
end:
+ evas_object_event_callback_all_del(eo_obj);
+ evas_object_event_callback_cleanup(eo_obj);
eo_do_super(eo_obj, MY_CLASS, eo_destructor());
}
diff --git a/src/lib/evas/include/evas_private.h
b/src/lib/evas/include/evas_private.h
index 5db60ac..ebfda7f 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -32,7 +32,6 @@ typedef struct _Evas_Font Evas_Font;
typedef struct _Evas_Font_Alias Evas_Font_Alias;
typedef struct _Evas_Font_Description Evas_Font_Description;
typedef struct _Evas_Data_Node Evas_Data_Node;
-typedef struct _Evas_Func_Node Evas_Func_Node;
typedef RGBA_Image_Loadopts Evas_Image_Load_Opts;
typedef struct _Evas_Func Evas_Func;
typedef struct _Evas_Image_Load_Func Evas_Image_Load_Func;
@@ -40,7 +39,6 @@ typedef struct _Evas_Image_Save_Func
Evas_Image_Save_Func;
typedef struct _Evas_Object_Func Evas_Object_Func;
typedef struct _Evas_Intercept_Func Evas_Intercept_Func;
typedef struct _Evas_Key_Grab Evas_Key_Grab;
-typedef struct _Evas_Callbacks Evas_Callbacks;
typedef struct _Evas_Format Evas_Format;
typedef struct _Evas_Map_Point Evas_Map_Point;
typedef struct _Evas_Smart_Cb_Description_Array
Evas_Smart_Cb_Description_Array;
@@ -307,13 +305,6 @@ struct _Evas_Post_Callback
unsigned char delete_me : 1;
};
-struct _Evas_Callbacks
-{
- Eina_Inlist *callbacks;
- int walking_list;
- unsigned char deletions_waiting : 1;
-};
-
struct _Evas_Public_Data
{
EINA_INLIST;
@@ -400,8 +391,7 @@ struct _Evas_Public_Data
Eina_List *post_events; // free me on evas_free
- Evas_Callbacks *callbacks;
- Eina_Inlist *callbacks_infos;
+ Eina_Inlist *callbacks;
int delete_grabs;
int walking_grabs;
@@ -579,7 +569,7 @@ struct _Evas_Object_Protected_Data
Evas_Intercept_Func *interceptors;
Eina_List *grabs;
- Evas_Callbacks *callbacks;
+ Eina_Inlist *callbacks;
struct {
Eina_List *clipees;
@@ -662,16 +652,6 @@ struct _Evas_Object_Protected_Data
Eina_Bool is_smart : 1;
};
-struct _Evas_Func_Node
-{
- EINA_INLIST;
- void (*func) ();
- void *data;
- Evas_Callback_Type type;
- Evas_Callback_Priority priority;
- unsigned char delete_me : 1;
-};
-
struct _Evas_Data_Node
{
char *key;
--
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and
their applications. This 200-page book is written by three acclaimed
leaders in the field. The early access version is available now.
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
