If the vertical cursor movement crosses the scroll region, CUU and CUD

shouldn't be used even if VPA isn't present - in that case CUP should be used.
pull/1/head
Nicholas Marriott 2009-10-12 16:37:43 +00:00
parent 56157444de
commit eb9826f65d
1 changed files with 7 additions and 6 deletions

13
tty.c
View File

@ -1027,15 +1027,16 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy)
change = thisy - cy; /* +ve up, -ve down */
/*
* Use VPA if change is larger than absolute or if this change
* Try to use VPA if change is larger than absolute or if this change
* would cross the scroll region, otherwise use CUU/CUD.
*/
if ((abs(change) > cy ||
if (abs(change) > cy ||
(change < 0 && cy - change > tty->rlower) ||
(change > 0 && cy - change < tty->rupper)) &&
tty_term_has(term, TTYC_VPA)) {
tty_putcode1(tty, TTYC_VPA, cy);
goto out;
(change > 0 && cy - change < tty->rupper)) {
if (tty_term_has(term, TTYC_VPA)) {
tty_putcode1(tty, TTYC_VPA, cy);
goto out;
}
} else if (change > 0 && tty_term_has(term, TTYC_CUU)) {
tty_putcode1(tty, TTYC_CUU, change);
goto out;