aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-02-09 10:24:50 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-02-09 10:24:50 +0000
commit8955875584714ece0929840eb941f33e068f1f69 (patch)
tree177e86a4977efcb5801e8d1e1a723648ef357e8b /render.c
parentterm: reduce max number of iterations when trying to drain client (diff)
parentmeson/PKGBUILD: adjust fcft requirements; the new version is 1.1.1 (diff)
Merge branch 'text-resize'
Diffstat (limited to 'render.c')
-rw-r--r--render.c26
1 files changed, 20 insertions, 6 deletions
diff --git a/render.c b/render.c
index f97a957f..7fa7dd86 100644
--- a/render.c
+++ b/render.c
@@ -995,10 +995,10 @@ reflow(struct row **new_grid, int new_cols, int new_rows,
}
/* Move to terminal.c? */
-void
-render_resize(struct terminal *term, int width, int height)
+static void
+maybe_resize(struct terminal *term, int width, int height, bool force)
{
- if (width == 0 || height == 0)
+ if (!force && (width == 0 || height == 0))
return;
int scale = -1;
@@ -1015,12 +1015,12 @@ render_resize(struct terminal *term, int width, int height)
width *= scale;
height *= scale;
- if (width == 0 && height == 0) {
+ if (!force && width == 0 && height == 0) {
/* Assume we're not fully up and running yet */
return;
}
- if (width == term->width && height == term->height && scale == term->scale)
+ if (!force && width == term->width && height == term->height && scale == term->scale)
return;
/* Cancel an application initiated "Synchronized Update" */
@@ -1123,11 +1123,25 @@ render_resize(struct terminal *term, int width, int height)
min(term->cursor.point.col, term->cols - 1));
term->render.last_cursor.cell = NULL;
-
+ tll_free(term->normal.scroll_damage);
+ tll_free(term->alt.scroll_damage);
+ term->render.last_buf = NULL;
term_damage_view(term);
render_refresh(term);
}
+void
+render_resize(struct terminal *term, int width, int height)
+{
+ return maybe_resize(term, width, height, false);
+}
+
+void
+render_resize_force(struct terminal *term, int width, int height)
+{
+ return maybe_resize(term, width, height, true);
+}
+
static void xcursor_callback(
void *data, struct wl_callback *wl_callback, uint32_t callback_data);