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 | |
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')
25 files changed, 34 insertions, 34 deletions
diff --git a/sway/commands/bar/bind.c b/sway/commands/bar/bind.c index 4b0be804..17030a05 100644 --- a/sway/commands/bar/bind.c +++ b/sway/commands/bar/bind.c | |||
@@ -59,7 +59,7 @@ static struct cmd_results *bar_cmd_bind(int argc, char **argv, bool code) { | |||
59 | overwritten = true; | 59 | overwritten = true; |
60 | bindings->items[i] = binding; | 60 | bindings->items[i] = binding; |
61 | free_bar_binding(other); | 61 | free_bar_binding(other); |
62 | wlr_log(WLR_DEBUG, "[bar %s] Updated binding for %u (%s)%s", | 62 | sway_log(SWAY_DEBUG, "[bar %s] Updated binding for %u (%s)%s", |
63 | config->current_bar->id, binding->button, name, | 63 | config->current_bar->id, binding->button, name, |
64 | binding->release ? " - release" : ""); | 64 | binding->release ? " - release" : ""); |
65 | break; | 65 | break; |
@@ -67,7 +67,7 @@ static struct cmd_results *bar_cmd_bind(int argc, char **argv, bool code) { | |||
67 | } | 67 | } |
68 | if (!overwritten) { | 68 | if (!overwritten) { |
69 | list_add(bindings, binding); | 69 | list_add(bindings, binding); |
70 | wlr_log(WLR_DEBUG, "[bar %s] Added binding for %u (%s)%s", | 70 | sway_log(SWAY_DEBUG, "[bar %s] Added binding for %u (%s)%s", |
71 | config->current_bar->id, binding->button, name, | 71 | config->current_bar->id, binding->button, name, |
72 | binding->release ? " - release" : ""); | 72 | binding->release ? " - release" : ""); |
73 | } | 73 | } |
diff --git a/sway/commands/bar/binding_mode_indicator.c b/sway/commands/bar/binding_mode_indicator.c index 15acc309..29c93ddc 100644 --- a/sway/commands/bar/binding_mode_indicator.c +++ b/sway/commands/bar/binding_mode_indicator.c | |||
@@ -16,10 +16,10 @@ struct cmd_results *bar_cmd_binding_mode_indicator(int argc, char **argv) { | |||
16 | config->current_bar->binding_mode_indicator = | 16 | config->current_bar->binding_mode_indicator = |
17 | parse_boolean(argv[0], config->current_bar->binding_mode_indicator); | 17 | parse_boolean(argv[0], config->current_bar->binding_mode_indicator); |
18 | if (config->current_bar->binding_mode_indicator) { | 18 | if (config->current_bar->binding_mode_indicator) { |
19 | wlr_log(WLR_DEBUG, "Enabling binding mode indicator on bar: %s", | 19 | sway_log(SWAY_DEBUG, "Enabling binding mode indicator on bar: %s", |
20 | config->current_bar->id); | 20 | config->current_bar->id); |
21 | } else { | 21 | } else { |
22 | wlr_log(WLR_DEBUG, "Disabling binding mode indicator on bar: %s", | 22 | sway_log(SWAY_DEBUG, "Disabling binding mode indicator on bar: %s", |
23 | config->current_bar->id); | 23 | config->current_bar->id); |
24 | } | 24 | } |
25 | return cmd_results_new(CMD_SUCCESS, NULL); | 25 | return cmd_results_new(CMD_SUCCESS, NULL); |
diff --git a/sway/commands/bar/font.c b/sway/commands/bar/font.c index c6147e3d..cf1f759e 100644 --- a/sway/commands/bar/font.c +++ b/sway/commands/bar/font.c | |||
@@ -15,7 +15,7 @@ struct cmd_results *bar_cmd_font(int argc, char **argv) { | |||
15 | char *font = join_args(argv, argc); | 15 | char *font = join_args(argv, argc); |
16 | free(config->current_bar->font); | 16 | free(config->current_bar->font); |
17 | config->current_bar->font = font; | 17 | config->current_bar->font = font; |
18 | wlr_log(WLR_DEBUG, "Settings font '%s' for bar: %s", | 18 | sway_log(SWAY_DEBUG, "Settings font '%s' for bar: %s", |
19 | config->current_bar->font, config->current_bar->id); | 19 | config->current_bar->font, config->current_bar->id); |
20 | return cmd_results_new(CMD_SUCCESS, NULL); | 20 | return cmd_results_new(CMD_SUCCESS, NULL); |
21 | } | 21 | } |
diff --git a/sway/commands/bar/gaps.c b/sway/commands/bar/gaps.c index fabe12fc..83480fb5 100644 --- a/sway/commands/bar/gaps.c +++ b/sway/commands/bar/gaps.c | |||
@@ -47,7 +47,7 @@ struct cmd_results *bar_cmd_gaps(int argc, char **argv) { | |||
47 | config->current_bar->gaps.bottom = bottom; | 47 | config->current_bar->gaps.bottom = bottom; |
48 | config->current_bar->gaps.left = left; | 48 | config->current_bar->gaps.left = left; |
49 | 49 | ||
50 | wlr_log(WLR_DEBUG, "Setting bar gaps to %d %d %d %d on bar: %s", | 50 | sway_log(SWAY_DEBUG, "Setting bar gaps to %d %d %d %d on bar: %s", |
51 | config->current_bar->gaps.top, config->current_bar->gaps.right, | 51 | config->current_bar->gaps.top, config->current_bar->gaps.right, |
52 | config->current_bar->gaps.bottom, config->current_bar->gaps.left, | 52 | config->current_bar->gaps.bottom, config->current_bar->gaps.left, |
53 | config->current_bar->id); | 53 | config->current_bar->id); |
diff --git a/sway/commands/bar/height.c b/sway/commands/bar/height.c index a2e72533..945eb707 100644 --- a/sway/commands/bar/height.c +++ b/sway/commands/bar/height.c | |||
@@ -14,7 +14,7 @@ struct cmd_results *bar_cmd_height(int argc, char **argv) { | |||
14 | "Invalid height value: %s", argv[0]); | 14 | "Invalid height value: %s", argv[0]); |
15 | } | 15 | } |
16 | config->current_bar->height = height; | 16 | config->current_bar->height = height; |
17 | wlr_log(WLR_DEBUG, "Setting bar height to %d on bar: %s", | 17 | sway_log(SWAY_DEBUG, "Setting bar height to %d on bar: %s", |
18 | height, config->current_bar->id); | 18 | height, config->current_bar->id); |
19 | return cmd_results_new(CMD_SUCCESS, NULL); | 19 | return cmd_results_new(CMD_SUCCESS, NULL); |
20 | } | 20 | } |
diff --git a/sway/commands/bar/hidden_state.c b/sway/commands/bar/hidden_state.c index 3364ce70..b2c2d245 100644 --- a/sway/commands/bar/hidden_state.c +++ b/sway/commands/bar/hidden_state.c | |||
@@ -26,7 +26,7 @@ static struct cmd_results *bar_set_hidden_state(struct bar_config *bar, | |||
26 | if (!config->reading) { | 26 | if (!config->reading) { |
27 | ipc_event_barconfig_update(bar); | 27 | ipc_event_barconfig_update(bar); |
28 | } | 28 | } |
29 | wlr_log(WLR_DEBUG, "Setting hidden_state: '%s' for bar: %s", | 29 | sway_log(SWAY_DEBUG, "Setting hidden_state: '%s' for bar: %s", |
30 | bar->hidden_state, bar->id); | 30 | bar->hidden_state, bar->id); |
31 | } | 31 | } |
32 | // free old mode | 32 | // free old mode |
diff --git a/sway/commands/bar/icon_theme.c b/sway/commands/bar/icon_theme.c index 2d16f748..54b7b16e 100644 --- a/sway/commands/bar/icon_theme.c +++ b/sway/commands/bar/icon_theme.c | |||
@@ -16,7 +16,7 @@ struct cmd_results *bar_cmd_icon_theme(int argc, char **argv) { | |||
16 | return cmd_results_new(CMD_FAILURE, "No bar defined."); | 16 | return cmd_results_new(CMD_FAILURE, "No bar defined."); |
17 | } | 17 | } |
18 | 18 | ||
19 | wlr_log(WLR_DEBUG, "[Bar %s] Setting icon theme to %s", | 19 | sway_log(SWAY_DEBUG, "[Bar %s] Setting icon theme to %s", |
20 | config->current_bar->id, argv[0]); | 20 | config->current_bar->id, argv[0]); |
21 | free(config->current_bar->icon_theme); | 21 | free(config->current_bar->icon_theme); |
22 | config->current_bar->icon_theme = strdup(argv[0]); | 22 | config->current_bar->icon_theme = strdup(argv[0]); |
diff --git a/sway/commands/bar/id.c b/sway/commands/bar/id.c index bef3023b..a9a61743 100644 --- a/sway/commands/bar/id.c +++ b/sway/commands/bar/id.c | |||
@@ -26,7 +26,7 @@ struct cmd_results *bar_cmd_id(int argc, char **argv) { | |||
26 | } | 26 | } |
27 | } | 27 | } |
28 | 28 | ||
29 | wlr_log(WLR_DEBUG, "Renaming bar: '%s' to '%s'", oldname, name); | 29 | sway_log(SWAY_DEBUG, "Renaming bar: '%s' to '%s'", oldname, name); |
30 | 30 | ||
31 | // free old bar id | 31 | // free old bar id |
32 | free(config->current_bar->id); | 32 | free(config->current_bar->id); |
diff --git a/sway/commands/bar/mode.c b/sway/commands/bar/mode.c index 1698db8d..d89ddf24 100644 --- a/sway/commands/bar/mode.c +++ b/sway/commands/bar/mode.c | |||
@@ -28,7 +28,7 @@ static struct cmd_results *bar_set_mode(struct bar_config *bar, const char *mode | |||
28 | if (!config->reading) { | 28 | if (!config->reading) { |
29 | ipc_event_barconfig_update(bar); | 29 | ipc_event_barconfig_update(bar); |
30 | } | 30 | } |
31 | wlr_log(WLR_DEBUG, "Setting mode: '%s' for bar: %s", bar->mode, bar->id); | 31 | sway_log(SWAY_DEBUG, "Setting mode: '%s' for bar: %s", bar->mode, bar->id); |
32 | } | 32 | } |
33 | 33 | ||
34 | // free old mode | 34 | // free old mode |
diff --git a/sway/commands/bar/modifier.c b/sway/commands/bar/modifier.c index 0d28d6a2..62ec681f 100644 --- a/sway/commands/bar/modifier.c +++ b/sway/commands/bar/modifier.c | |||
@@ -29,7 +29,7 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) { | |||
29 | } | 29 | } |
30 | list_free_items_and_destroy(split); | 30 | list_free_items_and_destroy(split); |
31 | config->current_bar->modifier = mod; | 31 | config->current_bar->modifier = mod; |
32 | wlr_log(WLR_DEBUG, | 32 | sway_log(SWAY_DEBUG, |
33 | "Show/Hide the bar when pressing '%s' in hide mode.", argv[0]); | 33 | "Show/Hide the bar when pressing '%s' in hide mode.", argv[0]); |
34 | return cmd_results_new(CMD_SUCCESS, NULL); | 34 | return cmd_results_new(CMD_SUCCESS, NULL); |
35 | } | 35 | } |
diff --git a/sway/commands/bar/output.c b/sway/commands/bar/output.c index 9ad10678..956c1959 100644 --- a/sway/commands/bar/output.c +++ b/sway/commands/bar/output.c | |||
@@ -42,7 +42,7 @@ struct cmd_results *bar_cmd_output(int argc, char **argv) { | |||
42 | 42 | ||
43 | if (add_output) { | 43 | if (add_output) { |
44 | list_add(outputs, strdup(output)); | 44 | list_add(outputs, strdup(output)); |
45 | wlr_log(WLR_DEBUG, "Adding bar: '%s' to output '%s'", | 45 | sway_log(SWAY_DEBUG, "Adding bar: '%s' to output '%s'", |
46 | config->current_bar->id, output); | 46 | config->current_bar->id, output); |
47 | } | 47 | } |
48 | return cmd_results_new(CMD_SUCCESS, NULL); | 48 | return cmd_results_new(CMD_SUCCESS, NULL); |
diff --git a/sway/commands/bar/pango_markup.c b/sway/commands/bar/pango_markup.c index 0ffa41d9..b0958cf1 100644 --- a/sway/commands/bar/pango_markup.c +++ b/sway/commands/bar/pango_markup.c | |||
@@ -15,10 +15,10 @@ struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) { | |||
15 | config->current_bar->pango_markup | 15 | config->current_bar->pango_markup |
16 | = parse_boolean(argv[0], config->current_bar->pango_markup); | 16 | = parse_boolean(argv[0], config->current_bar->pango_markup); |
17 | if (config->current_bar->pango_markup) { | 17 | if (config->current_bar->pango_markup) { |
18 | wlr_log(WLR_DEBUG, "Enabling pango markup for bar: %s", | 18 | sway_log(SWAY_DEBUG, "Enabling pango markup for bar: %s", |
19 | config->current_bar->id); | 19 | config->current_bar->id); |
20 | } else { | 20 | } else { |
21 | wlr_log(WLR_DEBUG, "Disabling pango markup for bar: %s", | 21 | sway_log(SWAY_DEBUG, "Disabling pango markup for bar: %s", |
22 | config->current_bar->id); | 22 | config->current_bar->id); |
23 | } | 23 | } |
24 | return cmd_results_new(CMD_SUCCESS, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL); |
diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c index 2e3f79b4..4456d724 100644 --- a/sway/commands/bar/position.c +++ b/sway/commands/bar/position.c | |||
@@ -15,7 +15,7 @@ struct cmd_results *bar_cmd_position(int argc, char **argv) { | |||
15 | char *valid[] = { "top", "bottom" }; | 15 | char *valid[] = { "top", "bottom" }; |
16 | for (size_t i = 0; i < sizeof(valid) / sizeof(valid[0]); ++i) { | 16 | for (size_t i = 0; i < sizeof(valid) / sizeof(valid[0]); ++i) { |
17 | if (strcasecmp(valid[i], argv[0]) == 0) { | 17 | if (strcasecmp(valid[i], argv[0]) == 0) { |
18 | wlr_log(WLR_DEBUG, "Setting bar position '%s' for bar: %s", | 18 | sway_log(SWAY_DEBUG, "Setting bar position '%s' for bar: %s", |
19 | argv[0], config->current_bar->id); | 19 | argv[0], config->current_bar->id); |
20 | free(config->current_bar->position); | 20 | free(config->current_bar->position); |
21 | config->current_bar->position = strdup(argv[0]); | 21 | config->current_bar->position = strdup(argv[0]); |
diff --git a/sway/commands/bar/separator_symbol.c b/sway/commands/bar/separator_symbol.c index 145cdea5..76e99b49 100644 --- a/sway/commands/bar/separator_symbol.c +++ b/sway/commands/bar/separator_symbol.c | |||
@@ -13,7 +13,7 @@ struct cmd_results *bar_cmd_separator_symbol(int argc, char **argv) { | |||
13 | } | 13 | } |
14 | free(config->current_bar->separator_symbol); | 14 | free(config->current_bar->separator_symbol); |
15 | config->current_bar->separator_symbol = strdup(argv[0]); | 15 | config->current_bar->separator_symbol = strdup(argv[0]); |
16 | wlr_log(WLR_DEBUG, "Settings separator_symbol '%s' for bar: %s", | 16 | sway_log(SWAY_DEBUG, "Settings separator_symbol '%s' for bar: %s", |
17 | config->current_bar->separator_symbol, config->current_bar->id); | 17 | config->current_bar->separator_symbol, config->current_bar->id); |
18 | return cmd_results_new(CMD_SUCCESS, NULL); | 18 | return cmd_results_new(CMD_SUCCESS, NULL); |
19 | } | 19 | } |
diff --git a/sway/commands/bar/status_command.c b/sway/commands/bar/status_command.c index c379cc72..0b58e5fa 100644 --- a/sway/commands/bar/status_command.c +++ b/sway/commands/bar/status_command.c | |||
@@ -17,7 +17,7 @@ struct cmd_results *bar_cmd_status_command(int argc, char **argv) { | |||
17 | char *new_command = join_args(argv, argc); | 17 | char *new_command = join_args(argv, argc); |
18 | if (strcmp(new_command, "-") != 0) { | 18 | if (strcmp(new_command, "-") != 0) { |
19 | config->current_bar->status_command = new_command; | 19 | config->current_bar->status_command = new_command; |
20 | wlr_log(WLR_DEBUG, "Feeding bar with status command: %s", | 20 | sway_log(SWAY_DEBUG, "Feeding bar with status command: %s", |
21 | config->current_bar->status_command); | 21 | config->current_bar->status_command); |
22 | } else { | 22 | } else { |
23 | free(new_command); | 23 | free(new_command); |
diff --git a/sway/commands/bar/status_edge_padding.c b/sway/commands/bar/status_edge_padding.c index 565ab9a9..75ef86f0 100644 --- a/sway/commands/bar/status_edge_padding.c +++ b/sway/commands/bar/status_edge_padding.c | |||
@@ -15,7 +15,7 @@ struct cmd_results *bar_cmd_status_edge_padding(int argc, char **argv) { | |||
15 | "Padding must be a positive integer"); | 15 | "Padding must be a positive integer"); |
16 | } | 16 | } |
17 | config->current_bar->status_edge_padding = padding; | 17 | config->current_bar->status_edge_padding = padding; |
18 | wlr_log(WLR_DEBUG, "Status edge padding on bar %s: %d", | 18 | sway_log(SWAY_DEBUG, "Status edge padding on bar %s: %d", |
19 | config->current_bar->id, config->current_bar->status_edge_padding); | 19 | config->current_bar->id, config->current_bar->status_edge_padding); |
20 | return cmd_results_new(CMD_SUCCESS, NULL); | 20 | return cmd_results_new(CMD_SUCCESS, NULL); |
21 | } | 21 | } |
diff --git a/sway/commands/bar/status_padding.c b/sway/commands/bar/status_padding.c index 7a69a25d..0c65e516 100644 --- a/sway/commands/bar/status_padding.c +++ b/sway/commands/bar/status_padding.c | |||
@@ -15,7 +15,7 @@ struct cmd_results *bar_cmd_status_padding(int argc, char **argv) { | |||
15 | "Padding must be a positive integer"); | 15 | "Padding must be a positive integer"); |
16 | } | 16 | } |
17 | config->current_bar->status_padding = padding; | 17 | config->current_bar->status_padding = padding; |
18 | wlr_log(WLR_DEBUG, "Status padding on bar %s: %d", | 18 | sway_log(SWAY_DEBUG, "Status padding on bar %s: %d", |
19 | config->current_bar->id, config->current_bar->status_padding); | 19 | config->current_bar->id, config->current_bar->status_padding); |
20 | return cmd_results_new(CMD_SUCCESS, NULL); | 20 | return cmd_results_new(CMD_SUCCESS, NULL); |
21 | } | 21 | } |
diff --git a/sway/commands/bar/strip_workspace_name.c b/sway/commands/bar/strip_workspace_name.c index b74afd6e..1aa39359 100644 --- a/sway/commands/bar/strip_workspace_name.c +++ b/sway/commands/bar/strip_workspace_name.c | |||
@@ -20,10 +20,10 @@ struct cmd_results *bar_cmd_strip_workspace_name(int argc, char **argv) { | |||
20 | if (config->current_bar->strip_workspace_name) { | 20 | if (config->current_bar->strip_workspace_name) { |
21 | config->current_bar->strip_workspace_numbers = false; | 21 | config->current_bar->strip_workspace_numbers = false; |
22 | 22 | ||
23 | wlr_log(WLR_DEBUG, "Stripping workspace name on bar: %s", | 23 | sway_log(SWAY_DEBUG, "Stripping workspace name on bar: %s", |
24 | config->current_bar->id); | 24 | config->current_bar->id); |
25 | } else { | 25 | } else { |
26 | wlr_log(WLR_DEBUG, "Enabling workspace name on bar: %s", | 26 | sway_log(SWAY_DEBUG, "Enabling workspace name on bar: %s", |
27 | config->current_bar->id); | 27 | config->current_bar->id); |
28 | } | 28 | } |
29 | 29 | ||
diff --git a/sway/commands/bar/strip_workspace_numbers.c b/sway/commands/bar/strip_workspace_numbers.c index 9c6ec228..56c4c4a1 100644 --- a/sway/commands/bar/strip_workspace_numbers.c +++ b/sway/commands/bar/strip_workspace_numbers.c | |||
@@ -20,10 +20,10 @@ struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) { | |||
20 | if (config->current_bar->strip_workspace_numbers) { | 20 | if (config->current_bar->strip_workspace_numbers) { |
21 | config->current_bar->strip_workspace_name = false; | 21 | config->current_bar->strip_workspace_name = false; |
22 | 22 | ||
23 | wlr_log(WLR_DEBUG, "Stripping workspace numbers on bar: %s", | 23 | sway_log(SWAY_DEBUG, "Stripping workspace numbers on bar: %s", |
24 | config->current_bar->id); | 24 | config->current_bar->id); |
25 | } else { | 25 | } else { |
26 | wlr_log(WLR_DEBUG, "Enabling workspace numbers on bar: %s", | 26 | sway_log(SWAY_DEBUG, "Enabling workspace numbers on bar: %s", |
27 | config->current_bar->id); | 27 | config->current_bar->id); |
28 | } | 28 | } |
29 | 29 | ||
diff --git a/sway/commands/bar/swaybar_command.c b/sway/commands/bar/swaybar_command.c index 6253e2b1..b54bafa9 100644 --- a/sway/commands/bar/swaybar_command.c +++ b/sway/commands/bar/swaybar_command.c | |||
@@ -13,7 +13,7 @@ struct cmd_results *bar_cmd_swaybar_command(int argc, char **argv) { | |||
13 | } | 13 | } |
14 | free(config->current_bar->swaybar_command); | 14 | free(config->current_bar->swaybar_command); |
15 | config->current_bar->swaybar_command = join_args(argv, argc); | 15 | config->current_bar->swaybar_command = join_args(argv, argc); |
16 | wlr_log(WLR_DEBUG, "Using custom swaybar command: %s", | 16 | sway_log(SWAY_DEBUG, "Using custom swaybar command: %s", |
17 | config->current_bar->swaybar_command); | 17 | config->current_bar->swaybar_command); |
18 | return cmd_results_new(CMD_SUCCESS, NULL); | 18 | return cmd_results_new(CMD_SUCCESS, NULL); |
19 | } | 19 | } |
diff --git a/sway/commands/bar/tray_bind.c b/sway/commands/bar/tray_bind.c index 48a15462..7fe67c42 100644 --- a/sway/commands/bar/tray_bind.c +++ b/sway/commands/bar/tray_bind.c | |||
@@ -67,7 +67,7 @@ static struct cmd_results *tray_bind(int argc, char **argv, bool code) { | |||
67 | other->command = binding->command; | 67 | other->command = binding->command; |
68 | free(binding); | 68 | free(binding); |
69 | binding = other; | 69 | binding = other; |
70 | wlr_log(WLR_DEBUG, | 70 | sway_log(SWAY_DEBUG, |
71 | "[bar %s] Updated tray binding for %u (%s) to %s", | 71 | "[bar %s] Updated tray binding for %u (%s) to %s", |
72 | config->current_bar->id, binding->button, name, | 72 | config->current_bar->id, binding->button, name, |
73 | binding->command); | 73 | binding->command); |
@@ -76,7 +76,7 @@ static struct cmd_results *tray_bind(int argc, char **argv, bool code) { | |||
76 | } | 76 | } |
77 | if (!overwritten) { | 77 | if (!overwritten) { |
78 | wl_list_insert(&config->current_bar->tray_bindings, &binding->link); | 78 | wl_list_insert(&config->current_bar->tray_bindings, &binding->link); |
79 | wlr_log(WLR_DEBUG, "[bar %s] Added tray binding for %u (%s) to %s", | 79 | sway_log(SWAY_DEBUG, "[bar %s] Added tray binding for %u (%s) to %s", |
80 | config->current_bar->id, binding->button, name, | 80 | config->current_bar->id, binding->button, name, |
81 | binding->command); | 81 | binding->command); |
82 | } | 82 | } |
diff --git a/sway/commands/bar/tray_output.c b/sway/commands/bar/tray_output.c index d45c09c6..16e16f60 100644 --- a/sway/commands/bar/tray_output.c +++ b/sway/commands/bar/tray_output.c | |||
@@ -23,13 +23,13 @@ struct cmd_results *bar_cmd_tray_output(int argc, char **argv) { | |||
23 | } | 23 | } |
24 | 24 | ||
25 | if (strcmp(argv[0], "none") == 0) { | 25 | if (strcmp(argv[0], "none") == 0) { |
26 | wlr_log(WLR_DEBUG, "Hiding tray on bar: %s", config->current_bar->id); | 26 | sway_log(SWAY_DEBUG, "Hiding tray on bar: %s", config->current_bar->id); |
27 | for (int i = 0; i < outputs->length; ++i) { | 27 | for (int i = 0; i < outputs->length; ++i) { |
28 | free(outputs->items[i]); | 28 | free(outputs->items[i]); |
29 | } | 29 | } |
30 | outputs->length = 0; | 30 | outputs->length = 0; |
31 | } else { | 31 | } else { |
32 | wlr_log(WLR_DEBUG, "Showing tray on output '%s' for bar: %s", argv[0], | 32 | sway_log(SWAY_DEBUG, "Showing tray on output '%s' for bar: %s", argv[0], |
33 | config->current_bar->id); | 33 | config->current_bar->id); |
34 | } | 34 | } |
35 | list_add(outputs, strdup(argv[0])); | 35 | list_add(outputs, strdup(argv[0])); |
diff --git a/sway/commands/bar/tray_padding.c b/sway/commands/bar/tray_padding.c index 1e8b294b..f43cfe4f 100644 --- a/sway/commands/bar/tray_padding.c +++ b/sway/commands/bar/tray_padding.c | |||
@@ -32,7 +32,7 @@ struct cmd_results *bar_cmd_tray_padding(int argc, char **argv) { | |||
32 | "Expected 'tray_padding <px> [px]'"); | 32 | "Expected 'tray_padding <px> [px]'"); |
33 | } | 33 | } |
34 | 34 | ||
35 | wlr_log(WLR_DEBUG, "[Bar %s] Setting tray padding to %d", bar->id, padding); | 35 | sway_log(SWAY_DEBUG, "[Bar %s] Setting tray padding to %d", bar->id, padding); |
36 | config->current_bar->tray_padding = padding; | 36 | config->current_bar->tray_padding = padding; |
37 | return cmd_results_new(CMD_SUCCESS, NULL); | 37 | return cmd_results_new(CMD_SUCCESS, NULL); |
38 | #else | 38 | #else |
diff --git a/sway/commands/bar/workspace_buttons.c b/sway/commands/bar/workspace_buttons.c index 773e6357..792ef605 100644 --- a/sway/commands/bar/workspace_buttons.c +++ b/sway/commands/bar/workspace_buttons.c | |||
@@ -15,10 +15,10 @@ struct cmd_results *bar_cmd_workspace_buttons(int argc, char **argv) { | |||
15 | config->current_bar->workspace_buttons = | 15 | config->current_bar->workspace_buttons = |
16 | parse_boolean(argv[0], config->current_bar->workspace_buttons); | 16 | parse_boolean(argv[0], config->current_bar->workspace_buttons); |
17 | if (config->current_bar->workspace_buttons) { | 17 | if (config->current_bar->workspace_buttons) { |
18 | wlr_log(WLR_DEBUG, "Enabling workspace buttons on bar: %s", | 18 | sway_log(SWAY_DEBUG, "Enabling workspace buttons on bar: %s", |
19 | config->current_bar->id); | 19 | config->current_bar->id); |
20 | } else { | 20 | } else { |
21 | wlr_log(WLR_DEBUG, "Disabling workspace buttons on bar: %s", | 21 | sway_log(SWAY_DEBUG, "Disabling workspace buttons on bar: %s", |
22 | config->current_bar->id); | 22 | config->current_bar->id); |
23 | } | 23 | } |
24 | return cmd_results_new(CMD_SUCCESS, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL); |
diff --git a/sway/commands/bar/wrap_scroll.c b/sway/commands/bar/wrap_scroll.c index 2f7bb090..decd238d 100644 --- a/sway/commands/bar/wrap_scroll.c +++ b/sway/commands/bar/wrap_scroll.c | |||
@@ -15,10 +15,10 @@ struct cmd_results *bar_cmd_wrap_scroll(int argc, char **argv) { | |||
15 | config->current_bar->wrap_scroll = | 15 | config->current_bar->wrap_scroll = |
16 | parse_boolean(argv[0], config->current_bar->wrap_scroll); | 16 | parse_boolean(argv[0], config->current_bar->wrap_scroll); |
17 | if (config->current_bar->wrap_scroll) { | 17 | if (config->current_bar->wrap_scroll) { |
18 | wlr_log(WLR_DEBUG, "Enabling wrap scroll on bar: %s", | 18 | sway_log(SWAY_DEBUG, "Enabling wrap scroll on bar: %s", |
19 | config->current_bar->id); | 19 | config->current_bar->id); |
20 | } else { | 20 | } else { |
21 | wlr_log(WLR_DEBUG, "Disabling wrap scroll on bar: %s", | 21 | sway_log(SWAY_DEBUG, "Disabling wrap scroll on bar: %s", |
22 | config->current_bar->id); | 22 | config->current_bar->id); |
23 | } | 23 | } |
24 | return cmd_results_new(CMD_SUCCESS, NULL); | 24 | return cmd_results_new(CMD_SUCCESS, NULL); |