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

tweaks: elide an intermediate variable

master
Benno Schulenberg 2017-03-29 10:20:41 +02:00
parent 873e3d6fa6
commit 33cefa9208
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/winio.c
View File

@ -2869,21 +2869,18 @@ bool less_than_a_screenful(size_t was_lineno, size_t was_leftedge)
* and draw new lines on the blank lines left after the scrolling. */ * and draw new lines on the blank lines left after the scrolling. */
void edit_scroll(scroll_dir direction, int nrows) void edit_scroll(scroll_dir direction, int nrows)
{ {
int i;
filestruct *line; filestruct *line;
size_t leftedge; size_t leftedge;
/* 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. */
/* Move the top line of the edit window the requested number of rows. */ /* Move the top line of the edit window the requested number of rows up or
* down, and reduce the number of rows with the amount we couldn't move. */
if (direction == UPWARD) if (direction == UPWARD)
i = go_back_chunks(nrows, &openfile->edittop, &openfile->firstcolumn); nrows -= go_back_chunks(nrows, &openfile->edittop, &openfile->firstcolumn);
else else
i = go_forward_chunks(nrows, &openfile->edittop, &openfile->firstcolumn); nrows -= go_forward_chunks(nrows, &openfile->edittop, &openfile->firstcolumn);
/* If necessary, reduce the number of rows to what we could scroll. */
nrows -= i;
/* Don't bother scrolling zero rows, nor more than the window can hold. */ /* Don't bother scrolling zero rows, nor more than the window can hold. */
if (nrows == 0) if (nrows == 0)
@ -2914,18 +2911,17 @@ void edit_scroll(scroll_dir direction, int nrows)
if (direction == DOWNWARD) if (direction == DOWNWARD)
go_forward_chunks(editwinrows - nrows, &line, &leftedge); go_forward_chunks(editwinrows - nrows, &line, &leftedge);
i = nrows;
#ifndef NANO_TINY #ifndef NANO_TINY
/* Compensate for the earlier onscreen chunks of a softwrapped line /* Compensate for the earlier onscreen chunks of a softwrapped line
* when the first blank row happens to be in the middle of that line. */ * when the first blank row happens to be in the middle of that line. */
if (ISSET(SOFTWRAP) && line != openfile->edittop) if (ISSET(SOFTWRAP) && line != openfile->edittop)
i += leftedge / editwincols; nrows += leftedge / editwincols;
#endif #endif
/* Draw new content on the blank rows inside the scrolled region /* Draw new content on the blank rows inside the scrolled region
* (and on the bordering row too when it was deemed necessary). */ * (and on the bordering row too when it was deemed necessary). */
while (i > 0 && line != NULL) { while (nrows > 0 && line != NULL) {
i -= update_line(line, (line == openfile->current) ? nrows -= update_line(line, (line == openfile->current) ?
openfile->current_x : 0); openfile->current_x : 0);
line = line->next; line = line->next;
} }