diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-11-30 19:14:37 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-11-30 19:14:37 +0000 |
| commit | f55e65808c86d4a4c49e0777af6ecae7d3a107df (patch) | |
| tree | 57d244881467b30488f384a7d5e38c839ec64830 /config.c | |
| parent | selection: offer clipboard content in more mime types (diff) | |
| parent | config: 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.c | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -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, |
