From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Tue, 2 Nov 2004 02:48:02 +0000 (+0000)
Subject: in get_kbinput(), make sure meta_key and func_key are set properly in
X-Git-Tag: v1.3.5~76
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=1e1f572c51b5456aaad3978e19b62a0b6feb3518;p=nano.git

in get_kbinput(), make sure meta_key and func_key are set properly in
all cases


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2044 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/src/winio.c b/src/winio.c
index ab6664dc..5aae8234 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -194,13 +194,13 @@ int get_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 		    *meta_key = TRUE;
 		    retval = tolower(kbinput);
 		/* If the escape sequence is more than one character
-		 * long, set meta_key to FALSE, translate the escape
+		 * long, set func_key to TRUE, translate the escape
 		 * sequence into the corresponding key value, and save
 		 * that as the result. */
 		} else if (seq_len > 1) {
 		    bool ignore_seq;
 
-		    *meta_key = FALSE;
+		    *func_key = TRUE;
 		    retval = get_escape_seq_kbinput(sequence, seq_len,
 			&ignore_seq);
 
@@ -215,9 +215,9 @@ int get_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 		}
 	    /* Handle UTF-8 sequences. */
 	    } else if (seq == UTF8_SEQ) {
-		/* If we have a UTF-8 sequence, set func_key to FALSE,
-		 * translate the UTF-8 sequence into the corresponding
-		 * wide character value, and save that as the result. */
+		/* If we have a UTF-8 sequence, translate the UTF-8
+		 * sequence into the corresponding wide character value,
+		 * and save that as the result. */
 		int i = 0;
 		char *s = charalloc(seq_len + 1);
 		wchar_t wc;
@@ -226,7 +226,6 @@ int get_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 		    s[i] = (char)sequence[i];
 		s[seq_len] = '\0';
 
-		*func_key = FALSE;
 		if (mbtowc(&wc, s, MB_CUR_MAX) == -1) {
 		    /* This UTF-8 sequence is unrecognized.  Send it
 		     * back. */