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

scrolling: elide a variable, to make clearer that edittop is being moved

master
Benno Schulenberg 2016-04-16 11:38:39 +02:00
parent 4c075f3771
commit 0bffd99dcb
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/winio.c
View File

@ -3032,8 +3032,7 @@ void edit_refresh(void)
* more than needed to bring current into view. */ * more than needed to bring current into view. */
void edit_update(update_type manner) void edit_update(update_type manner)
{ {
filestruct *foo = openfile->current; int goal = 0;
int goal;
/* If manner is CENTERING, move edittop half the number of window /* If manner is CENTERING, move edittop half the number of window
* lines back from current. If manner is STATIONARY, move edittop * lines back from current. If manner is STATIONARY, move edittop
@ -3047,9 +3046,7 @@ void edit_update(update_type manner)
if (manner == CENTERING) if (manner == CENTERING)
goal = editwinrows / 2; goal = editwinrows / 2;
else if (manner == FLOWING) { else if (manner == FLOWING) {
if (openfile->current->lineno < openfile->edittop->lineno) if (openfile->current->lineno >= openfile->edittop->lineno)
goal = 0;
else
goal = editwinrows - 1; goal = editwinrows - 1;
} else { } else {
goal = openfile->current_y; goal = openfile->current_y;
@ -3059,14 +3056,16 @@ void edit_update(update_type manner)
goal = editwinrows - 1; goal = editwinrows - 1;
} }
for (; goal > 0 && foo->prev != NULL; goal--) { openfile->edittop = openfile->current;
foo = foo->prev;
while (goal > 0 && openfile->edittop->prev != NULL) {
openfile->edittop = openfile->edittop->prev;
goal --;
#ifndef NANO_TINY #ifndef NANO_TINY
if (ISSET(SOFTWRAP) && foo) if (ISSET(SOFTWRAP))
goal -= strlenpt(foo->data) / COLS; goal -= strlenpt(openfile->edittop->data) / COLS;
#endif #endif
} }
openfile->edittop = foo;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "edit_update(): setting edittop to lineno %ld\n", (long)openfile->edittop->lineno); fprintf(stderr, "edit_update(): setting edittop to lineno %ld\n", (long)openfile->edittop->lineno);
#endif #endif