aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.1.2350: other text for CTRL-V in Insert mode with modifyOtherKeys

Browse Source 
Problem:    Other text for CTRL-V in Insert mode with modifyOtherKeys.
Solution:   Convert the Escape sequence back to key as if modifyOtherKeys is
            not set, and use CTRL-SHIFT-V to get the Escape sequence itself.
            (closes #5254)
This commit is contained in:
Bram Moolenaar
2019-11-26 19:33:22 +01:00
parent cc4423ae13
commit fc4ea2a72d
11 changed files with 182 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/edit.c
View File

@@ -1531,6 +1531,7 @@ ins_ctrl_v(void)
{
int c;
int did_putchar = FALSE;
int prev_mod_mask = mod_mask;
/* may need to redraw when no more chars available now */
ins_redraw(FALSE);
@@ -1554,6 +1555,12 @@ ins_ctrl_v(void)
#ifdef FEAT_CMDL_INFO
clear_showcmd();
#endif
if ((c == ESC || c == CSI) && !(prev_mod_mask & MOD_MASK_SHIFT))
// Using CTRL-V: Change any modifyOtherKeys ESC sequence to a normal
// key. Don't do this for CTRL-SHIFT-V.
c = decodeModifyOtherKeys(c);
insert_special(c, FALSE, TRUE);
#ifdef FEAT_RIGHTLEFT
revins_chars++;
@@ -1561,6 +1568,59 @@ ins_ctrl_v(void)
#endif
}
/*
* After getting an ESC or CSI for a literal key: If the typeahead buffer
* contains a modifyOtherKeys sequence then decode it and return the result.
* Otherwise return "c".
* Note that this doesn't wait for characters, they must be in the typeahead
* buffer already.
*/
int
decodeModifyOtherKeys(int c)
{
char_u *p = typebuf.tb_buf + typebuf.tb_off;
int idx;
int form = 0;
int argidx = 0;
int arg[2] = {0, 0};
// Recognize:
// form 0: {lead}{key};{modifier}u
// form 1: {lead}27;{modifier};{key}~
if ((c == CSI || (c == ESC && *p == '[')) && typebuf.tb_len >= 4)
{
idx = (*p == '[');
if (p[idx] == '2' && p[idx + 1] == '7' && p[idx + 2] == ';')
{
form = 1;
idx += 3;
}
while (idx < typebuf.tb_len && argidx < 2)
{
if (p[idx] == ';')
++argidx;
else if (VIM_ISDIGIT(p[idx]))
arg[argidx] = arg[argidx] * 10 + (p[idx] - '0');
else
break;
++idx;
}
if (idx < typebuf.tb_len
&& p[idx] == (form == 1 ? '~' : 'u')
&& argidx == 1)
{
// Match, consume the code.
typebuf.tb_off += idx + 1;
typebuf.tb_len -= idx + 1;
mod_mask = decode_modifiers(arg[!form]);
c = merge_modifyOtherKeys(arg[form]);
}
}
return c;
}
/*
* Put a character directly onto the screen. It's not stored in a buffer.
* Used while handling CTRL-K, CTRL-V, etc. in Insert mode.