mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-30 06:58:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17279 from zeertzjq/state-enter-vpeekc

Browse Source 
fix(event-loop): call vpeekc() directly first to check for character
This commit is contained in:
bfredl
2022-02-06 19:22:02 +01:00
committed by GitHub
parent c7df847c07 74998b0449
commit f0699f4356
4 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval/funcs.c
View File

@@ -3189,7 +3189,7 @@ static void getchar_common(typval_T *argvars, typval_T *rettv)
if (argvars[0].v_type == VAR_UNKNOWN) {
// getchar(): blocking wait.
// TODO(bfredl): deduplicate shared logic with state_enter ?
if (!(char_avail() || using_script() || input_available())) {
if (!char_avail()) {
(void)os_inchar(NULL, 0, -1, 0, main_loop.events);
if (!multiqueue_empty(main_loop.events)) {
state_handle_k_event();

22
src/nvim/state.c
View File

@@ -39,10 +39,16 @@ void state_enter(VimState *s)
int key;
getkey:
if (char_avail() || using_script() || input_available()) {
// Don't block for events if there's a character already available for
// processing. Characters can come from mappings, scripts and other
// sources, so this scenario is very common.
// Expand mappings first by calling vpeekc() directly.
// - If vpeekc() returns non-NUL, there is a character already available for processing, so
// don't block for events. vgetc() may still block, in case of an incomplete UTF-8 sequence.
// - If vpeekc() returns NUL, vgetc() will block, and there are three cases:
// - There is no input available.
// - All of available input maps to an empty string.
// - There is an incomplete mapping.
// A blocking wait for a character should only be done in the third case, which is the only
// case of the three where typebuf.tb_len > 0 after vpeekc() returns NUL.
if (vpeekc() != NUL || typebuf.tb_len > 0) {
key = safe_vgetc();
} else if (!multiqueue_empty(main_loop.events)) {
// Event was made available after the last multiqueue_process_events call
@@ -55,9 +61,11 @@ getkey:
// mapping engine.
(void)os_inchar(NULL, 0, -1, 0, main_loop.events);
// If an event was put into the queue, we send K_EVENT directly.
key = !multiqueue_empty(main_loop.events)
? K_EVENT
: safe_vgetc();
if (!multiqueue_empty(main_loop.events)) {
key = K_EVENT;
} else {
goto getkey;
}
}
if (key == K_EVENT) {