From 892d1acccb705e5547be1b3b6fad8b6d480c290b Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Sat, 13 Apr 2024 14:47:04 +0900 Subject: [PATCH] Fix tcell build --- src/tui/tcell.go | 38 ++++++++++++++++---------------- src/tui/tcell_test.go | 50 +++++++++++++++++++++---------------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/tui/tcell.go b/src/tui/tcell.go index 0ca8aee7..af0902cb 100644 --- a/src/tui/tcell.go +++ b/src/tui/tcell.go @@ -320,16 +320,16 @@ func (r *FullscreenRenderer) GetChar() Event { switch ev.Rune() { case 0: if ctrl { - return Event{BSpace, 0, nil} + return Event{Backspace, 0, nil} } case rune(tcell.KeyCtrlH): switch { case ctrl: return keyfn('h') case alt: - return Event{AltBS, 0, nil} + return Event{AltBackspace, 0, nil} case none, shift: - return Event{BSpace, 0, nil} + return Event{Backspace, 0, nil} } } case tcell.KeyCtrlI: @@ -382,17 +382,17 @@ func (r *FullscreenRenderer) GetChar() Event { // section 3: (Alt)+Backspace2 case tcell.KeyBackspace2: if alt { - return Event{AltBS, 0, nil} + return Event{AltBackspace, 0, nil} } - return Event{BSpace, 0, nil} + return Event{Backspace, 0, nil} // section 4: (Alt+Shift)+Key(Up|Down|Left|Right) case tcell.KeyUp: if altShift { - return Event{AltSUp, 0, nil} + return Event{AltShiftUp, 0, nil} } if shift { - return Event{SUp, 0, nil} + return Event{ShiftUp, 0, nil} } if alt { return Event{AltUp, 0, nil} @@ -400,10 +400,10 @@ func (r *FullscreenRenderer) GetChar() Event { return Event{Up, 0, nil} case tcell.KeyDown: if altShift { - return Event{AltSDown, 0, nil} + return Event{AltShiftDown, 0, nil} } if shift { - return Event{SDown, 0, nil} + return Event{ShiftDown, 0, nil} } if alt { return Event{AltDown, 0, nil} @@ -411,10 +411,10 @@ func (r *FullscreenRenderer) GetChar() Event { return Event{Down, 0, nil} case tcell.KeyLeft: if altShift { - return Event{AltSLeft, 0, nil} + return Event{AltShiftLeft, 0, nil} } if shift { - return Event{SLeft, 0, nil} + return Event{ShiftLeft, 0, nil} } if alt { return Event{AltLeft, 0, nil} @@ -422,10 +422,10 @@ func (r *FullscreenRenderer) GetChar() Event { return Event{Left, 0, nil} case tcell.KeyRight: if altShift { - return Event{AltSRight, 0, nil} + return Event{AltShiftRight, 0, nil} } if shift { - return Event{SRight, 0, nil} + return Event{ShiftRight, 0, nil} } if alt { return Event{AltRight, 0, nil} @@ -442,17 +442,17 @@ func (r *FullscreenRenderer) GetChar() Event { return Event{CtrlDelete, 0, nil} } if shift { - return Event{SDelete, 0, nil} + return Event{ShiftDelete, 0, nil} } - return Event{Del, 0, nil} + return Event{Delete, 0, nil} case tcell.KeyEnd: return Event{End, 0, nil} case tcell.KeyPgUp: - return Event{PgUp, 0, nil} + return Event{PageUp, 0, nil} case tcell.KeyPgDn: - return Event{PgDn, 0, nil} + return Event{PageDown, 0, nil} case tcell.KeyBacktab: - return Event{BTab, 0, nil} + return Event{ShiftTab, 0, nil} case tcell.KeyF1: return Event{F1, 0, nil} case tcell.KeyF2: @@ -498,7 +498,7 @@ func (r *FullscreenRenderer) GetChar() Event { // section 7: Esc case tcell.KeyEsc: - return Event{ESC, 0, nil} + return Event{Esc, 0, nil} } } diff --git a/src/tui/tcell_test.go b/src/tui/tcell_test.go index 0772a9e2..54b9c9b3 100644 --- a/src/tui/tcell_test.go +++ b/src/tui/tcell_test.go @@ -102,22 +102,22 @@ func TestGetCharEventKey(t *testing.T) { // KeyBackspace2 is alias for KeyDEL = 0x7F (ASCII) (allegedly unused by Windows) // KeyDelete = 0x2E (VK_DELETE constant in Windows) // KeyBackspace is alias for KeyBS = 0x08 (ASCII) (implicit alias with KeyCtrlH) - {giveKey{tcell.KeyBackspace2, 0, tcell.ModNone}, wantKey{BSpace, 0, nil}}, // fabricated - {giveKey{tcell.KeyBackspace2, 0, tcell.ModAlt}, wantKey{AltBS, 0, nil}}, // fabricated - {giveKey{tcell.KeyDEL, 0, tcell.ModNone}, wantKey{BSpace, 0, nil}}, // fabricated, unhandled - {giveKey{tcell.KeyDelete, 0, tcell.ModNone}, wantKey{Del, 0, nil}}, - {giveKey{tcell.KeyDelete, 0, tcell.ModAlt}, wantKey{Del, 0, nil}}, + {giveKey{tcell.KeyBackspace2, 0, tcell.ModNone}, wantKey{Backspace, 0, nil}}, // fabricated + {giveKey{tcell.KeyBackspace2, 0, tcell.ModAlt}, wantKey{AltBackspace, 0, nil}}, // fabricated + {giveKey{tcell.KeyDEL, 0, tcell.ModNone}, wantKey{Backspace, 0, nil}}, // fabricated, unhandled + {giveKey{tcell.KeyDelete, 0, tcell.ModNone}, wantKey{Delete, 0, nil}}, + {giveKey{tcell.KeyDelete, 0, tcell.ModAlt}, wantKey{Delete, 0, nil}}, {giveKey{tcell.KeyBackspace, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled {giveKey{tcell.KeyBS, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled {giveKey{tcell.KeyCtrlH, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled - {giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModNone}, wantKey{BSpace, 0, nil}}, // actual "Backspace" keystroke - {giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModAlt}, wantKey{AltBS, 0, nil}}, // actual "Alt+Backspace" keystroke - {giveKey{tcell.KeyDEL, rune(tcell.KeyDEL), tcell.ModCtrl}, wantKey{BSpace, 0, nil}}, // actual "Ctrl+Backspace" keystroke - {giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModShift}, wantKey{BSpace, 0, nil}}, // actual "Shift+Backspace" keystroke - {giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{BSpace, 0, nil}}, // actual "Ctrl+Alt+Backspace" keystroke - {giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{BSpace, 0, nil}}, // actual "Ctrl+Shift+Backspace" keystroke - {giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModShift | tcell.ModAlt}, wantKey{AltBS, 0, nil}}, // actual "Shift+Alt+Backspace" keystroke - {giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModAlt | tcell.ModShift}, wantKey{BSpace, 0, nil}}, // actual "Ctrl+Shift+Alt+Backspace" keystroke + {giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModNone}, wantKey{Backspace, 0, nil}}, // actual "Backspace" keystroke + {giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModAlt}, wantKey{AltBackspace, 0, nil}}, // actual "Alt+Backspace" keystroke + {giveKey{tcell.KeyDEL, rune(tcell.KeyDEL), tcell.ModCtrl}, wantKey{Backspace, 0, nil}}, // actual "Ctrl+Backspace" keystroke + {giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModShift}, wantKey{Backspace, 0, nil}}, // actual "Shift+Backspace" keystroke + {giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{Backspace, 0, nil}}, // actual "Ctrl+Alt+Backspace" keystroke + {giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{Backspace, 0, nil}}, // actual "Ctrl+Shift+Backspace" keystroke + {giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModShift | tcell.ModAlt}, wantKey{AltBackspace, 0, nil}}, // actual "Shift+Alt+Backspace" keystroke + {giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModAlt | tcell.ModShift}, wantKey{Backspace, 0, nil}}, // actual "Ctrl+Shift+Alt+Backspace" keystroke {giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModCtrl}, wantKey{CtrlH, 0, nil}}, // actual "Ctrl+H" keystroke {giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAlt, 'h', nil}}, // fabricated "Ctrl+Alt+H" keystroke {giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlH, 0, nil}}, // actual "Ctrl+Shift+H" keystroke @@ -126,8 +126,8 @@ func TestGetCharEventKey(t *testing.T) { // section 4: (Alt+Shift)+Key(Up|Down|Left|Right) {giveKey{tcell.KeyUp, 0, tcell.ModNone}, wantKey{Up, 0, nil}}, {giveKey{tcell.KeyDown, 0, tcell.ModAlt}, wantKey{AltDown, 0, nil}}, - {giveKey{tcell.KeyLeft, 0, tcell.ModShift}, wantKey{SLeft, 0, nil}}, - {giveKey{tcell.KeyRight, 0, tcell.ModShift | tcell.ModAlt}, wantKey{AltSRight, 0, nil}}, + {giveKey{tcell.KeyLeft, 0, tcell.ModShift}, wantKey{ShiftLeft, 0, nil}}, + {giveKey{tcell.KeyRight, 0, tcell.ModShift | tcell.ModAlt}, wantKey{AltShiftRight, 0, nil}}, {giveKey{tcell.KeyUpLeft, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled {giveKey{tcell.KeyUpRight, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled {giveKey{tcell.KeyDownLeft, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}}, // fabricated, unhandled @@ -161,11 +161,11 @@ func TestGetCharEventKey(t *testing.T) { // section 7: Esc // KeyEsc and KeyEscape are aliases for KeyESC - {giveKey{tcell.KeyEsc, rune(tcell.KeyEsc), tcell.ModNone}, wantKey{ESC, 0, nil}}, // fabricated - {giveKey{tcell.KeyESC, rune(tcell.KeyESC), tcell.ModNone}, wantKey{ESC, 0, nil}}, // unhandled - {giveKey{tcell.KeyEscape, rune(tcell.KeyEscape), tcell.ModNone}, wantKey{ESC, 0, nil}}, // fabricated, unhandled - {giveKey{tcell.KeyESC, rune(tcell.KeyESC), tcell.ModCtrl}, wantKey{ESC, 0, nil}}, // actual Ctrl+[ keystroke - {giveKey{tcell.KeyCtrlLeftSq, rune(tcell.KeyCtrlLeftSq), tcell.ModCtrl}, wantKey{ESC, 0, nil}}, // fabricated, unhandled + {giveKey{tcell.KeyEsc, rune(tcell.KeyEsc), tcell.ModNone}, wantKey{Esc, 0, nil}}, // fabricated + {giveKey{tcell.KeyESC, rune(tcell.KeyESC), tcell.ModNone}, wantKey{Esc, 0, nil}}, // unhandled + {giveKey{tcell.KeyEscape, rune(tcell.KeyEscape), tcell.ModNone}, wantKey{Esc, 0, nil}}, // fabricated, unhandled + {giveKey{tcell.KeyESC, rune(tcell.KeyESC), tcell.ModCtrl}, wantKey{Esc, 0, nil}}, // actual Ctrl+[ keystroke + {giveKey{tcell.KeyCtrlLeftSq, rune(tcell.KeyCtrlLeftSq), tcell.ModCtrl}, wantKey{Esc, 0, nil}}, // fabricated, unhandled // section 8: Invalid {giveKey{tcell.KeyRune, 'a', tcell.ModMeta}, wantKey{Rune, 'a', nil}}, // fabricated @@ -259,7 +259,7 @@ Quick reference 37 LeftClick 38 RightClick 39 BTab -40 BSpace +40 Backspace 41 Del 42 PgUp 43 PgDn @@ -272,7 +272,7 @@ Quick reference 50 Insert 51 SUp 52 SDown -53 SLeft +53 ShiftLeft 54 SRight 55 F1 56 F2 @@ -288,15 +288,15 @@ Quick reference 66 F12 67 Change 68 BackwardEOF -69 AltBS +69 AltBackspace 70 AltUp 71 AltDown 72 AltLeft 73 AltRight 74 AltSUp 75 AltSDown -76 AltSLeft -77 AltSRight +76 AltShiftLeft +77 AltShiftRight 78 Alt 79 CtrlAlt ..