Wrap interface for wl-export-dmabuf

.gitignore

@@ -1,3 +1,4 @@
 build-*
 *.swp
 protocols/build
+.clang_complete

include/dmabuf.h

@@ -0,0 +1,46 @@
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+struct zwlr_export_dmabuf_manager_v1;
+struct zwlr_export_dmabuf_frame_v1;
+struct wl_output;
+
+enum dmabuf_capture_status {
+        DMABUF_CAPTURE_UNSPEC = 0,
+        DMABUF_CAPTURE_CANCELLED,
+        DMABUF_CAPTURE_FATAL,
+        DMABUF_CAPTURE_DONE
+};
+
+struct dmabuf_plane {
+	int fd;
+	uint32_t offset;
+	uint32_t size;
+	uint32_t pitch;
+	uint64_t modifier;
+};
+
+struct dmabuf_frame {
+	uint32_t width;
+	uint32_t height;
+	uint32_t format;
+
+	uint32_t n_planes;
+	struct dmabuf_plane plane[4];
+};
+
+struct dmabuf_capture {
+	struct zwlr_export_dmabuf_frame_v1* zwlr_frame;
+	struct dmabuf_frame frame;
+
+        enum dmabuf_capture_status status;
+        void (*on_done)(struct dmabuf_capture*);
+};
+
+struct dmabuf_capture*
+dmabuf_capture_start(struct zwlr_export_dmabuf_manager_v1* manager,
+		     bool overlay_cursor, struct wl_output* output,
+		     void (*on_done)(struct dmabuf_capture*));
+void dmabuf_capture_stop(struct dmabuf_capture* self);

src/dmabuf.c

@@ -0,0 +1,111 @@
+#include <unistd.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <wayland-client.h>
+
+#include "dmabuf.h"
+#include "wlr-export-dmabuf-unstable-v1.h"
+
+void dmabuf_capture_stop(struct dmabuf_capture* self)
+{
+	if (self->zwlr_frame)
+		zwlr_export_dmabuf_frame_v1_destroy(self->zwlr_frame);
+
+	free(self);
+}
+
+static void dmabuf_frame_start(void* data,
+			       struct zwlr_export_dmabuf_frame_v1* frame,
+			       uint32_t width, uint32_t height,
+			       uint32_t offset_x, uint32_t offset_y,
+			       uint32_t buffer_flags, uint32_t flags,
+			       uint32_t format,
+			       uint32_t mod_high, uint32_t mod_low,
+			       uint32_t num_objects)
+{
+	struct dmabuf_capture* self = data;
+
+	uint64_t mod = ((uint64_t)mod_high << 32) | (uint64_t)mod_low;
+
+	self->frame.width = width;
+	self->frame.height = height;
+	self->frame.n_planes = num_objects;
+	self->frame.format = format;
+
+	self->frame.plane[0].modifier = mod;
+	self->frame.plane[1].modifier = mod;
+	self->frame.plane[2].modifier = mod;
+	self->frame.plane[3].modifier = mod;
+}
+
+static void dmabuf_frame_object(void* data,
+				struct zwlr_export_dmabuf_frame_v1* frame,
+				uint32_t index, int32_t fd, uint32_t size, 
+				uint32_t offset, uint32_t stride,
+				uint32_t plane_index)
+{
+	struct dmabuf_capture* self = data;
+
+	self->frame.plane[plane_index].fd = fd;
+	self->frame.plane[plane_index].size = size;
+	self->frame.plane[plane_index].offset = offset;
+	self->frame.plane[plane_index].pitch = stride;
+}
+
+static void dmabuf_frame_ready(void* data,
+			       struct zwlr_export_dmabuf_frame_v1* frame,
+			       uint32_t tv_sec_hi, uint32_t tv_sec_lo,
+			       uint32_t tv_nsec)
+{
+	struct dmabuf_capture* self = data;
+
+	self->status = DMABUF_CAPTURE_DONE;
+	self->on_done(self);
+
+	dmabuf_capture_stop(self);
+}
+
+static void dmabuf_frame_cancel(void* data,
+				struct zwlr_export_dmabuf_frame_v1* frame,
+				uint32_t reason)
+{
+	struct dmabuf_capture* self = data;
+
+	self->status = reason == ZWLR_EXPORT_DMABUF_FRAME_V1_CANCEL_REASON_PERMANENT
+		     ? DMABUF_CAPTURE_FATAL : DMABUF_CAPTURE_DONE;
+	self->on_done(self);
+
+	dmabuf_capture_stop(self);
+}
+
+struct dmabuf_capture*
+dmabuf_capture_start(struct zwlr_export_dmabuf_manager_v1* manager,
+		     bool overlay_cursor, struct wl_output* output,
+		     void (*on_done)(struct dmabuf_capture*))
+{
+	struct dmabuf_capture* self = calloc(1, sizeof(*self));
+	if (!self)
+		return NULL;
+
+	self->on_done = on_done;
+
+	static const struct zwlr_export_dmabuf_frame_v1_listener
+	dmabuf_frame_listener = {
+		.frame = dmabuf_frame_start,
+		.object = dmabuf_frame_object,
+		.ready = dmabuf_frame_ready,
+		.cancel = dmabuf_frame_cancel,
+	};
+
+	self->zwlr_frame =
+		zwlr_export_dmabuf_manager_v1_capture_output(manager,
+							    overlay_cursor,
+							    output);
+	if (!self->zwlr_frame)
+		return NULL;
+
+	zwlr_export_dmabuf_frame_v1_add_listener(self->zwlr_frame,
+			&dmabuf_frame_listener, self);
+
+	return self;
+}

src/render.c

@@ -10,6 +10,8 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
+#include "dmabuf.h"
+
 #define MAYBE_UNUSED __attribute__((unused))
 
 #ifdef NDEBUG
@@ -50,23 +52,6 @@ struct renderer {
 	GLint read_type;
 };
 
-struct dmabuf_plane {
-	int fd;
-	uint32_t offset;
-	uint32_t size;
-	uint32_t pitch;
-	uint64_t modifier;
-};
-
-struct dmabuf_frame {
-	uint32_t width;
-	uint32_t height;
-	uint32_t format;
-
-	uint32_t n_planes;
-	struct dmabuf_plane plane[4];
-};
-
 static inline void* gl_load_single_extension(const char* name)
 {
 	void* ext = eglGetProcAddress(name);