From 1d716241afbc721c3ae65d4a2bb0e25866fe081c Mon Sep 17 00:00:00 2001
From: Heghedus Razvan <heghedus.razvan@gmail.com>
Date: Sun, 15 Oct 2017 13:32:37 +0300
Subject: Replace list_t with wl_list in wlr_output

Signed-off-by: Heghedus Razvan <heghedus.razvan@gmail.com>
---
 examples/shared.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'examples')

diff --git a/examples/shared.c b/examples/shared.c
index bb1d2737..d9f9ae61 100644
--- a/examples/shared.c
+++ b/examples/shared.c
@@ -427,8 +427,10 @@ static void output_add_notify(struct wl_listener *listener, void *data) {
 	wlr_log(L_DEBUG, "Output '%s' added", output->name);
 	wlr_log(L_DEBUG, "%s %s %"PRId32"mm x %"PRId32"mm", output->make, output->model,
 		output->phys_width, output->phys_height);
-	if (output->modes->length > 0) {
-		wlr_output_set_mode(output, output->modes->items[0]);
+	if (wl_list_length(&output->modes) > 0) {
+		struct wlr_output_mode *mode = NULL;
+		wl_container_of((&output->modes)->prev, mode, link);
+		wlr_output_set_mode(output, mode);
 	}
 	struct output_state *ostate = calloc(1, sizeof(struct output_state));
 	clock_gettime(CLOCK_MONOTONIC, &ostate->last_frame);
-- 
cgit v1.2.3


From e1f196a3e9477385ca30180686cda82e3ab735ce Mon Sep 17 00:00:00 2001
From: Heghedus Razvan <heghedus.razvan@gmail.com>
Date: Sat, 14 Oct 2017 19:17:43 +0300
Subject: Replace list_t with wl_list for wlr_input_device

Signed-off-by: Heghedus Razvan <heghedus.razvan@gmail.com>
---
 backend/drm/backend.c                |  1 -
 backend/libinput/events.c            | 41 ++++++++++++++++++------------------
 examples/pointer.c                   |  1 +
 include/wlr/types/wlr_input_device.h |  2 ++
 include/wlr/xwayland.h               |  1 +
 5 files changed, 25 insertions(+), 21 deletions(-)

(limited to 'examples')

diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 33f8eaf9..3293196b 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -153,7 +153,6 @@ error_event:
 	wl_event_source_remove(drm->drm_event);
 error_fd:
 	wlr_session_close_file(drm->session, drm->fd);
-error_backend:
 	free(drm);
 	return NULL;
 }
diff --git a/backend/libinput/events.c b/backend/libinput/events.c
index 2a396536..f6634814 100644
--- a/backend/libinput/events.c
+++ b/backend/libinput/events.c
@@ -3,19 +3,19 @@
 #include <libinput.h>
 #include <wlr/backend/session.h>
 #include <wlr/interfaces/wlr_input_device.h>
-#include <wlr/util/list.h>
 #include <wlr/util/log.h>
+#include <wayland-util.h>
 #include "backend/libinput.h"
 
 struct wlr_input_device *get_appropriate_device(
 		enum wlr_input_device_type desired_type,
 		struct libinput_device *libinput_dev) {
-	list_t *wlr_devices = libinput_device_get_user_data(libinput_dev);
+	struct wl_list *wlr_devices = libinput_device_get_user_data(libinput_dev);
 	if (!wlr_devices) {
 		return NULL;
 	}
-	for (size_t i = 0; i < wlr_devices->length; ++i) {
-		struct wlr_input_device *dev = wlr_devices->items[i];
+	struct wlr_input_device *dev;
+	wl_list_for_each(dev, wlr_devices, link) {
 		if (dev->type == desired_type) {
 			return dev;
 		}
@@ -35,7 +35,7 @@ static struct wlr_input_device_impl input_device_impl = {
 
 static struct wlr_input_device *allocate_device(
 		struct wlr_libinput_backend *backend, struct libinput_device *libinput_dev,
-		list_t *wlr_devices, enum wlr_input_device_type type) {
+		struct wl_list *wlr_devices, enum wlr_input_device_type type) {
 	int vendor = libinput_device_get_id_vendor(libinput_dev);
 	int product = libinput_device_get_id_product(libinput_dev);
 	const char *name = libinput_device_get_name(libinput_dev);
@@ -44,10 +44,7 @@ static struct wlr_input_device *allocate_device(
 		return NULL;
 	}
 	struct wlr_input_device *wlr_dev = &wlr_libinput_dev->wlr_input_device;
-	if (list_add(wlr_devices, wlr_dev) == -1) {
-		free(wlr_libinput_dev);
-		return NULL;
-	}
+	wl_list_insert(wlr_devices, &wlr_dev->link);
 	wlr_libinput_dev->handle = libinput_dev;
 	libinput_device_ref(libinput_dev);
 	wlr_input_device_init(wlr_dev, type, &input_device_impl,
@@ -67,7 +64,8 @@ static void handle_device_added(struct wlr_libinput_backend *backend,
 	int vendor = libinput_device_get_id_vendor(libinput_dev);
 	int product = libinput_device_get_id_product(libinput_dev);
 	const char *name = libinput_device_get_name(libinput_dev);
-	list_t *wlr_devices = list_create();
+	struct wl_list *wlr_devices = calloc(1, sizeof(struct wl_list));
+	wl_list_init(wlr_devices);
 	if (!wlr_devices) {
 		goto fail;
 	}
@@ -145,23 +143,26 @@ static void handle_device_added(struct wlr_libinput_backend *backend,
 		// TODO
 	}
 
-	if (wlr_devices->length > 0) {
+	if (wl_list_length(wlr_devices) > 0) {
 		libinput_device_set_user_data(libinput_dev, wlr_devices);
 		list_add(backend->wlr_device_lists, wlr_devices);
 	} else {
-		list_free(wlr_devices);
+		free(wlr_devices);
 	}
 	return;
 
 fail:
 	wlr_log(L_ERROR, "Could not allocate new device");
-	list_foreach(wlr_devices, free);
-	list_free(wlr_devices);
+	struct wlr_input_device *dev, *tmp_dev;
+	wl_list_for_each_safe(dev, tmp_dev, wlr_devices, link) {
+		free(dev);
+	}
+	free(wlr_devices);
 }
 
 static void handle_device_removed(struct wlr_libinput_backend *backend,
 		struct libinput_device *libinput_dev) {
-	list_t *wlr_devices = libinput_device_get_user_data(libinput_dev);
+	struct wl_list *wlr_devices = libinput_device_get_user_data(libinput_dev);
 	int vendor = libinput_device_get_id_vendor(libinput_dev);
 	int product = libinput_device_get_id_product(libinput_dev);
 	const char *name = libinput_device_get_name(libinput_dev);
@@ -169,10 +170,10 @@ static void handle_device_removed(struct wlr_libinput_backend *backend,
 	if (!wlr_devices) {
 		return;
 	}
-	for (size_t i = 0; i < wlr_devices->length; i++) {
-		struct wlr_input_device *wlr_dev = wlr_devices->items[i];
-		wl_signal_emit(&backend->backend.events.input_remove, wlr_dev);
-		wlr_input_device_destroy(wlr_dev);
+	struct wlr_input_device *dev, *tmp_dev;
+	wl_list_for_each_safe(dev, tmp_dev, wlr_devices, link) {
+		wl_signal_emit(&backend->backend.events.input_remove, dev);
+		wlr_input_device_destroy(dev);
 	}
 	for (size_t i = 0; i < backend->wlr_device_lists->length; i++) {
 		if (backend->wlr_device_lists->items[i] == wlr_devices) {
@@ -180,7 +181,7 @@ static void handle_device_removed(struct wlr_libinput_backend *backend,
 			break;
 		}
 	}
-	list_free(wlr_devices);
+	free(wlr_devices);
 }
 
 void wlr_libinput_event(struct wlr_libinput_backend *backend,
diff --git a/examples/pointer.c b/examples/pointer.c
index 238be9b3..f03571c3 100644
--- a/examples/pointer.c
+++ b/examples/pointer.c
@@ -21,6 +21,7 @@
 #include <wlr/xcursor.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/util/log.h>
+#include <wlr/util/list.h>
 #include "shared.h"
 #include "config.h"
 #include "cat.h"
diff --git a/include/wlr/types/wlr_input_device.h b/include/wlr/types/wlr_input_device.h
index 50b0fb88..306a1166 100644
--- a/include/wlr/types/wlr_input_device.h
+++ b/include/wlr/types/wlr_input_device.h
@@ -45,6 +45,8 @@ struct wlr_input_device {
 	} events;
 
 	void *data;
+
+	struct wl_list link;
 };
 
 #endif
diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h
index 09f9fbac..4f309a96 100644
--- a/include/wlr/xwayland.h
+++ b/include/wlr/xwayland.h
@@ -5,6 +5,7 @@
 #include <stdbool.h>
 #include <wlr/types/wlr_compositor.h>
 #include <xcb/xcb.h>
+#include <wlr/util/list.h>
 
 #ifdef HAS_XCB_ICCCM
 	#include <xcb/xcb_icccm.h>
-- 
cgit v1.2.3


From 169b68b17c668fc6d3feec92f3cf72308ba4e99c Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sat, 21 Oct 2017 22:00:04 -0400
Subject: 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/types/wlr_list.h        |  60 +++++++++++++++++++
 include/wlr/util/list.h             |  60 -------------------
 include/wlr/xwayland.h              |   4 +-
 types/meson.build                   |  11 ++--
 types/wlr_data_source.c             |   2 +-
 types/wlr_list.c                    | 115 ++++++++++++++++++++++++++++++++++++
 types/wlr_output.c                  |   2 +-
 util/list.c                         | 115 ------------------------------------
 util/meson.build                    |   1 -
 16 files changed, 197 insertions(+), 197 deletions(-)
 create mode 100644 include/wlr/types/wlr_list.h
 delete mode 100644 include/wlr/util/list.h
 create mode 100644 types/wlr_list.c
 delete mode 100644 util/list.c

(limited to 'examples')

diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 3293196b..978994f0 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -9,7 +9,7 @@
 #include <wlr/backend/session.h>
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_output.h>
-#include <wlr/util/list.h>
+#include <wlr/types/wlr_list.h>
 #include <wlr/util/log.h>
 #include <wlr/egl.h>
 #include "backend/drm/drm.h"
diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
index 3d3c90ce..b278b8f7 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 f03571c3..f3361973 100644
--- a/examples/pointer.c
+++ b/examples/pointer.c
@@ -21,7 +21,7 @@
 #include <wlr/xcursor.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/util/log.h>
-#include <wlr/util/list.h>
+#include <wlr/types/wlr_list.h>
 #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 db025942..60fb0ae4 100644
--- a/examples/touch.c
+++ b/examples/touch.c
@@ -16,7 +16,7 @@
 #include <wlr/render.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
-#include <wlr/util/list.h>
+#include <wlr/types/wlr_list.h>
 #include <wlr/util/log.h>
 #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 bb6083a4..93b859a7 100644
--- a/include/backend/libinput.h
+++ b/include/backend/libinput.h
@@ -5,7 +5,7 @@
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_input_device.h>
-#include <wlr/util/list.h>
+#include <wlr/types/wlr_list.h>
 
 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 <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/types/wlr_gamma_control.h>
 #include <wlr/types/wlr_screenshooter.h>
-#include <wlr/util/list.h>
+#include <wlr/types/wlr_list.h>
 #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 <wayland-server.h>
-#include <wlr/util/list.h>
+#include <wlr/types/wlr_list.h>
 
 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 <stddef.h>
+
+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 <stddef.h>
-
-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 <stdbool.h>
 #include <wlr/types/wlr_compositor.h>
 #include <xcb/xcb.h>
-#include <wlr/util/list.h>
+#include <wlr/types/wlr_list.h>
 
 #ifdef HAS_XCB_ICCCM
 	#include <xcb/xcb_icccm.h>
@@ -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 a151e8a3..bd71dac6 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 83064fac..2c227778 100644
--- a/types/wlr_data_source.c
+++ b/types/wlr_data_source.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <wayland-server.h>
-#include <wlr/util/list.h>
+#include <wlr/types/wlr_list.h>
 #include <wlr/util/log.h>
 #include <wlr/types/wlr_data_source.h>
 #include <wlr/types/wlr_data_device_manager.h>
diff --git a/types/wlr_list.c b/types/wlr_list.c
new file mode 100644
index 00000000..365ad236
--- /dev/null
+++ b/types/wlr_list.c
@@ -0,0 +1,115 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+#include <stddef.h>
+#include <wlr/types/wlr_list.h>
+
+struct wlr_list *list_create(void) {
+	struct wlr_list *list = malloc(sizeof(struct wlr_list));
+	if (!list) {
+		return NULL;
+	}
+	list->capacity = 10;
+	list->length = 0;
+	list->items = malloc(sizeof(void*) * list->capacity);
+	if (!list->items) {
+		free(list);
+		return NULL;
+	}
+	return 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) {
+			return false;
+		}
+		list->capacity += 10;
+		list->items = new_items;
+	}
+	return true;
+}
+
+void list_free(struct wlr_list *list) {
+	if (list == NULL) {
+		return;
+	}
+	free(list->items);
+	free(list);
+}
+
+void list_foreach(struct wlr_list *list, void (*callback)(void *item)) {
+	if (list == NULL || callback == NULL) {
+		return;
+	}
+	for (size_t i = 0; i < list->length; i++) {
+		callback(list->items[i]);
+	}
+}
+
+int list_add(struct wlr_list *list, void *item) {
+	if (!list_resize(list)) {
+		return -1;
+	}
+	list->items[list->length++] = item;
+	return list->length;
+}
+
+int list_push(struct wlr_list *list, void *item) {
+	return list_add(list, item);
+}
+
+int list_insert(struct wlr_list *list, size_t index, void *item) {
+	if (!list_resize(list)) {
+		return -1;
+	}
+	memmove(&list->items[index + 1], &list->items[index], sizeof(void*) * (list->length - index));
+	list->length++;
+	list->items[index] = item;
+	return list->length;
+}
+
+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(struct wlr_list *list) {
+	void *_ = list->items[list->length - 1];
+	list_del(list, list->length - 1);
+	return _;
+}
+
+void *list_peek(struct wlr_list *list) {
+	return list->items[list->length - 1];
+}
+
+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) {
+		if (list_add(list, source->items[i]) == -1) {
+			list->length = old_len;
+			return -1;
+		}
+	}
+	return list->length;
+}
+
+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(struct wlr_list *list,
+		int compare(const void *item, const void *data),
+		const void *data) {
+	for (size_t i = 0; i < list->length; i++) {
+		void *item = list->items[i];
+		if (compare(item, data) == 0) {
+			return i;
+		}
+	}
+	return -1;
+}
diff --git a/types/wlr_output.c b/types/wlr_output.c
index 82e04ebf..140c817b 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -8,7 +8,7 @@
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/interfaces/wlr_output.h>
-#include <wlr/util/list.h>
+#include <wlr/types/wlr_list.h>
 #include <wlr/util/log.h>
 #include <GLES2/gl2.h>
 #include <wlr/render/matrix.h>
diff --git a/util/list.c b/util/list.c
deleted file mode 100644
index 4abd689b..00000000
--- a/util/list.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-#include <stddef.h>
-#include <wlr/util/list.h>
-
-list_t *list_create(void) {
-	list_t *list = malloc(sizeof(list_t));
-	if (!list) {
-		return NULL;
-	}
-	list->capacity = 10;
-	list->length = 0;
-	list->items = malloc(sizeof(void*) * list->capacity);
-	if (!list->items) {
-		free(list);
-		return NULL;
-	}
-	return list;
-}
-
-static bool list_resize(list_t *list) {
-	if (list->length == list->capacity) {
-		void *new_items = realloc(list->items, sizeof(void*) * (list->capacity + 10));
-		if (!new_items) {
-			return false;
-		}
-		list->capacity += 10;
-		list->items = new_items;
-	}
-	return true;
-}
-
-void list_free(list_t *list) {
-	if (list == NULL) {
-		return;
-	}
-	free(list->items);
-	free(list);
-}
-
-void list_foreach(list_t *list, void (*callback)(void *item)) {
-	if (list == NULL || callback == NULL) {
-		return;
-	}
-	for (size_t i = 0; i < list->length; i++) {
-		callback(list->items[i]);
-	}
-}
-
-int list_add(list_t *list, void *item) {
-	if (!list_resize(list)) {
-		return -1;
-	}
-	list->items[list->length++] = item;
-	return list->length;
-}
-
-int list_push(list_t *list, void *item) {
-	return list_add(list, item);
-}
-
-int list_insert(list_t *list, size_t index, void *item) {
-	if (!list_resize(list)) {
-		return -1;
-	}
-	memmove(&list->items[index + 1], &list->items[index], sizeof(void*) * (list->length - index));
-	list->length++;
-	list->items[index] = item;
-	return list->length;
-}
-
-void list_del(list_t *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->items[list->length - 1];
-	list_del(list, list->length - 1);
-	return _;
-}
-
-void *list_peek(list_t *list) {
-	return list->items[list->length - 1];
-}
-
-int list_cat(list_t *list, list_t *source) {
-	size_t old_len = list->length;
-	size_t i;
-	for (i = 0; i < source->length; ++i) {
-		if (list_add(list, source->items[i]) == -1) {
-			list->length = old_len;
-			return -1;
-		}
-	}
-	return list->length;
-}
-
-void list_qsort(list_t *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 compare(const void *item, const void *data),
-		const void *data) {
-	for (size_t i = 0; i < list->length; i++) {
-		void *item = list->items[i];
-		if (compare(item, data) == 0) {
-			return i;
-		}
-	}
-	return -1;
-}
diff --git a/util/meson.build b/util/meson.build
index a612325f..dd620818 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,
-- 
cgit v1.2.3