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

patch 9.0.0748: Kitty may send key without modifiers with CSI u code

Browse Source 
Problem:    Kitty may send key without modifiers with CSI u code.
Solution:   Handle CSI u code without modifiers. (Trygve Aaberge,
            closes #11364)
This commit is contained in:
Trygve Aaberge
2022-10-14 12:08:24 +01:00
committed by Bram Moolenaar
parent ba43e76fcd
commit b9c09c118e
3 changed files with 76 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/term.c
View File

@@ -4806,6 +4806,28 @@ handle_version_response(int first, int *arg, int argc, char_u *tp)
}
}
/*
* Add "key" to "buf" and return the number of bytes used.
* Handles special keys and multi-byte characters.
*/
static int
add_key_to_buf(int key, char_u *buf)
{
int idx = 0;
if (IS_SPECIAL(key))
{
buf[idx++] = K_SPECIAL;
buf[idx++] = KEY2TERMCAP0(key);
buf[idx++] = KEY2TERMCAP1(key);
}
else if (has_mbyte)
idx += (*mb_char2bytes)(key, buf + idx);
else
buf[idx++] = key;
return idx;
}
/*
* Handle a sequence with key and modifier, one of:
* {lead}27;{modifier};{key}~
@@ -4824,7 +4846,6 @@ handle_key_with_modifier(
{
int key;
int modifiers;
int new_slen;
char_u string[MAX_KEY_CODE_LEN + 1];
seenModifyOtherKeys = TRUE;
@@ -4842,18 +4863,33 @@ handle_key_with_modifier(
modifiers = may_remove_shift_modifier(modifiers, key);
// insert modifiers with KS_MODIFIER
new_slen = modifiers2keycode(modifiers, &key, string);
int new_slen = modifiers2keycode(modifiers, &key, string);
if (IS_SPECIAL(key))
{
string[new_slen++] = K_SPECIAL;
string[new_slen++] = KEY2TERMCAP0(key);
string[new_slen++] = KEY2TERMCAP1(key);
}
else if (has_mbyte)
new_slen += (*mb_char2bytes)(key, string + new_slen);
else
string[new_slen++] = key;
// add the bytes for the key
new_slen += add_key_to_buf(key, string + new_slen);
if (put_string_in_typebuf(offset, csi_len, string, new_slen,
buf, bufsize, buflen) == FAIL)
return -1;
return new_slen - csi_len + offset;
}
/*
* Handle a sequence with key without a modifier:
* {lead}{key}u
* Returns the difference in length.
*/
static int
handle_key_without_modifier(
int *arg,
int csi_len,
int offset,
char_u *buf,
int bufsize,
int *buflen)
{
char_u string[MAX_KEY_CODE_LEN + 1];
int new_slen = add_key_to_buf(arg[0], string);
if (put_string_in_typebuf(offset, csi_len, string, new_slen,
buf, bufsize, buflen) == FAIL)
@@ -5016,6 +5052,14 @@ handle_csi(
csi_len, offset, buf, bufsize, buflen);
}
// Key without modifier (bad Kitty may send this):
// {lead}{key}u
else if (argc == 1 && trail == 'u')
{
return len + handle_key_without_modifier(arg,
csi_len, offset, buf, bufsize, buflen);
}
// else: Unknown CSI sequence. We could drop it, but then the
// user can't create a map for it.
return 0;