alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

add config handlers

Browse source
This commit is contained in:
Tony Crisci 2018-02-24 13:34:47 -05:00
parent 7262bf655f
commit 2154b7c7d6
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sway/commands.c
View file

@ -138,10 +138,17 @@ static struct cmd_handler handlers[] = {
{ "input", cmd_input },
{ "output", cmd_output },
{ "seat", cmd_seat },
{ "set", cmd_set },
{ "workspace", cmd_workspace },
};
/**
* Commands that can *only* run in the config loading context
* Keep alphabetized
*/
static struct cmd_handler config_handlers[] = {
{ "set", cmd_set },
};
/**
* Commands that can *not* run in the config loading context
* Keep alphabetized
@ -215,6 +222,16 @@ static struct cmd_handler *find_handler(char *line, enum cmd_status block) {
}
}
if (config->reading) {
res = bsearch(&d, config_handlers,
sizeof(config_handlers) / sizeof(struct cmd_handler),
sizeof(struct cmd_handler), handler_compare);
if (res) {
return res;
}
}
res = bsearch(&d, handlers,
sizeof(handlers) / sizeof(struct cmd_handler),
sizeof(struct cmd_handler), handler_compare);

1
sway/commands/set.c
View file

@ -27,7 +27,6 @@ void free_sway_variable(struct sway_variable *var) {
struct cmd_results *cmd_set(int argc, char **argv) {
char *tmp;
struct cmd_results *error = NULL;
if (!config->reading) return cmd_results_new(CMD_FAILURE, "set", "Can only be used in config file.");
if ((error = checkarg(argc, "set", EXPECTED_AT_LEAST, 2))) {
return error;
}