ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

softwrap: remove and replace workarounds for firstcolumn 

Actually enable scrolling edittop partially off the screen by making
edit_scroll() and adjust_viewport() use firstcolumn properly when
iterating through softwrapped chunks in softwrap mode, or lines in
non-softwrap mode.

In non-softwrap mode, firstcolumn should still always be zero, because
it's initially set to that, and because passing it through the iterators
will maintain it at that.

This fixes https://savannah.gnu.org/bugs/?49100.
Reported-by: David Lawrence Ramsey <pooka109@gmail.com>
master
David Lawrence Ramsey 2017-01-21 11:02:58 -06:00 committed by Benno Schulenberg
parent 4144f76e19
commit e52d5b0672
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/winio.c
View File

@ -2837,10 +2837,6 @@ void edit_scroll(scroll_dir direction, int nrows)
filestruct *line; filestruct *line;
size_t leftedge; size_t leftedge;
/* FIXME: This should be replaced with openfile->firstcolumn when the
* latter is added. */
size_t firstcolumn = 0;
/* Part 1: nrows is the number of rows we're going to scroll the text of /* Part 1: nrows is the number of rows we're going to scroll the text of
* the edit window. */ * the edit window. */
@ -2848,18 +2844,9 @@ void edit_scroll(scroll_dir direction, int nrows)
* of direction) nrows rows, or as many rows as we can if there are fewer * of direction) nrows rows, or as many rows as we can if there are fewer
* than nrows rows available. */ * than nrows rows available. */
if (direction == UPWARD) if (direction == UPWARD)
i = go_back_chunks(nrows, &openfile->edittop, &firstcolumn); i = go_back_chunks(nrows, &openfile->edittop, &openfile->firstcolumn);
else else
i = go_forward_chunks(nrows, &openfile->edittop, &firstcolumn); i = go_forward_chunks(nrows, &openfile->edittop, &openfile->firstcolumn);
#ifndef NANO_TINY
/* FIXME: nano currently can't handle a partially scrolled edittop,
* so for now: move edittop back to a full line and refresh. */
if (ISSET(SOFTWRAP) && firstcolumn > 0) {
openfile->edittop = openfile->edittop->prev;
refresh_needed = TRUE;
}
#endif
/* Limit nrows to the number of rows we could scroll. */ /* Limit nrows to the number of rows we could scroll. */
nrows -= i; nrows -= i;
@ -2892,7 +2879,7 @@ void edit_scroll(scroll_dir direction, int nrows)
/* If we scrolled up, we're on the line before the scrolled region. */ /* If we scrolled up, we're on the line before the scrolled region. */
line = openfile->edittop; line = openfile->edittop;
leftedge = firstcolumn; leftedge = openfile->firstcolumn;
/* If we scrolled down, move down to the line before the scrolled region. */ /* If we scrolled down, move down to the line before the scrolled region. */
if (direction == DOWNWARD) if (direction == DOWNWARD)
@ -3041,10 +3028,6 @@ void adjust_viewport(update_type manner)
{ {
int goal = 0; int goal = 0;
/* FIXME: This should be replaced with openfile->firstcolumn when the
* latter is added. */
size_t firstcolumn = 0;
/* If manner is CENTERING, move edittop half the number of window rows /* If manner is CENTERING, move edittop half the number of window rows
* back from current. If manner is FLOWING, move edittop back 0 rows * back from current. If manner is FLOWING, move edittop back 0 rows
* or (editwinrows - 1) rows, depending on where current has moved. * or (editwinrows - 1) rows, depending on where current has moved.
@ -3070,11 +3053,11 @@ void adjust_viewport(update_type manner)
#ifndef NANO_TINY #ifndef NANO_TINY
if (ISSET(SOFTWRAP)) if (ISSET(SOFTWRAP))
firstcolumn = (xplustabs() / editwincols) * editwincols; openfile->firstcolumn = (xplustabs() / editwincols) * editwincols;
#endif #endif
/* Move edittop back goal rows, starting at current[current_x]. */ /* Move edittop back goal rows, starting at current[current_x]. */
go_back_chunks(goal, &openfile->edittop, &firstcolumn); go_back_chunks(goal, &openfile->edittop, &openfile->firstcolumn);
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "adjust_viewport(): setting edittop to lineno %ld\n", (long)openfile->edittop->lineno); fprintf(stderr, "adjust_viewport(): setting edittop to lineno %ld\n", (long)openfile->edittop->lineno);