mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 15:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

input: Remove CURSORHOLD key

Browse Source 
Refactor input.c, normal.c and edit.c to use the K_EVENT special key to trigger
the CURSORHOLD event. In normal and edit mode, K_EVENT is treated as
K_CURSORHOLD, which enables better handling of arbitrary actions in those
states(eg: In normal mode the previous operator counts will be restored).

Also fix a test in vim_spec.lua. The test had a wrong assumption: cmdheight is
only used to determine when the press enter screen will be shown, not to limit
how many lines or control pagination.
This commit is contained in:
Thiago de Arruda
2015-10-05 10:13:18 -03:00
parent d8055f8eab
commit e5165bae11
7 changed files with 46 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nvim/edit.c
View File

@@ -626,14 +626,9 @@ edit (
} while (c == K_IGNORE);
input_disable_events();
if (c == K_EVENT) {
c = lastc;
queue_process_events(loop.events);
continue;
}
/* Don't want K_CURSORHOLD for the second key, e.g., after CTRL-V. */
did_cursorhold = TRUE;
// Don't want K_EVENT with cursorhold for the second key, e.g., after
// CTRL-V.
did_cursorhold = true;
if (p_hkmap && KeyTyped)
c = hkmap(c); /* Hebrew mode mapping */
@@ -974,9 +969,8 @@ doESCkey:
case K_IGNORE: /* Something mapped to nothing */
break;
case K_CURSORHOLD: /* Didn't type something for a while. */
apply_autocmds(EVENT_CURSORHOLDI, NULL, NULL, FALSE, curbuf);
did_cursorhold = TRUE;
case K_EVENT: // some event
queue_process_events(loop.events);
break;
case K_HOME: /* <Home> */
@@ -1223,9 +1217,10 @@ normalchar:
break;
} /* end of switch (c) */
/* If typed something may trigger CursorHoldI again. */
if (c != K_CURSORHOLD)
did_cursorhold = FALSE;
// If typed something may trigger CursorHoldI again.
if (c != K_EVENT) {
did_cursorhold = false;
}
/* If the cursor was moved we didn't just insert a space */
if (arrow_used)