From b9db967bc4e41a7cb3b38ddd09c6a681106325aa Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Mon, 20 Jul 2020 18:41:06 +0200
Subject: [PATCH] tweaks: reshuffle some lines, for esthetics

There is no need to reset the digit counter (because this counter
matters only when the escape counter equals two) -- resetting the
escape counter is enough.
---
 src/winio.c | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/winio.c b/src/winio.c
index 5a0d2ec0..c9d74c84 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -845,24 +845,24 @@ int assemble_byte_code(int keycode)
 {
 	static int byte = 0;
 
+	/* The first digit is either 0, 1, or 2 (which has been checked before
+	 * the call.  The second digit may be at most 5 if the first was 2. */
 	if (++digit_count == 1) {
-		/* The first digit is either 0, 1, or 2. */
 		byte = (keycode - '0') * 100;
 		return PROCEED;
 	} else if (digit_count == 2) {
-		/* The second digit may be at most 5 if the first was 2. */
 		if (byte < 200 || keycode <= '5') {
 			byte += (keycode - '0') * 10;
 			return PROCEED;
 		} else
 			return keycode;
-	} else {
-		/* The third digit may be at most 5 if first two were 2 and 5. */
-		if (byte < 250 || keycode <= '5') {
-			return (byte + keycode - '0');
-		} else
-			return keycode;
 	}
+
+	/* The third digit may be at most 5 if the first two were 2 and 5. */
+	if (byte < 250 || keycode <= '5')
+		return (byte + keycode - '0');
+	else
+		return keycode;
 }
 
 /* Translate a normal ASCII character into its corresponding control code.
@@ -985,32 +985,36 @@ int parse_kbinput(WINDOW *win)
 										(keycode <= '9' && digit_count > 0))) {
 					/* Two escapes followed by one digit, and no other codes
 					 * are waiting: byte sequence mode.  If the range of the
-					 * byte sequence is limited to 2XX, interpret it. */
+					 * sequence of digits is limited to 2XX, interpret it. */
 					int byte = assemble_byte_code(keycode);
 
-					/* If the decimal byte value is complete, convert it and
-					 * put the obtained byte(s) back into the input buffer. */
+					/* If the decimal byte value is not yet complete,
+					 * return nothing; otherwise convert it and put the
+					 * obtained byte(s) back into the input buffer. */
 					if (byte == PROCEED)
 						return ERR;
 					else {
+						int count, onebyte;
 						char *multibyte;
-						int count, onebyte, i;
 
 						/* Convert the decimal code to one or two bytes. */
 						multibyte = make_mbchar((long)byte, &count);
 
 						/* Insert the byte(s) into the input buffer. */
-						for (i = count; i > 0 ; i--) {
+						for (int i = count; i > 0 ; i--) {
 							onebyte = (unsigned char)multibyte[i - 1];
 							put_back(onebyte);
 						}
 
 						free(multibyte);
-
 						escapes = 0;
 					}
 				} else {
-					if (digit_count == 0)
+					if (digit_count > 0)
+						/* A non-digit in the middle of a byte sequence:
+						 * the keycode itself is the result. */
+						retval = keycode;
+					else {
 						/* Two escapes followed by a non-digit: meta key
 						 * or control character sequence mode. */
 						if (!solitary) {
@@ -1018,12 +1022,6 @@ int parse_kbinput(WINDOW *win)
 							retval = (shifted_metas) ? keycode : tolower(keycode);
 						} else
 							retval = convert_to_control(keycode);
-					else {
-						/* An invalid digit in the middle of a byte
-						 * sequence: reset the byte sequence counter
-						 * and save the code we got as the result. */
-						digit_count = 0;
-						retval = keycode;
 					}
 					escapes = 0;
 				}