From b02f660475fd6318fc387708c55c73ad4aebf062 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Wed, 15 Apr 2020 12:47:55 +0200 Subject: Rename render.[hc] to bindings.[hc] --- build.zig | 2 +- include/bindings.c | 37 +++++++++++++++++++++++++++++++++++++ include/bindings.h | 35 +++++++++++++++++++++++++++++++++++ include/render.c | 37 ------------------------------------- include/render.h | 34 ---------------------------------- src/c.zig | 2 +- 6 files changed, 74 insertions(+), 73 deletions(-) create mode 100644 include/bindings.c create mode 100644 include/bindings.h delete mode 100644 include/render.c delete mode 100644 include/render.h diff --git a/build.zig b/build.zig index 6cd3f88..cc59cf0 100644 --- a/build.zig +++ b/build.zig @@ -38,7 +38,7 @@ fn addDeps(exe: *std.build.LibExeObjStep, protocol_step: *std.build.Step) void { exe.step.dependOn(protocol_step); exe.addIncludeDir("protocol"); - exe.addCSourceFile("include/render.c", &[_][]const u8{"-std=c99"}); + exe.addCSourceFile("include/bindings.c", &[_][]const u8{"-std=c99"}); exe.addIncludeDir("."); exe.linkLibC(); diff --git a/include/bindings.c b/include/bindings.c new file mode 100644 index 0000000..0eaf76d --- /dev/null +++ b/include/bindings.c @@ -0,0 +1,37 @@ +#define WLR_USE_UNSTABLE +#include +#include +#include +#include + +struct wlr_backend *river_wlr_backend_autocreate(struct wl_display *display) { + return wlr_backend_autocreate(display, NULL); +} + +struct wlr_renderer *river_wlr_backend_get_renderer(struct wlr_backend *backend) { + return wlr_backend_get_renderer(backend); +} + +bool river_wlr_backend_start(struct wlr_backend *backend) { + return wlr_backend_start(backend); +} + +bool river_wlr_backend_is_multi(struct wlr_backend *backend) { + return wlr_backend_is_multi(backend); +} + +struct wlr_session *river_wlr_backend_get_session(struct wlr_backend *backend) { + return wlr_backend_get_session(backend); +} + +struct wlr_backend *river_wlr_noop_backend_create(struct wl_display *display) { + return wlr_noop_backend_create(display); +} + +struct wlr_output *river_wlr_noop_add_output(struct wlr_backend *backend) { + return wlr_noop_add_output(backend); +} + +bool river_wlr_output_is_noop(struct wlr_output *output) { + return wlr_output_is_noop(output); +} diff --git a/include/bindings.h b/include/bindings.h new file mode 100644 index 0000000..d8b9358 --- /dev/null +++ b/include/bindings.h @@ -0,0 +1,35 @@ +#ifndef RIVER_BINDINGS_H +#define RIVER_BINDINGS_H + +#include + +/* + * This header is needed since zig cannot yet translate flexible arrays. + * See https://github.com/ziglang/zig/issues/4775 + */ + +struct wlr_backend_impl; + +struct wlr_backend { + const struct wlr_backend_impl *impl; + + struct { + /** Raised when destroyed, passed the wlr_backend reference */ + struct wl_signal destroy; + /** Raised when new inputs are added, passed the wlr_input_device */ + struct wl_signal new_input; + /** Raised when new outputs are added, passed the wlr_output */ + struct wl_signal new_output; + } events; +}; + +struct wlr_backend *river_wlr_backend_autocreate(struct wl_display *display); +struct wlr_renderer *river_wlr_backend_get_renderer(struct wlr_backend *backend); +bool river_wlr_backend_start(struct wlr_backend *backend); +bool river_wlr_backend_is_multi(struct wlr_backend *backend); +struct wlr_session *river_wlr_backend_get_session(struct wlr_backend *backend); +struct wlr_backend *river_wlr_noop_backend_create(struct wl_display *display); +struct wlr_output *river_wlr_noop_add_output(struct wlr_backend *backend); +bool river_wlr_output_is_noop(struct wlr_output *output); + +#endif // RIVER_BINDINGS_H diff --git a/include/render.c b/include/render.c deleted file mode 100644 index 0eaf76d..0000000 --- a/include/render.c +++ /dev/null @@ -1,37 +0,0 @@ -#define WLR_USE_UNSTABLE -#include -#include -#include -#include - -struct wlr_backend *river_wlr_backend_autocreate(struct wl_display *display) { - return wlr_backend_autocreate(display, NULL); -} - -struct wlr_renderer *river_wlr_backend_get_renderer(struct wlr_backend *backend) { - return wlr_backend_get_renderer(backend); -} - -bool river_wlr_backend_start(struct wlr_backend *backend) { - return wlr_backend_start(backend); -} - -bool river_wlr_backend_is_multi(struct wlr_backend *backend) { - return wlr_backend_is_multi(backend); -} - -struct wlr_session *river_wlr_backend_get_session(struct wlr_backend *backend) { - return wlr_backend_get_session(backend); -} - -struct wlr_backend *river_wlr_noop_backend_create(struct wl_display *display) { - return wlr_noop_backend_create(display); -} - -struct wlr_output *river_wlr_noop_add_output(struct wlr_backend *backend) { - return wlr_noop_add_output(backend); -} - -bool river_wlr_output_is_noop(struct wlr_output *output) { - return wlr_output_is_noop(output); -} diff --git a/include/render.h b/include/render.h deleted file mode 100644 index 2da8f6e..0000000 --- a/include/render.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef RIVER_RENDER_H -#define RIVER_RENDER_H - -#include -/* - * This header is needed since zig cannot yet translate flexible arrays. - * See https://github.com/ziglang/zig/issues/4775 - */ - -struct wlr_backend_impl; - -struct wlr_backend { - const struct wlr_backend_impl *impl; - - struct { - /** Raised when destroyed, passed the wlr_backend reference */ - struct wl_signal destroy; - /** Raised when new inputs are added, passed the wlr_input_device */ - struct wl_signal new_input; - /** Raised when new outputs are added, passed the wlr_output */ - struct wl_signal new_output; - } events; -}; - -struct wlr_backend *river_wlr_backend_autocreate(struct wl_display *display); -struct wlr_renderer *river_wlr_backend_get_renderer(struct wlr_backend *backend); -bool river_wlr_backend_start(struct wlr_backend *backend); -bool river_wlr_backend_is_multi(struct wlr_backend *backend); -struct wlr_session *river_wlr_backend_get_session(struct wlr_backend *backend); -struct wlr_backend *river_wlr_noop_backend_create(struct wl_display *display); -struct wlr_output *river_wlr_noop_add_output(struct wlr_backend *backend); -bool river_wlr_output_is_noop(struct wlr_output *output); - -#endif diff --git a/src/c.zig b/src/c.zig index 96a0b8c..7cc0fce 100644 --- a/src/c.zig +++ b/src/c.zig @@ -26,5 +26,5 @@ pub usingnamespace @cImport({ // Contains a subset of functions from wlr/backend.h and wlr/render/wlr_renderer.h // that can be automatically imported - @cInclude("include/render.h"); + @cInclude("include/bindings.h"); }); -- cgit v1.2.3