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

tweaks: factor out a common condition

master
Benno Schulenberg 2016-07-25 12:31:40 +02:00
parent 8eb99e2a1d
commit aefe26d216
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/prompt.c
View File

@ -145,12 +145,17 @@ int do_statusbar_input(bool *ran_func, bool *finished,
do_statusbar_home(); do_statusbar_home();
else if (s->scfunc == do_end) else if (s->scfunc == do_end)
do_statusbar_end(); do_statusbar_end();
else if (ISSET(RESTRICTED) && currmenu == MWRITEFILE &&
openfile->filename[0] != '\0' &&
(s->scfunc == do_verbatim_input ||
s->scfunc == do_cut_text_void ||
s->scfunc == do_delete ||
s->scfunc == do_backspace))
/* When in restricted mode and at the "Write File" prompt
* and the filename isn't blank, disallow verbatim input
* and disallow all forms of deletion. */
;
else if (s->scfunc == do_verbatim_input) { else if (s->scfunc == do_verbatim_input) {
/* If we're using restricted mode, the filename
* isn't blank, and we're at the "Write File"
* prompt, disable verbatim input. */
if (!ISSET(RESTRICTED) || currmenu != MWRITEFILE ||
openfile->filename[0] == '\0') {
bool got_newline = FALSE; bool got_newline = FALSE;
/* Whether we got a verbatim ^J. */ /* Whether we got a verbatim ^J. */
@ -164,27 +169,11 @@ 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) {
/* If we're using restricted mode, the filename
* isn't blank, and we're at the "Write File"
* prompt, disable Cut. */
if (!ISSET(RESTRICTED) || openfile->filename[0] == '\0' ||
currmenu != MWRITEFILE)
do_statusbar_cut_text(); do_statusbar_cut_text();
} else if (s->scfunc == do_delete) { } else if (s->scfunc == do_delete) {
/* If we're using restricted mode, the filename
* isn't blank, and we're at the "Write File"
* prompt, disable Delete. */
if (!ISSET(RESTRICTED) || openfile->filename[0] == '\0' ||
currmenu != MWRITEFILE)
do_statusbar_delete(); do_statusbar_delete();
} else if (s->scfunc == do_backspace) { } else if (s->scfunc == do_backspace) {
/* If we're using restricted mode, the filename
* isn't blank, and we're at the "Write File"
* prompt, disable Backspace. */
if (!ISSET(RESTRICTED) || openfile->filename[0] == '\0' ||
currmenu != MWRITEFILE)
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