IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

terminal: less babysitting of mapped_ctrl_c

Browse Source 
process_interrupts() checks get_real_state() so we can avoid some
housekeeping of mapped_ctrl_c in terminal-mode.
This commit is contained in:
Justin M. Keyes 2016-01-13 00:39:54 -05:00
parent 3dfbeabf35
commit 8eeda7169a
4 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/getchar.c
View File

@ -2940,11 +2940,12 @@ do_map (
if (!did_it) {
retval = 2; /* no match */
} else if (*keys == Ctrl_C) {
/* If CTRL-C has been unmapped, reuse it for Interrupting. */
if (map_table == curbuf->b_maphash)
// If CTRL-C has been unmapped, reuse it for Interrupting.
if (map_table == curbuf->b_maphash) {
curbuf->b_mapped_ctrl_c &= ~mode;
else
} else {
mapped_ctrl_c &= ~mode;
}
}
goto theend;
}
@ -2971,10 +2972,11 @@ do_map (
// If CTRL-C has been mapped, don't always use it for Interrupting.
if (*keys == Ctrl_C) {
if (map_table == curbuf->b_maphash)
if (map_table == curbuf->b_maphash) {
curbuf->b_mapped_ctrl_c |= mode;
else
} else {
mapped_ctrl_c |= mode;
}
}
mp->m_keys = vim_strsave(keys);

2
src/nvim/globals.h
View File

@ -887,7 +887,7 @@ EXTERN int ctrl_x_mode INIT(= 0); /* Which Ctrl-X mode are we in? */
EXTERN int no_abbr INIT(= TRUE); /* TRUE when no abbreviations loaded */
EXTERN int mapped_ctrl_c INIT(= 0); /* modes where CTRL-C is mapped */
EXTERN int mapped_ctrl_c INIT(= 0); // Modes where CTRL-C is mapped.
EXTERN cmdmod_T cmdmod; /* Ex command modifiers */

10
src/nvim/terminal.c
View File

@ -77,9 +77,7 @@
typedef struct terminal_state {
VimState state;
Terminal *term;
int save_state; // saved value of State
int save_rd; // saved value of RedrawingDisabled
int save_mapped_ctrl_c; // saved value of mapped_ctrl_c;
bool close;
bool got_bs; // if the last input was <C-\>
} TerminalState;
@ -362,12 +360,11 @@ void terminal_enter(void)
checkpcmark();
setpcmark();
s->save_state = State;
int save_state = State;
s->save_rd = RedrawingDisabled;
State = TERM_FOCUS;
mapped_ctrl_c |= TERM_FOCUS; // Always map CTRL-C to avoid interrupt.
RedrawingDisabled = false;
s->save_mapped_ctrl_c = mapped_ctrl_c;
mapped_ctrl_c = MAP_ALL_MODES;
// go to the bottom when the terminal is focused
adjust_topline(s->term, buf, false);
// erase the unfocused cursor
@ -380,11 +377,10 @@ void terminal_enter(void)
state_enter(&s->state);
restart_edit = 0;
State = s->save_state;
State = save_state;
RedrawingDisabled = s->save_rd;
// draw the unfocused cursor
invalidate_terminal(s->term, s->term->cursor.row, s->term->cursor.row + 1);
mapped_ctrl_c = s->save_mapped_ctrl_c;
unshowmode(true);
redraw(curbuf->handle != s->term->buf_handle);
ui_busy_stop();

15
test/functional/legacy/mapping_spec.lua
View File

@ -21,7 +21,7 @@ describe('mapping', function()
vim ]])
end)
it('works with Ctrl-c in Insert mode', function()
it('Ctrl-c works in Insert mode', function()
-- Mapping of ctrl-c in insert mode
execute('set cpo-=< cpo-=k')
execute('inoremap <c-c> <ctrl-c>')
@ -41,16 +41,13 @@ describe('mapping', function()
]])
end)
it('works with Ctrl-c in Visual mode', function()
-- Mapping of ctrl-c in Visual mode.
execute([[vnoremap <c-c> :<C-u>$put ='vmap works']])
it('Ctrl-c works in Visual mode', function()
execute([[vnoremap <c-c> :<C-u>$put ='vmap works'<cr>]])
feed('GV')
-- For some reason the mapping is only triggered when <C-c> is entered in a
-- separate feed command.
-- XXX: For some reason the mapping is only triggered
-- when <C-c> is in a separate feed command.
wait()
feed('<c-c>')
wait()
feed('<cr>')
execute('vunmap <c-c>')
expect([[
@ -58,7 +55,7 @@ describe('mapping', function()
vmap works]])
end)
it('works with Ctrl-c in Insert mode with langmap', function()
it('langmap', function()
-- langmap should not get remapped in insert mode.
execute('inoremap { FAIL_ilangmap')
execute('set langmap=+{ langnoremap')