Fix bug preventing 'ctrl-h' from being bound to an action

Fix #4556
2025-11-08 03:13:48 -05:00 · 2025-10-15 12:16:09 +09:00
parent 8cdfb23df6
commit a0cabe021d
4 changed files with 68 additions and 73 deletions
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -800,7 +800,6 @@ func defaultKeymap() map[tui.Event][]*action {
 	add(tui.CtrlD, actDeleteCharEof)
 	add(tui.CtrlE, actEndOfLine)
 	add(tui.CtrlF, actForwardChar)
-	add(tui.CtrlH, actBackwardDeleteChar)
 	add(tui.Backspace, actBackwardDeleteChar)
 	add(tui.CtrlBackspace, actBackwardDeleteChar)
 	add(tui.Tab, actToggleDown)
--- a/src/tui/eventtype_string.go
+++ b/src/tui/eventtype_string.go
@@ -16,7 +16,7 @@ func _() {
 	_ = x[CtrlE-5]
 	_ = x[CtrlF-6]
 	_ = x[CtrlG-7]
-	_ = x[CtrlH-8]
+	_ = x[CtrlBackspace-8]
 	_ = x[Tab-9]
 	_ = x[CtrlJ-10]
 	_ = x[CtrlK-11]
@@ -99,75 +99,74 @@ func _() {
 	_ = x[CtrlRight-88]
 	_ = x[CtrlHome-89]
 	_ = x[CtrlEnd-90]
-	_ = x[CtrlBackspace-91]
-	_ = x[CtrlDelete-92]
-	_ = x[CtrlPageUp-93]
-	_ = x[CtrlPageDown-94]
-	_ = x[Alt-95]
-	_ = x[CtrlAlt-96]
-	_ = x[CtrlAltUp-97]
-	_ = x[CtrlAltDown-98]
-	_ = x[CtrlAltLeft-99]
-	_ = x[CtrlAltRight-100]
-	_ = x[CtrlAltHome-101]
-	_ = x[CtrlAltEnd-102]
-	_ = x[CtrlAltBackspace-103]
-	_ = x[CtrlAltDelete-104]
-	_ = x[CtrlAltPageUp-105]
-	_ = x[CtrlAltPageDown-106]
-	_ = x[CtrlShiftUp-107]
-	_ = x[CtrlShiftDown-108]
-	_ = x[CtrlShiftLeft-109]
-	_ = x[CtrlShiftRight-110]
-	_ = x[CtrlShiftHome-111]
-	_ = x[CtrlShiftEnd-112]
-	_ = x[CtrlShiftDelete-113]
-	_ = x[CtrlShiftPageUp-114]
-	_ = x[CtrlShiftPageDown-115]
-	_ = x[CtrlAltShiftUp-116]
-	_ = x[CtrlAltShiftDown-117]
-	_ = x[CtrlAltShiftLeft-118]
-	_ = x[CtrlAltShiftRight-119]
-	_ = x[CtrlAltShiftHome-120]
-	_ = x[CtrlAltShiftEnd-121]
-	_ = x[CtrlAltShiftDelete-122]
-	_ = x[CtrlAltShiftPageUp-123]
-	_ = x[CtrlAltShiftPageDown-124]
-	_ = x[Invalid-125]
-	_ = x[Fatal-126]
-	_ = x[BracketedPasteBegin-127]
-	_ = x[BracketedPasteEnd-128]
-	_ = x[Mouse-129]
-	_ = x[DoubleClick-130]
-	_ = x[LeftClick-131]
-	_ = x[RightClick-132]
-	_ = x[SLeftClick-133]
-	_ = x[SRightClick-134]
-	_ = x[ScrollUp-135]
-	_ = x[ScrollDown-136]
-	_ = x[SScrollUp-137]
-	_ = x[SScrollDown-138]
-	_ = x[PreviewScrollUp-139]
-	_ = x[PreviewScrollDown-140]
-	_ = x[Resize-141]
-	_ = x[Change-142]
-	_ = x[BackwardEOF-143]
-	_ = x[Start-144]
-	_ = x[Load-145]
-	_ = x[Focus-146]
-	_ = x[One-147]
-	_ = x[Zero-148]
-	_ = x[Result-149]
-	_ = x[Jump-150]
-	_ = x[JumpCancel-151]
-	_ = x[ClickHeader-152]
-	_ = x[ClickFooter-153]
-	_ = x[Multi-154]
+	_ = x[CtrlDelete-91]
+	_ = x[CtrlPageUp-92]
+	_ = x[CtrlPageDown-93]
+	_ = x[Alt-94]
+	_ = x[CtrlAlt-95]
+	_ = x[CtrlAltUp-96]
+	_ = x[CtrlAltDown-97]
+	_ = x[CtrlAltLeft-98]
+	_ = x[CtrlAltRight-99]
+	_ = x[CtrlAltHome-100]
+	_ = x[CtrlAltEnd-101]
+	_ = x[CtrlAltBackspace-102]
+	_ = x[CtrlAltDelete-103]
+	_ = x[CtrlAltPageUp-104]
+	_ = x[CtrlAltPageDown-105]
+	_ = x[CtrlShiftUp-106]
+	_ = x[CtrlShiftDown-107]
+	_ = x[CtrlShiftLeft-108]
+	_ = x[CtrlShiftRight-109]
+	_ = x[CtrlShiftHome-110]
+	_ = x[CtrlShiftEnd-111]
+	_ = x[CtrlShiftDelete-112]
+	_ = x[CtrlShiftPageUp-113]
+	_ = x[CtrlShiftPageDown-114]
+	_ = x[CtrlAltShiftUp-115]
+	_ = x[CtrlAltShiftDown-116]
+	_ = x[CtrlAltShiftLeft-117]
+	_ = x[CtrlAltShiftRight-118]
+	_ = x[CtrlAltShiftHome-119]
+	_ = x[CtrlAltShiftEnd-120]
+	_ = x[CtrlAltShiftDelete-121]
+	_ = x[CtrlAltShiftPageUp-122]
+	_ = x[CtrlAltShiftPageDown-123]
+	_ = x[Invalid-124]
+	_ = x[Fatal-125]
+	_ = x[BracketedPasteBegin-126]
+	_ = x[BracketedPasteEnd-127]
+	_ = x[Mouse-128]
+	_ = x[DoubleClick-129]
+	_ = x[LeftClick-130]
+	_ = x[RightClick-131]
+	_ = x[SLeftClick-132]
+	_ = x[SRightClick-133]
+	_ = x[ScrollUp-134]
+	_ = x[ScrollDown-135]
+	_ = x[SScrollUp-136]
+	_ = x[SScrollDown-137]
+	_ = x[PreviewScrollUp-138]
+	_ = x[PreviewScrollDown-139]
+	_ = x[Resize-140]
+	_ = x[Change-141]
+	_ = x[BackwardEOF-142]
+	_ = x[Start-143]
+	_ = x[Load-144]
+	_ = x[Focus-145]
+	_ = x[One-146]
+	_ = x[Zero-147]
+	_ = x[Result-148]
+	_ = x[Jump-149]
+	_ = x[JumpCancel-150]
+	_ = x[ClickHeader-151]
+	_ = x[ClickFooter-152]
+	_ = x[Multi-153]
 }

-const _EventType_name = "RuneCtrlACtrlBCtrlCCtrlDCtrlECtrlFCtrlGCtrlHTabCtrlJCtrlKCtrlLEnterCtrlNCtrlOCtrlPCtrlQCtrlRCtrlSCtrlTCtrlUCtrlVCtrlWCtrlXCtrlYCtrlZEscCtrlSpaceCtrlBackSlashCtrlRightBracketCtrlCaretCtrlSlashShiftTabBackspaceDeletePageUpPageDownUpDownLeftRightHomeEndInsertShiftUpShiftDownShiftLeftShiftRightShiftDeleteShiftHomeShiftEndShiftPageUpShiftPageDownF1F2F3F4F5F6F7F8F9F10F11F12AltBackspaceAltUpAltDownAltLeftAltRightAltDeleteAltHomeAltEndAltPageUpAltPageDownAltShiftUpAltShiftDownAltShiftLeftAltShiftRightAltShiftDeleteAltShiftHomeAltShiftEndAltShiftPageUpAltShiftPageDownCtrlUpCtrlDownCtrlLeftCtrlRightCtrlHomeCtrlEndCtrlBackspaceCtrlDeleteCtrlPageUpCtrlPageDownAltCtrlAltCtrlAltUpCtrlAltDownCtrlAltLeftCtrlAltRightCtrlAltHomeCtrlAltEndCtrlAltBackspaceCtrlAltDeleteCtrlAltPageUpCtrlAltPageDownCtrlShiftUpCtrlShiftDownCtrlShiftLeftCtrlShiftRightCtrlShiftHomeCtrlShiftEndCtrlShiftDeleteCtrlShiftPageUpCtrlShiftPageDownCtrlAltShiftUpCtrlAltShiftDownCtrlAltShiftLeftCtrlAltShiftRightCtrlAltShiftHomeCtrlAltShiftEndCtrlAltShiftDeleteCtrlAltShiftPageUpCtrlAltShiftPageDownInvalidFatalBracketedPasteBeginBracketedPasteEndMouseDoubleClickLeftClickRightClickSLeftClickSRightClickScrollUpScrollDownSScrollUpSScrollDownPreviewScrollUpPreviewScrollDownResizeChangeBackwardEOFStartLoadFocusOneZeroResultJumpJumpCancelClickHeaderClickFooterMulti"
+const _EventType_name = "RuneCtrlACtrlBCtrlCCtrlDCtrlECtrlFCtrlGCtrlBackspaceTabCtrlJCtrlKCtrlLEnterCtrlNCtrlOCtrlPCtrlQCtrlRCtrlSCtrlTCtrlUCtrlVCtrlWCtrlXCtrlYCtrlZEscCtrlSpaceCtrlBackSlashCtrlRightBracketCtrlCaretCtrlSlashShiftTabBackspaceDeletePageUpPageDownUpDownLeftRightHomeEndInsertShiftUpShiftDownShiftLeftShiftRightShiftDeleteShiftHomeShiftEndShiftPageUpShiftPageDownF1F2F3F4F5F6F7F8F9F10F11F12AltBackspaceAltUpAltDownAltLeftAltRightAltDeleteAltHomeAltEndAltPageUpAltPageDownAltShiftUpAltShiftDownAltShiftLeftAltShiftRightAltShiftDeleteAltShiftHomeAltShiftEndAltShiftPageUpAltShiftPageDownCtrlUpCtrlDownCtrlLeftCtrlRightCtrlHomeCtrlEndCtrlDeleteCtrlPageUpCtrlPageDownAltCtrlAltCtrlAltUpCtrlAltDownCtrlAltLeftCtrlAltRightCtrlAltHomeCtrlAltEndCtrlAltBackspaceCtrlAltDeleteCtrlAltPageUpCtrlAltPageDownCtrlShiftUpCtrlShiftDownCtrlShiftLeftCtrlShiftRightCtrlShiftHomeCtrlShiftEndCtrlShiftDeleteCtrlShiftPageUpCtrlShiftPageDownCtrlAltShiftUpCtrlAltShiftDownCtrlAltShiftLeftCtrlAltShiftRightCtrlAltShiftHomeCtrlAltShiftEndCtrlAltShiftDeleteCtrlAltShiftPageUpCtrlAltShiftPageDownInvalidFatalBracketedPasteBeginBracketedPasteEndMouseDoubleClickLeftClickRightClickSLeftClickSRightClickScrollUpScrollDownSScrollUpSScrollDownPreviewScrollUpPreviewScrollDownResizeChangeBackwardEOFStartLoadFocusOneZeroResultJumpJumpCancelClickHeaderClickFooterMulti"

-var _EventType_index = [...]uint16{0, 4, 9, 14, 19, 24, 29, 34, 39, 44, 47, 52, 57, 62, 67, 72, 77, 82, 87, 92, 97, 102, 107, 112, 117, 122, 127, 132, 135, 144, 157, 173, 182, 191, 199, 208, 214, 220, 228, 230, 234, 238, 243, 247, 250, 256, 263, 272, 281, 291, 302, 311, 319, 330, 343, 345, 347, 349, 351, 353, 355, 357, 359, 361, 364, 367, 370, 382, 387, 394, 401, 409, 418, 425, 431, 440, 451, 461, 473, 485, 498, 512, 524, 535, 549, 565, 571, 579, 587, 596, 604, 611, 624, 634, 644, 656, 659, 666, 675, 686, 697, 709, 720, 730, 746, 759, 772, 787, 798, 811, 824, 838, 851, 863, 878, 893, 910, 924, 940, 956, 973, 989, 1004, 1022, 1040, 1060, 1067, 1072, 1091, 1108, 1113, 1124, 1133, 1143, 1153, 1164, 1172, 1182, 1191, 1202, 1217, 1234, 1240, 1246, 1257, 1262, 1266, 1271, 1274, 1278, 1284, 1288, 1298, 1309, 1320, 1325}
+var _EventType_index = [...]uint16{0, 4, 9, 14, 19, 24, 29, 34, 39, 52, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100, 105, 110, 115, 120, 125, 130, 135, 140, 143, 152, 165, 181, 190, 199, 207, 216, 222, 228, 236, 238, 242, 246, 251, 255, 258, 264, 271, 280, 289, 299, 310, 319, 327, 338, 351, 353, 355, 357, 359, 361, 363, 365, 367, 369, 372, 375, 378, 390, 395, 402, 409, 417, 426, 433, 439, 448, 459, 469, 481, 493, 506, 520, 532, 543, 557, 573, 579, 587, 595, 604, 612, 619, 629, 639, 651, 654, 661, 670, 681, 692, 704, 715, 725, 741, 754, 767, 782, 793, 806, 819, 833, 846, 858, 873, 888, 905, 919, 935, 951, 968, 984, 999, 1017, 1035, 1055, 1062, 1067, 1086, 1103, 1108, 1119, 1128, 1138, 1148, 1159, 1167, 1177, 1186, 1197, 1212, 1229, 1235, 1241, 1252, 1257, 1261, 1266, 1269, 1273, 1279, 1283, 1293, 1304, 1315, 1320}

 func (i EventType) String() string {
 	if i < 0 || i >= EventType(len(_EventType_index)-1) {
--- a/src/tui/tcell.go
+++ b/src/tui/tcell.go
@@ -371,12 +371,10 @@ func (r *FullscreenRenderer) GetChar() Event {
 				}
 			case rune(tcell.KeyCtrlH):
 				switch {
-				case ctrl:
+				case ctrl, none, shift:
 					return keyfn('h')
 				case alt:
 					return Event{AltBackspace, 0, nil}
-				case none, shift:
-					return Event{Backspace, 0, nil}
 				}
 			}
 		case tcell.KeyCtrlI:
--- a/src/tui/tui.go
+++ b/src/tui/tui.go
@@ -43,7 +43,7 @@ const (
 	CtrlE
 	CtrlF
 	CtrlG
-	CtrlH
+	CtrlBackspace
 	Tab
 	CtrlJ
 	CtrlK
@@ -137,7 +137,6 @@ const (
 	CtrlRight
 	CtrlHome
 	CtrlEnd
-	CtrlBackspace
 	CtrlDelete
 	CtrlPageUp
 	CtrlPageDown