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

tweaks: reshuffle some more lines and improve four comments

master
Benno Schulenberg 2017-03-28 11:24:32 +02:00
parent da3a015f7d
commit 644fedcb61
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/move.c
View File

@ -49,7 +49,7 @@ void do_last_line(void)
focusing = FALSE; focusing = FALSE;
} }
/* Move up one page. */ /* Move up nearly one screenful. */
void do_page_up(void) void do_page_up(void)
{ {
int mustmove = (editwinrows < 3) ? 1 : editwinrows - 2; int mustmove = (editwinrows < 3) ? 1 : editwinrows - 2;
@ -87,7 +87,7 @@ void do_page_up(void)
refresh_needed = TRUE; refresh_needed = TRUE;
} }
/* Move down one page. */ /* Move down nearly one screenful. */
void do_page_down(void) void do_page_down(void)
{ {
int mustmove = (editwinrows < 3) ? 1 : editwinrows - 2; int mustmove = (editwinrows < 3) ? 1 : editwinrows - 2;
@ -451,10 +451,9 @@ void do_end_void(void)
* also scroll the screen one row, so the cursor stays in the same spot. */ * also scroll the screen one row, so the cursor stays in the same spot. */
void do_up(bool scroll_only) void do_up(bool scroll_only)
{ {
size_t was_column = xplustabs();
filestruct *was_current = openfile->current; filestruct *was_current = openfile->current;
size_t leftedge = 0; size_t was_column = xplustabs();
size_t target_column = openfile->placewewant; size_t leftedge = 0, target_column;
/* When just scrolling and the top of the file is onscreen, get out. */ /* When just scrolling and the top of the file is onscreen, get out. */
if (scroll_only && openfile->edittop == openfile->fileage && if (scroll_only && openfile->edittop == openfile->fileage &&
@ -470,16 +469,17 @@ void do_up(bool scroll_only)
leftedge = (realspan / editwincols) * editwincols; leftedge = (realspan / editwincols) * editwincols;
target_column = openfile->placewewant % editwincols; target_column = openfile->placewewant % editwincols;
} } else
#endif #endif
target_column = openfile->placewewant;
/* Move up one line or chunk. */ /* If we can't move up one line or chunk, we're at top of file. */
if (go_back_chunks(1, &openfile->current, &leftedge) > 0) if (go_back_chunks(1, &openfile->current, &leftedge) > 0)
return; return;
openfile->current_x = actual_x(openfile->current->data,
leftedge + target_column);
openfile->placewewant = leftedge + target_column; openfile->placewewant = leftedge + target_column;
openfile->current_x = actual_x(openfile->current->data,
openfile->placewewant);
/* When the cursor was on the first line of the edit window (or when just /* When the cursor was on the first line of the edit window (or when just
* scrolling without moving the cursor), scroll the edit window up -- one * scrolling without moving the cursor), scroll the edit window up -- one
@ -511,10 +511,9 @@ void do_up_void(void)
* scroll the screen one row, so the cursor stays in the same spot. */ * scroll the screen one row, so the cursor stays in the same spot. */
void do_down(bool scroll_only) void do_down(bool scroll_only)
{ {
size_t was_column = xplustabs();
filestruct *was_current = openfile->current; filestruct *was_current = openfile->current;
size_t leftedge = 0; size_t was_column = xplustabs();
size_t target_column = openfile->placewewant; size_t leftedge = 0, target_column;
#ifndef NANO_TINY #ifndef NANO_TINY
if (ISSET(SOFTWRAP)) { if (ISSET(SOFTWRAP)) {
@ -525,16 +524,17 @@ void do_down(bool scroll_only)
leftedge = (realspan / editwincols) * editwincols; leftedge = (realspan / editwincols) * editwincols;
target_column = openfile->placewewant % editwincols; target_column = openfile->placewewant % editwincols;
} } else
#endif #endif
target_column = openfile->placewewant;
/* Move down one line or chunk. */ /* If we can't move down one line or chunk, we're at bottom of file. */
if (go_forward_chunks(1, &openfile->current, &leftedge) > 0) if (go_forward_chunks(1, &openfile->current, &leftedge) > 0)
return; return;
openfile->current_x = actual_x(openfile->current->data,
leftedge + target_column);
openfile->placewewant = leftedge + target_column; openfile->placewewant = leftedge + target_column;
openfile->current_x = actual_x(openfile->current->data,
openfile->placewewant);
/* When the cursor was on the last line of the edit window (or when just /* When the cursor was on the last line of the edit window (or when just
* scrolling without moving the cursor), scroll the edit window down -- one * scrolling without moving the cursor), scroll the edit window down -- one