Placing the cursor in the edit window again also after a Justify, after an

invalid escape sequence, and when entering a verbatim keystroke.
But leaving the cursor off during Unicode input, for extra feedback.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5771 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2016-03-29 14:09:17 +00:00
parent 7561b1b026
commit f45a2938e3
3 changed files with 9 additions and 2 deletions

View File

@ -1,6 +1,9 @@
2016-03-29 Benno Schulenberg <bensberg@justemail.net> 2016-03-29 Benno Schulenberg <bensberg@justemail.net>
* src/nano.c (main): Place the cursor in the edit window also when * src/nano.c (main), src/text.c (do_justify, do_verbatim_input),
--constantshow is in effect. src/winio.c (parse_escape_sequence): Place the cursor in the edit
window also when --constantshow is in effect, after a ^J Justify or
an invalid escape sequence, and when entering a verbatim keystroke.
Leave the cursor off during Unicode input, for extra feedback.
2016-03-28 Benno Schulenberg <bensberg@justemail.net> 2016-03-28 Benno Schulenberg <bensberg@justemail.net>
* src/winio.c (statusbar): Don't bother putting back the cursor in * src/winio.c (statusbar): Don't bother putting back the cursor in

View File

@ -2250,6 +2250,7 @@ void do_justify(bool full_justify)
do { do {
#endif #endif
statusbar(_("Can now UnJustify!")); statusbar(_("Can now UnJustify!"));
reset_cursor();
curs_set(1); curs_set(1);
kbinput = do_input(FALSE); kbinput = do_input(FALSE);
#ifndef NANO_TINY #ifndef NANO_TINY
@ -3414,6 +3415,8 @@ void do_verbatim_input(void)
/* TRANSLATORS: This is displayed when the next keystroke will be /* TRANSLATORS: This is displayed when the next keystroke will be
* inserted verbatim. */ * inserted verbatim. */
statusbar(_("Verbatim Input")); statusbar(_("Verbatim Input"));
reset_cursor();
curs_set(1);
/* Read in all the verbatim characters. */ /* Read in all the verbatim characters. */
kbinput = get_verbatim_kbinput(edit, &kbinput_len); kbinput = get_verbatim_kbinput(edit, &kbinput_len);

View File

@ -1118,6 +1118,7 @@ int parse_escape_sequence(WINDOW *win, int kbinput)
if (retval == ERR) { if (retval == ERR) {
if (win == edit) { if (win == edit) {
statusbar(_("Unknown Command")); statusbar(_("Unknown Command"));
reset_cursor();
curs_set(1); curs_set(1);
beep(); beep();
} }