aboutsummaryrefslogtreecommitdiffstats
path: root/sway/server.c
diff options
context:
space:
mode:
authorLibravatar Simon Zeni <simon@bl4ckb0ne.ca>2021-10-04 10:04:46 -0400
committerLibravatar Simon Ser <contact@emersion.fr>2021-11-25 17:48:34 +0100
commit0cd8efe0bb669e71e9cdc30d96ae466cb583e605 (patch)
tree0cc1cdf1d76347b92376fcf9087792e1b2f69a49 /sway/server.c
parentReplace wlr_headless_backend_create_with_renderer call (diff)
downloadsway-0cd8efe0bb669e71e9cdc30d96ae466cb583e605.tar.gz
sway-0cd8efe0bb669e71e9cdc30d96ae466cb583e605.tar.zst
sway-0cd8efe0bb669e71e9cdc30d96ae466cb583e605.zip
sway: replace noop_output by fallback_output
wlroots removed the support for the noop backend. Instead we rely on the headless backend to provide the fallback output.
Diffstat (limited to 'sway/server.c')
-rw-r--r--sway/server.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sway/server.c b/sway/server.c
index 246f9c4f..ff269c79 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -7,7 +7,6 @@
7#include <wlr/backend.h> 7#include <wlr/backend.h>
8#include <wlr/backend/headless.h> 8#include <wlr/backend/headless.h>
9#include <wlr/backend/multi.h> 9#include <wlr/backend/multi.h>
10#include <wlr/backend/noop.h>
11#include <wlr/backend/session.h> 10#include <wlr/backend/session.h>
12#include <wlr/config.h> 11#include <wlr/config.h>
13#include <wlr/render/wlr_renderer.h> 12#include <wlr/render/wlr_renderer.h>
@@ -217,11 +216,6 @@ bool server_init(struct sway_server *server) {
217 return false; 216 return false;
218 } 217 }
219 218
220 server->noop_backend = wlr_noop_backend_create(server->wl_display);
221
222 struct wlr_output *wlr_output = wlr_noop_add_output(server->noop_backend);
223 root->noop_output = output_create(wlr_output);
224
225 server->headless_backend = wlr_headless_backend_create(server->wl_display); 219 server->headless_backend = wlr_headless_backend_create(server->wl_display);
226 if (!server->headless_backend) { 220 if (!server->headless_backend) {
227 sway_log(SWAY_ERROR, "Failed to create secondary headless backend"); 221 sway_log(SWAY_ERROR, "Failed to create secondary headless backend");
@@ -231,6 +225,10 @@ bool server_init(struct sway_server *server) {
231 wlr_multi_backend_add(server->backend, server->headless_backend); 225 wlr_multi_backend_add(server->backend, server->headless_backend);
232 } 226 }
233 227
228 struct wlr_output *wlr_output =
229 wlr_headless_add_output(server->headless_backend, 800, 600);
230 root->fallback_output = output_create(wlr_output);
231
234 // This may have been set already via -Dtxn-timeout 232 // This may have been set already via -Dtxn-timeout
235 if (!server->txn_timeout_ms) { 233 if (!server->txn_timeout_ms) {
236 server->txn_timeout_ms = 200; 234 server->txn_timeout_ms = 200;
@@ -287,6 +285,7 @@ bool server_start(struct sway_server *server) {
287 wlr_backend_destroy(server->backend); 285 wlr_backend_destroy(server->backend);
288 return false; 286 return false;
289 } 287 }
288
290 return true; 289 return true;
291} 290}
292 291