aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-09-08 17:17:29 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-09-08 17:41:00 +0000
commiteb6737ca2593f457368ae16e920911cdd70a2e33 (patch)
treef8dbf85542613c15d50439255d99db4e3d90ef25 /render.c
parentchangelog: move deprecation section up first, change most ‘footrc’ -> ‘foot.ini’ (diff)
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
Diffstat (limited to 'render.c')
-rw-r--r--render.c23
1 files changed, 17 insertions, 6 deletions
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;
+ 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;
+
+ 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;