Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a secondary headless backend #5216

Merged
merged 1 commit into from
May 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions include/sway/server.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 8 additions & 1 deletion sway/server.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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;
Expand Down