diff options
| author | Brian Ashworth <bosrsf04@gmail.com> | 2018-11-28 11:08:54 -0500 |
|---|---|---|
| committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-11-28 11:09:01 -0500 |
| commit | e5f90f25d755b19151dfcfd98790c1bad3eb8068 (patch) | |
| tree | c6af192b469e6cf86ee00cb5d0ab4e03a98bacae /sway/commands | |
| parent | a22d0c0ff60469d57de733bb767333d5b222df2d (diff) | |
Introduce a way to show config warnings in swaynag
Adds the function `config_add_swaynag_warning(char *fmt, ...)` so that
handlers can add warnings to the swaynag config log in a uniform way.
The formatting is identical to errors and include the line number, line,
and config path.
This also alters the background file access warning to use the function
and introduces a warning for duplicate bindings.
Diffstat (limited to 'sway/commands')
| -rw-r--r-- | sway/commands/bind.c | 8 | ||||
| -rw-r--r-- | sway/commands/output/background.c | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sway/commands/bind.c b/sway/commands/bind.c index 34881b0f..9112815f 100644 --- a/sway/commands/bind.c +++ b/sway/commands/bind.c @@ -255,8 +255,12 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv, for (int i = 0; i < mode_bindings->length; ++i) { struct sway_binding *config_binding = mode_bindings->items[i]; if (binding_key_compare(binding, config_binding)) { - wlr_log(WLR_DEBUG, "overwriting old binding with command '%s'", - config_binding->command); + wlr_log(WLR_INFO, "Overwriting binding '%s' for device '%s' " + "from `%s` to `%s`", argv[0], binding->input, + binding->command, config_binding->command); + config_add_swaynag_warning("Overwriting binding '%s' for device " + "'%s' to `%s` from `%s`", argv[0], binding->input, + binding->command, config_binding->command); free_sway_binding(config_binding); mode_bindings->items[i] = binding; overwritten = true; diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c index 30fb47c4..2cd1b76a 100644 --- a/sway/commands/output/background.c +++ b/sway/commands/output/background.c @@ -116,11 +116,8 @@ struct cmd_results *output_cmd_background(int argc, char **argv) { if (!can_access) { wlr_log(WLR_ERROR, "Unable to access background file '%s': %s", src, strerror(errno)); - if (config->reading && !config->validating) { - swaynag_log(config->swaynag_command, - &config->swaynag_config_errors, - "Unable to access background file '%s'", src); - } + config_add_swaynag_warning("Unable to access background file '%s'", + src); free(src); } else { // Escape double quotes in the final path for swaybg |