From f45a2938e31d552ab4e106b4ebcdda16a51a66c4 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Tue, 29 Mar 2016 14:09:17 +0000 Subject: [PATCH] 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 --- ChangeLog | 7 +++++-- src/text.c | 3 +++ src/winio.c | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c4ee5f4..59858872 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2016-03-29 Benno Schulenberg - * src/nano.c (main): Place the cursor in the edit window also when - --constantshow is in effect. + * src/nano.c (main), src/text.c (do_justify, do_verbatim_input), + 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 * src/winio.c (statusbar): Don't bother putting back the cursor in diff --git a/src/text.c b/src/text.c index 07dd6853..be7c47c3 100644 --- a/src/text.c +++ b/src/text.c @@ -2250,6 +2250,7 @@ void do_justify(bool full_justify) do { #endif statusbar(_("Can now UnJustify!")); + reset_cursor(); curs_set(1); kbinput = do_input(FALSE); #ifndef NANO_TINY @@ -3414,6 +3415,8 @@ void do_verbatim_input(void) /* TRANSLATORS: This is displayed when the next keystroke will be * inserted verbatim. */ statusbar(_("Verbatim Input")); + reset_cursor(); + curs_set(1); /* Read in all the verbatim characters. */ kbinput = get_verbatim_kbinput(edit, &kbinput_len); diff --git a/src/winio.c b/src/winio.c index 78cccea0..ffe1a05e 100644 --- a/src/winio.c +++ b/src/winio.c @@ -1118,6 +1118,7 @@ int parse_escape_sequence(WINDOW *win, int kbinput) if (retval == ERR) { if (win == edit) { statusbar(_("Unknown Command")); + reset_cursor(); curs_set(1); beep(); } -- 2.39.5