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

in do_(statusbar_)?input(), if we get NANO_CONTROL_8, handle it instead 

of ignoring it, for consistency


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3451 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2006-04-28 18:59:34 +00:00
parent 4d9ef69f8e
commit fbf46a5d88
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -133,10 +133,16 @@ CVS code -
- nano.c:
renumber()
- Remove invalid assert. (DLR, found by Filipe Moreira)
do_input()
- If we get NANO_CONTROL_8, handle it instead of ignoring it,
for consistency. (DLR)
- nano.h:
- Reorder the toggle #defines to match their corresponding order
in toggle_init(). (DLR)
- prompt.c:
do_statusbar_input()
- If we get NANO_CONTROL_8, handle it instead of ignoring it,
for consistency. (DLR)
get_prompt_string()
- Include the handling of the help key even when help is
disabled, so that we aren't erroneously kicked out of the

18
src/nano.c
View File

@ -1281,16 +1281,20 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
/* Read in a character. */
input = get_kbinput(edit, meta_key, func_key);
if (allow_funcs) {
#ifndef DISABLE_MOUSE
/* If we got a mouse click and it was on a shortcut, read in the
* shortcut character. */
if (allow_funcs && *func_key == TRUE && input == KEY_MOUSE) {
if (do_mouse())
input = get_kbinput(edit, meta_key, func_key);
/* If we got a mouse click and it was on a shortcut, read in the
* shortcut character. */
if (*func_key == TRUE && input == KEY_MOUSE)
input = do_mouse() ? get_kbinput(edit, meta_key, func_key) :
ERR;
else
input = ERR;
}
#endif
if (input == NANO_CONTROL_8 && *meta_key == FALSE &&
*func_key == FALSE)
input = ISSET(REBIND_DELETE) ? NANO_BACKSPACE_KEY :
NANO_DELETE_KEY;
}
/* Check for a shortcut in the main list. */
s = get_shortcut(main_list, &input, meta_key, func_key);

18
src/prompt.c
View File

@ -68,16 +68,20 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *s_or_t,
/* Read in a character. */
input = get_kbinput(bottomwin, meta_key, func_key);
if (allow_funcs) {
#ifndef DISABLE_MOUSE
/* If we got a mouse click and it was on a shortcut, read in the
* shortcut character. */
if (allow_funcs && *func_key == TRUE && input == KEY_MOUSE) {
if (do_statusbar_mouse())
input = get_kbinput(bottomwin, meta_key, func_key);
/* If we got a mouse click and it was on a shortcut, read in the
* shortcut character. */
if (*func_key == TRUE && input == KEY_MOUSE)
input = do_statusbar_mouse() ? get_kbinput(bottomwin,
meta_key, func_key) : ERR;
else
input = ERR;
}
#endif
if (input == NANO_CONTROL_8 && *meta_key == FALSE &&
*func_key == FALSE)
input = ISSET(REBIND_DELETE) ? NANO_BACKSPACE_KEY :
NANO_DELETE_KEY;
}
/* Check for a shortcut in the current list. */
s = get_shortcut(currshortcut, &input, meta_key, func_key);