aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-11-25 19:33:56 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-11-25 19:33:56 +0000
commitd151d4bc50a94d6a24c95f705a0ba65fbef3ae80 (patch)
treeb039212cd6ed14e70706fd6f036a7171ab1e8b1d /render.c
parentMerge branch 'wl_output' (diff)
parentgrid: resize_without_reflow: don’t call min() on every loop iteration (diff)
Merge branch 'dont-reflow-alt-screen'
Closes #221
Diffstat (limited to 'render.c')
-rw-r--r--render.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/render.c b/render.c
index b4afab83..53363071 100644
--- a/render.c
+++ b/render.c
@@ -2276,23 +2276,22 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
goto damage_view;
}
+ if (term->grid == &term->alt)
+ selection_cancel(term);
+
struct coord *const tracking_points[] = {
&term->selection.start,
&term->selection.end,
};
- /* Reflow grids */
- grid_reflow(
+ /* Resize grids */
+ grid_resize_and_reflow(
&term->normal, new_normal_grid_rows, new_cols, old_rows, new_rows,
- term->grid == &term->normal ? ALEN(tracking_points) : 0,
- term->grid == &term->normal ? tracking_points : NULL,
+ ALEN(tracking_points), tracking_points,
term->composed_count, term->composed);
- grid_reflow(
- &term->alt, new_alt_grid_rows, new_cols, old_rows, new_rows,
- term->grid == &term->alt ? ALEN(tracking_points) : 0,
- term->grid == &term->alt ? tracking_points : NULL,
- term->composed_count, term->composed);
+ grid_resize_without_reflow(
+ &term->alt, new_alt_grid_rows, new_cols, old_rows, new_rows);
/* Reset tab stops */
tll_free(term->tab_stops);