From 470989bd708d9a425dbbf2d83b8fcbd0a8d0f488 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Fri, 14 Mar 2014 23:15:16 +0100 Subject: events: Rework event subsystem (add_event, send_event) to be more versatile. add_event_ex is added that takes an extra user_data pointer. This pointer is passed to the callback (add_event and add_event_ex have slightly different callbacks types). All callbacks also get the event id passed. Events added with add_event_ex must be removed with remove_event_ex because the user_data pointer must match in addition to the callback pointer. On the other add_event is simplified to omit the oneshort parameter which was almost always false (still there with add_event_ex). As a side effect the ata_idle_notify callbacks are changed as well, they do not take a data parameter anymore which was always NULL anyway. This commit also adds some documentation to events.h Change-Id: I13e29a0f88ef908f175b376d83550f9e0231f772 --- apps/gui/list.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'apps/gui/list.c') diff --git a/apps/gui/list.c b/apps/gui/list.c index c393340c57..8663abe8a0 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c @@ -66,16 +66,17 @@ static bool list_is_dirty(struct gui_synclist *list) return TIME_BEFORE(list->dirty_tick, last_dirty_tick); } -static void list_force_reinit(void *param) +static void list_force_reinit(unsigned short id, void *param, void *last_dirty_tick) { + (void)id; (void)param; - last_dirty_tick = current_tick; + *(int *)last_dirty_tick = current_tick; } void list_init(void) { last_dirty_tick = current_tick; - add_event(GUI_EVENT_THEME_CHANGED, false, list_force_reinit); + add_event_ex(GUI_EVENT_THEME_CHANGED, false, list_force_reinit, &last_dirty_tick); } static void list_init_viewports(struct gui_synclist *list) @@ -611,8 +612,9 @@ bool gui_synclist_keyclick_callback(int action, void* data) */ static struct gui_synclist *current_lists; static bool ui_update_event_registered = false; -static void _lists_uiviewport_update_callback(void *data) +static void _lists_uiviewport_update_callback(unsigned short id, void *data) { + (void)id; (void)data; if (current_lists) gui_synclist_draw(current_lists); @@ -801,8 +803,7 @@ int list_do_action_timeout(struct gui_synclist *lists, int timeout) { if (!ui_update_event_registered) ui_update_event_registered = - add_event(GUI_EVENT_NEED_UI_UPDATE, false, - _lists_uiviewport_update_callback); + add_event(GUI_EVENT_NEED_UI_UPDATE, _lists_uiviewport_update_callback); current_lists = lists; } if(lists->scheduled_talk_tick) -- cgit v1.2.3