aboutsummaryrefslogtreecommitdiff
path: root/screen-write.c
diff options
context:
space:
mode:
Diffstat (limited to 'screen-write.c')
-rw-r--r--screen-write.c26
1 files changed, 15 insertions, 11 deletions
diff --git a/screen-write.c b/screen-write.c
index d735d450..dd553f17 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -858,7 +858,8 @@ screen_write_overwrite(struct screen_write_ctx *ctx)
u_int xx;
gc = grid_view_peek_cell(gd, s->cx, s->cy);
- gu = grid_view_peek_utf8(gd, s->cx, s->cy);
+ if (gc->flags & GRID_FLAG_UTF8)
+ gu = grid_view_peek_utf8(gd, s->cx, s->cy);
if (gc->flags & GRID_FLAG_PADDING) {
/*
@@ -885,16 +886,19 @@ screen_write_overwrite(struct screen_write_ctx *ctx)
break;
grid_view_set_cell(gd, xx, s->cy, &grid_default_cell);
}
- } else if (gc->flags & GRID_FLAG_UTF8 && gu->width > 1) {
- /*
- * An UTF-8 wide cell; overwrite following padding cells only.
- */
- xx = s->cx;
- while (++xx < screen_size_x(s)) {
- gc = grid_view_peek_cell(gd, xx, s->cy);
- if (!(gc->flags & GRID_FLAG_PADDING))
- break;
- grid_view_set_cell(gd, xx, s->cy, &grid_default_cell);
+ } else if (gc->flags & GRID_FLAG_UTF8) {
+ gu = grid_view_peek_utf8(gd, s->cx, s->cy);
+ if (gu->width > 1) {
+ /*
+ * An UTF-8 wide cell; overwrite following padding cells only.
+ */
+ xx = s->cx;
+ while (++xx < screen_size_x(s)) {
+ gc = grid_view_peek_cell(gd, xx, s->cy);
+ if (!(gc->flags & GRID_FLAG_PADDING))
+ break;
+ grid_view_set_cell(gd, xx, s->cy, &grid_default_cell);
+ }
}
}
}