aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/output
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-11-28 11:08:54 -0500
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-11-28 11:09:01 -0500
commite5f90f25d755b19151dfcfd98790c1bad3eb8068 (patch)
treec6af192b469e6cf86ee00cb5d0ab4e03a98bacae /sway/commands/output
parentMerge pull request #3211 from emersion/child-view-unmapped-segfault (diff)
downloadsway-e5f90f25d755b19151dfcfd98790c1bad3eb8068.tar.gz
sway-e5f90f25d755b19151dfcfd98790c1bad3eb8068.tar.zst
sway-e5f90f25d755b19151dfcfd98790c1bad3eb8068.zip
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/output')
-rw-r--r--sway/commands/output/background.c7
1 files changed, 2 insertions, 5 deletions
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) {
116 if (!can_access) { 116 if (!can_access) {
117 wlr_log(WLR_ERROR, "Unable to access background file '%s': %s", 117 wlr_log(WLR_ERROR, "Unable to access background file '%s': %s",
118 src, strerror(errno)); 118 src, strerror(errno));
119 if (config->reading && !config->validating) { 119 config_add_swaynag_warning("Unable to access background file '%s'",
120 swaynag_log(config->swaynag_command, 120 src);
121 &config->swaynag_config_errors,
122 "Unable to access background file '%s'", src);
123 }
124 free(src); 121 free(src);
125 } else { 122 } else {
126 // Escape double quotes in the final path for swaybg 123 // Escape double quotes in the final path for swaybg