aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-02-25 19:29:44 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-02-25 19:29:44 +0000
commitef53729242596344f07b1e9329ffaad51252b0c3 (patch)
tree0d9b48f36af4fce174c0cfbb5c74de0fbde04c6d
parentwayland: mark the whole search surface as opaque (diff)
render: resize with with/height == 0 resizes to user configured dimensions
-rw-r--r--render.c12
-rw-r--r--terminal.c17
2 files changed, 6 insertions, 23 deletions
diff --git a/render.c b/render.c
index 460ffd74..54c9e993 100644
--- a/render.c
+++ b/render.c
@@ -1117,7 +1117,7 @@ render_search_box(struct terminal *term)
static bool
maybe_resize(struct terminal *term, int width, int height, bool force)
{
- if (!force && (width == 0 || height == 0))
+ if (term->cell_width == 0 && term->cell_height == 0)
return false;
int scale = -1;
@@ -1131,14 +1131,14 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
scale = 1;
}
+ if (width == 0 && height == 0) {
+ width = term->conf->width;
+ height = term->conf->height;
+ }
+
width *= scale;
height *= scale;
- if (!force && width == 0 && height == 0) {
- /* Assume we're not fully up and running yet */
- return false;
- }
-
/* Scaled CSD border + title bar sizes */
const int csd_border = term->window->use_csd ? csd_border_size * scale : 0;
const int csd_title = term->window->use_csd ? csd_title_size * scale : 0;
diff --git a/terminal.c b/terminal.c
index 000d95b3..9c90e37d 100644
--- a/terminal.c
+++ b/terminal.c
@@ -773,29 +773,12 @@ term_init(const struct config *conf, struct fdm *fdm, struct wayland *wayl,
term_set_window_title(term, "foot");
/* Load fonts */
-#if 0
- struct font *fonts[4];
- if (!load_fonts_from_conf(term, conf, fonts))
- goto err;
- term_set_fonts(term, fonts);
-#endif
term_font_dpi_changed(term);
/* Start the slave/client */
if ((term->slave = slave_spawn(term->ptmx, argc, term->cwd, argv, term_env, conf->shell, login_shell)) == -1)
goto err;
- if (term->width == 0 && term->height == 0) {
-
- /* Try to use user-configured window dimentions */
- unsigned width = conf->width;
- unsigned height = conf->height;
-
- /* Don't go below a single cell */
- width = max(width, term->cell_width);
- height = max(height, term->cell_height);
- render_resize(term, width, height);
- }
return term;