code: Remove most of the hack around @cImport and flexible arrays

This commit is contained in:
Marten Ringwelski
2020-10-30 13:36:34 +01:00
committed by Isaac Freund
parent 9a2e11620c
commit 1bd6f6bed1
7 changed files with 12 additions and 62 deletions

View File

@ -1,7 +1,5 @@
#define WLR_USE_UNSTABLE
#include <wlr/backend.h>
#include <wlr/backend/noop.h>
#include <wlr/backend/multi.h>
#include <wlr/render/wlr_renderer.h>
struct wlr_backend *river_wlr_backend_autocreate(struct wl_display *display) {
@ -11,31 +9,3 @@ struct wlr_backend *river_wlr_backend_autocreate(struct wl_display *display) {
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);
}
void river_wlr_backend_destory(struct wlr_backend *backend) {
wlr_backend_destroy(backend);
}

View File

@ -8,29 +8,7 @@
* 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);
void river_wlr_backend_destory(struct wlr_backend *backend);
#endif // RIVER_BINDINGS_H