From eb6737ca2593f457368ae16e920911cdd70a2e33 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 8 Sep 2020 19:17:29 +0200 Subject: Add -W,--window-size-chars, and foot.ini:initial-window-size-chars * Add -W,--window-size-chars command line option * Add initial-window-size-chars foot.ini option * Add -w,--window-size-pixels command line option * Add initial-window-size-pixels foot.ini option * Deprecate -g,--geometry command line option in favor of -w,--window-size-pixels * Deprecate geometry option in foot.ini in favor of initial-window-size-pixels --- render.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'render.c') diff --git a/render.c b/render.c index 288ea8da..80f3bd90 100644 --- a/render.c +++ b/render.c @@ -2032,13 +2032,24 @@ maybe_resize(struct terminal *term, int width, int height, bool force) width = term->unmaximized_width; height = term->unmaximized_height; } else { - width = term->conf->width; - height = term->conf->height; + switch (term->conf->size.type) { + case CONF_SIZE_PX: + width = term->conf->size.px.width; + height = term->conf->size.px.height; + + if (term->window->use_csd == CSD_YES) { + /* Take CSD title bar into account */ + assert(!term->window->is_fullscreen); + height -= term->conf->csd.title_height; + } + break; - if (term->window->use_csd == CSD_YES) { - /* Take CSD title bar into account */ - assert(!term->window->is_fullscreen); - height -= term->conf->csd.title_height; + case CONF_SIZE_CELLS: + width = 2 * term->conf->pad_x; + height = 2 * term->conf->pad_y; + width += term->conf->size.cells.width * term->cell_width; + height += term->conf->size.cells.height * term->cell_height; + break; } width *= scale; -- cgit v1.3