mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-30 17:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3202 from RedSoxFan/swaynag-config-warnings

Browse source 
Introduce a way to show config warnings in swaynag
This commit is contained in:
emersion 2018-11-28 17:13:24 +01:00 committed by GitHub
commit ef18745951
Failed to generate hash of commit
4 changed files with 43 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/sway/config.h
View file

@ -425,6 +425,8 @@ struct sway_config {
list_t *config_chain;
const char *current_config_path;
const char *current_config;
int current_config_line_number;
char *current_config_line;
enum sway_container_border border;
enum sway_container_border floating_border;
@ -489,6 +491,11 @@ bool load_include_configs(const char *path, struct sway_config *config,
bool read_config(FILE *file, struct sway_config *config,
struct swaynag_instance *swaynag);
/**
* Adds a warning entry to the swaynag instance used for errors.
*/
void config_add_swaynag_warning(char *fmt, ...);
/**
* Free config struct
*/

8
sway/commands/bind.c
View file

@ -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;

7
sway/commands/output/background.c
View file

@ -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

28
sway/config.c
View file

@ -700,6 +700,8 @@ bool read_config(FILE *file, struct sway_config *config,
free(line);
return false;
}
config->current_config_line_number = line_number;
config->current_config_line = line;
struct cmd_results *res;
if (block && strcmp(block, "<commands>") == 0) {
// Special case
@ -761,10 +763,36 @@ bool read_config(FILE *file, struct sway_config *config,
}
list_foreach(stack, free);
list_free(stack);
config->current_config_line_number = 0;
config->current_config_line = NULL;
return success;
}
void config_add_swaynag_warning(char *fmt, ...) {
if (config->reading && !config->validating) {
va_list args;
va_start(args, fmt);
size_t length = vsnprintf(NULL, 0, fmt, args) + 1;
va_end(args);
char *temp = malloc(length + 1);
if (!temp) {
wlr_log(WLR_ERROR, "Failed to allocate buffer for warning.");
return;
}
va_start(args, fmt);
vsnprintf(temp, length, fmt, args);
va_end(args);
swaynag_log(config->swaynag_command, &config->swaynag_config_errors,
"Warning on line %i (%s) '%s': %s",
config->current_config_line_number, config->current_config_path,
config->current_config_line, temp);
}
}
char *do_var_replacement(char *str) {
int i;
char *find = str;