diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2019-07-29 10:51:30 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2019-07-29 10:51:30 +0100 |
| commit | da552eb73b80bab3c0a28dfb9ae2c75fa6d4bdaf (patch) | |
| tree | cf9c86c3218659faf46e606a1e38bc6ebb570dcd /screen-write.c | |
| parent | 5a501a8ae27c2d0128870caa48c5708e97528567 (diff) | |
| parent | b90a9fcd13f4434aed0fe1785d619aa668bbc77d (diff) | |
| download | rtmux-da552eb73b80bab3c0a28dfb9ae2c75fa6d4bdaf.tar.gz rtmux-da552eb73b80bab3c0a28dfb9ae2c75fa6d4bdaf.tar.bz2 rtmux-da552eb73b80bab3c0a28dfb9ae2c75fa6d4bdaf.zip | |
Merge branch 'master' into 3.0-rc
Diffstat (limited to 'screen-write.c')
| -rw-r--r-- | screen-write.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/screen-write.c b/screen-write.c index 174c7a82..98cdf158 100644 --- a/screen-write.c +++ b/screen-write.c @@ -36,7 +36,7 @@ static const struct grid_cell *screen_write_combine(struct screen_write_ctx *, const struct utf8_data *, u_int *); static const struct grid_cell screen_write_pad_cell = { - GRID_FLAG_PADDING, 0, 8, 8, { { 0 }, 0, 0, 0 } + { { 0 }, 0, 0, 0 }, 0, GRID_FLAG_PADDING, 0, 8, 8 }; struct screen_write_collect_item { @@ -1169,11 +1169,7 @@ screen_write_clearscreen(struct screen_write_ctx *ctx, u_int bg) void screen_write_clearhistory(struct screen_write_ctx *ctx) { - struct screen *s = ctx->s; - struct grid *gd = s->grid; - - grid_move_lines(gd, 0, gd->hsize, gd->sy, 8); - gd->hscrolled = gd->hsize = 0; + grid_clear_history(ctx->s->grid); } /* Clear a collected line. */ |