mirror of
https://github.com/tmux/tmux.git
synced 2024-11-16 17:39:09 +00:00
Sync OpenBSD patchset 1050:
Store context off before moving the cursor when wrapping, to fix long standing bug drawing over the status line.
This commit is contained in:
parent
3893cc17a4
commit
c7f078dcbc
@ -1071,9 +1071,6 @@ screen_write_cell(struct screen_write_ctx *ctx,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialise the redraw context, saving the last cell. */
|
|
||||||
screen_write_initctx(ctx, &ttyctx, 1);
|
|
||||||
|
|
||||||
/* If in insert mode, make space for the cells. */
|
/* If in insert mode, make space for the cells. */
|
||||||
if (s->mode & MODE_INSERT && s->cx <= screen_size_x(s) - width) {
|
if (s->mode & MODE_INSERT && s->cx <= screen_size_x(s) - width) {
|
||||||
xx = screen_size_x(s) - s->cx - width;
|
xx = screen_size_x(s) - s->cx - width;
|
||||||
@ -1087,6 +1084,9 @@ screen_write_cell(struct screen_write_ctx *ctx,
|
|||||||
s->cx = 0; /* carriage return */
|
s->cx = 0; /* carriage return */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Initialise the redraw context, saving the last cell. */
|
||||||
|
screen_write_initctx(ctx, &ttyctx, 1);
|
||||||
|
|
||||||
/* Sanity checks. */
|
/* Sanity checks. */
|
||||||
if (((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - width)
|
if (((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - width)
|
||||||
|| s->cy > screen_size_y(s) - 1)
|
|| s->cy > screen_size_y(s) - 1)
|
||||||
|
Loading…
Reference in New Issue
Block a user