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

tweaks: elide an unused parameter, and rename the other and a variable 

Also, regroup a few lines.
master
Benno Schulenberg 2020-06-03 18:38:11 +02:00
parent c5b0e1958a
commit bc92e28b30
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/winio.c
View File

@ -811,17 +811,19 @@ int convert_sequence(const int *seq, size_t length, int *consumed)
/* Interpret the escape sequence in the keystroke buffer, the first /* Interpret the escape sequence in the keystroke buffer, the first
* character of which is kbinput. Assume that the keystroke buffer * character of which is kbinput. Assume that the keystroke buffer
* isn't empty, and that the initial escape has already been read in. */ * isn't empty, and that the initial escape has already been read in. */
int parse_escape_sequence(WINDOW *win, int kbinput) int parse_escape_sequence(int firstbyte)
{ {
int retval, *sequence, length, consumed; int *sequence, length, consumed, keycode;
/* Put back the non-escape code, then grab at most six integers /* Put the first character of the sequence back into the keybuffer. */
* (the longest possible escape sequence) from the keybuffer and put_back(firstbyte);
* translate the sequence into its corresponding keycode. */
put_back(kbinput); /* Grab at most six integers (the longest possible escape sequence)
* from the keybuffer. */
length = (key_buffer_len < 6 ? key_buffer_len : 6); length = (key_buffer_len < 6 ? key_buffer_len : 6);
sequence = get_input(NULL, length); sequence = get_input(NULL, length);
retval = convert_sequence(sequence, length, &consumed);
keycode = convert_sequence(sequence, length, &consumed);
/* If not all grabbed integers were consumed, put the leftovers back. */ /* If not all grabbed integers were consumed, put the leftovers back. */
for (int i = length - 1; i >= consumed; i--) for (int i = length - 1; i >= consumed; i--)
@ -829,7 +831,7 @@ int parse_escape_sequence(WINDOW *win, int kbinput)
free(sequence); free(sequence);
return retval; return keycode;
} }
/* Extract a single keystroke from the input stream. Translate escape /* Extract a single keystroke from the input stream. Translate escape
@ -892,7 +894,7 @@ int parse_kbinput(WINDOW *win)
} else } else
/* One escape followed by a non-escape, and there /* One escape followed by a non-escape, and there
* are more codes waiting: escape sequence mode. */ * are more codes waiting: escape sequence mode. */
retval = parse_escape_sequence(win, keycode); retval = parse_escape_sequence(keycode);
escapes = 0; escapes = 0;
break; break;
case 2: case 2:
@ -983,7 +985,7 @@ int parse_kbinput(WINDOW *win)
} else { } else {
/* Two escapes followed by a non-escape, and there are more /* Two escapes followed by a non-escape, and there are more
* codes waiting: combined meta and escape sequence mode. */ * codes waiting: combined meta and escape sequence mode. */
retval = parse_escape_sequence(win, keycode); retval = parse_escape_sequence(keycode);
meta_key = TRUE; meta_key = TRUE;
escapes = 0; escapes = 0;
} }
@ -1003,7 +1005,7 @@ int parse_kbinput(WINDOW *win)
* escape sequence mode. First interpret the escape * escape sequence mode. First interpret the escape
* sequence, then the result as a control sequence. */ * sequence, then the result as a control sequence. */
retval = get_control_kbinput( retval = get_control_kbinput(
parse_escape_sequence(win, keycode)); parse_escape_sequence(keycode));
escapes = 0; escapes = 0;
break; break;
} }