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

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 <derek.foreman.samsung@gmail.com>
Reviewed-by: Chris Michael <cp.michael@samsung.com>
Differential Revision: https://phab.enlightenment.org/D7610
This commit is contained in:
Derek Foreman 2019-01-10 15:58:16 -06:00
parent 625955a597
commit be3020b0ab
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/ecore_wl2/ecore_wl2_private.h
View File

@ -147,6 +147,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;
@ -221,7 +222,7 @@ struct _Ecore_Wl2_Window
Eina_Inlist *subsurfs;
Eina_List *supported_aux_hints;
Eina_List *frame_callbacks;
Eina_Inlist *frame_callbacks;
Eina_List *outputs;

8
src/lib/ecore_wl2/ecore_wl2_window.c
View File

@ -1418,13 +1418,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);
}
@ -1652,7 +1652,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;
}
@ -1662,7 +1662,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);
}