Mercurial > vim
changeset 31245:fbc4d3b0302d v9.0.0956
patch 9.0.0956: terminal tests fail when using key with modifier
Commit: https://github.com/vim/vim/commit/9f14557d6a5b4f832029c292d7b3359b68336058
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Nov 27 12:45:41 2022 +0000
patch 9.0.0956: terminal tests fail when using key with modifier
Problem: Terminal tests fail when using key with modifier.
Solution: Use the modifyOtherKeys encoding when using RunVimInTerminal().
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 27 Nov 2022 14:00:05 +0100 |
| parents | 1866e7eb3b85 |
| children | a536455a9b74 |
| files | src/testdir/term_util.vim src/testdir/test_mapping.vim src/testdir/test_popupwin.vim src/testdir/test_termcodes.vim src/version.c |
| diffstat | 5 files changed, 46 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/term_util.vim +++ b/src/testdir/term_util.vim @@ -189,4 +189,43 @@ func Term_getlines(buf, lines) return join(map(a:lines, 'term_getline(a:buf, v:val)'), '') endfunc +" When using RunVimInTerminal() we expect modifyOtherKeys level 2 to be enabled +" automatically. The key + modifier Escape codes must then use the +" modifyOtherKeys encoding. They are recognized anyway, thus it's safer to use +" than the raw code. + +" Return the modifyOtherKeys level 2 encoding for "key" with "modifier" +" (number value, e.g. CTRL is 5). +func GetEscCodeCSI27(key, modifier) + let key = printf("%d", char2nr(a:key)) + let mod = printf("%d", a:modifier) + return "\<Esc>[27;" .. mod .. ';' .. key .. '~' +endfunc + +" Return the modifyOtherKeys level 2 encoding for "key" with "modifier" +" (character value, e.g. CTRL is "C"). +func GetEscCodeWithModifier(modifier, key) + let modifier = get({'C': 5}, a:modifier, '') + if modifier == '' + echoerr 'Unknown modifier: ' .. a:modifier + endif + return GetEscCodeCSI27(a:key, modifier) +endfunc + +" Return the kitty keyboard protocol encoding for "key" with "modifier" +" (number value, e.g. CTRL is 5). +func GetEscCodeCSIu(key, modifier) + let key = printf("%d", char2nr(a:key)) + let mod = printf("%d", a:modifier) + return "\<Esc>[" .. key .. ';' .. mod .. 'u' +endfunc + +" Return the kitty keyboard protocol encoding for "key" without a modifier. +" Used for the Escape key. +func GetEscCodeCSIuWithoutModifier(key) + let key = printf("%d", char2nr(a:key)) + return "\<Esc>[" .. key .. 'u' +endfunc + + " vim: shiftwidth=2 sts=2 expandtab
--- a/src/testdir/test_mapping.vim +++ b/src/testdir/test_mapping.vim @@ -584,7 +584,7 @@ func Test_expr_map_restore_cursor() END call writefile(lines, 'XtestExprMap', 'D') let buf = RunVimInTerminal('-S XtestExprMap', #{rows: 10}) - call term_sendkeys(buf, "\<C-B>") + call term_sendkeys(buf, GetEscCodeWithModifier('C', 'B')) call VerifyScreenDump(buf, 'Test_map_expr_1', {}) " clean up
--- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -4,6 +4,7 @@ source check.vim CheckFeature popupwin source screendump.vim +source term_util.vim func Test_simple_popup() CheckScreendump @@ -3722,7 +3723,9 @@ func Test_popupmenu_masking() let buf = RunVimInTerminal('-S XtestPopupmenuMasking', #{rows: 14}) call TermWait(buf, 25) - call term_sendkeys(buf, "A\<C-X>\<C-U>\<C-A>") + call term_sendkeys(buf, "A" .. GetEscCodeWithModifier('C', 'X') + \ .. GetEscCodeWithModifier('C', 'U') + \ .. GetEscCodeWithModifier('C', 'A')) call VerifyScreenDump(buf, 'Test_popupwin_popupmenu_masking_1', {}) call term_sendkeys(buf, "\<Esc>")
--- a/src/testdir/test_termcodes.vim +++ b/src/testdir/test_termcodes.vim @@ -2094,23 +2094,6 @@ func Test_list_builtin_terminals() call StopVimInTerminal('') endfunc -func GetEscCodeCSI27(key, modifier) - let key = printf("%d", char2nr(a:key)) - let mod = printf("%d", a:modifier) - return "\<Esc>[27;" .. mod .. ';' .. key .. '~' -endfunc - -func GetEscCodeCSIu(key, modifier) - let key = printf("%d", char2nr(a:key)) - let mod = printf("%d", a:modifier) - return "\<Esc>[" .. key .. ';' .. mod .. 'u' -endfunc - -func GetEscCodeCSIuWithoutModifier(key) - let key = printf("%d", char2nr(a:key)) - return "\<Esc>[" .. key .. 'u' -endfunc - " This checks the CSI sequences when in modifyOtherKeys mode. " The mode doesn't need to be enabled, the codes are always detected. func RunTest_modifyOtherKeys(func)