src/usr.bin/tmux/tty.c - diff

Return to tty.c CVS log

Up to [local] / src / usr.bin / tmux

version 1.300, 2018/02/04 10:10:39

version 1.301, 2018/04/23 07:41:30

Line 1244

tty_margin_pane(tty, ctx);

* If we want to wrap a pane, the cursor needs to be exactly on the

* If we want to wrap a pane while using margins, the cursor needs to

* right of the region. But if the pane isn't on the right, it may be

* be exactly on the right of the region. If the cursor is entirely off

* off the edge - if so, move the cursor back to the right.

* the edge - move it back to the right. Some terminals are funny about

* this and insert extra spaces, so only use the right if margins are

* enabled.

if (ctx->xoff + ctx->ocx > tty->rright)

if (ctx->xoff + ctx->ocx > tty->rright) {

tty_cursor(tty, tty->rright, ctx->yoff + ctx->ocy);

if (!tty_use_margin(tty))

else

tty_cursor(tty, 0, ctx->yoff + ctx->ocy);

else

tty_cursor(tty, tty->rright, ctx->yoff + ctx->ocy);

} else

tty_cursor_pane(tty, ctx, ctx->ocx, ctx->ocy);

tty_putc(tty, '\n');

Line 1275

Line 1280

tty_margin_pane(tty, ctx);

if (ctx->num == 1 || !tty_term_has(tty->term, TTYC_INDN)) {

tty_cursor(tty, tty->rright, tty->rlower);

if (!tty_use_margin(tty))

tty_cursor(tty, 0, tty->rlower);

else

tty_cursor(tty, tty->rright, tty->rlower);

for (i = 0; i < ctx->num; i++)

tty_putc(tty, '\n');

} else

} else {

tty_cursor(tty, 0, tty->cy);

tty_putcode1(tty, TTYC_INDN, ctx->num);

}

void