De-duplicate code for KeyEvent creation

This commit is contained in:
Dmytro Maluka 2024-06-10 02:54:37 +02:00
parent a85696d5e0
commit 25c7fa55b1
4 changed files with 15 additions and 29 deletions

View File

@ -469,13 +469,7 @@ func (h *BufPane) HandleEvent(event tcell.Event) {
h.paste(e.Text())
h.Relocate()
case *tcell.EventKey:
ke := KeyEvent{
code: e.Key(),
mod: metaToAlt(e.Modifiers()),
}
if e.Key() == tcell.KeyRune {
ke.r = e.Rune()
}
ke := keyEvent(e)
done := h.DoKeyEvent(ke)
if !done && e.Key() == tcell.KeyRune {

View File

@ -44,6 +44,17 @@ func metaToAlt(mod tcell.ModMask) tcell.ModMask {
return mod
}
func keyEvent(e *tcell.EventKey) KeyEvent {
ke := KeyEvent{
code: e.Key(),
mod: metaToAlt(e.Modifiers()),
}
if e.Key() == tcell.KeyRune {
ke.r = e.Rune()
}
return ke
}
func (k KeyEvent) Name() string {
if k.any {
return "<any>"
@ -155,14 +166,7 @@ func (m MouseEvent) Name() string {
func ConstructEvent(event tcell.Event) (Event, error) {
switch e := event.(type) {
case *tcell.EventKey:
ke := KeyEvent{
code: e.Key(),
mod: metaToAlt(e.Modifiers()),
}
if e.Key() == tcell.KeyRune {
ke.r = e.Rune()
}
return ke, nil
return keyEvent(e), nil
case *tcell.EventRaw:
return RawEvent{
esc: e.EscSeq(),

View File

@ -86,13 +86,7 @@ func (h *InfoPane) HandleEvent(event tcell.Event) {
case *tcell.EventResize:
// TODO
case *tcell.EventKey:
ke := KeyEvent{
code: e.Key(),
mod: metaToAlt(e.Modifiers()),
}
if e.Key() == tcell.KeyRune {
ke.r = e.Rune()
}
ke := keyEvent(e)
done := h.DoKeyEvent(ke)
hasYN := h.HasYN

View File

@ -125,13 +125,7 @@ func (t *TermPane) Unsplit() {
// copy-paste
func (t *TermPane) HandleEvent(event tcell.Event) {
if e, ok := event.(*tcell.EventKey); ok {
ke := KeyEvent{
code: e.Key(),
mod: metaToAlt(e.Modifiers()),
}
if e.Key() == tcell.KeyRune {
ke.r = e.Rune()
}
ke := keyEvent(e)
action, more := TermBindings.NextEvent(ke, nil)
if !more {