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/desktop/output.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/desktop/output.c')
-rw-r--r-- | sway/desktop/output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 646b6d70..edf77fbc 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -510,7 +510,7 @@ static void handle_mode(struct wl_listener *listener, void *data) { | |||
510 | // We want to enable this output, but it didn't work last time, | 510 | // We want to enable this output, but it didn't work last time, |
511 | // possibly because we hadn't enough CRTCs. Try again now that the | 511 | // possibly because we hadn't enough CRTCs. Try again now that the |
512 | // output has a mode. | 512 | // output has a mode. |
513 | wlr_log(WLR_DEBUG, "Output %s has gained a CRTC, " | 513 | sway_log(SWAY_DEBUG, "Output %s has gained a CRTC, " |
514 | "trying to enable it", output->wlr_output->name); | 514 | "trying to enable it", output->wlr_output->name); |
515 | apply_output_config(oc, output); | 515 | apply_output_config(oc, output); |
516 | } | 516 | } |
@@ -580,7 +580,7 @@ static void handle_present(struct wl_listener *listener, void *data) { | |||
580 | void handle_new_output(struct wl_listener *listener, void *data) { | 580 | void handle_new_output(struct wl_listener *listener, void *data) { |
581 | struct sway_server *server = wl_container_of(listener, server, new_output); | 581 | struct sway_server *server = wl_container_of(listener, server, new_output); |
582 | struct wlr_output *wlr_output = data; | 582 | struct wlr_output *wlr_output = data; |
583 | wlr_log(WLR_DEBUG, "New output %p: %s", wlr_output, wlr_output->name); | 583 | sway_log(SWAY_DEBUG, "New output %p: %s", wlr_output, wlr_output->name); |
584 | 584 | ||
585 | struct sway_output *output = output_create(wlr_output); | 585 | struct sway_output *output = output_create(wlr_output); |
586 | if (!output) { | 586 | if (!output) { |