diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2012-03-18 01:57:01 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2012-03-18 01:57:01 +0000 |
| commit | 21ab66569cb426e38e150fa79eeeed7cf57f2f01 (patch) | |
| tree | cb9d00acdad1bf948836c3630642bf8c54639d81 | |
| parent | 070d266aae6dd309d3fb9c4fab7d30f0fbc88854 (diff) | |
| download | rtmux-21ab66569cb426e38e150fa79eeeed7cf57f2f01.tar.gz rtmux-21ab66569cb426e38e150fa79eeeed7cf57f2f01.tar.bz2 rtmux-21ab66569cb426e38e150fa79eeeed7cf57f2f01.zip | |
Sync OpenBSD patchset 1055:
Revert screen-write.c r1.54 and fix the bug properly. After wrapping a
line in a pane, the cursor needs to move to the next line unless it
scrolled.
| -rw-r--r-- | screen-write.c | 8 | ||||
| -rw-r--r-- | tty.c | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/screen-write.c b/screen-write.c index 8b28ccbb..3054ebc7 100644 --- a/screen-write.c +++ b/screen-write.c @@ -1071,8 +1071,11 @@ screen_write_cell(struct screen_write_ctx *ctx, 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 (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; grid_move_cells(s->grid, s->cx + width, s->cx, s->cy, xx); insert = 1; @@ -1084,9 +1087,6 @@ screen_write_cell(struct screen_write_ctx *ctx, s->cx = 0; /* carriage return */ } - /* Initialise the redraw context, saving the last cell. */ - screen_write_initctx(ctx, &ttyctx, 1); - /* Sanity checks. */ if (((s->mode & MODE_WRAP) && s->cx > screen_size_x(s) - width) || s->cy > screen_size_y(s) - 1) @@ -1000,7 +1000,10 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx) * The pane doesn't fill the entire line, the linefeed * will already have happened, so just move the cursor. */ - tty_cursor_pane(tty, ctx, 0, ctx->ocy + 1); + if (ctx->ocy != wp->yoff + wp->sy) + tty_cursor_pane(tty, ctx, 0, ctx->ocy + 1); + else + tty_cursor_pane(tty, ctx, 0, ctx->ocy); } else if (tty->cx < tty->sx) { /* * The cursor isn't in the last position already, so |