diff options
| -rw-r--r-- | src/config.c | 30 | ||||
| -rw-r--r-- | src/main.c | 6 |
2 files changed, 28 insertions, 8 deletions
diff --git a/src/config.c b/src/config.c index f1bf915..834bc46 100644 --- a/src/config.c +++ b/src/config.c @@ -242,7 +242,7 @@ bool parse_option(struct tofi *tofi, size_t lineno, const char *option, const ch } tofi->window.entry.font_name = strdup(value); } else if (strcasecmp(option, "font-size") == 0) { - tofi->window.entry.padding = parse_uint32(lineno, value, &err); + tofi->window.entry.font_size = parse_uint32(lineno, value, &err); } else if (strcasecmp(option, "num-results") == 0) { tofi->window.entry.num_results = parse_uint32(lineno, value, &err); } else if (strcasecmp(option, "outline-width") == 0) { @@ -287,7 +287,9 @@ bool parse_option(struct tofi *tofi, size_t lineno, const char *option, const ch void apply_option(struct tofi *tofi, const char *option, const char *value) { - parse_option(tofi, 0, option, value); + if (!parse_option(tofi, 0, option, value)) { + exit(EXIT_FAILURE); + }; } char *get_config_path() @@ -354,9 +356,13 @@ int parse_anchor(size_t lineno, const char *str, bool *err) return ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT; } if (strcasecmp(str, "center") == 0) { - return 0; + return ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP + | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM + | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT + | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; } PARSE_ERROR(lineno, "Invalid anchor \"%s\".\n", str); + *err = true; return 0; } @@ -369,11 +375,17 @@ uint32_t parse_uint32(size_t lineno, const char *str, bool *err) { errno = 0; char *endptr; - uint32_t ret = strtoul(str, &endptr, 0); + int32_t ret = strtoul(str, &endptr, 0); if (endptr == str) { PARSE_ERROR(lineno, "Failed to parse \"%s\" as unsigned int.\n", str); - } else if (errno) { + if (err) { + *err = true; + } + } else if (errno || ret < 0) { PARSE_ERROR(lineno, "Unsigned int value \"%s\" out of range.\n", str); + if (err) { + *err = true; + } } return ret; } @@ -382,11 +394,17 @@ int32_t parse_int32(size_t lineno, const char *str, bool *err) { errno = 0; char *endptr; - uint32_t ret = strtol(str, &endptr, 0); + int32_t ret = strtol(str, &endptr, 0); if (endptr == str) { PARSE_ERROR(lineno, "Failed to parse \"%s\" as int.\n", str); + if (err) { + *err = true; + } } else if (errno) { PARSE_ERROR(lineno, "Int value \"%s\" out of range.\n", str); + if (err) { + *err = true; + } } return ret; } @@ -600,10 +600,11 @@ static void parse_args(struct tofi *tofi, int argc, char *argv[]) {"hide-cursor", required_argument, NULL, 0}, {NULL, 0, NULL, 0} }; - const char *short_options = "hc:"; + const char *short_options = ":hc:"; bool load_default_config = true; int option_index = 0; + opterr = 0; /* First pass, just check for config file, help, and errors. */ int opt = getopt_long(argc, argv, short_options, long_options, &option_index); @@ -680,6 +681,8 @@ int main(int argc, char *argv[]) } }; + parse_args(&tofi, argc, argv); + log_debug("Generating command list.\n"); log_indent(); tofi.window.entry.history = history_load(); @@ -689,7 +692,6 @@ int main(int argc, char *argv[]) log_unindent(); log_debug("Command list generated.\n"); - parse_args(&tofi, argc, argv); /* * Initial Wayland & XKB setup. |