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/commands/bar.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/commands/bar.c')
-rw-r--r-- | sway/commands/bar.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/commands/bar.c b/sway/commands/bar.c index 2cfc538f..e9360603 100644 --- a/sway/commands/bar.c +++ b/sway/commands/bar.c | |||
@@ -1,9 +1,9 @@ | |||
1 | #define _POSIX_C_SOURCE 200809 | 1 | #define _POSIX_C_SOURCE 200809 |
2 | #include <string.h> | 2 | #include <string.h> |
3 | #include <strings.h> | 3 | #include <strings.h> |
4 | #include <wlr/util/log.h> | ||
5 | #include "sway/commands.h" | 4 | #include "sway/commands.h" |
6 | #include "sway/config.h" | 5 | #include "sway/config.h" |
6 | #include "log.h" | ||
7 | #include "util.h" | 7 | #include "util.h" |
8 | 8 | ||
9 | // Must be in alphabetical order for bsearch | 9 | // Must be in alphabetical order for bsearch |
@@ -60,14 +60,14 @@ struct cmd_results *cmd_bar(int argc, char **argv) { | |||
60 | for (int i = 0; i < config->bars->length; ++i) { | 60 | for (int i = 0; i < config->bars->length; ++i) { |
61 | struct bar_config *item = config->bars->items[i]; | 61 | struct bar_config *item = config->bars->items[i]; |
62 | if (strcmp(item->id, argv[0]) == 0) { | 62 | if (strcmp(item->id, argv[0]) == 0) { |
63 | wlr_log(WLR_DEBUG, "Selecting bar: %s", argv[0]); | 63 | sway_log(SWAY_DEBUG, "Selecting bar: %s", argv[0]); |
64 | bar = item; | 64 | bar = item; |
65 | break; | 65 | break; |
66 | } | 66 | } |
67 | } | 67 | } |
68 | if (!bar) { | 68 | if (!bar) { |
69 | spawn = !config->reading; | 69 | spawn = !config->reading; |
70 | wlr_log(WLR_DEBUG, "Creating bar: %s", argv[0]); | 70 | sway_log(SWAY_DEBUG, "Creating bar: %s", argv[0]); |
71 | bar = default_bar_config(); | 71 | bar = default_bar_config(); |
72 | if (!bar) { | 72 | if (!bar) { |
73 | return cmd_results_new(CMD_FAILURE, | 73 | return cmd_results_new(CMD_FAILURE, |
@@ -99,7 +99,7 @@ struct cmd_results *cmd_bar(int argc, char **argv) { | |||
99 | 99 | ||
100 | // Set current bar | 100 | // Set current bar |
101 | config->current_bar = bar; | 101 | config->current_bar = bar; |
102 | wlr_log(WLR_DEBUG, "Creating bar %s", bar->id); | 102 | sway_log(SWAY_DEBUG, "Creating bar %s", bar->id); |
103 | } | 103 | } |
104 | 104 | ||
105 | if (find_handler(argv[0], bar_config_handlers, | 105 | if (find_handler(argv[0], bar_config_handlers, |