commit 5e5e5f2ee54b7139fafe6b55efce0c276c6cc39a
parent 6021fc4a08c9a870e2821b907e056f336c39a99a
Author: Simon Ser <contact@emersion.fr>
Date: Tue, 14 Apr 2020 15:04:56 +0200
Add a secondary headless backend
This allows the create_output command to work on DRM too.
Diffstat:
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/include/sway/server.h b/include/sway/server.h
@@ -29,6 +29,8 @@ struct sway_server {
struct wlr_backend *backend;
struct wlr_backend *noop_backend;
+ // secondary headless backend used for creating virtual outputs on-the-fly
+ struct wlr_backend *headless_backend;
struct wlr_compositor *compositor;
struct wl_listener compositor_new_surface;
diff --git a/sway/server.c b/sway/server.c
@@ -4,6 +4,8 @@
#include <stdlib.h>
#include <wayland-server-core.h>
#include <wlr/backend.h>
+#include <wlr/backend/headless.h>
+#include <wlr/backend/multi.h>
#include <wlr/backend/noop.h>
#include <wlr/backend/session.h>
#include <wlr/render/wlr_renderer.h>
@@ -41,7 +43,6 @@ bool server_privileged_prepare(struct sway_server *server) {
server->wl_display = wl_display_create();
server->wl_event_loop = wl_display_get_event_loop(server->wl_display);
server->backend = wlr_backend_autocreate(server->wl_display, NULL);
- server->noop_backend = wlr_noop_backend_create(server->wl_display);
if (!server->backend) {
sway_log(SWAY_ERROR, "Unable to create backend");
@@ -153,9 +154,15 @@ bool server_init(struct sway_server *server) {
return false;
}
+ server->noop_backend = wlr_noop_backend_create(server->wl_display);
+
struct wlr_output *wlr_output = wlr_noop_add_output(server->noop_backend);
root->noop_output = output_create(wlr_output);
+ server->headless_backend =
+ wlr_headless_backend_create_with_renderer(server->wl_display, renderer);
+ wlr_multi_backend_add(server->backend, server->headless_backend);
+
// This may have been set already via -Dtxn-timeout
if (!server->txn_timeout_ms) {
server->txn_timeout_ms = 200;