diff options
Diffstat (limited to 'sway/server.c')
-rw-r--r-- | sway/server.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/server.c b/sway/server.c index cd15f454..1d8eb964 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -29,20 +29,20 @@ | |||
29 | #include "sway/xwayland.h" | 29 | #include "sway/xwayland.h" |
30 | 30 | ||
31 | bool server_privileged_prepare(struct sway_server *server) { | 31 | bool server_privileged_prepare(struct sway_server *server) { |
32 | wlr_log(L_DEBUG, "Preparing Wayland server initialization"); | 32 | wlr_log(WLR_DEBUG, "Preparing Wayland server initialization"); |
33 | server->wl_display = wl_display_create(); | 33 | server->wl_display = wl_display_create(); |
34 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); | 34 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); |
35 | server->backend = wlr_backend_autocreate(server->wl_display, NULL); | 35 | server->backend = wlr_backend_autocreate(server->wl_display, NULL); |
36 | 36 | ||
37 | if (!server->backend) { | 37 | if (!server->backend) { |
38 | wlr_log(L_ERROR, "Unable to create backend"); | 38 | wlr_log(WLR_ERROR, "Unable to create backend"); |
39 | return false; | 39 | return false; |
40 | } | 40 | } |
41 | return true; | 41 | return true; |
42 | } | 42 | } |
43 | 43 | ||
44 | bool server_init(struct sway_server *server) { | 44 | bool server_init(struct sway_server *server) { |
45 | wlr_log(L_DEBUG, "Initializing Wayland server"); | 45 | wlr_log(WLR_DEBUG, "Initializing Wayland server"); |
46 | 46 | ||
47 | struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); | 47 | struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); |
48 | assert(renderer); | 48 | assert(renderer); |
@@ -116,7 +116,7 @@ bool server_init(struct sway_server *server) { | |||
116 | 116 | ||
117 | server->socket = wl_display_add_socket_auto(server->wl_display); | 117 | server->socket = wl_display_add_socket_auto(server->wl_display); |
118 | if (!server->socket) { | 118 | if (!server->socket) { |
119 | wlr_log(L_ERROR, "Unable to open wayland socket"); | 119 | wlr_log(WLR_ERROR, "Unable to open wayland socket"); |
120 | wlr_backend_destroy(server->backend); | 120 | wlr_backend_destroy(server->backend); |
121 | return false; | 121 | return false; |
122 | } | 122 | } |
@@ -141,10 +141,10 @@ void server_fini(struct sway_server *server) { | |||
141 | } | 141 | } |
142 | 142 | ||
143 | void server_run(struct sway_server *server) { | 143 | void server_run(struct sway_server *server) { |
144 | wlr_log(L_INFO, "Running compositor on wayland display '%s'", | 144 | wlr_log(WLR_INFO, "Running compositor on wayland display '%s'", |
145 | server->socket); | 145 | server->socket); |
146 | if (!wlr_backend_start(server->backend)) { | 146 | if (!wlr_backend_start(server->backend)) { |
147 | wlr_log(L_ERROR, "Failed to start backend"); | 147 | wlr_log(WLR_ERROR, "Failed to start backend"); |
148 | wlr_backend_destroy(server->backend); | 148 | wlr_backend_destroy(server->backend); |
149 | return; | 149 | return; |
150 | } | 150 | } |