mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-10-29 05:40:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace wlr_log with sway_log

Browse source 
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.
This commit is contained in:
M Stoeckl 2019-01-20 13:51:12 -05:00 • committed by emersion
parent 5c834d36e1
commit 1211a81aad
108 changed files with 613 additions and 504 deletions
Download patch file Download diff file Expand all files Collapse all files

10
swaybar/main.c
View file

@ -4,9 +4,9 @@
#include <string.h>
#include <stdbool.h>
#include <getopt.h>
#include <wlr/util/log.h>
#include "swaybar/bar.h"
#include "ipc-client.h"
#include "log.h"
static struct swaybar swaybar;
@ -74,13 +74,13 @@ int main(int argc, char **argv) {
}
if (debug) {
wlr_log_init(WLR_DEBUG, NULL);
sway_log_init(SWAY_DEBUG, NULL);
} else {
wlr_log_init(WLR_INFO, NULL);
sway_log_init(SWAY_INFO, NULL);
}
if (!swaybar.id) {
wlr_log(WLR_ERROR, "No bar_id passed. "
sway_log(SWAY_ERROR, "No bar_id passed. "
"Provide --bar_id or let sway start swaybar");
return 1;
}
@ -88,7 +88,7 @@ int main(int argc, char **argv) {
if (!socket_path) {
socket_path = get_socketpath();
if (!socket_path) {
wlr_log(WLR_ERROR, "Unable to retrieve socket path");
sway_log(SWAY_ERROR, "Unable to retrieve socket path");
return 1;
}
}