From b6c65669104836426eb95c55d935063599cb7af8 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Thu, 10 Jan 2019 15:58:16 -0600 Subject: [PATCH] ecore_wl2: Convert frame callbacks to inlist They're only ever on a single list, and never counted. inlist makes more sense. Signed-off-by: Derek Foreman Reviewed-by: Chris Michael Differential Revision: https://phab.enlightenment.org/D7610 --- src/lib/ecore_wl2/ecore_wl2_private.h | 3 ++- src/lib/ecore_wl2/ecore_wl2_window.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h b/src/lib/ecore_wl2/ecore_wl2_private.h index 77cf352..06e8719 100644 --- a/src/lib/ecore_wl2/ecore_wl2_private.h +++ b/src/lib/ecore_wl2/ecore_wl2_private.h @@ -185,6 +185,7 @@ struct _Ecore_Wl2_Aux_Hint struct _Ecore_Wl2_Frame_Cb_Handle { + EINA_INLIST; Ecore_Wl2_Window *win; Ecore_Wl2_Frame_Cb cb; void *data; @@ -271,7 +272,7 @@ struct _Ecore_Wl2_Window Eina_Inlist *subsurfs; Eina_List *supported_aux_hints; - Eina_List *frame_callbacks; + Eina_Inlist *frame_callbacks; Eina_List *outputs; diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index cb5d29d..e74fb06 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -2904,13 +2904,13 @@ _frame_cb(void *data, struct wl_callback *callback, uint32_t timestamp) { Ecore_Wl2_Frame_Cb_Handle *cb; Ecore_Wl2_Window *window; - Eina_List *l, *ll; + Eina_Inlist *l; window = data; window->commit_pending = EINA_FALSE; wl_callback_destroy(callback); window->callback = NULL; - EINA_LIST_FOREACH_SAFE(window->frame_callbacks, l, ll, cb) + EINA_INLIST_FOREACH_SAFE(window->frame_callbacks, l, cb) cb->cb(window, timestamp, cb->data); } @@ -3135,7 +3135,7 @@ ecore_wl2_window_frame_callback_add(Ecore_Wl2_Window *window, Ecore_Wl2_Frame_Cb callback->data = data; callback->win = window; window->frame_callbacks = - eina_list_append(window->frame_callbacks, callback); + eina_inlist_append(window->frame_callbacks, EINA_INLIST_GET(callback)); return callback; } @@ -3145,7 +3145,7 @@ ecore_wl2_window_frame_callback_del(Ecore_Wl2_Frame_Cb_Handle *handle) EINA_SAFETY_ON_NULL_RETURN(handle); handle->win->frame_callbacks = - eina_list_remove(handle->win->frame_callbacks, handle); + eina_inlist_remove(handle->win->frame_callbacks, EINA_INLIST_GET(handle)); free(handle); } -- 2.7.4