diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-05-30 13:20:02 -0400 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-06-02 08:07:44 -0400 |
commit | 7c810dc344c28d1876c5ee158cb0806289d0f813 (patch) | |
tree | dbe756bceca42ea6f9a6cf5e5771037417bb64c3 /sway/config.c | |
parent | 2d480e754e8287ba747faf1b21d8ecb927d565a1 (diff) |
Make command block implementation generic
Diffstat (limited to 'sway/config.c')
-rw-r--r-- | sway/config.c | 156 |
1 files changed, 37 insertions, 119 deletions
diff --git a/sway/config.c b/sway/config.c index 27308066..26e6f3e3 100644 --- a/sway/config.c +++ b/sway/config.c @@ -59,12 +59,12 @@ static void free_mode(struct sway_mode *mode) { } void free_config(struct sway_config *config) { - config_clear_handler_context(config); - if (!config) { return; } + memset(&config->handler_context, 0, sizeof(config->handler_context)); + // TODO: handle all currently unhandled lists as we add implementations if (config->symbols) { for (int i = 0; i < config->symbols->length; ++i) { @@ -107,7 +107,6 @@ void free_config(struct sway_config *config) { list_free(config->command_policies); list_free(config->feature_policies); list_free(config->ipc_policies); - free(config->current_bar); free(config->floating_scroll_up_cmd); free(config->floating_scroll_down_cmd); free(config->floating_scroll_left_cmd); @@ -514,37 +513,41 @@ bool load_include_configs(const char *path, struct sway_config *config) { return true; } -void config_clear_handler_context(struct sway_config *config) { - free_input_config(config->handler_context.input_config); - free_seat_config(config->handler_context.seat_config); - - memset(&config->handler_context, 0, sizeof(config->handler_context)); -} - bool read_config(FILE *file, struct sway_config *config) { bool success = true; - enum cmd_status block = CMD_BLOCK_END; - int line_number = 0; char *line; + list_t *stack = create_list(); while (!feof(file)) { + char *block = stack->length ? stack->items[0] : NULL; line = read_line(file); if (!line) { continue; } line_number++; + wlr_log(L_DEBUG, "Read line %d: %s", line_number, line); line = strip_whitespace(line); if (line[0] == '#') { free(line); continue; } + if (strlen(line) == 0) { + free(line); + continue; + } + char *full = calloc(strlen(block ? block : "") + strlen(line) + 2, 1); + strcat(full, block ? block : ""); + strcat(full, block ? " " : ""); + strcat(full, line); + wlr_log(L_DEBUG, "Expanded line: %s", full); struct cmd_results *res; - if (block == CMD_BLOCK_COMMANDS) { + if (block && strcmp(block, "<commands>") == 0) { // Special case - res = config_commands_command(line); + res = config_commands_command(full); } else { - res = config_command(line, block); + res = config_command(full); } + free(full); switch(res->status) { case CMD_FAILURE: case CMD_INVALID: @@ -558,126 +561,41 @@ bool read_config(FILE *file, struct sway_config *config) { list_add(config->cmd_queue, strdup(line)); break; - case CMD_BLOCK_MODE: - if (block == CMD_BLOCK_END) { - block = CMD_BLOCK_MODE; - } else { - wlr_log(L_ERROR, "Invalid block '%s'", line); - } - break; - - case CMD_BLOCK_INPUT: - if (block == CMD_BLOCK_END) { - block = CMD_BLOCK_INPUT; - } else { - wlr_log(L_ERROR, "Invalid block '%s'", line); - } - break; - - case CMD_BLOCK_SEAT: - if (block == CMD_BLOCK_END) { - block = CMD_BLOCK_SEAT; - } else { - wlr_log(L_ERROR, "Invalid block '%s'", line); - } - break; - - case CMD_BLOCK_BAR: - if (block == CMD_BLOCK_END) { - block = CMD_BLOCK_BAR; - } else { - wlr_log(L_ERROR, "Invalid block '%s'", line); - } - break; - - case CMD_BLOCK_BAR_COLORS: - if (block == CMD_BLOCK_BAR) { - block = CMD_BLOCK_BAR_COLORS; - } else { - wlr_log(L_ERROR, "Invalid block '%s'", line); - } - break; - case CMD_BLOCK_COMMANDS: - if (block == CMD_BLOCK_END) { - block = CMD_BLOCK_COMMANDS; - } else { - wlr_log(L_ERROR, "Invalid block '%s'", line); - } - break; - - case CMD_BLOCK_IPC: - if (block == CMD_BLOCK_END) { - block = CMD_BLOCK_IPC; - } else { - wlr_log(L_ERROR, "Invalid block '%s'", line); - } + wlr_log(L_DEBUG, "Entering commands block"); + list_insert(stack, 0, "<commands>"); break; - case CMD_BLOCK_IPC_EVENTS: - if (block == CMD_BLOCK_IPC) { - block = CMD_BLOCK_IPC_EVENTS; - } else { - wlr_log(L_ERROR, "Invalid block '%s'", line); + case CMD_BLOCK: + wlr_log(L_DEBUG, "Entering block '%s'", res->input); + list_insert(stack, 0, strdup(res->input)); + if (strcmp(res->input, "bar") == 0) { + config->current_bar = NULL; } break; case CMD_BLOCK_END: - switch(block) { - case CMD_BLOCK_MODE: - wlr_log(L_DEBUG, "End of mode block"); - config->current_mode = config->modes->items[0]; - block = CMD_BLOCK_END; - break; - - case CMD_BLOCK_INPUT: - wlr_log(L_DEBUG, "End of input block"); - block = CMD_BLOCK_END; - break; - - case CMD_BLOCK_SEAT: - wlr_log(L_DEBUG, "End of seat block"); - block = CMD_BLOCK_END; + if (!block) { + wlr_log(L_DEBUG, "Unmatched '}' on line %i", line_number); + success = false; break; + } + wlr_log(L_DEBUG, "Exiting block '%s'", block); + list_del(stack, 0); + free(block); - case CMD_BLOCK_BAR: - wlr_log(L_DEBUG, "End of bar block"); + if (strcmp(block, "bar") == 0) { config->current_bar = NULL; - block = CMD_BLOCK_END; - break; - - case CMD_BLOCK_BAR_COLORS: - wlr_log(L_DEBUG, "End of bar colors block"); - block = CMD_BLOCK_BAR; - break; - - case CMD_BLOCK_COMMANDS: - wlr_log(L_DEBUG, "End of commands block"); - block = CMD_BLOCK_END; - break; - - case CMD_BLOCK_IPC: - wlr_log(L_DEBUG, "End of IPC block"); - block = CMD_BLOCK_END; - break; - - case CMD_BLOCK_IPC_EVENTS: - wlr_log(L_DEBUG, "End of IPC events block"); - block = CMD_BLOCK_IPC; - break; - - case CMD_BLOCK_END: - wlr_log(L_ERROR, "Unmatched }"); - break; - - default:; } - config_clear_handler_context(config); + memset(&config->handler_context, 0, + sizeof(config->handler_context)); default:; } free(line); free_cmd_results(res); } + list_foreach(stack, free); + list_free(stack); return success; } |