mirror/nano
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/nano.git synced 2026-01-26 16:09:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweaks: split the goto function into an interactive and command-line one

Browse Source
This commit is contained in:
Benno Schulenberg 2025-07-04 16:27:25 +02:00
parent d7e427daac
commit 2a51d35e25
4 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/history.c
View File

@ -595,6 +595,6 @@ void restore_cursor_position_if_any(void)
if (item && item->anchors)
restore_anchors(item->anchors);
if (item)
goto_line_and_column(item->linenumber, item->columnnumber, FALSE, FALSE);
goto_line_and_column(item->linenumber, item->columnnumber, FALSE);
}
#endif /* ENABLE_HISTORIES */

2
src/nano.c
View File

@ -2589,7 +2589,7 @@ int main(int argc, char **argv)
if (givenline != 0 || givencol != 0) {
openfile->current = openfile->filetop;
openfile->placewewant = 0;
goto_line_and_column(givenline, givencol, FALSE, FALSE);
goto_line_and_column(givenline, givencol, FALSE);
}
#ifndef NANO_TINY
else if (searchstring != NULL) {

4
src/prototypes.h
View File

@ -484,8 +484,8 @@ void ask_for_and_do_replacements(void);
#if !defined(NANO_TINY) || defined(ENABLE_SPELLER) || defined (ENABLE_LINTER) || defined (ENABLE_FORMATTER)
void goto_line_posx(ssize_t line, size_t pos_x);
#endif
void goto_line_and_column(ssize_t line, ssize_t column, bool retain_answer,
bool interactive);
void ask_for_line_and_column(bool retain_answer);
void goto_line_and_column(ssize_t line, ssize_t column, bool interactive);
void do_gotolinecolumn(void);
#ifndef NANO_TINY
void do_find_bracket(void);

44
src/search.c
View File

@ -155,7 +155,7 @@ void search_init(bool replacing, bool retain_answer)
} else
replacing = !replacing;
} else if (function == flip_goto) {
goto_line_and_column(0, 0, TRUE, TRUE);
ask_for_line_and_column(TRUE);
break;
} else
break;
@ -762,18 +762,12 @@ void goto_line_posx(ssize_t linenumber, size_t pos_x)
}
#endif
/* Go to the specified line and column, or ask for them if interactive
* is TRUE. In the latter case also update the screen afterwards.
* Note that both the line and column number should be one-based. */
void goto_line_and_column(ssize_t line, ssize_t column, bool retain_answer,
bool interactive)
/* Ask for a line and maybe column number, and then jump there. */
void ask_for_line_and_column(bool retain_answer)
{
if (line == 0)
line = openfile->current->lineno;
if (column == 0)
column = openfile->placewewant + 1;
ssize_t line = openfile->current->lineno;
ssize_t column = openfile->placewewant + 1;
if (interactive) {
/* Ask for the line and column. */
int response = do_prompt(MGOTOLINE, retain_answer ? answer : "", NULL,
/* TRANSLATORS: This is a prompt. */
@ -809,7 +803,20 @@ void goto_line_and_column(ssize_t line, ssize_t column, bool retain_answer,
if (doublesign)
line += openfile->current->lineno;
}
goto_line_and_column(line, column, TRUE);
adjust_viewport((*answer == ',') ? STATIONARY : CENTERING);
refresh_needed = TRUE;
}
/* Go to the specified line and column. (Note that both are one-based.) */
void goto_line_and_column(ssize_t line, ssize_t column, bool interactive)
{
if (line == 0)
line = openfile->current->lineno;
if (column == 0)
column = openfile->placewewant + 1;
/* Take a negative line number to mean: from the end of the file. */
if (line < 0)
@ -844,12 +851,10 @@ void goto_line_and_column(ssize_t line, ssize_t column, bool retain_answer,
openfile->placewewant = breadth(openfile->current->data);
#endif
/* When a line number was manually given, center the target line. */
if (interactive) {
adjust_viewport((*answer == ',') ? STATIONARY : CENTERING);
refresh_needed = TRUE;
} else {
int rows_from_tail;
if (interactive)
return;
int rows_from_tail;
#ifndef NANO_TINY
if (ISSET(SOFTWRAP)) {
@ -871,13 +876,12 @@ void goto_line_and_column(ssize_t line, ssize_t column, bool retain_answer,
adjust_viewport(STATIONARY);
} else
adjust_viewport(CENTERING);
}
}
/* Go to the specified line and column, asking for them beforehand. */
void do_gotolinecolumn(void)
{
goto_line_and_column(0, 0, FALSE, TRUE);
ask_for_line_and_column(FALSE);
}
#ifndef NANO_TINY