diff options
Diffstat (limited to 'sway/server.c')
-rw-r--r-- | sway/server.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sway/server.c b/sway/server.c index 32c8f03c..365094ef 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -10,12 +10,12 @@ | |||
10 | #include <wlr/types/wlr_wl_shell.h> | 10 | #include <wlr/types/wlr_wl_shell.h> |
11 | // TODO WLR: make Xwayland optional | 11 | // TODO WLR: make Xwayland optional |
12 | #include <wlr/xwayland.h> | 12 | #include <wlr/xwayland.h> |
13 | #include <wlr/util/log.h> | ||
13 | #include "sway/server.h" | 14 | #include "sway/server.h" |
14 | #include "sway/input/input-manager.h" | 15 | #include "sway/input/input-manager.h" |
15 | #include "log.h" | ||
16 | 16 | ||
17 | bool server_init(struct sway_server *server) { | 17 | bool server_init(struct sway_server *server) { |
18 | sway_log(L_DEBUG, "Initializing Wayland server"); | 18 | wlr_log(L_DEBUG, "Initializing Wayland server"); |
19 | 19 | ||
20 | server->wl_display = wl_display_create(); | 20 | server->wl_display = wl_display_create(); |
21 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); | 21 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); |
@@ -55,7 +55,8 @@ bool server_init(struct sway_server *server) { | |||
55 | server->wl_shell_surface.notify = handle_wl_shell_surface; | 55 | server->wl_shell_surface.notify = handle_wl_shell_surface; |
56 | 56 | ||
57 | server->socket = wl_display_add_socket_auto(server->wl_display); | 57 | server->socket = wl_display_add_socket_auto(server->wl_display); |
58 | if (!sway_assert(server->socket, "Unable to open wayland socket")) { | 58 | if (!server->socket) { |
59 | wlr_log(L_ERROR, "Unable to open wayland socket"); | ||
59 | wlr_backend_destroy(server->backend); | 60 | wlr_backend_destroy(server->backend); |
60 | return false; | 61 | return false; |
61 | } | 62 | } |
@@ -71,11 +72,11 @@ void server_fini(struct sway_server *server) { | |||
71 | } | 72 | } |
72 | 73 | ||
73 | void server_run(struct sway_server *server) { | 74 | void server_run(struct sway_server *server) { |
74 | sway_log(L_INFO, "Running compositor on wayland display '%s'", | 75 | wlr_log(L_INFO, "Running compositor on wayland display '%s'", |
75 | server->socket); | 76 | server->socket); |
76 | setenv("_WAYLAND_DISPLAY", server->socket, true); | 77 | setenv("_WAYLAND_DISPLAY", server->socket, true); |
77 | if (!sway_assert(wlr_backend_start(server->backend), | 78 | if (!wlr_backend_start(server->backend)) { |
78 | "Failed to start backend")) { | 79 | wlr_log(L_ERROR, "Failed to start backend"); |
79 | wlr_backend_destroy(server->backend); | 80 | wlr_backend_destroy(server->backend); |
80 | return; | 81 | return; |
81 | } | 82 | } |