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

fix - don't call new event handler added for the SAMe event. defer 

adding in a list and handle after all current ahndlers for the event
have been called.



SVN revision: 54212
This commit is contained in:
Carsten Haitzler 2010-11-06 03:11:17 +00:00
parent fc6657453d
commit 75abb8f8a3
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
legacy/ecore/src/lib/ecore/ecore_events.c
View File

@ -57,6 +57,8 @@ static int event_handlers_num = 0;
static int event_handlers_alloc_num = 0; static int event_handlers_alloc_num = 0;
static Eina_List *event_handlers_delete_list = NULL; static Eina_List *event_handlers_delete_list = NULL;
static Ecore_Event_Handler *event_handlers_add_list = NULL;
static Ecore_Event_Filter *event_filters = NULL; static Ecore_Event_Filter *event_filters = NULL;
static Ecore_Event_Filter *event_filter_current = NULL; static Ecore_Event_Filter *event_filter_current = NULL;
static Ecore_Event *event_filter_event_current = NULL; static Ecore_Event *event_filter_event_current = NULL;
@ -141,7 +143,10 @@ ecore_event_handler_add(int type, Ecore_Event_Handler_Cb func, const void *data)
event_handlers[i] = NULL; event_handlers[i] = NULL;
} }
} }
event_handlers[type] = (Ecore_Event_Handler *) eina_inlist_append(EINA_INLIST_GET(event_handlers[type]), EINA_INLIST_GET(eh)); if (ecore_raw_event_type == type)
event_handlers_add_list = (Ecore_Event_Handler *)eina_inlist_append(EINA_INLIST_GET(event_handlers_add_list), EINA_INLIST_GET(eh));
else
event_handlers[type] = (Ecore_Event_Handler *)eina_inlist_append(EINA_INLIST_GET(event_handlers[type]), EINA_INLIST_GET(eh));
return eh; return eh;
} }
@ -625,7 +630,7 @@ _ecore_event_call(void)
while ((event_handler_current) && (!e->delete_me)) while ((event_handler_current) && (!e->delete_me))
{ {
Ecore_Event_Handler *eh = event_handler_current; eh = event_handler_current;
if (!eh->delete_me) if (!eh->delete_me)
{ {
Eina_Bool ret; Eina_Bool ret;
@ -647,6 +652,12 @@ _ecore_event_call(void)
event_handler_current = (Ecore_Event_Handler *)EINA_INLIST_GET(event_handler_current)->next; event_handler_current = (Ecore_Event_Handler *)EINA_INLIST_GET(event_handler_current)->next;
} }
} }
while (event_handlers_add_list)
{
eh = event_handlers_add_list;
event_handlers_add_list = (Ecore_Event_Handler *)eina_inlist_remove(EINA_INLIST_GET(event_handlers_add_list), EINA_INLIST_GET(eh));
event_handlers[eh->type] = (Ecore_Event_Handler *)eina_inlist_append(EINA_INLIST_GET(event_handlers[eh->type]), EINA_INLIST_GET(eh));
}
/* if no handlers were set for EXIT signal - then default is */ /* if no handlers were set for EXIT signal - then default is */
/* to quit the main loop */ /* to quit the main loop */
if ((e->type == ECORE_EVENT_SIGNAL_EXIT) && (handle_count == 0)) if ((e->type == ECORE_EVENT_SIGNAL_EXIT) && (handle_count == 0))