aboutsummaryrefslogtreecommitdiff
path: root/screen-write.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2012-03-18 01:57:01 +0000
committerTiago Cunha <tcunha@gmx.com>2012-03-18 01:57:01 +0000
commit21ab66569cb426e38e150fa79eeeed7cf57f2f01 (patch)
treecb9d00acdad1bf948836c3630642bf8c54639d81 /screen-write.c
parent070d266aae6dd309d3fb9c4fab7d30f0fbc88854 (diff)
downloadrtmux-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.
Diffstat (limited to 'screen-write.c')
-rw-r--r--screen-write.c8
1 files changed, 4 insertions, 4 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)