diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-11-14 10:01:29 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-11-14 10:01:29 +0000 |
| commit | 518a687886456baeb397bdc751beb1ad682a3e6a (patch) | |
| tree | 1a4952dcc110966800798961992f00b7553ac9d8 /tty.c | |
| parent | eb215d3d3fc6a55245cfbad77613129c06f6ff3c (diff) | |
| parent | 2dbf062a891e992b438a0923b9ffd79638014872 (diff) | |
| download | rtmux-518a687886456baeb397bdc751beb1ad682a3e6a.tar.gz rtmux-518a687886456baeb397bdc751beb1ad682a3e6a.tar.bz2 rtmux-518a687886456baeb397bdc751beb1ad682a3e6a.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'tty.c')
| -rw-r--r-- | tty.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -2106,7 +2106,9 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy) if ((u_int) abs(change) > cx && tty_term_has(term, TTYC_HPA)) { tty_putcode1(tty, TTYC_HPA, cx); goto out; - } else if (change > 0 && tty_term_has(term, TTYC_CUB)) { + } else if (change > 0 && + tty_term_has(term, TTYC_CUB) && + !tty_use_margin(tty)) { if (change == 2 && tty_term_has(term, TTYC_CUB1)) { tty_putcode(tty, TTYC_CUB1); tty_putcode(tty, TTYC_CUB1); @@ -2114,7 +2116,9 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy) } tty_putcode1(tty, TTYC_CUB, change); goto out; - } else if (change < 0 && tty_term_has(term, TTYC_CUF)) { + } else if (change < 0 && + tty_term_has(term, TTYC_CUF) && + !tty_use_margin(tty)) { tty_putcode1(tty, TTYC_CUF, -change); goto out; } |