display: with softwrap, show the cursor where the eye expects it

When a multi-column character straddles a chunk boundary, and the
preferred column (placewewant) for the cursor is zero, cheat: show
the cursor not where the character starts but on the beginning of
the next row.  This makes the cursor move smoothly in the leftmost
column of the screen when using <Up> and <Down> and such, instead
of jumping around.

In this way the scrolling logic won't get confused and the screen
will scroll properly when stepping beyond the top or bottom row.

This fixes https://savannah.gnu.org/bugs/?50687.
master
Benno Schulenberg 2017-04-06 19:37:36 +02:00
parent 6ec65d5500
commit f3e2ad945d
1 changed files with 6 additions and 0 deletions

View File

@ -2287,6 +2287,12 @@ void reset_cursor(void)
/* Add the number of wraps in the current line before the cursor. */ /* Add the number of wraps in the current line before the cursor. */
row += xpt / editwincols; row += xpt / editwincols;
col = xpt % editwincols; col = xpt % editwincols;
/* If the cursor ought to be in column zero, nudge it there. */
if (openfile->placewewant % editwincols == 0 && col != 0) {
row++;
col = 0;
}
} else } else
#endif #endif
{ {