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

Fix current event pointer when walking filters 

When walking the filters' list, using event_current might screw a
recursive main loop that had to process filters *and* events on the
first iteration. Thus, use a new pointer to mark the current event being
treated when walking filters' list.

Tests for this one is difficult. I'll try to think about a test later.



SVN revision: 49435
This commit is contained in:
Lucas De Marchi 2010-06-04 02:45:47 +00:00
parent 0fa2ca5721
commit bda2b1d0af
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,7 @@ static Eina_List *event_handlers_delete_list = NULL;
static Ecore_Event_Filter *event_filters = NULL;
static Ecore_Event_Filter *event_filter_current = NULL;
static Ecore_Event *event_filter_event_current = NULL;
static int event_filters_delete_me = 0;
static int event_id_max = ECORE_EVENT_COUNT;
static int ecore_raw_event_type = ECORE_EVENT_NONE;
@ -365,6 +366,7 @@ _ecore_event_shutdown(void)
}
event_filters_delete_me = 0;
event_filter_current = NULL;
event_filter_event_current = NULL;
}
int
@ -465,20 +467,20 @@ _ecore_event_call(void)
if (ef->func_start)
ef->loop_data = ef->func_start(ef->data);
if (!event_current)
if (!event_filter_event_current)
{
/* regular main loop, start from head */
event_current = events;
event_filter_event_current = events;
}
else
{
/* recursive main loop, continue from where we were */
event_current = (Ecore_Event *)EINA_INLIST_GET(event_current)->next;
event_filter_event_current = (Ecore_Event *)EINA_INLIST_GET(event_filter_event_current)->next;
}
while (event_current)
while (event_filter_event_current)
{
Ecore_Event *e = event_current;
Ecore_Event *e = event_filter_event_current;
if (!ef->func_filter(ef->data, ef->loop_data,
e->type, e->event))
@ -487,8 +489,8 @@ _ecore_event_call(void)
ecore_event_del(e);
}
if (event_current) /* may have changed in recursive main loops */
event_current = (Ecore_Event *)EINA_INLIST_GET(event_current)->next;
if (event_filter_event_current) /* may have changed in recursive main loops */
event_filter_event_current = (Ecore_Event *)EINA_INLIST_GET(event_filter_event_current)->next;
}
if (ef->func_end)
ef->func_end(ef->data, ef->loop_data);