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>
---
 include/wlr/types/wlr_output.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/wlr')

diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index dc637e26..15df4efd 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -2,13 +2,13 @@
 #define WLR_TYPES_WLR_OUTPUT_H
 
 #include <wayland-server.h>
-#include <wlr/util/list.h>
 #include <stdbool.h>
 
 struct wlr_output_mode {
 	uint32_t flags; // enum wl_output_mode
 	int32_t width, height;
 	int32_t refresh; // mHz
+	struct wl_list link;
 };
 
 struct wlr_output_impl;
@@ -32,7 +32,7 @@ struct wlr_output {
 	float transform_matrix[16];
 
 	/* Note: some backends may have zero modes */
-	list_t *modes;
+	struct wl_list modes;
 	struct wlr_output_mode *current_mode;
 
 	struct {
-- 
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 'include/wlr')

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 d3f0878d716011bf158b49b063f9391080c22c8a Mon Sep 17 00:00:00 2001
From: Heghedus Razvan <heghedus.razvan@gmail.com>
Date: Sat, 14 Oct 2017 23:33:00 +0300
Subject: Replace list_t with wl_list in wlr_wl_backend

Now wlr_backend->outputs is a list of wlr_wl_backend_output instead of
wlr_output.

Signed-off-by: Heghedus Razvan <heghedus.razvan@gmail.com>
---
 backend/wayland/backend.c      | 35 ++++++++++-------------------------
 backend/wayland/output.c       |  9 +++------
 backend/wayland/wl_seat.c      |  6 +-----
 include/backend/wayland.h      |  7 ++++---
 include/wlr/types/wlr_output.h |  1 +
 5 files changed, 19 insertions(+), 39 deletions(-)

(limited to 'include/wlr')

diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index e57f3583..84624bfe 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -64,16 +64,16 @@ static void wlr_wl_backend_destroy(struct wlr_backend *_backend) {
 		return;
 	}
 
-	for (size_t i = 0; i < backend->outputs->length; ++i) {
-		wlr_output_destroy(backend->outputs->items[i]);
+	struct wlr_wl_backend_output *output, *tmp_output;
+	wl_list_for_each_safe(output, tmp_output, &backend->outputs, link) {
+		wlr_output_destroy(&output->wlr_output);
 	}
 
-	for (size_t i = 0; i < backend->devices->length; ++i) {
-		wlr_input_device_destroy(backend->devices->items[i]);
+	struct wlr_input_device *input_device, *tmp_input_device;
+	wl_list_for_each_safe(input_device, tmp_input_device, &backend->devices, link) {
+		wlr_input_device_destroy(input_device);
 	}
 
-	list_free(backend->devices);
-	list_free(backend->outputs);
 	free(backend->seat_name);
 
 	wl_event_source_remove(backend->remote_display_src);
@@ -104,8 +104,8 @@ bool wlr_backend_is_wl(struct wlr_backend *b) {
 
 struct wlr_wl_backend_output *wlr_wl_output_for_surface(
 		struct wlr_wl_backend *backend, struct wl_surface *surface) {
-	for (size_t i = 0; i < backend->outputs->length; ++i) {
-		struct wlr_wl_backend_output *output = backend->outputs->items[i];
+	struct wlr_wl_backend_output *output;
+	wl_list_for_each(output, &backend->outputs, link) {
 		if (output->surface == surface) {
 			return output;
 		}
@@ -123,15 +123,8 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display) {
 	}
 	wlr_backend_init(&backend->backend, &backend_impl);
 
-	if (!(backend->devices = list_create())) {
-		wlr_log(L_ERROR, "Could not allocate devices list");
-		goto error;
-	}
-
-	if (!(backend->outputs = list_create())) {
-		wlr_log(L_ERROR, "Could not allocate outputs list");
-		goto error;
-	}
+	wl_list_init(&backend->devices);
+	wl_list_init(&backend->outputs);
 
 	backend->local_display = display;
 
@@ -150,12 +143,4 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display) {
 	wlr_egl_bind_display(&backend->egl, backend->local_display);
 
 	return &backend->backend;
-
-error:
-	if (backend) {
-		list_free(backend->devices);
-		list_free(backend->outputs);
-	}
-	free(backend);
-	return NULL;
 }
diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index e1138ee1..1a0f0364 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -248,8 +248,8 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
 	wlr_output->height = 480;
 	strncpy(wlr_output->make, "wayland", sizeof(wlr_output->make));
 	strncpy(wlr_output->model, "wayland", sizeof(wlr_output->model));
-	snprintf(wlr_output->name, sizeof(wlr_output->name), "WL-%zd",
-			backend->outputs->length + 1);
+	snprintf(wlr_output->name, sizeof(wlr_output->name), "WL-%d",
+			wl_list_length(&backend->outputs) + 1);
 	wlr_output_update_matrix(wlr_output);
 
 	output->backend = backend;
@@ -306,10 +306,7 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
 		goto error;
 	}
 
-	if (list_add(backend->outputs, wlr_output) == -1) {
-		wlr_log(L_ERROR, "Allocation failed");
-		goto error;
-	}
+	wl_list_insert(&backend->outputs, &output->link);
 	wlr_output_create_global(wlr_output, backend->local_display);
 	wl_signal_emit(&backend->backend.events.output_add, wlr_output);
 	return wlr_output;
diff --git a/backend/wayland/wl_seat.c b/backend/wayland/wl_seat.c
index d3ff9b64..30074abd 100644
--- a/backend/wayland/wl_seat.c
+++ b/backend/wayland/wl_seat.c
@@ -204,11 +204,7 @@ static struct wlr_input_device *allocate_device(struct wlr_wl_backend *backend,
 	struct wlr_input_device *wlr_device = &wlr_wl_dev->wlr_input_device;
 	wlr_input_device_init(wlr_device, type, &input_device_impl,
 			name, vendor, product);
-	if (list_add(backend->devices, wlr_device) == -1) {
-		wlr_log_errno(L_ERROR, "Allocation failed");
-		free(wlr_wl_dev);
-		return NULL;
-	}
+	wl_list_insert(&backend->devices, &wlr_device->link);
 	return wlr_device;
 }
 
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index 508a7f52..bc3b6277 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -9,7 +9,7 @@
 #include <wlr/backend/wayland.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_input_device.h>
-#include <wlr/util/list.h>
+#include <wayland-util.h>
 
 struct wlr_wl_backend {
 	struct wlr_backend backend;
@@ -17,8 +17,8 @@ struct wlr_wl_backend {
 	/* local state */
 	bool started;
 	struct wl_display *local_display;
-	list_t *devices;
-	list_t *outputs;
+	struct wl_list devices;
+	struct wl_list outputs;
 	struct wlr_egl egl;
 	size_t requested_outputs;
 	/* remote state */
@@ -51,6 +51,7 @@ struct wlr_wl_backend_output {
 	uint32_t enter_serial;
 
 	void *egl_surface;
+	struct wl_list link;
 };
 
 struct wlr_wl_input_device {
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index 15df4efd..5c85ce91 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -1,6 +1,7 @@
 #ifndef WLR_TYPES_WLR_OUTPUT_H
 #define WLR_TYPES_WLR_OUTPUT_H
 
+#include <wayland-util.h>
 #include <wayland-server.h>
 #include <stdbool.h>
 
-- 
cgit v1.2.3


From 9b984253e2b878128d2042836a8c86228700b1ee Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Sat, 21 Oct 2017 14:48:58 +1300
Subject: Move egl.h to render/egl.h

---
 backend/drm/backend.c           |  2 +-
 backend/drm/renderer.c          |  2 +-
 backend/wayland/backend.c       |  2 +-
 backend/x11/backend.c           |  2 +-
 include/backend/drm/drm.h       |  2 +-
 include/backend/wayland.h       |  2 +-
 include/backend/x11.h           |  2 +-
 include/render/gles2.h          |  2 +-
 include/wlr/backend.h           |  2 +-
 include/wlr/backend/interface.h |  2 +-
 include/wlr/egl.h               | 66 -----------------------------------------
 include/wlr/render/egl.h        | 66 +++++++++++++++++++++++++++++++++++++++++
 render/egl.c                    |  2 +-
 render/gles2/renderer.c         |  2 +-
 render/gles2/texture.c          |  2 +-
 types/wlr_surface.c             |  2 +-
 16 files changed, 80 insertions(+), 80 deletions(-)
 delete mode 100644 include/wlr/egl.h
 create mode 100644 include/wlr/render/egl.h

(limited to 'include/wlr')

diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index d7e2e616..ab66adf5 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -11,7 +11,7 @@
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/list.h>
 #include <wlr/util/log.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
 #include "backend/drm/drm.h"
 
 static bool wlr_drm_backend_start(struct wlr_backend *backend) {
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index 0d338490..d53acaa8 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -8,8 +8,8 @@
 #include <EGL/eglext.h>
 #include <wayland-util.h>
 
-#include <wlr/egl.h>
 #include <wlr/util/log.h>
+#include <wlr/render/egl.h>
 #include <wlr/render/matrix.h>
 #include <wlr/render/gles2.h>
 #include <wlr/render.h>
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index e57f3583..5018eeb0 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -4,7 +4,7 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <wayland-server.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/interfaces/wlr_input_device.h>
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index 11dd8568..4ecca325 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -15,7 +15,7 @@
 #endif
 #include <wlr/backend/interface.h>
 #include <wlr/backend/x11.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/interfaces/wlr_input_device.h>
 #include <wlr/interfaces/wlr_keyboard.h>
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h
index 6106a85a..7a0e43ea 100644
--- a/include/backend/drm/drm.h
+++ b/include/backend/drm/drm.h
@@ -12,7 +12,7 @@
 #include <wlr/backend/session.h>
 #include <wlr/backend/drm.h>
 #include <wlr/types/wlr_output.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
 #include <wlr/util/list.h>
 
 #include "iface.h"
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index 508a7f52..88aeabca 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -5,7 +5,7 @@
 #include <wayland-client.h>
 #include <wayland-server.h>
 #include <wayland-egl.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
 #include <wlr/backend/wayland.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_input_device.h>
diff --git a/include/backend/x11.h b/include/backend/x11.h
index b4284b63..f5ec56bc 100644
--- a/include/backend/x11.h
+++ b/include/backend/x11.h
@@ -5,7 +5,7 @@
 #include <xcb/xcb.h>
 #include <X11/Xlib-xcb.h>
 #include <wayland-server.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_input_device.h>
 
diff --git a/include/render/gles2.h b/include/render/gles2.h
index 688a51dd..0b7032cc 100644
--- a/include/render/gles2.h
+++ b/include/render/gles2.h
@@ -8,9 +8,9 @@
 #include <GLES2/gl2ext.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
-#include <wlr/egl.h>
 #include <wlr/backend.h>
 #include <wlr/render.h>
+#include <wlr/render/egl.h>
 #include <wlr/render/interface.h>
 #include <wlr/util/log.h>
 
diff --git a/include/wlr/backend.h b/include/wlr/backend.h
index 6c11152f..78d01edf 100644
--- a/include/wlr/backend.h
+++ b/include/wlr/backend.h
@@ -3,7 +3,7 @@
 
 #include <wayland-server.h>
 #include <wlr/backend/session.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
 
 struct wlr_backend_impl;
 
diff --git a/include/wlr/backend/interface.h b/include/wlr/backend/interface.h
index ea41400a..3f0aaadb 100644
--- a/include/wlr/backend/interface.h
+++ b/include/wlr/backend/interface.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 #include <wlr/backend.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
 
 struct wlr_backend_impl {
 	bool (*start)(struct wlr_backend *backend);
diff --git a/include/wlr/egl.h b/include/wlr/egl.h
deleted file mode 100644
index 9ab4d9ce..00000000
--- a/include/wlr/egl.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef WLR_EGL_H
-#define WLR_EGL_H
-
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <stdbool.h>
-
-struct wlr_egl {
-	EGLDisplay display;
-	EGLConfig config;
-	EGLContext context;
-
-	const char *egl_exts;
-	const char *gl_exts;
-
-	struct wl_display *wl_display;
-};
-
-// TODO: Allocate and return a wlr_egl
-/**
- *  Initializes an egl context for the given platform and remote display.
- * Will attempt to load all possibly required api functions.
- */
-bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, EGLint visual_id, void *display);
-
-/**
- * Frees all related egl resources, makes the context not-current and
- * unbinds a bound wayland display.
- */
-void wlr_egl_free(struct wlr_egl *egl);
-
-/**
- * Binds the given display to the egl instance.
- * This will allow clients to create egl surfaces from wayland ones and render to it.
- */
-bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display);
-
-/**
- * Refer to the eglQueryWaylandBufferWL extension function.
- */
-bool wlr_egl_query_buffer(struct wlr_egl *egl, struct wl_resource *buf,
-	EGLint attrib, EGLint *value);
-
-/**
- * Returns a surface for the given native window
- * The window must match the remote display the wlr_egl was created with.
- */
-EGLSurface wlr_egl_create_surface(struct wlr_egl *egl, void *window);
-
-/**
- * Creates an egl image from the given client buffer and attributes.
- */
-EGLImageKHR wlr_egl_create_image(struct wlr_egl *egl,
-		EGLenum target, EGLClientBuffer buffer, const EGLint *attribs);
-
-/**
- * Destroys an egl image created with the given wlr_egl.
- */
-bool wlr_egl_destroy_image(struct wlr_egl *egl, EGLImageKHR image);
-
-/**
- * Returns a string for the last error ocurred with egl.
- */
-const char *egl_error(void);
-
-#endif
diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h
new file mode 100644
index 00000000..9ab4d9ce
--- /dev/null
+++ b/include/wlr/render/egl.h
@@ -0,0 +1,66 @@
+#ifndef WLR_EGL_H
+#define WLR_EGL_H
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <stdbool.h>
+
+struct wlr_egl {
+	EGLDisplay display;
+	EGLConfig config;
+	EGLContext context;
+
+	const char *egl_exts;
+	const char *gl_exts;
+
+	struct wl_display *wl_display;
+};
+
+// TODO: Allocate and return a wlr_egl
+/**
+ *  Initializes an egl context for the given platform and remote display.
+ * Will attempt to load all possibly required api functions.
+ */
+bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, EGLint visual_id, void *display);
+
+/**
+ * Frees all related egl resources, makes the context not-current and
+ * unbinds a bound wayland display.
+ */
+void wlr_egl_free(struct wlr_egl *egl);
+
+/**
+ * Binds the given display to the egl instance.
+ * This will allow clients to create egl surfaces from wayland ones and render to it.
+ */
+bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display);
+
+/**
+ * Refer to the eglQueryWaylandBufferWL extension function.
+ */
+bool wlr_egl_query_buffer(struct wlr_egl *egl, struct wl_resource *buf,
+	EGLint attrib, EGLint *value);
+
+/**
+ * Returns a surface for the given native window
+ * The window must match the remote display the wlr_egl was created with.
+ */
+EGLSurface wlr_egl_create_surface(struct wlr_egl *egl, void *window);
+
+/**
+ * Creates an egl image from the given client buffer and attributes.
+ */
+EGLImageKHR wlr_egl_create_image(struct wlr_egl *egl,
+		EGLenum target, EGLClientBuffer buffer, const EGLint *attribs);
+
+/**
+ * Destroys an egl image created with the given wlr_egl.
+ */
+bool wlr_egl_destroy_image(struct wlr_egl *egl, EGLImageKHR image);
+
+/**
+ * Returns a string for the last error ocurred with egl.
+ */
+const char *egl_error(void);
+
+#endif
diff --git a/render/egl.c b/render/egl.c
index 9815b923..08612125 100644
--- a/render/egl.c
+++ b/render/egl.c
@@ -3,7 +3,7 @@
 #include <GLES2/gl2.h>
 #include <stdlib.h>
 #include <wlr/util/log.h>
-#include <wlr/egl.h>
+#include <wlr/render/egl.h>
 #include "render/glapi.h"
 
 // Extension documentation
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
index 94c50b9a..cf4a0aab 100644
--- a/render/gles2/renderer.c
+++ b/render/gles2/renderer.c
@@ -5,9 +5,9 @@
 #include <GLES2/gl2ext.h>
 #include <wayland-util.h>
 #include <wayland-server-protocol.h>
-#include <wlr/egl.h>
 #include <wlr/backend.h>
 #include <wlr/render.h>
+#include <wlr/render/egl.h>
 #include <wlr/render/interface.h>
 #include <wlr/render/matrix.h>
 #include <wlr/util/log.h>
diff --git a/render/gles2/texture.c b/render/gles2/texture.c
index 5e934aa4..ff71cb08 100644
--- a/render/gles2/texture.c
+++ b/render/gles2/texture.c
@@ -5,8 +5,8 @@
 #include <GLES2/gl2ext.h>
 #include <wayland-util.h>
 #include <wayland-server-protocol.h>
-#include <wlr/egl.h>
 #include <wlr/render.h>
+#include <wlr/render/egl.h>
 #include <wlr/render/interface.h>
 #include <wlr/render/matrix.h>
 #include <wlr/util/log.h>
diff --git a/types/wlr_surface.c b/types/wlr_surface.c
index 9e38d701..68c21468 100644
--- a/types/wlr_surface.c
+++ b/types/wlr_surface.c
@@ -2,9 +2,9 @@
 #include <stdlib.h>
 #include <wayland-server.h>
 #include <wlr/util/log.h>
-#include <wlr/egl.h>
 #include <wlr/render/interface.h>
 #include <wlr/types/wlr_surface.h>
+#include <wlr/render/egl.h>
 #include <wlr/render/matrix.h>
 
 static void wlr_surface_state_reset_buffer(struct wlr_surface_state *state) {
-- 
cgit v1.2.3


From 822a9f65a4f965a7561de287013c2a5c159453ab Mon Sep 17 00:00:00 2001
From: Scott Anderson <ascent12@hotmail.com>
Date: Sat, 21 Oct 2017 17:37:25 +1300
Subject: Add pointer to backend inside wlr_output

---
 backend/drm/drm.c                   | 2 +-
 backend/wayland/output.c            | 2 +-
 backend/x11/backend.c               | 2 +-
 include/wlr/interfaces/wlr_output.h | 6 ++++--
 include/wlr/types/wlr_output.h      | 4 +++-
 types/wlr_output.c                  | 3 ++-
 6 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'include/wlr')

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 0e898d3f..b3057166 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -707,7 +707,7 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
 				drmModeFreeConnector(drm_conn);
 				continue;
 			}
-			wlr_output_init(&wlr_conn->output, &output_impl);
+			wlr_output_init(&wlr_conn->output, &drm->backend, &output_impl);
 
 			struct wl_event_loop *ev = wl_display_get_event_loop(drm->display);
 			wlr_conn->retry_pageflip = wl_event_loop_add_timer(ev, retry_pageflip,
diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index e1138ee1..0216823e 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -241,7 +241,7 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
 		wlr_log(L_ERROR, "Failed to allocate wlr_wl_backend_output");
 		return NULL;
 	}
-	wlr_output_init(&output->wlr_output, &output_impl);
+	wlr_output_init(&output->wlr_output, &backend->backend, &output_impl);
 	struct wlr_output *wlr_output = &output->wlr_output;
 
 	wlr_output->width = 640;
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index 4ecca325..d30ec376 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -264,7 +264,7 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) {
 
 	output->x11 = x11;
 
-	wlr_output_init(&output->wlr_output, &output_impl);
+	wlr_output_init(&output->wlr_output, &x11->backend, &output_impl);
 	snprintf(output->wlr_output.name, sizeof(output->wlr_output.name), "X11-1");
 
 	output->win = xcb_generate_id(x11->xcb_conn);
diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h
index b7927569..17dd5538 100644
--- a/include/wlr/interfaces/wlr_output.h
+++ b/include/wlr/interfaces/wlr_output.h
@@ -1,8 +1,9 @@
 #ifndef WLR_INTERFACES_WLR_OUTPUT_H
 #define WLR_INTERFACES_WLR_OUTPUT_H
 
-#include <wlr/types/wlr_output.h>
 #include <stdbool.h>
+#include <wlr/types/wlr_output.h>
+#include <wlr/backend.h>
 
 struct wlr_output_impl {
 	void (*enable)(struct wlr_output *output, bool enable);
@@ -21,7 +22,8 @@ struct wlr_output_impl {
 	uint16_t (*get_gamma_size)(struct wlr_output *output);
 };
 
-void wlr_output_init(struct wlr_output *output, const struct wlr_output_impl *impl);
+void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
+	const struct wlr_output_impl *impl);
 void wlr_output_free(struct wlr_output *output);
 void wlr_output_update_matrix(struct wlr_output *output);
 struct wl_global *wlr_output_create_global(
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index 312b51f8..a2d595ea 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -1,9 +1,10 @@
 #ifndef WLR_TYPES_WLR_OUTPUT_H
 #define WLR_TYPES_WLR_OUTPUT_H
 
+#include <stdbool.h>
 #include <wayland-server.h>
+#include <wlr/backend.h>
 #include <wlr/util/list.h>
-#include <stdbool.h>
 
 struct wlr_output_mode {
 	uint32_t flags; // enum wl_output_mode
@@ -15,6 +16,7 @@ struct wlr_output_impl;
 
 struct wlr_output {
 	const struct wlr_output_impl *impl;
+	struct wlr_backend *backend;
 
 	struct wl_global *wl_global;
 	struct wl_list wl_resources;
diff --git a/types/wlr_output.c b/types/wlr_output.c
index 5e10509e..c89c5c45 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -307,8 +307,9 @@ bool wlr_output_move_cursor(struct wlr_output *output, int x, int y) {
 	return output->impl->move_cursor(output, x, y);
 }
 
-void wlr_output_init(struct wlr_output *output,
+void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
 		const struct wlr_output_impl *impl) {
+	output->backend = backend;
 	output->impl = impl;
 	output->modes = list_create();
 	output->transform = WL_OUTPUT_TRANSFORM_NORMAL;
-- 
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 'include/wlr')

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


From c5fff08f8a63b37ceb42e15641a14384efd163d2 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sun, 22 Oct 2017 10:56:40 -0400
Subject: Forgot to rename these

---
 backend/libinput/backend.c   |  6 +++---
 backend/libinput/events.c    |  4 ++--
 examples/pointer.c           |  6 +++---
 examples/touch.c             |  6 +++---
 include/wlr/types/wlr_list.h | 24 ++++++++++++------------
 rootston/cursor.c            |  4 ++--
 rootston/desktop.c           |  4 ++--
 rootston/wl_shell.c          |  4 ++--
 rootston/xdg_shell_v6.c      |  2 +-
 rootston/xwayland.c          |  2 +-
 types/wlr_data_source.c      |  8 ++++----
 types/wlr_list.c             | 30 +++++++++++++++---------------
 xwayland/xwm.c               |  8 ++++----
 13 files changed, 54 insertions(+), 54 deletions(-)

(limited to 'include/wlr')

diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
index b278b8f7..781314a3 100644
--- a/backend/libinput/backend.c
+++ b/backend/libinput/backend.c
@@ -105,9 +105,9 @@ static void wlr_libinput_backend_destroy(struct wlr_backend *_backend) {
 			wl_signal_emit(&backend->backend.events.input_remove, wlr_dev);
 			wlr_input_device_destroy(wlr_dev);
 		}
-		list_free(wlr_devices);
+		wlr_list_free(wlr_devices);
 	}
-	list_free(backend->wlr_device_lists);
+	wlr_list_free(backend->wlr_device_lists);
 	wl_event_source_remove(backend->input_event);
 	libinput_unref(backend->libinput_context);
 	free(backend);
@@ -148,7 +148,7 @@ struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display,
 	}
 	wlr_backend_init(&backend->backend, &backend_impl);
 
-	if (!(backend->wlr_device_lists = list_create())) {
+	if (!(backend->wlr_device_lists = wlr_list_create())) {
 		wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
 		goto error_backend;
 	}
diff --git a/backend/libinput/events.c b/backend/libinput/events.c
index f6634814..053cab02 100644
--- a/backend/libinput/events.c
+++ b/backend/libinput/events.c
@@ -145,7 +145,7 @@ static void handle_device_added(struct wlr_libinput_backend *backend,
 
 	if (wl_list_length(wlr_devices) > 0) {
 		libinput_device_set_user_data(libinput_dev, wlr_devices);
-		list_add(backend->wlr_device_lists, wlr_devices);
+		wlr_list_add(backend->wlr_device_lists, wlr_devices);
 	} else {
 		free(wlr_devices);
 	}
@@ -177,7 +177,7 @@ static void handle_device_removed(struct wlr_libinput_backend *backend,
 	}
 	for (size_t i = 0; i < backend->wlr_device_lists->length; i++) {
 		if (backend->wlr_device_lists->items[i] == wlr_devices) {
-			list_del(backend->wlr_device_lists, i);
+			wlr_list_del(backend->wlr_device_lists, i);
 			break;
 		}
 	}
diff --git a/examples/pointer.c b/examples/pointer.c
index 8c3c8b85..66598ad4 100644
--- a/examples/pointer.c
+++ b/examples/pointer.c
@@ -213,7 +213,7 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
 	for (size_t i = 0; i < sample->touch_points->length; ++i) {
 		struct touch_point *point = sample->touch_points->items[i];
 		if (point->slot == event->slot) {
-			list_del(sample->touch_points, i);
+			wlr_list_del(sample->touch_points, i);
 			break;
 		}
 	}
@@ -228,7 +228,7 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
 	point->slot = event->slot;
 	point->x = event->x_mm / event->width_mm;
 	point->y = event->y_mm / event->height_mm;
-	if (list_add(sample->touch_points, point) == -1) {
+	if (wlr_list_add(sample->touch_points, point) == -1) {
 		free(point);
 	}
 
@@ -270,7 +270,7 @@ int main(int argc, char *argv[]) {
 	struct sample_state state = {
 		.default_color = { 0.25f, 0.25f, 0.25f, 1 },
 		.clear_color = { 0.25f, 0.25f, 0.25f, 1 },
-		.touch_points = list_create(),
+		.touch_points = wlr_list_create(),
 	};
 
 	state.config = parse_args(argc, argv);
diff --git a/examples/touch.c b/examples/touch.c
index 60fb0ae4..3f0c4867 100644
--- a/examples/touch.c
+++ b/examples/touch.c
@@ -65,7 +65,7 @@ static void handle_touch_down(struct touch_state *tstate, int32_t slot,
 	point->slot = slot;
 	point->x = x / width;
 	point->y = y / height;
-	if (list_add(sample->touch_points, point) == -1) {
+	if (wlr_list_add(sample->touch_points, point) == -1) {
 		free(point);
 	}
 }
@@ -75,7 +75,7 @@ static void handle_touch_up(struct touch_state *tstate, int32_t slot) {
 	for (size_t i = 0; i < sample->touch_points->length; ++i) {
 		struct touch_point *point = sample->touch_points->items[i];
 		if (point->slot == slot) {
-			list_del(sample->touch_points, i);
+			wlr_list_del(sample->touch_points, i);
 			break;
 		}
 	}
@@ -96,7 +96,7 @@ static void handle_touch_motion(struct touch_state *tstate, int32_t slot,
 
 int main(int argc, char *argv[]) {
 	struct sample_state state = {
-		.touch_points = list_create()
+		.touch_points = wlr_list_create()
 	};
 	struct compositor_state compositor = { 0,
 		.data = &state,
diff --git a/include/wlr/types/wlr_list.h b/include/wlr/types/wlr_list.h
index 6a4fe863..8ddd30b6 100644
--- a/include/wlr/types/wlr_list.h
+++ b/include/wlr/types/wlr_list.h
@@ -12,48 +12,48 @@ struct wlr_list {
 /**
  * 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));
+struct wlr_list *wlr_list_create(void);
+void wlr_list_free(struct wlr_list *list);
+void wlr_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);
+int wlr_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);
+int wlr_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);
+int wlr_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);
+void wlr_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);
+void *wlr_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);
+void *wlr_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);
+int wlr_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));
+void wlr_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 wlr_list_seq_find(struct wlr_list *list,
 		int compare(const void *item, const void *cmp_to),
 		const void *cmp_to);
 
diff --git a/rootston/cursor.c b/rootston/cursor.c
index 3be4c2a6..2a3a7c25 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -183,8 +183,8 @@ void set_view_focus(struct roots_input *input, struct roots_desktop *desktop,
 	}
 	view_activate(view, true);
 	// TODO: list_swap
-	list_del(desktop->views, index);
-	list_add(desktop->views, view);
+	wlr_list_del(desktop->views, index);
+	wlr_list_add(desktop->views, view);
 }
 
 static void handle_cursor_motion(struct wl_listener *listener, void *data) {
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 70767f92..40d088b8 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -29,7 +29,7 @@ void view_destroy(struct roots_view *view) {
 	for (size_t i = 0; i < desktop->views->length; ++i) {
 		struct roots_view *_view = desktop->views->items[i];
 		if (view == _view) {
-			list_del(desktop->views, i);
+			wlr_list_del(desktop->views, i);
 			break;
 		}
 	}
@@ -209,7 +209,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
 		return NULL;
 	}
 
-	desktop->views = list_create();
+	desktop->views = wlr_list_create();
 	if (desktop->views == NULL) {
 		free(desktop);
 		return NULL;
diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c
index 248514f0..88397af8 100644
--- a/rootston/wl_shell.c
+++ b/rootston/wl_shell.c
@@ -110,12 +110,12 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
 	view->close = close;
 	view->desktop = desktop;
 	roots_surface->view = view;
-	list_add(desktop->views, view);
+	wlr_list_add(desktop->views, view);
 	view_initialize(view);
 
 	if (surface->state == WLR_WL_SHELL_SURFACE_STATE_TRANSIENT) {
 		// we need to map it relative to the parent
-		int i = list_seq_find(desktop->views, shell_surface_compare_equals,
+		int i = wlr_list_seq_find(desktop->views, shell_surface_compare_equals,
 			surface->parent);
 		if (i != -1) {
 			struct roots_view *parent = desktop->views->items[i];
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 028545df..95b20a8b 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -124,7 +124,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 	view->close = close;
 	view->desktop = desktop;
 	roots_surface->view = view;
-	list_add(desktop->views, view);
+	wlr_list_add(desktop->views, view);
 
 	view_initialize(view);
 }
diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index 6ef33403..1149b966 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -98,7 +98,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 	view->set_position = set_position;
 	view->close = close;
 	roots_surface->view = view;
-	list_add(desktop->views, view);
+	wlr_list_add(desktop->views, view);
 
 	if (!surface->override_redirect) {
 		view_initialize(view);
diff --git a/types/wlr_data_source.c b/types/wlr_data_source.c
index 2c227778..98de4f97 100644
--- a/types/wlr_data_source.c
+++ b/types/wlr_data_source.c
@@ -14,16 +14,16 @@ bool wlr_data_source_init(struct wlr_data_source *source,
 		struct wlr_data_source_impl *impl) {
 	source->impl = impl;
 	wl_signal_init(&source->events.destroy);
-	return (source->types = list_create());
+	return (source->types = wlr_list_create());
 }
 
 void wlr_data_source_finish(struct wlr_data_source *source) {
 	if (source) {
 		wl_signal_emit(&source->events.destroy, source);
 		if (source->types) {
-			list_foreach(source->types, free);
+			wlr_list_foreach(source->types, free);
 		}
-		list_free(source->types);
+		wlr_list_free(source->types);
 	}
 }
 
@@ -81,7 +81,7 @@ static void data_source_offer(struct wl_client *client,
 		return;
 	}
 
-	list_add(src->base.types, dtype);
+	wlr_list_add(src->base.types, dtype);
 }
 
 static void data_source_destroy(struct wl_client *client,
diff --git a/types/wlr_list.c b/types/wlr_list.c
index 365ad236..33e3ea8a 100644
--- a/types/wlr_list.c
+++ b/types/wlr_list.c
@@ -5,7 +5,7 @@
 #include <stddef.h>
 #include <wlr/types/wlr_list.h>
 
-struct wlr_list *list_create(void) {
+struct wlr_list *wlr_list_create(void) {
 	struct wlr_list *list = malloc(sizeof(struct wlr_list));
 	if (!list) {
 		return NULL;
@@ -32,7 +32,7 @@ static bool list_resize(struct wlr_list *list) {
 	return true;
 }
 
-void list_free(struct wlr_list *list) {
+void wlr_list_free(struct wlr_list *list) {
 	if (list == NULL) {
 		return;
 	}
@@ -40,7 +40,7 @@ void list_free(struct wlr_list *list) {
 	free(list);
 }
 
-void list_foreach(struct wlr_list *list, void (*callback)(void *item)) {
+void wlr_list_foreach(struct wlr_list *list, void (*callback)(void *item)) {
 	if (list == NULL || callback == NULL) {
 		return;
 	}
@@ -49,7 +49,7 @@ void list_foreach(struct wlr_list *list, void (*callback)(void *item)) {
 	}
 }
 
-int list_add(struct wlr_list *list, void *item) {
+int wlr_list_add(struct wlr_list *list, void *item) {
 	if (!list_resize(list)) {
 		return -1;
 	}
@@ -57,11 +57,11 @@ int list_add(struct wlr_list *list, void *item) {
 	return list->length;
 }
 
-int list_push(struct wlr_list *list, void *item) {
-	return list_add(list, item);
+int wlr_list_push(struct wlr_list *list, void *item) {
+	return wlr_list_add(list, item);
 }
 
-int list_insert(struct wlr_list *list, size_t index, void *item) {
+int wlr_list_insert(struct wlr_list *list, size_t index, void *item) {
 	if (!list_resize(list)) {
 		return -1;
 	}
@@ -71,26 +71,26 @@ int list_insert(struct wlr_list *list, size_t index, void *item) {
 	return list->length;
 }
 
-void list_del(struct wlr_list *list, size_t index) {
+void wlr_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 *wlr_list_pop(struct wlr_list *list) {
 	void *_ = list->items[list->length - 1];
-	list_del(list, list->length - 1);
+	wlr_list_del(list, list->length - 1);
 	return _;
 }
 
-void *list_peek(struct wlr_list *list) {
+void *wlr_list_peek(struct wlr_list *list) {
 	return list->items[list->length - 1];
 }
 
-int list_cat(struct wlr_list *list, struct wlr_list *source) {
+int wlr_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) {
+		if (wlr_list_add(list, source->items[i]) == -1) {
 			list->length = old_len;
 			return -1;
 		}
@@ -98,11 +98,11 @@ int list_cat(struct wlr_list *list, struct wlr_list *source) {
 	return list->length;
 }
 
-void list_qsort(struct wlr_list *list, int compare(const void *left, const void *right)) {
+void wlr_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 wlr_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/xwayland/xwm.c b/xwayland/xwm.c
index bc1bb4de..f58acb73 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -71,7 +71,7 @@ static struct wlr_xwayland_surface *wlr_xwayland_surface_create(
 	surface->height = height;
 	surface->override_redirect = override_redirect;
 	wl_list_insert(&xwm->new_surfaces, &surface->link);
-	surface->state = list_create();
+	surface->state = wlr_list_create();
 	wl_signal_init(&surface->events.destroy);
 	wl_signal_init(&surface->events.request_configure);
 	wl_signal_init(&surface->events.set_class);
@@ -92,7 +92,7 @@ static void wlr_xwayland_surface_destroy(struct wlr_xwayland_surface *surface) {
 	free(surface->title);
 	free(surface->class);
 	free(surface->instance);
-	list_free(surface->state);
+	wlr_list_free(surface->state);
 	free(surface->window_type);
 	free(surface->protocols);
 	free(surface->hints);
@@ -199,7 +199,7 @@ static void handle_surface_state(struct wlr_xwm *xwm,
 				if (action == NET_WM_STATE_REMOVE ||
 						action == NET_WM_STATE_TOGGLE) {
 					free(surface->state->items[j]);
-					list_del(surface->state, j);
+					wlr_list_del(surface->state, j);
 				}
 				break;
 			}
@@ -209,7 +209,7 @@ static void handle_surface_state(struct wlr_xwm *xwm,
 				action == NET_WM_STATE_TOGGLE)) {
 			xcb_atom_t *atom_ptr = malloc(sizeof(xcb_atom_t));
 			*atom_ptr = atom;
-			list_add(surface->state, atom_ptr);
+			wlr_list_add(surface->state, atom_ptr);
 		}
 	}
 
-- 
cgit v1.2.3


From e1d213fccdae068ecc0f11f4321dfd6528163253 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Sun, 22 Oct 2017 22:21:23 +0200
Subject: Create globals only for enabled outputs in DRM backend

---
 backend/drm/drm.c                   |  7 ++++---
 examples/screenshot.c               |  4 ----
 include/wlr/interfaces/wlr_output.h |  5 +++--
 types/wlr_output.c                  | 31 ++++++++++++++++++++++++-------
 4 files changed, 31 insertions(+), 16 deletions(-)

(limited to 'include/wlr')

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 51a5f636..8f80e65c 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -748,7 +748,6 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
 			free(edid);
 
 			wl_list_insert(&drm->outputs, &wlr_conn->link);
-			wlr_output_create_global(&wlr_conn->output, drm->display);
 			wlr_log(L_INFO, "Found display '%s'", wlr_conn->output.name);
 		} else {
 			seen[index] = true;
@@ -756,7 +755,6 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
 
 		if (wlr_conn->state == WLR_DRM_CONN_DISCONNECTED &&
 				drm_conn->connection == DRM_MODE_CONNECTED) {
-
 			wlr_log(L_INFO, "'%s' connected", wlr_conn->output.name);
 			wlr_log(L_INFO, "Detected modes:");
 
@@ -778,14 +776,17 @@ void wlr_drm_scan_connectors(struct wlr_drm_backend *drm) {
 				wl_list_insert(&wlr_conn->output.modes, &mode->wlr_mode.link);
 			}
 
+			wlr_output_create_global(&wlr_conn->output, drm->display);
+
 			wlr_conn->state = WLR_DRM_CONN_NEEDS_MODESET;
 			wlr_log(L_INFO, "Sending modesetting signal for '%s'",
 				wlr_conn->output.name);
 			wl_signal_emit(&drm->backend.events.output_add, &wlr_conn->output);
 		} else if (wlr_conn->state == WLR_DRM_CONN_CONNECTED &&
 				drm_conn->connection != DRM_MODE_CONNECTED) {
-
 			wlr_log(L_INFO, "'%s' disconnected", wlr_conn->output.name);
+
+			wlr_output_destroy_global(&wlr_conn->output);
 			wlr_drm_connector_cleanup(wlr_conn);
 		}
 
diff --git a/examples/screenshot.c b/examples/screenshot.c
index 95af49ca..2a3b74aa 100644
--- a/examples/screenshot.c
+++ b/examples/screenshot.c
@@ -267,10 +267,6 @@ int main(int argc, char *argv[]) {
 
 	struct screenshooter_output *output;
 	wl_list_for_each(output, &output_list, link) {
-		if (output->width == 0 || output->height == 0) {
-			continue;
-		}
-
 		output->buffer = create_shm_buffer(output->width, output->height, &output->data);
 		if (output->buffer == NULL) {
 			return -1;
diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h
index 17dd5538..338d3375 100644
--- a/include/wlr/interfaces/wlr_output.h
+++ b/include/wlr/interfaces/wlr_output.h
@@ -26,7 +26,8 @@ void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
 	const struct wlr_output_impl *impl);
 void wlr_output_free(struct wlr_output *output);
 void wlr_output_update_matrix(struct wlr_output *output);
-struct wl_global *wlr_output_create_global(
-	struct wlr_output *wlr_output, struct wl_display *display);
+struct wl_global *wlr_output_create_global(struct wlr_output *wlr_output,
+	struct wl_display *display);
+void wlr_output_destroy_global(struct wlr_output *wlr_output);
 
 #endif
diff --git a/types/wlr_output.c b/types/wlr_output.c
index 611d4ad1..eb5bdd26 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -76,16 +76,20 @@ static void wl_output_bind(struct wl_client *wl_client, void *_wlr_output,
 	struct wlr_output *wlr_output = _wlr_output;
 	assert(wl_client && wlr_output);
 
-	struct wl_resource *wl_resource = wl_resource_create(
-			wl_client, &wl_output_interface, version, id);
-	wl_resource_set_implementation(wl_resource, &wl_output_impl,
-			wlr_output, wl_output_destroy);
-	wl_list_insert(&wlr_output->wl_resources, wl_resource_get_link(wl_resource));
+	struct wl_resource *wl_resource = wl_resource_create(wl_client,
+		&wl_output_interface, version, id);
+	wl_resource_set_implementation(wl_resource, &wl_output_impl, wlr_output,
+		wl_output_destroy);
+	wl_list_insert(&wlr_output->wl_resources,
+		wl_resource_get_link(wl_resource));
 	wl_output_send_to_resource(wl_resource);
 }
 
-struct wl_global *wlr_output_create_global(
-		struct wlr_output *wlr_output, struct wl_display *display) {
+struct wl_global *wlr_output_create_global(struct wlr_output *wlr_output,
+		struct wl_display *display) {
+	if (wlr_output->wl_global != NULL) {
+		return wlr_output->wl_global;
+	}
 	struct wl_global *wl_global = wl_global_create(display,
 		&wl_output_interface, 3, wlr_output, wl_output_bind);
 	wlr_output->wl_global = wl_global;
@@ -93,6 +97,19 @@ struct wl_global *wlr_output_create_global(
 	return wl_global;
 }
 
+void wlr_output_destroy_global(struct wlr_output *wlr_output) {
+	if (wlr_output->wl_global == NULL) {
+		return;
+	}
+	struct wl_resource *resource, *tmp;
+	wl_resource_for_each_safe(resource, tmp, &wlr_output->wl_resources) {
+		struct wl_list *link = wl_resource_get_link(resource);
+		wl_list_remove(link);
+	}
+	wl_global_destroy(wlr_output->wl_global);
+	wlr_output->wl_global = NULL;
+}
+
 void wlr_output_update_matrix(struct wlr_output *output) {
 	wlr_matrix_texture(output->transform_matrix, output->width, output->height, output->transform);
 }
-- 
cgit v1.2.3


From 1cc8f21d8e19df2d1cc43864ae5715fbb5fbbe21 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Sun, 22 Oct 2017 12:30:45 +0200
Subject: Cleanup wlr_gamma_control

---
 backend/drm/drm.c                     |   4 +-
 include/wlr/interfaces/wlr_output.h   |   4 +-
 include/wlr/types/wlr_gamma_control.h |  16 ++++-
 include/wlr/types/wlr_output.h        |   4 +-
 types/wlr_gamma_control.c             | 121 +++++++++++++++++++++++++---------
 types/wlr_output.c                    |   4 +-
 6 files changed, 111 insertions(+), 42 deletions(-)

(limited to 'include/wlr')

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 8f80e65c..d0bdfcd5 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -211,13 +211,13 @@ static void wlr_drm_connector_swap_buffers(struct wlr_output *output) {
 }
 
 static void wlr_drm_connector_set_gamma(struct wlr_output *output,
-		uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b) {
+		uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b) {
 	struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
 	struct wlr_drm_backend *drm = (struct wlr_drm_backend *)output->backend;
 	drmModeCrtcSetGamma(drm->fd, conn->crtc->id, size, r, g, b);
 }
 
-static uint16_t wlr_drm_connector_get_gamma_size(struct wlr_output *output) {
+static uint32_t wlr_drm_connector_get_gamma_size(struct wlr_output *output) {
 	struct wlr_drm_connector *conn = (struct wlr_drm_connector *)output;
 	drmModeCrtc *crtc = conn->old_crtc;
 	return crtc ? crtc->gamma_size : 0;
diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h
index 338d3375..636cc06c 100644
--- a/include/wlr/interfaces/wlr_output.h
+++ b/include/wlr/interfaces/wlr_output.h
@@ -18,8 +18,8 @@ struct wlr_output_impl {
 	void (*make_current)(struct wlr_output *output);
 	void (*swap_buffers)(struct wlr_output *output);
 	void (*set_gamma)(struct wlr_output *output,
-		uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b);
-	uint16_t (*get_gamma_size)(struct wlr_output *output);
+		uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b);
+	uint32_t (*get_gamma_size)(struct wlr_output *output);
 };
 
 void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
diff --git a/include/wlr/types/wlr_gamma_control.h b/include/wlr/types/wlr_gamma_control.h
index 96c9f545..59f18494 100644
--- a/include/wlr/types/wlr_gamma_control.h
+++ b/include/wlr/types/wlr_gamma_control.h
@@ -5,18 +5,28 @@
 
 struct wlr_gamma_control_manager {
 	struct wl_global *wl_global;
+	struct wl_list controls; // list of wlr_gamma_control
 
 	void *data;
 };
 
 struct wlr_gamma_control {
 	struct wl_resource *resource;
-	struct wl_resource *output;
+	struct wlr_output *output;
+	struct wl_list link;
+
+	struct wl_listener output_destroy_listener;
+
+	struct {
+		struct wl_signal destroy;
+	} events;
 
 	void* data;
 };
 
-struct wlr_gamma_control_manager *wlr_gamma_control_manager_create(struct wl_display *display);
-void wlr_gamma_control_manager_destroy(struct wlr_gamma_control_manager *gamma_control_manager);
+struct wlr_gamma_control_manager *wlr_gamma_control_manager_create(
+	struct wl_display *display);
+void wlr_gamma_control_manager_destroy(
+	struct wlr_gamma_control_manager *gamma_control_manager);
 
 #endif
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index d8649bbb..74eb15ed 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -84,7 +84,7 @@ void wlr_output_effective_resolution(struct wlr_output *output,
 void wlr_output_make_current(struct wlr_output *output);
 void wlr_output_swap_buffers(struct wlr_output *output);
 void wlr_output_set_gamma(struct wlr_output *output,
-	uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b);
-uint16_t wlr_output_get_gamma_size(struct wlr_output *output);
+	uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b);
+uint32_t wlr_output_get_gamma_size(struct wlr_output *output);
 
 #endif
diff --git a/types/wlr_gamma_control.c b/types/wlr_gamma_control.c
index 973fd613..9d74e749 100644
--- a/types/wlr_gamma_control.c
+++ b/types/wlr_gamma_control.c
@@ -6,96 +6,155 @@
 #include <wlr/util/log.h>
 #include "gamma-control-protocol.h"
 
-static void resource_destroy(struct wl_client *client, struct wl_resource *resource) {
+static void resource_destroy(struct wl_client *client,
+		struct wl_resource *resource) {
 	wl_resource_destroy(resource);
 }
 
-static void gamma_control_destroy(struct wl_resource *resource) {
-	struct wlr_gamma_control *gamma_control = wl_resource_get_user_data(resource);
+static void gamma_control_destroy(struct wlr_gamma_control *gamma_control) {
+	wl_signal_emit(&gamma_control->events.destroy, gamma_control);
+	wl_list_remove(&gamma_control->output_destroy_listener.link);
+	wl_resource_set_user_data(gamma_control->resource, NULL);
 	free(gamma_control);
 }
 
+static void gamma_control_destroy_resource(struct wl_resource *resource) {
+	struct wlr_gamma_control *gamma_control =
+		wl_resource_get_user_data(resource);
+	gamma_control_destroy(gamma_control);
+}
+
+static void gamma_control_handle_output_destroy(struct wl_listener *listener,
+		void *data) {
+	struct wlr_gamma_control *gamma_control =
+		wl_container_of(listener, gamma_control, output_destroy_listener);
+	gamma_control_destroy(gamma_control);
+}
+
 static void gamma_control_set_gamma(struct wl_client *client,
-		struct wl_resource *_gamma_control, struct wl_array *red,
+		struct wl_resource *gamma_control_resource, struct wl_array *red,
 		struct wl_array *green, struct wl_array *blue) {
+	struct wlr_gamma_control *gamma_control =
+		wl_resource_get_user_data(gamma_control_resource);
+
 	if (red->size != green->size || red->size != blue->size) {
-		wl_resource_post_error(_gamma_control, GAMMA_CONTROL_ERROR_INVALID_GAMMA,
+		wl_resource_post_error(gamma_control_resource,
+			GAMMA_CONTROL_ERROR_INVALID_GAMMA,
 			"The gamma ramps don't have the same size");
 		return;
 	}
+
+	uint32_t size = red->size / sizeof(uint16_t);
 	uint16_t *r = (uint16_t *)red->data;
 	uint16_t *g = (uint16_t *)green->data;
 	uint16_t *b = (uint16_t *)blue->data;
-	struct wlr_gamma_control *gamma_control = wl_resource_get_user_data(_gamma_control);
-	struct wlr_output *output = wl_resource_get_user_data(gamma_control->output);
-	wlr_output_set_gamma(output, red->size / sizeof(uint16_t), r, g, b);
+
+	wlr_output_set_gamma(gamma_control->output, size, r, g, b);
 }
 
 static void gamma_control_reset_gamma(struct wl_client *client,
-		struct wl_resource *_gamma_control) {
+		struct wl_resource *gamma_control_resource) {
 	// TODO
 }
 
-static const struct gamma_control_interface gamma_control_implementation = {
+static const struct gamma_control_interface gamma_control_impl = {
 	.destroy = resource_destroy,
 	.set_gamma = gamma_control_set_gamma,
 	.reset_gamma = gamma_control_reset_gamma,
 };
 
 static void gamma_control_manager_get_gamma_control(struct wl_client *client,
-		struct wl_resource *_gamma_control_manager, uint32_t id,
-		struct wl_resource *_output) {
-	//struct wlr_gamma_control_manager *gamma_control_manager =
-	//	wl_resource_get_user_data(_gamma_control_manager);
-	struct wlr_output *output = wl_resource_get_user_data(_output);
-	struct wlr_gamma_control *gamma_control;
-	if (!(gamma_control = calloc(1, sizeof(struct wlr_gamma_control)))) {
+		struct wl_resource *gamma_control_manager_resource, uint32_t id,
+		struct wl_resource *output_resource) {
+	struct wlr_gamma_control_manager *gamma_control_manager =
+		wl_resource_get_user_data(gamma_control_manager_resource);
+	struct wlr_output *output = wl_resource_get_user_data(output_resource);
+
+	struct wlr_gamma_control *gamma_control =
+		calloc(1, sizeof(struct wlr_gamma_control));
+	if (gamma_control == NULL) {
+		wl_client_post_no_memory(client);
 		return;
 	}
-	gamma_control->output = _output;
+	gamma_control->output = output;
+
+	int version = wl_resource_get_version(gamma_control_manager_resource);
 	gamma_control->resource = wl_resource_create(client,
-		&gamma_control_interface, wl_resource_get_version(_gamma_control_manager), id);
-	wlr_log(L_DEBUG, "new gamma_control %p (res %p)", gamma_control, gamma_control->resource);
+		&gamma_control_interface, version, id);
+	if (gamma_control->resource == NULL) {
+		wl_client_post_no_memory(client);
+		free(gamma_control);
+		return;
+	}
+	wlr_log(L_DEBUG, "new gamma_control %p (res %p)", gamma_control,
+		gamma_control->resource);
 	wl_resource_set_implementation(gamma_control->resource,
-		&gamma_control_implementation, gamma_control, gamma_control_destroy);
-	gamma_control_send_gamma_size(gamma_control->resource, wlr_output_get_gamma_size(output));
+		&gamma_control_impl, gamma_control, gamma_control_destroy_resource);
+
+	wl_signal_init(&gamma_control->events.destroy);
+
+	wl_signal_add(&output->events.destroy,
+		&gamma_control->output_destroy_listener);
+	gamma_control->output_destroy_listener.notify =
+		gamma_control_handle_output_destroy;
+
+	wl_list_insert(&gamma_control_manager->controls, &gamma_control->link);
+
+	gamma_control_send_gamma_size(gamma_control->resource,
+		wlr_output_get_gamma_size(output));
 }
 
 static struct gamma_control_manager_interface gamma_control_manager_impl = {
 	.get_gamma_control = gamma_control_manager_get_gamma_control,
 };
 
-static void gamma_control_manager_bind(struct wl_client *wl_client,
+static void gamma_control_manager_bind(struct wl_client *client,
 		void *_gamma_control_manager, uint32_t version, uint32_t id) {
-	struct wlr_gamma_control_manager *gamma_control_manager = _gamma_control_manager;
-	assert(wl_client && gamma_control_manager);
+	struct wlr_gamma_control_manager *gamma_control_manager =
+		_gamma_control_manager;
+	assert(client && gamma_control_manager);
 
-	struct wl_resource *wl_resource = wl_resource_create(
-		wl_client, &gamma_control_manager_interface, version, id);
-	wl_resource_set_implementation(wl_resource, &gamma_control_manager_impl,
+	struct wl_resource *resource = wl_resource_create(client,
+		&gamma_control_manager_interface, version, id);
+	if (resource == NULL) {
+		wl_client_post_no_memory(client);
+		return;
+	}
+	wl_resource_set_implementation(resource, &gamma_control_manager_impl,
 		gamma_control_manager, NULL);
 }
 
-struct wlr_gamma_control_manager *wlr_gamma_control_manager_create(struct wl_display *display) {
+struct wlr_gamma_control_manager *wlr_gamma_control_manager_create(
+		struct wl_display *display) {
 	struct wlr_gamma_control_manager *gamma_control_manager =
 		calloc(1, sizeof(struct wlr_gamma_control_manager));
 	if (!gamma_control_manager) {
 		return NULL;
 	}
 	struct wl_global *wl_global = wl_global_create(display,
-		&gamma_control_manager_interface, 1, gamma_control_manager, gamma_control_manager_bind);
+		&gamma_control_manager_interface, 1, gamma_control_manager,
+		gamma_control_manager_bind);
 	if (!wl_global) {
 		free(gamma_control_manager);
 		return NULL;
 	}
 	gamma_control_manager->wl_global = wl_global;
+
+	wl_list_init(&gamma_control_manager->controls);
+
 	return gamma_control_manager;
 }
 
-void wlr_gamma_control_manager_destroy(struct wlr_gamma_control_manager *gamma_control_manager) {
+void wlr_gamma_control_manager_destroy(
+		struct wlr_gamma_control_manager *gamma_control_manager) {
 	if (!gamma_control_manager) {
 		return;
 	}
+	struct wlr_gamma_control *gamma_control, *tmp;
+	wl_list_for_each_safe(gamma_control, tmp, &gamma_control_manager->controls,
+			link) {
+		gamma_control_destroy(gamma_control);
+	}
 	// TODO: this segfault (wl_display->registry_resource_list is not init)
 	// wl_global_destroy(gamma_control_manager->wl_global);
 	free(gamma_control_manager);
diff --git a/types/wlr_output.c b/types/wlr_output.c
index eb5bdd26..a02798b2 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -404,13 +404,13 @@ void wlr_output_swap_buffers(struct wlr_output *output) {
 }
 
 void wlr_output_set_gamma(struct wlr_output *output,
-	uint16_t size, uint16_t *r, uint16_t *g, uint16_t *b) {
+	uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b) {
 	if (output->impl->set_gamma) {
 		output->impl->set_gamma(output, size, r, g, b);
 	}
 }
 
-uint16_t wlr_output_get_gamma_size(struct wlr_output *output) {
+uint32_t wlr_output_get_gamma_size(struct wlr_output *output) {
 	if (!output->impl->get_gamma_size) {
 		return 0;
 	}
-- 
cgit v1.2.3


From d1dd0a6970649d9f2c0eeed30da0eff745f16dd1 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sun, 22 Oct 2017 21:07:32 -0400
Subject: refactor buffer detection

---
 include/wlr/types/wlr_surface.h |  8 ++++++++
 types/wlr_surface.c             |  4 ++++
 types/wlr_wl_shell.c            |  5 ++---
 types/wlr_xdg_shell_v6.c        | 10 +++++-----
 4 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'include/wlr')

diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index 461e593f..ea4184aa 100644
--- a/include/wlr/types/wlr_surface.h
+++ b/include/wlr/types/wlr_surface.h
@@ -109,6 +109,14 @@ void wlr_surface_get_matrix(struct wlr_surface *surface,
 int wlr_surface_set_role(struct wlr_surface *surface, const char *role,
 		struct wl_resource *error_resource, uint32_t error_code);
 
+/**
+ * Whether or not this surface currently has an attached buffer. A surface has
+ * an attached buffer when it commits with a non-null buffer in its pending
+ * state. A surface will not have a buffer if it has never committed one, has
+ * committed a null buffer, or something went wrong with uploading the buffer.
+ */
+bool wlr_surface_has_buffer(struct wlr_surface *surface);
+
 /**
  * Create the subsurface implementation for this surface.
  */
diff --git a/types/wlr_surface.c b/types/wlr_surface.c
index 68c21468..79905fae 100644
--- a/types/wlr_surface.c
+++ b/types/wlr_surface.c
@@ -655,6 +655,10 @@ void wlr_surface_get_matrix(struct wlr_surface *surface,
 	wlr_matrix_mul(projection, matrix, matrix);
 }
 
+bool wlr_surface_has_buffer(struct wlr_surface *surface) {
+	return surface->texture && surface->texture->valid;
+}
+
 int wlr_surface_set_role(struct wlr_surface *surface, const char *role,
 		struct wl_resource *error_resource, uint32_t error_code) {
 	assert(role);
diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c
index c269351c..73985414 100644
--- a/types/wlr_wl_shell.c
+++ b/types/wlr_wl_shell.c
@@ -8,7 +8,6 @@
 #include <wlr/types/wlr_wl_shell.h>
 #include <stdlib.h>
 #include <wayland-server-protocol.h>
-#include <wlr/render/interface.h>
 
 static const char *wlr_wl_shell_surface_role = "wl-shell-surface";
 
@@ -482,7 +481,7 @@ static void handle_wlr_surface_committed(struct wl_listener *listener,
 	struct wlr_wl_shell_surface *surface =
 		wl_container_of(listener, surface, surface_commit_listener);
 	if (!surface->configured &&
-			surface->surface->texture->valid &&
+			wlr_surface_has_buffer(surface->surface) &&
 			surface->state != WLR_WL_SHELL_SURFACE_STATE_NONE) {
 		surface->configured = true;
 		wl_signal_emit(&surface->shell->events.new_surface, surface);
@@ -490,7 +489,7 @@ static void handle_wlr_surface_committed(struct wl_listener *listener,
 
 	if (surface->popup_mapped &&
 			surface->state == WLR_WL_SHELL_SURFACE_STATE_POPUP &&
-			!surface->surface->texture->valid) {
+			!wlr_surface_has_buffer(surface->surface)) {
 		surface->popup_mapped = false;
 		struct wlr_wl_shell_popup_grab *grab =
 			shell_popup_grab_from_seat(surface->shell,
diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c
index 91c38292..40fe252c4 100644
--- a/types/wlr_xdg_shell_v6.c
+++ b/types/wlr_xdg_shell_v6.c
@@ -9,7 +9,6 @@
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/util/log.h>
-#include <wlr/render/interface.h>
 #include "xdg-shell-unstable-v6-protocol.h"
 
 static const char *wlr_desktop_xdg_toplevel_role = "xdg_toplevel";
@@ -1018,7 +1017,8 @@ static void wlr_xdg_surface_v6_toplevel_committed(
 		struct wlr_xdg_surface_v6 *surface) {
 	assert(surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL);
 
-	if (!surface->surface->texture->valid && !surface->toplevel_state->added) {
+	if (!wlr_surface_has_buffer(surface->surface)
+			&& !surface->toplevel_state->added) {
 		// on the first commit, send a configure request to tell the client it
 		// is added
 		wlr_xdg_surface_v6_schedule_configure(surface);
@@ -1026,7 +1026,7 @@ static void wlr_xdg_surface_v6_toplevel_committed(
 		return;
 	}
 
-	if (!surface->surface->texture->valid) {
+	if (!wlr_surface_has_buffer(surface->surface)) {
 		return;
 	}
 
@@ -1048,7 +1048,7 @@ static void handle_wlr_surface_committed(struct wl_listener *listener,
 	struct wlr_xdg_surface_v6 *surface =
 		wl_container_of(listener, surface, surface_commit_listener);
 
-	if (surface->surface->texture->valid && !surface->configured) {
+	if (wlr_surface_has_buffer(surface->surface) && !surface->configured) {
 		wl_resource_post_error(surface->resource,
 			ZXDG_SURFACE_V6_ERROR_UNCONFIGURED_BUFFER,
 			"xdg_surface has never been configured");
@@ -1117,7 +1117,7 @@ static void xdg_shell_get_xdg_surface(struct wl_client *wl_client,
 		&zxdg_surface_v6_interface, wl_resource_get_version(client_resource),
 		id);
 
-	if (surface->surface->texture->valid) {
+	if (wlr_surface_has_buffer(surface->surface)) {
 		wl_resource_post_error(surface->resource,
 			ZXDG_SURFACE_V6_ERROR_UNCONFIGURED_BUFFER,
 			"xdg_surface must not have a buffer at creation");
-- 
cgit v1.2.3


From eea532911a5be8d45770d074546bdeb8a0f16c5b Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Mon, 23 Oct 2017 21:03:00 +0200
Subject: Send output current mode when changed

---
 backend/wayland/output.c            | 10 +++-----
 backend/x11/backend.c               |  4 +--
 include/wlr/interfaces/wlr_output.h |  3 ++-
 types/wlr_output.c                  | 51 ++++++++++++++++++++++++++++++++-----
 4 files changed, 51 insertions(+), 17 deletions(-)

(limited to 'include/wlr')

diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index 3194e2cf..0dde343c 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -210,9 +210,7 @@ static void xdg_toplevel_handle_configure(void *data, struct zxdg_toplevel_v6 *x
 	}
 	// loop over states for maximized etc?
 	wl_egl_window_resize(output->egl_window, width, height, 0, 0);
-	output->wlr_output.width = width;
-	output->wlr_output.height = height;
-	wlr_output_update_matrix(&output->wlr_output);
+	wlr_output_update_size(&output->wlr_output, width, height);
 	wl_signal_emit(&output->wlr_output.events.resolution, output);
 }
 
@@ -244,13 +242,11 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *_backend) {
 	wlr_output_init(&output->wlr_output, &backend->backend, &output_impl);
 	struct wlr_output *wlr_output = &output->wlr_output;
 
-	wlr_output->width = 640;
-	wlr_output->height = 480;
+	wlr_output_update_size(wlr_output, 640, 480);
 	strncpy(wlr_output->make, "wayland", sizeof(wlr_output->make));
 	strncpy(wlr_output->model, "wayland", sizeof(wlr_output->model));
 	snprintf(wlr_output->name, sizeof(wlr_output->name), "WL-%d",
-			wl_list_length(&backend->outputs) + 1);
-	wlr_output_update_matrix(wlr_output);
+		wl_list_length(&backend->outputs) + 1);
 
 	output->backend = backend;
 
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index d30ec376..0e98b8d9 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -121,9 +121,7 @@ static bool handle_x11_event(struct wlr_x11_backend *x11, xcb_generic_event_t *e
 	case XCB_CONFIGURE_NOTIFY: {
 		xcb_configure_notify_event_t *ev = (xcb_configure_notify_event_t *)event;
 
-		output->wlr_output.width = ev->width;
-		output->wlr_output.height = ev->height;
-		wlr_output_update_matrix(&output->wlr_output);
+		wlr_output_update_size(&output->wlr_output, ev->width, ev->height);
 		wl_signal_emit(&output->wlr_output.events.resolution, output);
 
 		// Move the pointer to its new location
diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h
index 636cc06c..d365e8f5 100644
--- a/include/wlr/interfaces/wlr_output.h
+++ b/include/wlr/interfaces/wlr_output.h
@@ -25,7 +25,8 @@ struct wlr_output_impl {
 void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
 	const struct wlr_output_impl *impl);
 void wlr_output_free(struct wlr_output *output);
-void wlr_output_update_matrix(struct wlr_output *output);
+void wlr_output_update_size(struct wlr_output *output, int32_t width,
+	int32_t height);
 struct wl_global *wlr_output_create_global(struct wlr_output *wlr_output,
 	struct wl_display *display);
 void wlr_output_destroy_global(struct wlr_output *wlr_output);
diff --git a/types/wlr_output.c b/types/wlr_output.c
index a02798b2..e8d4af3e 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -33,8 +33,8 @@ static void wl_output_send_to_resource(struct wl_resource *resource) {
 			if (output->current_mode == mode) {
 				flags |= WL_OUTPUT_MODE_CURRENT;
 			}
-			wl_output_send_mode(resource, flags,
-				mode->width, mode->height, mode->refresh);
+			wl_output_send_mode(resource, flags, mode->width, mode->height,
+				mode->refresh);
 		}
 
 		if (wl_list_length(&output->modes) == 0) {
@@ -51,6 +51,25 @@ static void wl_output_send_to_resource(struct wl_resource *resource) {
 	}
 }
 
+static void wlr_output_send_current_mode_to_resource(
+		struct wl_resource *resource) {
+	struct wlr_output *output = wl_resource_get_user_data(resource);
+	assert(output);
+	const uint32_t version = wl_resource_get_version(resource);
+	if (version < WL_OUTPUT_MODE_SINCE_VERSION) {
+		return;
+	}
+	if (output->current_mode != NULL) {
+		struct wlr_output_mode *mode = output->current_mode;
+		wl_output_send_mode(resource, mode->flags | WL_OUTPUT_MODE_CURRENT,
+			mode->width, mode->height, mode->refresh);
+	} else {
+		// Output has no mode, send the current width/height
+		wl_output_send_mode(resource, WL_OUTPUT_MODE_CURRENT, output->width,
+			output->height, 0);
+	}
+}
+
 static void wl_output_destroy(struct wl_resource *resource) {
 	struct wlr_output *output = wl_resource_get_user_data(resource);
 	struct wl_resource *_resource = NULL;
@@ -110,32 +129,52 @@ void wlr_output_destroy_global(struct wlr_output *wlr_output) {
 	wlr_output->wl_global = NULL;
 }
 
-void wlr_output_update_matrix(struct wlr_output *output) {
-	wlr_matrix_texture(output->transform_matrix, output->width, output->height, output->transform);
+static void wlr_output_update_matrix(struct wlr_output *output) {
+	wlr_matrix_texture(output->transform_matrix, output->width, output->height,
+		output->transform);
 }
 
 void wlr_output_enable(struct wlr_output *output, bool enable) {
 	output->impl->enable(output, enable);
 }
 
-bool wlr_output_set_mode(struct wlr_output *output, struct wlr_output_mode *mode) {
+bool wlr_output_set_mode(struct wlr_output *output,
+		struct wlr_output_mode *mode) {
 	if (!output->impl || !output->impl->set_mode) {
 		return false;
 	}
 	bool result = output->impl->set_mode(output, mode);
 	if (result) {
 		wlr_output_update_matrix(output);
+		struct wl_resource *resource;
+		wl_resource_for_each(resource, &output->wl_resources) {
+			wlr_output_send_current_mode_to_resource(resource);
+		}
 	}
 	return result;
 }
 
+void wlr_output_update_size(struct wlr_output *output, int32_t width,
+		int32_t height) {
+	output->width = width;
+	output->height = height;
+	wlr_output_update_matrix(output);
+	if (output->wl_global != NULL) {
+		struct wl_resource *resource;
+		wl_resource_for_each(resource, &output->wl_resources) {
+			wlr_output_send_current_mode_to_resource(resource);
+		}
+	}
+}
+
 void wlr_output_transform(struct wlr_output *output,
 		enum wl_output_transform transform) {
 	output->impl->transform(output, transform);
 	wlr_output_update_matrix(output);
 }
 
-void wlr_output_set_position(struct wlr_output *output, int32_t lx, int32_t ly) {
+void wlr_output_set_position(struct wlr_output *output, int32_t lx,
+		int32_t ly) {
 	if (lx == output->lx && ly == output->ly) {
 		return;
 	}
-- 
cgit v1.2.3