circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-05 08:07:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2017-03-15 16:01:13 +00:00
parent 4e809a3130 2a9d697771
commit 0dd694f5fd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tty.c
View File

@ -476,7 +476,10 @@ void
tty_putn(struct tty *tty, const void *buf, size_t len, u_int width) tty_putn(struct tty *tty, const void *buf, size_t len, u_int width)
{ {
tty_add(tty, buf, len); tty_add(tty, buf, len);
tty->cx += width; if (tty->cx + width > tty->sx)
tty->cx = tty->cy = UINT_MAX;
else
tty->cx += width;
} }
static void static void
@ -1403,7 +1406,8 @@ tty_cursor_pane_unless_wrap(struct tty *tty, const struct tty_ctx *ctx,
(tty->term->flags & TERM_EARLYWRAP) || (tty->term->flags & TERM_EARLYWRAP) ||
ctx->xoff + cx != 0 || ctx->xoff + cx != 0 ||
ctx->yoff + cy != tty->cy + 1 || ctx->yoff + cy != tty->cy + 1 ||
tty->cx < tty->sx) tty->cx < tty->sx ||
tty->cy == tty->rlower)
tty_cursor_pane(tty, ctx, cx, cy); tty_cursor_pane(tty, ctx, cx, cy);
else else
log_debug("%s: will wrap at %u,%u", __func__, tty->cx, tty->cy); log_debug("%s: will wrap at %u,%u", __func__, tty->cx, tty->cy);