mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-30 08:33:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

softwrap: account for firstcolumn when checking for offscreen current

Browse Source 
Make current_is_above_screen() check for current[current_x] being above
edittop at column firstcolumn, and make current_is_below_screen() start
counting down from edittop at column firstcolumn instead of edittop at
column zero.  This means that both functions now account for softwrapped
chunks properly.
This commit is contained in:
David Lawrence Ramsey 2017-01-21 11:18:17 -06:00 committed by Benno Schulenberg
parent e52d5b0672
commit c0fa3f04b1
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/winio.c
View File

@ -2908,7 +2908,16 @@ void edit_scroll(scroll_dir direction, int nrows)
* otherwise. */ * otherwise. */
bool current_is_above_screen(void) bool current_is_above_screen(void)
{ {
return (openfile->current->lineno < openfile->edittop->lineno); #ifndef NANO_TINY
if (ISSET(SOFTWRAP))
/* The cursor is above screen when current[current_x] is before edittop
* at column firstcolumn. */
return (openfile->current->lineno < openfile->edittop->lineno ||
(openfile->current->lineno == openfile->edittop->lineno &&
xplustabs() < openfile->firstcolumn));
else
#endif
return (openfile->current->lineno < openfile->edittop->lineno);
} }
/* Return TRUE if current[current_x] is below the bottom of the screen, and /* Return TRUE if current[current_x] is below the bottom of the screen, and
@ -2918,10 +2927,10 @@ bool current_is_below_screen(void)
#ifndef NANO_TINY #ifndef NANO_TINY
if (ISSET(SOFTWRAP)) { if (ISSET(SOFTWRAP)) {
filestruct *line = openfile->edittop; filestruct *line = openfile->edittop;
size_t leftedge = 0; size_t leftedge = openfile->firstcolumn;
/* If current[current_x] is more than a screen's worth of lines after /* If current[current_x] is more than a screen's worth of lines after
* edittop, it's below the screen. */ * edittop at column firstcolumn, it's below the screen. */
return (go_forward_chunks(editwinrows - 1, &line, &leftedge) == 0 && return (go_forward_chunks(editwinrows - 1, &line, &leftedge) == 0 &&
(line->lineno < openfile->current->lineno || (line->lineno < openfile->current->lineno ||
(line->lineno == openfile->current->lineno && (line->lineno == openfile->current->lineno &&