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

prompt: remove two fragments of dead code 

None of the prompts offer a total-refresh shortcut -- only the
edit window, the help viewer, and the file browser provide this.
master
Benno Schulenberg 2016-12-03 20:37:30 +01:00
parent bfcce57b69
commit 379b1556ed
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/prompt.c
View File

@ -34,10 +34,8 @@ static size_t statusbar_x = HIGHEST_POSITIVE;
/* Read in a keystroke, interpret it if it is a shortcut or toggle, and /* Read in a keystroke, interpret it if it is a shortcut or toggle, and
* return it. Set ran_func to TRUE if we ran a function associated with * return it. Set ran_func to TRUE if we ran a function associated with
* a shortcut key, and set finished to TRUE if we're done after running * a shortcut key, and set finished to TRUE if we're done after running
* or trying to run a function associated with a shortcut key. * or trying to run a function associated with a shortcut key. */
* refresh_func is the function we will call to refresh the edit window. */ int do_statusbar_input(bool *ran_func, bool *finished)
int do_statusbar_input(bool *ran_func, bool *finished,
void (*refresh_func)(void))
{ {
int input; int input;
/* The character we read in. */ /* The character we read in. */
@ -117,10 +115,7 @@ int do_statusbar_input(bool *ran_func, bool *finished,
if (have_shortcut) { if (have_shortcut) {
if (s->scfunc == do_tab || s->scfunc == do_enter) if (s->scfunc == do_tab || s->scfunc == do_enter)
; ;
else if (s->scfunc == total_refresh) { else if (s->scfunc == do_left)
total_redraw();
refresh_func();
} else if (s->scfunc == do_left)
do_statusbar_left(); do_statusbar_left();
else if (s->scfunc == do_right) else if (s->scfunc == do_right)
do_statusbar_right(); do_statusbar_right();
@ -511,7 +506,7 @@ functionptrtype acquire_an_answer(int *actual, bool allow_tabs,
/* Ensure the cursor is shown when waiting for input. */ /* Ensure the cursor is shown when waiting for input. */
curs_set(1); curs_set(1);
kbinput = do_statusbar_input(&ran_func, &finished, refresh_func); kbinput = do_statusbar_input(&ran_func, &finished);
#ifndef NANO_TINY #ifndef NANO_TINY
/* If the window size changed, go reformat the prompt string. */ /* If the window size changed, go reformat the prompt string. */
@ -818,10 +813,7 @@ int do_yesno_prompt(bool all, const char *msg)
} }
} }
#endif /* !DISABLE_MOUSE */ #endif /* !DISABLE_MOUSE */
else if (func == total_refresh) { else {
total_redraw();
continue;
} else {
/* Look for the kbinput in the Yes, No (and All) strings. */ /* Look for the kbinput in the Yes, No (and All) strings. */
if (strchr(yesstr, kbinput) != NULL) if (strchr(yesstr, kbinput) != NULL)
response = 1; response = 1;

4
src/proto.h
View File

@ -480,9 +480,7 @@ int do_mouse(void);
#endif #endif
void do_output(char *output, size_t output_len, bool allow_cntrls); void do_output(char *output, size_t output_len, bool allow_cntrls);
/* All functions in prompt.c. */ /* Most functions in prompt.c. */
int do_statusbar_input(bool *ran_func, bool *finished,
void (*refresh_func)(void));
#ifndef DISABLE_MOUSE #ifndef DISABLE_MOUSE
int do_statusbar_mouse(void); int do_statusbar_mouse(void);
#endif #endif