diff options
| -rw-r--r-- | include/commands.h | 6 | ||||
| -rw-r--r-- | sway/commands.c | 50 | ||||
| -rw-r--r-- | sway/config.c | 4 |
3 files changed, 32 insertions, 28 deletions
diff --git a/include/commands.h b/include/commands.h index 31bc0b0b..62f8166e 100644 --- a/include/commands.h +++ b/include/commands.h @@ -9,7 +9,11 @@ struct cmd_handler { // if <0 command is deffered until compositor is ready. // if =0 command can be called anytime. // if >0 command can only be called via keybind, ignored in config - int config_type; + enum { + CMD_COMPOSITOR_READY, + CMD_KEYBIND, + CMD_ANYTIME + } config_type; }; struct cmd_handler *find_handler(char *line); diff --git a/sway/commands.c b/sway/commands.c index fe480f0c..0fc98538 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -860,31 +860,31 @@ static bool cmd_ws_auto_back_and_forth(struct sway_config *config, int argc, cha /* Keep alphabetized */ static struct cmd_handler handlers[] = { - { "bindsym", cmd_bindsym, 0 }, - { "default_orientation", cmd_orientation, 0}, - { "exec", cmd_exec, -1 }, - { "exec_always", cmd_exec_always, -1 }, - { "exit", cmd_exit, 1 }, - { "floating", cmd_floating, 1 }, - { "floating_modifier", cmd_floating_mod, 0 }, - { "focus", cmd_focus, 1 }, - { "focus_follows_mouse", cmd_focus_follows_mouse, 0 }, - { "fullscreen", cmd_fullscreen, 1 }, - { "gaps", cmd_gaps, 0 }, - { "kill", cmd_kill, 1 }, - { "layout", cmd_layout, 1 }, - { "log_colors", cmd_log_colors, 0 }, - { "move", cmd_move, 1 }, - { "output", cmd_output, 0 }, - { "reload", cmd_reload, 1 }, - { "resize", cmd_resize, 1 }, - { "scratchpad", cmd_scratchpad, 1 }, - { "set", cmd_set, 0 }, - { "split", cmd_split, 1 }, - { "splith", cmd_splith, 1 }, - { "splitv", cmd_splitv, 1 }, - { "workspace", cmd_workspace, -1 }, - { "workspace_auto_back_and_forth", cmd_ws_auto_back_and_forth, 0 } + { "bindsym", cmd_bindsym, CMD_ANYTIME }, + { "default_orientation", cmd_orientation, CMD_ANYTIME}, + { "exec", cmd_exec, CMD_COMPOSITOR_READY }, + { "exec_always", cmd_exec_always, CMD_COMPOSITOR_READY }, + { "exit", cmd_exit, CMD_KEYBIND }, + { "floating", cmd_floating, CMD_KEYBIND }, + { "floating_modifier", cmd_floating_mod, CMD_ANYTIME }, + { "focus", cmd_focus, CMD_KEYBIND }, + { "focus_follows_mouse", cmd_focus_follows_mouse, CMD_ANYTIME }, + { "fullscreen", cmd_fullscreen, CMD_KEYBIND }, + { "gaps", cmd_gaps, CMD_ANYTIME }, + { "kill", cmd_kill, CMD_KEYBIND }, + { "layout", cmd_layout, CMD_KEYBIND }, + { "log_colors", cmd_log_colors, CMD_ANYTIME }, + { "move", cmd_move, CMD_KEYBIND }, + { "output", cmd_output, CMD_ANYTIME }, + { "reload", cmd_reload, CMD_KEYBIND }, + { "resize", cmd_resize, CMD_KEYBIND }, + { "scratchpad", cmd_scratchpad, CMD_KEYBIND }, + { "set", cmd_set, CMD_ANYTIME }, + { "split", cmd_split, CMD_KEYBIND }, + { "splith", cmd_splith, CMD_KEYBIND }, + { "splitv", cmd_splitv, CMD_KEYBIND }, + { "workspace", cmd_workspace, CMD_COMPOSITOR_READY }, + { "workspace_auto_back_and_forth", cmd_ws_auto_back_and_forth, CMD_ANYTIME }, }; static char **split_directive(char *line, int *argc) { diff --git a/sway/config.c b/sway/config.c index cbaab11e..90f6529a 100644 --- a/sway/config.c +++ b/sway/config.c @@ -220,9 +220,9 @@ bool read_config(FILE *file, bool is_active) { list_t *args = split_string(line, " "); struct cmd_handler *handler; if ((handler = find_handler(args->items[0]))) { - if (handler->config_type > 0) { + if (handler->config_type == CMD_KEYBIND) { sway_log(L_ERROR, "Invalid command during config ``%s''", line); - } else if (handler->config_type < 0 && !is_active) { + } else if (handler->config_type == CMD_COMPOSITOR_READY && !is_active) { sway_log(L_DEBUG, "Deferring command ``%s''", line); char *cmd = malloc(strlen(line) + 1); strcpy(cmd, line); |