diff options
author | M Stoeckl <code@mstoeckl.com> | 2019-01-20 13:51:12 -0500 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2019-01-21 12:59:42 +0100 |
commit | 1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 (patch) | |
tree | 5c3f60e0219cb8b4a1b7cafb760a871661866e32 /sway/server.c | |
parent | Log libinput_config_status errors (diff) | |
download | sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.tar.gz sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.tar.zst sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.zip |
Replace wlr_log with sway_log
This commit mostly duplicates the wlr_log functions, although
with a sway_* prefix. (This is very similar to PR #2009.)
However, the logging function no longer needs to be replaceable,
so sway_log_init's second argument is used to set the exit
callback for sway_abort.
wlr_log_init is still invoked in sway/main.c
This commit makes it easier to remove the wlroots dependency for
the helper programs swaymsg, swaybg, swaybar, and swaynag.
Diffstat (limited to 'sway/server.c')
-rw-r--r-- | sway/server.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sway/server.c b/sway/server.c index 0529cab1..5ae9bb01 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -19,9 +19,9 @@ | |||
19 | #include <wlr/types/wlr_xcursor_manager.h> | 19 | #include <wlr/types/wlr_xcursor_manager.h> |
20 | #include <wlr/types/wlr_xdg_decoration_v1.h> | 20 | #include <wlr/types/wlr_xdg_decoration_v1.h> |
21 | #include <wlr/types/wlr_xdg_output_v1.h> | 21 | #include <wlr/types/wlr_xdg_output_v1.h> |
22 | #include <wlr/util/log.h> | ||
23 | #include "config.h" | 22 | #include "config.h" |
24 | #include "list.h" | 23 | #include "list.h" |
24 | #include "log.h" | ||
25 | #include "sway/config.h" | 25 | #include "sway/config.h" |
26 | #include "sway/desktop/idle_inhibit_v1.h" | 26 | #include "sway/desktop/idle_inhibit_v1.h" |
27 | #include "sway/input/input-manager.h" | 27 | #include "sway/input/input-manager.h" |
@@ -32,20 +32,20 @@ | |||
32 | #endif | 32 | #endif |
33 | 33 | ||
34 | bool server_privileged_prepare(struct sway_server *server) { | 34 | bool server_privileged_prepare(struct sway_server *server) { |
35 | wlr_log(WLR_DEBUG, "Preparing Wayland server initialization"); | 35 | sway_log(SWAY_DEBUG, "Preparing Wayland server initialization"); |
36 | server->wl_display = wl_display_create(); | 36 | server->wl_display = wl_display_create(); |
37 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); | 37 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); |
38 | server->backend = wlr_backend_autocreate(server->wl_display, NULL); | 38 | server->backend = wlr_backend_autocreate(server->wl_display, NULL); |
39 | 39 | ||
40 | if (!server->backend) { | 40 | if (!server->backend) { |
41 | wlr_log(WLR_ERROR, "Unable to create backend"); | 41 | sway_log(SWAY_ERROR, "Unable to create backend"); |
42 | return false; | 42 | return false; |
43 | } | 43 | } |
44 | return true; | 44 | return true; |
45 | } | 45 | } |
46 | 46 | ||
47 | bool server_init(struct sway_server *server) { | 47 | bool server_init(struct sway_server *server) { |
48 | wlr_log(WLR_DEBUG, "Initializing Wayland server"); | 48 | sway_log(SWAY_DEBUG, "Initializing Wayland server"); |
49 | 49 | ||
50 | struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); | 50 | struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); |
51 | assert(renderer); | 51 | assert(renderer); |
@@ -111,7 +111,7 @@ bool server_init(struct sway_server *server) { | |||
111 | 111 | ||
112 | server->socket = wl_display_add_socket_auto(server->wl_display); | 112 | server->socket = wl_display_add_socket_auto(server->wl_display); |
113 | if (!server->socket) { | 113 | if (!server->socket) { |
114 | wlr_log(WLR_ERROR, "Unable to open wayland socket"); | 114 | sway_log(SWAY_ERROR, "Unable to open wayland socket"); |
115 | wlr_backend_destroy(server->backend); | 115 | wlr_backend_destroy(server->backend); |
116 | return false; | 116 | return false; |
117 | } | 117 | } |
@@ -155,7 +155,7 @@ bool server_start(struct sway_server *server) { | |||
155 | 155 | ||
156 | #if HAVE_XWAYLAND | 156 | #if HAVE_XWAYLAND |
157 | if (config->xwayland) { | 157 | if (config->xwayland) { |
158 | wlr_log(WLR_DEBUG, "Initializing Xwayland"); | 158 | sway_log(SWAY_DEBUG, "Initializing Xwayland"); |
159 | server->xwayland.wlr_xwayland = | 159 | server->xwayland.wlr_xwayland = |
160 | wlr_xwayland_create(server->wl_display, server->compositor, true); | 160 | wlr_xwayland_create(server->wl_display, server->compositor, true); |
161 | wl_signal_add(&server->xwayland.wlr_xwayland->events.new_surface, | 161 | wl_signal_add(&server->xwayland.wlr_xwayland->events.new_surface, |
@@ -179,10 +179,10 @@ bool server_start(struct sway_server *server) { | |||
179 | } | 179 | } |
180 | #endif | 180 | #endif |
181 | 181 | ||
182 | wlr_log(WLR_INFO, "Starting backend on wayland display '%s'", | 182 | sway_log(SWAY_INFO, "Starting backend on wayland display '%s'", |
183 | server->socket); | 183 | server->socket); |
184 | if (!wlr_backend_start(server->backend)) { | 184 | if (!wlr_backend_start(server->backend)) { |
185 | wlr_log(WLR_ERROR, "Failed to start backend"); | 185 | sway_log(SWAY_ERROR, "Failed to start backend"); |
186 | wlr_backend_destroy(server->backend); | 186 | wlr_backend_destroy(server->backend); |
187 | return false; | 187 | return false; |
188 | } | 188 | } |
@@ -190,7 +190,7 @@ bool server_start(struct sway_server *server) { | |||
190 | } | 190 | } |
191 | 191 | ||
192 | void server_run(struct sway_server *server) { | 192 | void server_run(struct sway_server *server) { |
193 | wlr_log(WLR_INFO, "Running compositor on wayland display '%s'", | 193 | sway_log(SWAY_INFO, "Running compositor on wayland display '%s'", |
194 | server->socket); | 194 | server->socket); |
195 | wl_display_run(server->wl_display); | 195 | wl_display_run(server->wl_display); |
196 | } | 196 | } |