mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-22 21:01:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

tweaks: elide a helper function, in preparation for an improvement

Browse Source
This commit is contained in:
Benno Schulenberg 2020-01-09 10:59:21 +01:00
parent 0e559c5bbc
commit e3edce4e7b
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/help.c
View File

@ -43,14 +43,22 @@ static size_t location;
void wrap_help_text_into_buffer(void) void wrap_help_text_into_buffer(void)
{ {
size_t sum = 0; size_t sum = 0;
/* Avoid overtight and overwide paragraphs in the introductory text. */
size_t wrapping_point = (COLS < 24) ? 24 : (COLS > 74) ? 74 : COLS;
const char *ptr = start_of_body; const char *ptr = start_of_body;
make_new_buffer(); make_new_buffer();
/* Copy the help text into the just-created new buffer. */ /* Copy the help text into the just-created new buffer. */
while (*ptr != '\0') { while (*ptr != '\0') {
int length = help_line_len(ptr); int length;
char *oneline = nmalloc(length + 1); char *oneline;
if (ptr >= end_of_intro)
wrapping_point = (COLS < 24) ? 24 : COLS;
length = break_line(ptr, wrapping_point, TRUE);
oneline = nmalloc(length + 1);
snprintf(oneline, length + 1, "%s", ptr); snprintf(oneline, length + 1, "%s", ptr);
free(openfile->current->data); free(openfile->current->data);
@ -572,18 +580,6 @@ functionptrtype parse_help_input(int *kbinput)
} }
return func_from_key(kbinput); return func_from_key(kbinput);
} }
/* Calculate the displayable length of the help-text line starting at ptr. */
size_t help_line_len(const char *ptr)
{
size_t wrapping_point = (COLS < 24) ? 24 : COLS;
/* Avoid overwide paragraphs in the introductory text. */
if (ptr < end_of_intro && COLS > 74)
wrapping_point = 74;
return break_line(ptr, wrapping_point, TRUE);
}
#endif /* ENABLE_HELP */ #endif /* ENABLE_HELP */
/* Start the help viewer, or indicate that there is no help. */ /* Start the help viewer, or indicate that there is no help. */

1
src/proto.h
View File

@ -340,7 +340,6 @@ const char *flagtostr(int flag);
void wrap_help_text_into_buffer(void); void wrap_help_text_into_buffer(void);
void help_init(void); void help_init(void);
functionptrtype parse_help_input(int *kbinput); functionptrtype parse_help_input(int *kbinput);
size_t help_line_len(const char *ptr);
#endif #endif
void do_help(void); void do_help(void);