diff --git a/src/move.c b/src/move.c index b13b9beb4042c5dfdd9a9fe8b5b9c0684b1845aa..623f01ff8d77850e36b154101cbc27bde29acc1b 100644 --- a/src/move.c +++ b/src/move.c @@ -99,7 +99,7 @@ void do_page_up(void) #endif /* Scroll the edit window up a page. */ - edit_update(STATIONARY); + adjust_viewport(STATIONARY); refresh_needed = TRUE; } @@ -139,7 +139,7 @@ void do_page_down(void) openfile->placewewant); /* Scroll the edit window down a page. */ - edit_update(STATIONARY); + adjust_viewport(STATIONARY); refresh_needed = TRUE; } @@ -369,7 +369,7 @@ void ensure_line_is_visible(void) #ifndef NANO_TINY if (ISSET(SOFTWRAP) && strlenpt(openfile->current->data) / editwincols + openfile->current_y >= editwinrows) { - edit_update(ISSET(SMOOTH_SCROLL) ? FLOWING : CENTERING); + adjust_viewport(ISSET(SMOOTH_SCROLL) ? FLOWING : CENTERING); refresh_needed = TRUE; } #endif diff --git a/src/nano.c b/src/nano.c index f237d70279bc7bec67bf89346e26c22992ca1bf0..03baa385a925faed33cdb7ab8c339814786fcb6f 100644 --- a/src/nano.c +++ b/src/nano.c @@ -395,7 +395,7 @@ void move_to_filestruct(filestruct **file_top, filestruct **file_bot, /* If the top of the edit window was inside the old partition, put * it in range of current. */ if (edittop_inside) { - edit_update(STATIONARY); + adjust_viewport(STATIONARY); refresh_needed = TRUE; } diff --git a/src/proto.h b/src/proto.h index 1f3f804cffb80ecbc39ba70cde2a07a52ed1689d..c4646a9f5d85db660f27ba3dbf9bb977d8b2a039 100644 --- a/src/proto.h +++ b/src/proto.h @@ -781,7 +781,7 @@ bool need_horizontal_scroll(const size_t old_column, const size_t new_column); void edit_scroll(scroll_dir direction, ssize_t nlines); void edit_redraw(filestruct *old_current); void edit_refresh(void); -void edit_update(update_type location); +void adjust_viewport(update_type location); void total_redraw(void); void total_refresh(void); void display_main_list(void); diff --git a/src/search.c b/src/search.c index cd23566a9484ab802582fde9ca684daf521a4136..03e9ae253f766e152095c133ee0dd2b70af71052 100644 --- a/src/search.c +++ b/src/search.c @@ -943,8 +943,8 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer, /* When the position was manually given, center the target line. */ if (interactive || ISSET(SOFTWRAP)) { - edit_update(CENTERING); - edit_refresh(); + adjust_viewport(CENTERING); + refresh_needed = TRUE; } else { /* If the target line is close to the tail of the file, put the last * line of the file on the bottom line of the screen; otherwise, just @@ -953,9 +953,9 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer, editwinrows / 2) { openfile->current_y = editwinrows - openfile->filebot->lineno + openfile->current->lineno - 1; - edit_update(STATIONARY); + adjust_viewport(STATIONARY); } else - edit_update(CENTERING); + adjust_viewport(CENTERING); } } diff --git a/src/text.c b/src/text.c index bdc45178dbedb87cdf4517d3605166afd44a7fce..0c73749afe2d37a72bebb133a0184b165e7da40b 100644 --- a/src/text.c +++ b/src/text.c @@ -3076,7 +3076,7 @@ const char *do_alt_speller(char *tempfile_name) goto_line_posx(lineno_save, current_x_save); openfile->current_y = current_y_save; openfile->placewewant = pww_save; - edit_update(STATIONARY); + adjust_viewport(STATIONARY); /* Stat the temporary file again, and mark the buffer as modified only * if this file was changed since it was written. */ @@ -3552,7 +3552,7 @@ void do_formatter(void) goto_line_posx(lineno_save, current_x_save); openfile->current_y = current_y_save; openfile->placewewant = pww_save; - edit_update(STATIONARY); + adjust_viewport(STATIONARY); set_modified(); diff --git a/src/winio.c b/src/winio.c index 381e114adea1e497c7dc14bbb1629dc554e1d097..ef18787263049a36b38d010b139e43f798cb0338 100644 --- a/src/winio.c +++ b/src/winio.c @@ -2899,7 +2899,7 @@ void edit_redraw(filestruct *old_current) ISSET(SOFTWRAP) && strlenpt(openfile->current->data) >= editwincols) || #endif openfile->current->lineno < openfile->edittop->lineno) { - edit_update((focusing || !ISSET(SMOOTH_SCROLL)) ? CENTERING : FLOWING); + adjust_viewport((focusing || !ISSET(SMOOTH_SCROLL)) ? CENTERING : FLOWING); refresh_needed = TRUE; } @@ -2948,7 +2948,7 @@ void edit_refresh(void) #endif /* Make sure the current line is on the screen. */ - edit_update((focusing || !ISSET(SMOOTH_SCROLL)) ? CENTERING : STATIONARY); + adjust_viewport((focusing || !ISSET(SMOOTH_SCROLL)) ? CENTERING : STATIONARY); } foo = openfile->edittop; @@ -2978,7 +2978,7 @@ void edit_refresh(void) * middle of the screen, STATIONARY means that it should stay at the * same vertical position, and FLOWING means that it should scroll no * more than needed to bring current into view. */ -void edit_update(update_type manner) +void adjust_viewport(update_type manner) { int goal = 0; @@ -3023,7 +3023,7 @@ void edit_update(update_type manner) #endif } #ifdef DEBUG - fprintf(stderr, "edit_update(): setting edittop to lineno %ld\n", (long)openfile->edittop->lineno); + fprintf(stderr, "adjust_viewport(): setting edittop to lineno %ld\n", (long)openfile->edittop->lineno); #endif compute_maxrows(); }