From adde947fc5ffc3d143040a984d0907262ac279bc Mon Sep 17 00:00:00 2001 From: Craig Barnes Date: Mon, 30 Nov 2020 02:24:38 +0000 Subject: config: replace union in config struct with simple width/height members --- config.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'config.c') diff --git a/config.c b/config.c index 4a4a6820..e5411bed 100644 --- a/config.c +++ b/config.c @@ -486,8 +486,8 @@ parse_section_main(const char *key, const char *value, struct config *conf, } conf->size.type = CONF_SIZE_PX; - conf->size.px.width = width; - conf->size.px.height = height; + conf->size.width = width; + conf->size.height = height; } else if (strcmp(key, "initial-window-size-chars") == 0) { @@ -501,8 +501,8 @@ parse_section_main(const char *key, const char *value, struct config *conf, } conf->size.type = CONF_SIZE_CELLS; - conf->size.cells.width = width; - conf->size.cells.height = height; + conf->size.width = width; + conf->size.height = height; } else if (strcmp(key, "pad") == 0) { @@ -2016,10 +2016,8 @@ config_load(struct config *conf, const char *conf_path, .word_delimiters = xwcsdup(L",│`|:\"'()[]{}<>"), .size = { .type = CONF_SIZE_PX, - .px = { - .width = 700, - .height = 500, - }, + .width = 700, + .height = 500, }, .pad_x = 2, .pad_y = 2, -- cgit v1.3