mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-08 13:29:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Show swaynag on config errors

Browse source
This commit is contained in:
Brian Ashworth 2018-08-01 23:54:40 -04:00
parent 3e2bf7f3a5
commit f9a6407111
6 changed files with 118 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
sway/commands/include.c
View file

@ -7,8 +7,19 @@ struct cmd_results *cmd_include(int argc, char **argv) {
return error;
}
if (!load_include_configs(argv[0], config)) {
return cmd_results_new(CMD_INVALID, "include", "Failed to include sub configuration file: %s", argv[0]);
char *errors = NULL;
if (!load_include_configs(argv[0], config, &errors)) {
struct cmd_results *result = cmd_results_new(CMD_INVALID, "include",
"Failed to include sub configuration file: %s", argv[0]);
free(errors);
return result;
}
if (errors) {
struct cmd_results *result = cmd_results_new(CMD_INVALID, "include",
"There are errors in the included config\n%s", errors);
free(errors);
return result;
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL);

19
sway/commands/reload.c
View file

@ -1,4 +1,5 @@
#define _XOPEN_SOURCE 500
#include <signal.h>
#include <string.h>
#include "sway/commands.h"
#include "sway/config.h"
@ -19,8 +20,11 @@ struct cmd_results *cmd_reload(int argc, char **argv) {
list_add(bar_ids, strdup(bar->id));
}
if (!load_main_config(config->current_config_path, true)) {
return cmd_results_new(CMD_FAILURE, "reload", "Error(s) reloading config.");
char *errors = NULL;
if (!load_main_config(config->current_config_path, true, &errors)) {
free(errors);
return cmd_results_new(CMD_FAILURE, "reload",
"Error(s) reloading config.");
}
ipc_event_workspace(NULL, NULL, "reload");
@ -42,5 +46,16 @@ struct cmd_results *cmd_reload(int argc, char **argv) {
list_free(bar_ids);
arrange_windows(&root_container);
if (config->swaynag_pid > 0) {
kill(config->swaynag_pid, SIGTERM);
config->swaynag_pid = -1;
}
if (errors) {
spawn_swaynag_config_errors(config, errors);
free(errors);
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}