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

tweaks: adjust indentation after previous change

master
Benno Schulenberg 2016-08-22 14:05:25 +02:00
parent 0d5fbfb91c
commit 2f9232a493
1 changed files with 63 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/prompt.c
View File

@ -33,10 +33,9 @@ static size_t statusbar_x = HIGHEST_POSITIVE;
static size_t statusbar_pww = HIGHEST_POSITIVE; static size_t statusbar_pww = HIGHEST_POSITIVE;
/* The place we want in answer. */ /* The place we want in answer. */
/* Read in a character, interpret it as a shortcut or toggle if /* Read in a keystroke, interpret it if it is a shortcut or toggle, and
* necessary, and return it. * return it. Set ran_func to TRUE if we ran a function associated with
* Set ran_func to TRUE if we ran a function associated with a * a shortcut key, and set finished to TRUE if we're done after running
* 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. */ * 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,
@ -103,12 +102,12 @@ int do_statusbar_input(bool *ran_func, bool *finished,
} }
} }
/* If we got a shortcut, or if there aren't any other characters /* If we got a shortcut, or if there aren't any other keystrokes waiting
* waiting after the one we read in, we need to display all the * after the one we read in, we need to insert all the characters in the
* characters in the input buffer if it isn't empty. */ * input buffer (if not empty) into the answer. */
if ((have_shortcut || get_key_buffer_len() == 0) && kbinput != NULL) { if ((have_shortcut || get_key_buffer_len() == 0) && kbinput != NULL) {
/* Display all the characters in the input buffer at /* Inject all characters in the input buffer at once, filtering out
* once, filtering out control characters. */ * control characters. */
do_statusbar_output(kbinput, kbinput_len, TRUE, NULL); do_statusbar_output(kbinput, kbinput_len, TRUE, NULL);
/* Empty the input buffer. */ /* Empty the input buffer. */
@ -117,7 +116,6 @@ int do_statusbar_input(bool *ran_func, bool *finished,
kbinput = NULL; kbinput = NULL;
} }
if (have_shortcut) { if (have_shortcut) {
if (s->scfunc == do_tab || s->scfunc == do_enter) if (s->scfunc == do_tab || s->scfunc == do_enter)
; ;
@ -160,18 +158,17 @@ int do_statusbar_input(bool *ran_func, bool *finished,
input = sc_seq_or(do_enter, 0); input = sc_seq_or(do_enter, 0);
*finished = TRUE; *finished = TRUE;
} }
} else if (s->scfunc == do_cut_text_void) { } else if (s->scfunc == do_cut_text_void)
do_statusbar_cut_text(); do_statusbar_cut_text();
} else if (s->scfunc == do_delete) { else if (s->scfunc == do_delete)
do_statusbar_delete(); do_statusbar_delete();
} else if (s->scfunc == do_backspace) { else if (s->scfunc == do_backspace)
do_statusbar_backspace(); do_statusbar_backspace();
} else { else {
/* Handle any other shortcut in the current menu, setting /* Handle any other shortcut in the current menu, setting
* ran_func to TRUE if we try to run their associated * ran_func to TRUE if we try to run their associated functions,
* functions and setting finished to TRUE to indicate * and setting finished to TRUE to indicatethat we're done after
* that we're done after running or trying to run their * running or trying to run their associated functions. */
* associated functions. */
f = sctofunc(s); f = sctofunc(s);
if (s->scfunc != NULL) { if (s->scfunc != NULL) {
*ran_func = TRUE; *ran_func = TRUE;