From 169b68b17c668fc6d3feec92f3cf72308ba4e99c Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sat, 21 Oct 2017 22:00:04 -0400 Subject: [PATCH] Rename remaining refs to wlr_list --- backend/drm/backend.c | 2 +- backend/libinput/backend.c | 2 +- examples/pointer.c | 4 +-- examples/touch.c | 4 +-- include/backend/libinput.h | 4 +-- include/rootston/desktop.h | 4 +-- include/wlr/types/wlr_data_source.h | 4 +-- include/wlr/{util/list.h => types/wlr_list.h} | 28 ++++++++--------- include/wlr/xwayland.h | 4 +-- types/meson.build | 11 +++---- types/wlr_data_source.c | 2 +- util/list.c => types/wlr_list.c | 30 +++++++++---------- types/wlr_output.c | 2 +- util/meson.build | 1 - 14 files changed, 51 insertions(+), 51 deletions(-) rename include/wlr/{util/list.h => types/wlr_list.h} (62%) rename util/list.c => types/wlr_list.c (69%) diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 3293196bf..978994f08 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include "backend/drm/drm.h" diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c index 3d3c90ceb..b278b8f7e 100644 --- a/backend/libinput/backend.c +++ b/backend/libinput/backend.c @@ -99,7 +99,7 @@ static void wlr_libinput_backend_destroy(struct wlr_backend *_backend) { } struct wlr_libinput_backend *backend = (struct wlr_libinput_backend *)_backend; for (size_t i = 0; i < backend->wlr_device_lists->length; i++) { - list_t *wlr_devices = backend->wlr_device_lists->items[i]; + struct wlr_list *wlr_devices = backend->wlr_device_lists->items[i]; for (size_t j = 0; j < wlr_devices->length; j++) { struct wlr_input_device *wlr_dev = wlr_devices->items[j]; wl_signal_emit(&backend->backend.events.input_remove, wlr_dev); diff --git a/examples/pointer.c b/examples/pointer.c index f03571c3d..f33619739 100644 --- a/examples/pointer.c +++ b/examples/pointer.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "shared.h" #include "config.h" #include "cat.h" @@ -46,7 +46,7 @@ struct sample_state { struct wl_listener touch_up; struct wl_listener touch_down; struct wl_listener touch_cancel; - list_t *touch_points; + struct wlr_list *touch_points; struct wl_listener tablet_tool_axis; struct wl_listener tablet_tool_proxmity; diff --git a/examples/touch.c b/examples/touch.c index db0259427..60fb0ae44 100644 --- a/examples/touch.c +++ b/examples/touch.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include "shared.h" #include "cat.h" @@ -24,7 +24,7 @@ struct sample_state { struct wlr_renderer *renderer; struct wlr_texture *cat_texture; - list_t *touch_points; + struct wlr_list *touch_points; }; struct touch_point { diff --git a/include/backend/libinput.h b/include/backend/libinput.h index bb6083a49..93b859a79 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 1225bdcd7..c3859afb5 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 19834cb64..f54ac0a95 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/util/list.h b/include/wlr/types/wlr_list.h similarity index 62% rename from include/wlr/util/list.h rename to include/wlr/types/wlr_list.h index 02039d89a..6a4fe8631 100644 --- a/include/wlr/util/list.h +++ b/include/wlr/types/wlr_list.h @@ -3,57 +3,57 @@ #include -typedef struct { +struct wlr_list { 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)); +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(list_t *list, void *item); +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(list_t *list, void *item); +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(list_t *list, size_t index, void *item); +int list_insert(struct wlr_list *list, size_t index, void *item); /** * Remove an item from the list */ -void list_del(list_t *list, size_t index); +void list_del(struct wlr_list *list, size_t index); /** * Remove and return an item from the end of the list */ -void *list_pop(list_t *list); +void *list_pop(struct wlr_list *list); /** * Get a reference to the last item of a list without removal */ -void *list_peek(list_t *list); +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(list_t *list, list_t *source); +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(list_t *list, int compare(const void *left, const void *right)); +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(list_t *list, +int list_seq_find(struct wlr_list *list, int compare(const void *item, const void *cmp_to), const void *cmp_to); diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index 4f309a965..c25d0eb00 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; diff --git a/types/meson.build b/types/meson.build index a151e8a3d..bd71dac69 100644 --- a/types/meson.build +++ b/types/meson.build @@ -1,15 +1,20 @@ lib_wlr_types = static_library( 'wlr_types', files( + 'wlr_box.c', + 'wlr_compositor.c', + 'wlr_cursor.c', 'wlr_data_device_manager.c', 'wlr_data_source.c', + 'wlr_gamma_control.c', 'wlr_input_device.c', 'wlr_keyboard.c', + 'wlr_list.c', 'wlr_output.c', 'wlr_output_layout.c', 'wlr_pointer.c', - 'wlr_cursor.c', 'wlr_region.c', + 'wlr_screenshooter.c', 'wlr_seat.c', 'wlr_surface.c', 'wlr_tablet_pad.c', @@ -17,10 +22,6 @@ lib_wlr_types = static_library( 'wlr_touch.c', 'wlr_xdg_shell_v6.c', 'wlr_wl_shell.c', - 'wlr_compositor.c', - 'wlr_box.c', - 'wlr_gamma_control.c', - 'wlr_screenshooter.c', ), include_directories: wlr_inc, dependencies: [wayland_server, pixman, wlr_protos], diff --git a/types/wlr_data_source.c b/types/wlr_data_source.c index 83064faca..2c227778a 100644 --- a/types/wlr_data_source.c +++ b/types/wlr_data_source.c @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/util/list.c b/types/wlr_list.c similarity index 69% rename from util/list.c rename to types/wlr_list.c index 4abd689b4..365ad2366 100644 --- a/util/list.c +++ b/types/wlr_list.c @@ -3,10 +3,10 @@ #include #include #include -#include +#include -list_t *list_create(void) { - list_t *list = malloc(sizeof(list_t)); +struct wlr_list *list_create(void) { + struct wlr_list *list = malloc(sizeof(struct wlr_list)); if (!list) { return NULL; } @@ -20,7 +20,7 @@ list_t *list_create(void) { return list; } -static bool list_resize(list_t *list) { +static bool list_resize(struct wlr_list *list) { if (list->length == list->capacity) { void *new_items = realloc(list->items, sizeof(void*) * (list->capacity + 10)); if (!new_items) { @@ -32,7 +32,7 @@ static bool list_resize(list_t *list) { return true; } -void list_free(list_t *list) { +void list_free(struct wlr_list *list) { if (list == NULL) { return; } @@ -40,7 +40,7 @@ void list_free(list_t *list) { free(list); } -void list_foreach(list_t *list, void (*callback)(void *item)) { +void list_foreach(struct wlr_list *list, void (*callback)(void *item)) { if (list == NULL || callback == NULL) { return; } @@ -49,7 +49,7 @@ void list_foreach(list_t *list, void (*callback)(void *item)) { } } -int list_add(list_t *list, void *item) { +int list_add(struct wlr_list *list, void *item) { if (!list_resize(list)) { return -1; } @@ -57,11 +57,11 @@ int list_add(list_t *list, void *item) { return list->length; } -int list_push(list_t *list, void *item) { +int list_push(struct wlr_list *list, void *item) { return list_add(list, item); } -int list_insert(list_t *list, size_t index, void *item) { +int list_insert(struct wlr_list *list, size_t index, void *item) { if (!list_resize(list)) { return -1; } @@ -71,22 +71,22 @@ int list_insert(list_t *list, size_t index, void *item) { return list->length; } -void list_del(list_t *list, size_t index) { +void list_del(struct wlr_list *list, size_t index) { list->length--; memmove(&list->items[index], &list->items[index + 1], sizeof(void*) * (list->length - index)); } -void *list_pop(list_t *list) { +void *list_pop(struct wlr_list *list) { void *_ = list->items[list->length - 1]; list_del(list, list->length - 1); return _; } -void *list_peek(list_t *list) { +void *list_peek(struct wlr_list *list) { return list->items[list->length - 1]; } -int list_cat(list_t *list, list_t *source) { +int list_cat(struct wlr_list *list, struct wlr_list *source) { size_t old_len = list->length; size_t i; for (i = 0; i < source->length; ++i) { @@ -98,11 +98,11 @@ int list_cat(list_t *list, list_t *source) { return list->length; } -void list_qsort(list_t *list, int compare(const void *left, const void *right)) { +void list_qsort(struct wlr_list *list, int compare(const void *left, const void *right)) { qsort(list->items, list->length, sizeof(void *), compare); } -int list_seq_find(list_t *list, +int list_seq_find(struct wlr_list *list, int compare(const void *item, const void *data), const void *data) { for (size_t i = 0; i < list->length; i++) { diff --git a/types/wlr_output.c b/types/wlr_output.c index 82e04ebf5..140c817bf 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/util/meson.build b/util/meson.build index a612325fd..dd6208189 100644 --- a/util/meson.build +++ b/util/meson.build @@ -1,7 +1,6 @@ lib_wlr_util = static_library( 'wlr_util', files( - 'list.c', 'log.c', ), include_directories: wlr_inc,