aboutsummaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-11-30 19:14:37 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-11-30 19:14:37 +0000
commitf55e65808c86d4a4c49e0777af6ecae7d3a107df (patch)
tree57d244881467b30488f384a7d5e38c839ec64830 /config.c
parentselection: offer clipboard content in more mime types (diff)
parentconfig: replace union in config struct with simple width/height members (diff)
Merge branch 'simplify-config-struct'
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,