diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-03-15 16:01:13 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-03-15 16:01:13 +0000 |
| commit | 0dd694f5fd89dcc86108438be0e55ec86d6dc3c6 (patch) | |
| tree | dbc4c1366f005131e6efb311c72484c6c6016b54 /tty.c | |
| parent | 4e809a3130cf1a689a33096f09d55e3b05815547 (diff) | |
| parent | 2a9d69777164291349ef4a00888153a69c330151 (diff) | |
| download | rtmux-0dd694f5fd89dcc86108438be0e55ec86d6dc3c6.tar.gz rtmux-0dd694f5fd89dcc86108438be0e55ec86d6dc3c6.tar.bz2 rtmux-0dd694f5fd89dcc86108438be0e55ec86d6dc3c6.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'tty.c')
| -rw-r--r-- | tty.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -476,7 +476,10 @@ void tty_putn(struct tty *tty, const void *buf, size_t len, u_int width) { 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 @@ -1403,7 +1406,8 @@ tty_cursor_pane_unless_wrap(struct tty *tty, const struct tty_ctx *ctx, (tty->term->flags & TERM_EARLYWRAP) || ctx->xoff + cx != 0 || 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); else log_debug("%s: will wrap at %u,%u", __func__, tty->cx, tty->cy); |