From 169b68b17c668fc6d3feec92f3cf72308ba4e99c Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sat, 21 Oct 2017 22:00:04 -0400 Subject: Rename remaining refs to wlr_list --- include/backend/libinput.h | 4 +-- include/rootston/desktop.h | 4 +-- include/wlr/types/wlr_data_source.h | 4 +-- include/wlr/types/wlr_list.h | 60 +++++++++++++++++++++++++++++++++++++ include/wlr/util/list.h | 60 ------------------------------------- include/wlr/xwayland.h | 4 +-- 6 files changed, 68 insertions(+), 68 deletions(-) create mode 100644 include/wlr/types/wlr_list.h delete mode 100644 include/wlr/util/list.h (limited to 'include') diff --git a/include/backend/libinput.h b/include/backend/libinput.h index bb6083a4..93b859a7 100644 --- a/include/backend/libinput.h +++ b/include/backend/libinput.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include struct wlr_libinput_backend { struct wlr_backend backend; @@ -18,7 +18,7 @@ struct wlr_libinput_backend { struct wl_listener session_signal; - list_t *wlr_device_lists; + struct wlr_list *wlr_device_lists; }; struct wlr_libinput_input_device { diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index 1225bdcd..c3859afb 100644 --- a/include/rootston/desktop.h +++ b/include/rootston/desktop.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include "rootston/view.h" #include "rootston/config.h" @@ -22,7 +22,7 @@ struct roots_output { }; struct roots_desktop { - list_t *views; + struct wlr_list *views; struct wl_list outputs; struct timespec last_frame; diff --git a/include/wlr/types/wlr_data_source.h b/include/wlr/types/wlr_data_source.h index 19834cb6..f54ac0a9 100644 --- a/include/wlr/types/wlr_data_source.h +++ b/include/wlr/types/wlr_data_source.h @@ -2,13 +2,13 @@ #define WLR_TYPES_WLR_DATA_SOURCE_H #include -#include +#include struct wlr_data_source_impl; struct wlr_data_source { struct wlr_data_source_impl *impl; - list_t *types; + struct wlr_list *types; void *data; struct { diff --git a/include/wlr/types/wlr_list.h b/include/wlr/types/wlr_list.h new file mode 100644 index 00000000..6a4fe863 --- /dev/null +++ b/include/wlr/types/wlr_list.h @@ -0,0 +1,60 @@ +#ifndef WLR_UTIL_LIST_H +#define WLR_UTIL_LIST_H + +#include + +struct wlr_list { + size_t capacity; + size_t length; + void **items; +}; + +/** + * Creates a new list, may return `NULL` on failure + */ +struct wlr_list *list_create(void); +void list_free(struct wlr_list *list); +void list_foreach(struct wlr_list *list, void (*callback)(void *item)); +/** + * Add `item` to the end of a list. + * Returns: new list length or `-1` on failure + */ +int list_add(struct wlr_list *list, void *item); +/** + * Add `item` to the end of a list. + * Returns: new list length or `-1` on failure + */ +int list_push(struct wlr_list *list, void *item); +/** + * Place `item` into index `index` in the list + * Returns: new list length or `-1` on failure + */ +int list_insert(struct wlr_list *list, size_t index, void *item); +/** + * Remove an item from the list + */ +void list_del(struct wlr_list *list, size_t index); +/** + * Remove and return an item from the end of the list + */ +void *list_pop(struct wlr_list *list); +/** + * Get a reference to the last item of a list without removal + */ +void *list_peek(struct wlr_list *list); +/** + * Append each item in `source` to `list` + * Does not modify `source` + * Returns: new list length or `-1` on failure + */ +int list_cat(struct wlr_list *list, struct wlr_list *source); +// See qsort. Remember to use *_qsort functions as compare functions, +// because they dereference the left and right arguments first! +void list_qsort(struct wlr_list *list, int compare(const void *left, const void *right)); +// Return index for first item in list that returns 0 for given compare +// function or -1 if none matches. +int list_seq_find(struct wlr_list *list, + int compare(const void *item, const void *cmp_to), + const void *cmp_to); + +#endif diff --git a/include/wlr/util/list.h b/include/wlr/util/list.h deleted file mode 100644 index 02039d89..00000000 --- a/include/wlr/util/list.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef WLR_UTIL_LIST_H -#define WLR_UTIL_LIST_H - -#include - -typedef struct { - size_t capacity; - size_t length; - void **items; -} list_t; - -/** - * Creates a new list, may return `NULL` on failure - */ -list_t *list_create(void); -void list_free(list_t *list); -void list_foreach(list_t *list, void (*callback)(void *item)); -/** - * Add `item` to the end of a list. - * Returns: new list length or `-1` on failure - */ -int list_add(list_t *list, void *item); -/** - * Add `item` to the end of a list. - * Returns: new list length or `-1` on failure - */ -int list_push(list_t *list, void *item); -/** - * Place `item` into index `index` in the list - * Returns: new list length or `-1` on failure - */ -int list_insert(list_t *list, size_t index, void *item); -/** - * Remove an item from the list - */ -void list_del(list_t *list, size_t index); -/** - * Remove and return an item from the end of the list - */ -void *list_pop(list_t *list); -/** - * Get a reference to the last item of a list without removal - */ -void *list_peek(list_t *list); -/** - * Append each item in `source` to `list` - * Does not modify `source` - * Returns: new list length or `-1` on failure - */ -int list_cat(list_t *list, list_t *source); -// See qsort. Remember to use *_qsort functions as compare functions, -// because they dereference the left and right arguments first! -void list_qsort(list_t *list, int compare(const void *left, const void *right)); -// Return index for first item in list that returns 0 for given compare -// function or -1 if none matches. -int list_seq_find(list_t *list, - int compare(const void *item, const void *cmp_to), - const void *cmp_to); - -#endif diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index 4f309a96..c25d0eb0 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #ifdef HAS_XCB_ICCCM #include @@ -79,7 +79,7 @@ struct wlr_xwayland_surface { char *class; char *instance; struct wlr_xwayland_surface *parent; - list_t *state; // list of xcb_atom_t + struct wlr_list *state; // list of xcb_atom_t pid_t pid; xcb_atom_t *window_type; -- cgit v1.2.3