diff options
| author | Vlastimil Ovčáčík <vovcacik@github.ovcacik.org> | 2021-09-20 20:19:11 +0200 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2021-10-03 01:39:30 +0900 |
| commit | 09700f676b8d0db016fc2b5d4baeedb9139daf76 (patch) | |
| tree | e502259472132f1e7ec0a284380b22403432d05a /src/tui | |
| parent | 4271e9cffae06b0b98d334d67ff7f0f5f9da80b0 (diff) | |
| download | fzf-09700f676b8d0db016fc2b5d4baeedb9139daf76.tar.gz | |
Add CtrlCaret keyboard event to FullscreenRenderer
Diffstat (limited to 'src/tui')
| -rw-r--r-- | src/tui/tcell.go | 2 | ||||
| -rw-r--r-- | src/tui/tcell_test.go | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/tui/tcell.go b/src/tui/tcell.go index 8ef3fba3..b5f788a1 100644 --- a/src/tui/tcell.go +++ b/src/tui/tcell.go @@ -296,6 +296,8 @@ func (r *FullscreenRenderer) GetChar() Event { return Event{CtrlBackSlash, 0, nil} case tcell.KeyCtrlRightSq: return Event{CtrlRightBracket, 0, nil} + case tcell.KeyCtrlCarat: + return Event{CtrlCaret, 0, nil} case tcell.KeyCtrlUnderscore: return Event{CtrlSlash, 0, nil} // section 3: (Alt)+Backspace2 diff --git a/src/tui/tcell_test.go b/src/tui/tcell_test.go index 1a10faf2..1569ae62 100644 --- a/src/tui/tcell_test.go +++ b/src/tui/tcell_test.go @@ -94,6 +94,8 @@ func TestGetCharEventKey(t *testing.T) { {giveKey{tcell.KeyRune, ' ', tcell.ModCtrl}, wantKey{CtrlSpace, 0, nil}}, // actual Ctrl+' ' {giveKey{tcell.KeyCtrlBackslash, rune(tcell.KeyCtrlBackslash), tcell.ModCtrl}, wantKey{CtrlBackSlash, 0, nil}}, {giveKey{tcell.KeyCtrlRightSq, rune(tcell.KeyCtrlRightSq), tcell.ModCtrl}, wantKey{CtrlRightBracket, 0, nil}}, + {giveKey{tcell.KeyCtrlCarat, rune(tcell.KeyCtrlCarat), tcell.ModShift | tcell.ModCtrl}, wantKey{CtrlCaret, 0, nil}}, // fabricated + {giveKey{tcell.KeyRS, rune(tcell.KeyRS), tcell.ModShift | tcell.ModCtrl}, wantKey{CtrlCaret, 0, nil}}, // actual Ctrl+Shift+6 (i.e. Ctrl+^) keystroke {giveKey{tcell.KeyCtrlUnderscore, rune(tcell.KeyCtrlUnderscore), tcell.ModShift | tcell.ModCtrl}, wantKey{CtrlSlash, 0, nil}}, // section 3: (Alt)+Backspace2 @@ -167,14 +169,12 @@ func TestGetCharEventKey(t *testing.T) { // section 8: Invalid {giveKey{tcell.KeyRune, 'a', tcell.ModMeta}, wantKey{Rune, 'a', nil}}, // fabricated {giveKey{tcell.KeyF24, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, - {giveKey{tcell.KeyCtrlCarat, rune(tcell.KeyCtrlCarat), tcell.ModShift | tcell.ModCtrl}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled - {giveKey{tcell.KeyRS, rune(tcell.KeyRS), tcell.ModShift | tcell.ModCtrl}, wantKey{Invalid, 0, nil}}, // actual Ctrl+Shift+6 (i.e. Ctrl+^) keystroke - {giveKey{tcell.KeyHelp, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled - {giveKey{tcell.KeyExit, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled - {giveKey{tcell.KeyClear, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // unhandled, actual keystroke Numpad_5 with Numlock OFF - {giveKey{tcell.KeyCancel, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled - {giveKey{tcell.KeyPrint, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled - {giveKey{tcell.KeyPause, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // unhandled + {giveKey{tcell.KeyHelp, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled + {giveKey{tcell.KeyExit, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled + {giveKey{tcell.KeyClear, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // unhandled, actual keystroke Numpad_5 with Numlock OFF + {giveKey{tcell.KeyCancel, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled + {giveKey{tcell.KeyPrint, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled + {giveKey{tcell.KeyPause, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // unhandled } r := NewFullscreenRenderer(&ColorTheme{}, false, false) @@ -246,7 +246,7 @@ Quick reference 27 7 KeyCtrlLeftSq KeyESC = ^[ KeyEsc, KeyEscape ESC 28 2 KeyCtrlBackslash KeyFS = ^\ CtrlSpace 29 2 KeyCtrlRightSq KeyGS = ^] CtrlBackSlash -30 8 KeyCtrlCarat KeyRS = ^^ CtrlRightBracket +30 2 KeyCtrlCarat KeyRS = ^^ CtrlRightBracket 31 2 KeyCtrlUnderscore KeyUS = ^_ CtrlCaret 32 CtrlSlash 33 Invalid |