diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-07-19 14:09:19 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-19 14:09:19 -0700 |
commit | 3483f1ea1ac66f261452f4cb4fea5f6b342b41d1 (patch) | |
tree | a81ef9a4d873de4a886ee414872b496838a61160 /sway/server.c | |
parent | Update for swaywm/wlroots#1148 (diff) | |
parent | Merge pull request #2310 from RyanDwyer/assign-output (diff) | |
download | sway-3483f1ea1ac66f261452f4cb4fea5f6b342b41d1.tar.gz sway-3483f1ea1ac66f261452f4cb4fea5f6b342b41d1.tar.zst sway-3483f1ea1ac66f261452f4cb4fea5f6b342b41d1.zip |
Merge branch 'master' into update-wlroots-1148
Diffstat (limited to 'sway/server.c')
-rw-r--r-- | sway/server.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sway/server.c b/sway/server.c index bad2b7e6..89dfbf8c 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -137,13 +137,19 @@ void server_fini(struct sway_server *server) { | |||
137 | list_free(server->transactions); | 137 | list_free(server->transactions); |
138 | } | 138 | } |
139 | 139 | ||
140 | void server_run(struct sway_server *server) { | 140 | bool server_start_backend(struct sway_server *server) { |
141 | wlr_log(WLR_INFO, "Running compositor on wayland display '%s'", | 141 | wlr_log(WLR_INFO, "Starting backend on wayland display '%s'", |
142 | server->socket); | 142 | server->socket); |
143 | if (!wlr_backend_start(server->backend)) { | 143 | if (!wlr_backend_start(server->backend)) { |
144 | wlr_log(WLR_ERROR, "Failed to start backend"); | 144 | wlr_log(WLR_ERROR, "Failed to start backend"); |
145 | wlr_backend_destroy(server->backend); | 145 | wlr_backend_destroy(server->backend); |
146 | return; | 146 | return false; |
147 | } | 147 | } |
148 | return true; | ||
149 | } | ||
150 | |||
151 | void server_run(struct sway_server *server) { | ||
152 | wlr_log(WLR_INFO, "Running compositor on wayland display '%s'", | ||
153 | server->socket); | ||
148 | wl_display_run(server->wl_display); | 154 | wl_display_run(server->wl_display); |
149 | } | 155 | } |