aboutsummaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorCraig Barnes <craigbarnes@protonmail.com>2020-11-30 02:24:38 +0000
committerCraig Barnes <craigbarnes@protonmail.com>2020-11-30 02:24:38 +0000
commitadde947fc5ffc3d143040a984d0907262ac279bc (patch)
tree1b29a75414035349d6178509e5660d917484cbc0 /config.c
parentMerge branch 'base64-optimize' (diff)
config: replace union in config struct with simple width/height members
Diffstat (limited to 'config.c')
-rw-r--r--config.c14
1 files changed, 6 insertions, 8 deletions
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,