fixup! Fix showing the "YOU ARE HERE" marker for old-style non-interactive rebases

When stopping in an old-style non-interactive rebase (see previous commit for an
explanation of what that means), the YOU ARE HERE marker should point to the
first non-rebasing commit, but it was pointing at the first rebasing commit
instead.

To keep the tests working, we need to set all commits that have an Action to
StatusRebasing, which matches what happens in the real code.

.github/workflows/sponsors.yml

@@ -1,24 +1,15 @@
+# see https://github.com/JamesIves/github-sponsors-readme-action
 name: Generate Sponsors README
 on:
   push:
     branches:
       - master
-  pull_request: # Add this if you want to run checks on PRs as well
-    branches:
-      - master
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v3
-        with:
-          ref: master # This ensures the checkout step fetches the master branch
-
-      - name: Switch to master branch
-        run: |
-          git fetch origin master:refs/remotes/origin/master
-          git checkout master
 
       - name: Generate Sponsors 💖
         uses: JamesIves/github-sponsors-readme-action@v1.2.2
@@ -33,7 +24,5 @@ jobs:
           git config --global user.email "actions@users.noreply.github.com"
           git config --global user.name "README-bot"
           git add README.md
-          git commit -m "Updated README.md [skip ci]" || exit 0
-          git push origin master # Explicitly push to master branch
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_API_TOKEN }}
+          git commit -m "Updated README.md" || exit 0
+          git push

docs/Config.md

@@ -92,8 +92,6 @@ git:
     useConfig: false
   commit:
     signOff: false
-    autoWrapCommitMessage: true # automatic WYSIWYG wrapping of the commit message as you type
-    autoWrapWidth: 72 # if autoWrapCommitMessage is true, the width to wrap to
   merging:
     # only applicable to unix users
     manualCommit: false

docs/keybindings/Keybindings_en.md

@@ -230,7 +230,6 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` c `` | Commit | Commit staged changes. |
 | `` w `` | Commit changes without pre-commit hook |  |
 | `` C `` | Commit changes using git editor |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Search the current view by text |  |
 
 ## Menu

docs/keybindings/Keybindings_ja.md

@@ -300,7 +300,6 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` c `` | 変更をコミット | Commit staged changes. |
 | `` w `` | pre-commitフックを実行せずに変更をコミット |  |
 | `` C `` | gitエディタを使用して変更をコミット |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | 検索を開始 |  |
 
 ## メニュー

docs/keybindings/Keybindings_ko.md

@@ -171,7 +171,6 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 | `` c `` | 커밋 변경내용 | Commit staged changes. |
 | `` w `` | Commit changes without pre-commit hook |  |
 | `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | 검색 시작 |  |
 
 ## 브랜치

docs/keybindings/Keybindings_nl.md

@@ -283,7 +283,6 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` c `` | Commit veranderingen | Commit staged changes. |
 | `` w `` | Commit veranderingen zonder pre-commit hook |  |
 | `` C `` | Commit veranderingen met de git editor |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Start met zoeken |  |
 
 ## Stash

docs/keybindings/Keybindings_pl.md

@@ -215,7 +215,6 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` c `` | Zatwierdź zmiany | Commit staged changes. |
 | `` w `` | Zatwierdź zmiany bez skryptu pre-commit |  |
 | `` C `` | Zatwierdź zmiany używając edytora |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Search the current view by text |  |
 
 ## Reflog

docs/keybindings/Keybindings_ru.md

@@ -78,7 +78,6 @@ _Связки клавиш_
 | `` c `` | Сохранить изменения | Commit staged changes. |
 | `` w `` | Закоммитить изменения без предварительного хука коммита |  |
 | `` C `` | Сохранить изменения с помощью редактора git |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | Найти |  |
 
 ## Главная панель (Обычный)

docs/keybindings/Keybindings_zh-CN.md

@@ -287,7 +287,6 @@ If you would instead like to start an interactive rebase from the selected commi
 | `` c `` | 提交更改 | Commit staged changes. |
 | `` w `` | 提交更改而无需预先提交钩子 |  |
 | `` C `` | 提交更改（使用编辑器编辑提交信息） |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | 开始搜索 |  |
 
 ## 正常

docs/keybindings/Keybindings_zh-TW.md

@@ -118,7 +118,6 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
 | `` c `` | 提交變更 | Commit staged changes. |
 | `` w `` | 沒有預提交 hook 就提交更改 |  |
 | `` C `` | 使用 git 編輯器提交變更 |  |
-| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
 | `` / `` | 開始搜尋 |  |
 
 ## 主面板 (補丁生成)

go.mod

@@ -9,14 +9,14 @@ require (
 	github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
 	github.com/creack/pty v1.1.11
 	github.com/fsmiamoto/git-todo-parser v0.0.5
-	github.com/gdamore/tcell/v2 v2.7.4
+	github.com/gdamore/tcell/v2 v2.7.1-0.20240121011954-0393f5eb0b1a
 	github.com/go-errors/errors v1.5.1
 	github.com/gookit/color v1.4.2
 	github.com/imdario/mergo v0.3.11
 	github.com/integrii/flaggy v1.4.0
 	github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68
 	github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d
-	github.com/jesseduffield/gocui v0.3.1-0.20240309085756-86e0d5a312de
+	github.com/jesseduffield/gocui v0.3.1-0.20240129213945-26fc8669eb5b
 	github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10
 	github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5
 	github.com/jesseduffield/minimal/gitignore v0.3.3-0.20211018110810-9cde264e6b1e
@@ -68,14 +68,14 @@ require (
 	github.com/onsi/gomega v1.7.1 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/rivo/uniseg v0.4.6 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/xanzy/ssh-agent v0.2.1 // indirect
 	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
 	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/term v0.18.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/term v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )

go.sum

@@ -89,8 +89,9 @@ github.com/fsmiamoto/git-todo-parser v0.0.5/go.mod h1:B+AgTbNE2BARvJqzXygThzqxLI
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
-github.com/gdamore/tcell/v2 v2.7.4 h1:sg6/UnTM9jGpZU+oFYAsDahfchWAFW8Xx2yFinNSAYU=
-github.com/gdamore/tcell/v2 v2.7.4/go.mod h1:dSXtXTSK0VsW1biw65DZLZ2NKr7j0qP/0J7ONmsraWg=
+github.com/gdamore/tcell/v2 v2.7.1-0.20240103180601-96e29905643b/go.mod h1:hl/KtAANGBecfIPxk+FzKvThTqI84oplgbPEmVX60b8=
+github.com/gdamore/tcell/v2 v2.7.1-0.20240121011954-0393f5eb0b1a h1:IgatwqPZL0RPblLezzibmx8GgARDjOQOvrLpCWLmZak=
+github.com/gdamore/tcell/v2 v2.7.1-0.20240121011954-0393f5eb0b1a/go.mod h1:hl/KtAANGBecfIPxk+FzKvThTqI84oplgbPEmVX60b8=
 github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
 github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/go-errors/errors v1.0.2/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
@@ -187,8 +188,8 @@ github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68 h1:EQP2Tv8T
 github.com/jesseduffield/generics v0.0.0-20220320043834-727e535cbe68/go.mod h1:+LLj9/WUPAP8LqCchs7P+7X0R98HiFujVFANdNaxhGk=
 github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d h1:bO+OmbreIv91rCe8NmscRwhFSqkDJtzWCPV4Y+SQuXE=
 github.com/jesseduffield/go-git/v5 v5.1.2-0.20221018185014-fdd53fef665d/go.mod h1:nGNEErzf+NRznT+N2SWqmHnDnF9aLgANB1CUNEan09o=
-github.com/jesseduffield/gocui v0.3.1-0.20240309085756-86e0d5a312de h1:2ww1SWgakihE8hFxZ7L3agVeGpA6qwW5vdnhFUXKMQo=
-github.com/jesseduffield/gocui v0.3.1-0.20240309085756-86e0d5a312de/go.mod h1:XtEbqCbn45keRXEu+OMZkjN5gw6AEob59afsgHjokZ8=
+github.com/jesseduffield/gocui v0.3.1-0.20240129213945-26fc8669eb5b h1:QASuIUc76BuFmSuzzqwzjpsn23r8ybfDqbKsY2WzTrE=
+github.com/jesseduffield/gocui v0.3.1-0.20240129213945-26fc8669eb5b/go.mod h1:9zkyjnUmdL3+sUknJrQy/3HweUu8mVln/3J2wRF/l8M=
 github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10 h1:jmpr7KpX2+2GRiE91zTgfq49QvgiqB0nbmlwZ8UnOx0=
 github.com/jesseduffield/kill v0.0.0-20220618033138-bfbe04675d10/go.mod h1:aA97kHeNA+sj2Hbki0pvLslmE4CbDyhBeSSTUUnOuVo=
 github.com/jesseduffield/lazycore v0.0.0-20221012050358-03d2e40243c5 h1:CDuQmfOjAtb1Gms6a1p5L2P8RhbLUq5t8aL7PiQd2uY=
@@ -263,8 +264,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
-github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rivo/uniseg v0.4.6 h1:Sovz9sDSwbOz9tgUy8JpT+KgCkPYJEN/oYzlJiYTNLg=
+github.com/rivo/uniseg v0.4.6/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI=
 github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
@@ -470,15 +471,15 @@ golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
-golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
+golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
+golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

pkg/commands/git_commands/branch.go

@@ -210,7 +210,7 @@ type MergeOpts struct {
 func (self *BranchCommands) Merge(branchName string, opts MergeOpts) error {
 	cmdArgs := NewGitCmd("merge").
 		Arg("--no-edit").
-		Arg(strings.Fields(self.UserConfig.Git.Merging.Args)...).
+		ArgIf(self.UserConfig.Git.Merging.Args != "", self.UserConfig.Git.Merging.Args).
 		ArgIf(opts.FastForwardOnly, "--ff-only").
 		Arg(branchName).
 		ToArgv()

pkg/commands/git_commands/branch_test.go

@@ -127,19 +127,6 @@ func TestBranchMerge(t *testing.T) {
 			branchName: "mybranch",
 			expected:   []string{"merge", "--no-edit", "--merging-args", "mybranch"},
 		},
-		{
-			testName: "multiple merging args",
-			userConfig: &config.UserConfig{
-				Git: config.GitConfig{
-					Merging: config.MergingConfig{
-						Args: "--arg1 --arg2", // it's up to the user what they put here
-					},
-				},
-			},
-			opts:       MergeOpts{},
-			branchName: "mybranch",
-			expected:   []string{"merge", "--no-edit", "--arg1", "--arg2", "mybranch"},
-		},
 		{
 			testName:   "fast forward only",
 			userConfig: &config.UserConfig{},

pkg/commands/git_commands/commit.go

@@ -142,7 +142,7 @@ func (self *CommitCommands) GetCommitMessage(commitSha string) (string, error) {
 		ToArgv()
 
 	message, err := self.cmd.New(cmdArgs).DontLog().RunWithOutput()
-	return strings.ReplaceAll(strings.TrimSpace(message), "\r\n", "\n"), err
+	return strings.TrimSpace(message), err
 }
 
 func (self *CommitCommands) GetCommitSubject(commitSha string) (string, error) {

pkg/commands/git_commands/commit_loader.go

@@ -254,7 +254,10 @@ func (self *CommitLoader) extractCommitFromLine(line string, showDivergence bool
 }
 
 func (self *CommitLoader) getHydratedRebasingCommits(rebaseMode enums.RebaseMode) ([]*models.Commit, error) {
-	commits := self.getRebasingCommits(rebaseMode)
+	commits, err := self.getRebasingCommits(rebaseMode)
+	if err != nil {
+		return nil, err
+	}
 
 	if len(commits) == 0 {
 		return nil, nil
@@ -275,7 +278,7 @@ func (self *CommitLoader) getHydratedRebasingCommits(rebaseMode enums.RebaseMode
 	).DontLog()
 
 	fullCommits := map[string]*models.Commit{}
-	err := cmdObj.RunAndProcessLines(func(line string) (bool, error) {
+	err = cmdObj.RunAndProcessLines(func(line string) (bool, error) {
 		commit := self.extractCommitFromLine(line, false)
 		fullCommits[commit.Sha] = commit
 		return false, nil
@@ -311,20 +314,73 @@ func (self *CommitLoader) getHydratedRebasingCommits(rebaseMode enums.RebaseMode
 }
 
 // getRebasingCommits obtains the commits that we're in the process of rebasing
+func (self *CommitLoader) getRebasingCommits(rebaseMode enums.RebaseMode) ([]*models.Commit, error) {
+	switch rebaseMode {
+	case enums.REBASE_MODE_NORMAL:
+		return self.getNormalRebasingCommits()
+	case enums.REBASE_MODE_INTERACTIVE:
+		return self.getInteractiveRebasingCommits()
+	default:
+		return nil, nil
+	}
+}
+
+func (self *CommitLoader) getNormalRebasingCommits() ([]*models.Commit, error) {
+	rewrittenCount := 0
+	bytesContent, err := self.readFile(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-apply/rewritten"))
+	if err == nil {
+		content := string(bytesContent)
+		rewrittenCount = len(strings.Split(content, "\n"))
+	}
+
+	// we know we're rebasing, so lets get all the files whose names have numbers
+	commits := []*models.Commit{}
+	err = self.walkFiles(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-apply"), func(path string, f os.FileInfo, err error) error {
+		if rewrittenCount > 0 {
+			rewrittenCount--
+			return nil
+		}
+		if err != nil {
+			return err
+		}
+		re := regexp.MustCompile(`^\d+$`)
+		if !re.MatchString(f.Name()) {
+			return nil
+		}
+		bytesContent, err := self.readFile(path)
+		if err != nil {
+			return err
+		}
+		content := string(bytesContent)
+		commit := self.commitFromPatch(content)
+		commits = append([]*models.Commit{commit}, commits...)
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return commits, nil
+}
 
 // git-rebase-todo example:
 // pick ac446ae94ee560bdb8d1d057278657b251aaef17 ac446ae
 // pick afb893148791a2fbd8091aeb81deba4930c73031 afb8931
-func (self *CommitLoader) getRebasingCommits(rebaseMode enums.RebaseMode) []*models.Commit {
-	if rebaseMode != enums.REBASE_MODE_INTERACTIVE {
-		return nil
-	}
 
+// git-rebase-todo.backup example:
+// pick 49cbba374296938ea86bbd4bf4fee2f6ba5cccf6 third commit on master
+// pick ac446ae94ee560bdb8d1d057278657b251aaef17 blah  commit on master
+// pick afb893148791a2fbd8091aeb81deba4930c73031 fourth commit on master
+
+// getInteractiveRebasingCommits takes our git-rebase-todo and our git-rebase-todo.backup files
+// and extracts out the sha and names of commits that we still have to go
+// in the rebase:
+func (self *CommitLoader) getInteractiveRebasingCommits() ([]*models.Commit, error) {
 	bytesContent, err := self.readFile(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "rebase-merge/git-rebase-todo"))
 	if err != nil {
 		self.Log.Error(fmt.Sprintf("error occurred reading git-rebase-todo: %s", err.Error()))
 		// we assume an error means the file doesn't exist so we just return
-		return nil
+		return nil, nil
 	}
 
 	commits := []*models.Commit{}
@@ -332,7 +388,7 @@ func (self *CommitLoader) getRebasingCommits(rebaseMode enums.RebaseMode) []*mod
 	todos, err := todo.Parse(bytes.NewBuffer(bytesContent), self.config.GetCoreCommentChar())
 	if err != nil {
 		self.Log.Error(fmt.Sprintf("error occurred while parsing git-rebase-todo file: %s", err.Error()))
-		return nil
+		return nil, nil
 	}
 
 	// See if the current commit couldn't be applied because it conflicted; if
@@ -361,7 +417,7 @@ func (self *CommitLoader) getRebasingCommits(rebaseMode enums.RebaseMode) []*mod
 		})
 	}
 
-	return commits
+	return commits, nil
 }
 
 func (self *CommitLoader) getConflictedCommit(todos []todo.Todo) string {
@@ -451,6 +507,22 @@ func (self *CommitLoader) getConflictedCommitImpl(todos []todo.Todo, doneTodos [
 	return lastTodo.Commit
 }
 
+// assuming the file starts like this:
+// From e93d4193e6dd45ca9cf3a5a273d7ba6cd8b8fb20 Mon Sep 17 00:00:00 2001
+// From: Lazygit Tester <test@example.com>
+// Date: Wed, 5 Dec 2018 21:03:23 +1100
+// Subject: second commit on master
+func (self *CommitLoader) commitFromPatch(content string) *models.Commit {
+	lines := strings.Split(content, "\n")
+	sha := strings.Split(lines[0], " ")[1]
+	name := strings.TrimPrefix(lines[3], "Subject: ")
+	return &models.Commit{
+		Sha:    sha,
+		Name:   name,
+		Status: models.StatusRebasing,
+	}
+}
+
 func setCommitMergedStatuses(ancestor string, commits []*models.Commit) {
 	if ancestor == "" {
 		return

pkg/commands/git_commands/git_command_builder.go

@@ -60,14 +60,6 @@ func (self *GitCommandBuilder) Dir(path string) *GitCommandBuilder {
 	return self
 }
 
-func (self *GitCommandBuilder) DirIf(condition bool, path string) *GitCommandBuilder {
-	if condition {
-		return self.Dir(path)
-	}
-
-	return self
-}
-
 // Note, you may prefer to use the Dir method instead of this one
 func (self *GitCommandBuilder) Worktree(path string) *GitCommandBuilder {
 	// worktree arg comes before the command

pkg/commands/git_commands/submodule.go

@@ -26,12 +26,8 @@ func NewSubmoduleCommands(gitCommon *GitCommon) *SubmoduleCommands {
 	}
 }
 
-func (self *SubmoduleCommands) GetConfigs(parentModule *models.SubmoduleConfig) ([]*models.SubmoduleConfig, error) {
-	gitModulesPath := ".gitmodules"
-	if parentModule != nil {
-		gitModulesPath = filepath.Join(parentModule.FullPath(), gitModulesPath)
-	}
-	file, err := os.Open(gitModulesPath)
+func (self *SubmoduleCommands) GetConfigs() ([]*models.SubmoduleConfig, error) {
+	file, err := os.Open(".gitmodules")
 	if err != nil {
 		if os.IsNotExist(err) {
 			return nil, nil
@@ -55,27 +51,21 @@ func (self *SubmoduleCommands) GetConfigs(parentModule *models.SubmoduleConfig)
 	}
 
 	configs := []*models.SubmoduleConfig{}
-	lastConfigIdx := -1
 	for scanner.Scan() {
 		line := scanner.Text()
 
 		if name, ok := firstMatch(line, `\[submodule "(.*)"\]`); ok {
-			configs = append(configs, &models.SubmoduleConfig{
-				Name: name, ParentModule: parentModule,
-			})
-			lastConfigIdx = len(configs) - 1
+			configs = append(configs, &models.SubmoduleConfig{Name: name})
 			continue
 		}
 
-		if lastConfigIdx != -1 {
+		if len(configs) > 0 {
+			lastConfig := configs[len(configs)-1]
+
 			if path, ok := firstMatch(line, `\s*path\s*=\s*(.*)\s*`); ok {
-				configs[lastConfigIdx].Path = path
-				nestedConfigs, err := self.GetConfigs(configs[lastConfigIdx])
-				if err == nil {
-					configs = append(configs, nestedConfigs...)
-				}
+				lastConfig.Path = path
 			} else if url, ok := firstMatch(line, `\s*url\s*=\s*(.*)\s*`); ok {
-				configs[lastConfigIdx].Url = url
+				lastConfig.Url = url
 			}
 		}
 	}
@@ -87,12 +77,12 @@ func (self *SubmoduleCommands) Stash(submodule *models.SubmoduleConfig) error {
 	// if the path does not exist then it hasn't yet been initialized so we'll swallow the error
 	// because the intention here is to have no dirty worktree state
 	if _, err := os.Stat(submodule.Path); os.IsNotExist(err) {
-		self.Log.Infof("submodule path %s does not exist, returning", submodule.FullPath())
+		self.Log.Infof("submodule path %s does not exist, returning", submodule.Path)
 		return nil
 	}
 
 	cmdArgs := NewGitCmd("stash").
-		Dir(submodule.FullPath()).
+		Dir(submodule.Path).
 		Arg("--include-untracked").
 		ToArgv()
 
@@ -100,13 +90,8 @@ func (self *SubmoduleCommands) Stash(submodule *models.SubmoduleConfig) error {
 }
 
 func (self *SubmoduleCommands) Reset(submodule *models.SubmoduleConfig) error {
-	parentDir := ""
-	if submodule.ParentModule != nil {
-		parentDir = submodule.ParentModule.FullPath()
-	}
 	cmdArgs := NewGitCmd("submodule").
 		Arg("update", "--init", "--force", "--", submodule.Path).
-		DirIf(parentDir != "", parentDir).
 		ToArgv()
 
 	return self.cmd.New(cmdArgs).Run()
@@ -122,20 +107,6 @@ func (self *SubmoduleCommands) UpdateAll() error {
 func (self *SubmoduleCommands) Delete(submodule *models.SubmoduleConfig) error {
 	// based on https://gist.github.com/myusuf3/7f645819ded92bda6677
 
-	if submodule.ParentModule != nil {
-		wd, err := os.Getwd()
-		if err != nil {
-			return err
-		}
-
-		err = os.Chdir(submodule.ParentModule.FullPath())
-		if err != nil {
-			return err
-		}
-
-		defer func() { _ = os.Chdir(wd) }()
-	}
-
 	if err := self.cmd.New(
 		NewGitCmd("submodule").
 			Arg("deinit", "--force", "--", submodule.Path).ToArgv(),
@@ -170,7 +141,7 @@ func (self *SubmoduleCommands) Delete(submodule *models.SubmoduleConfig) error {
 
 	// We may in fact want to use the repo's git dir path but git docs say not to
 	// mix submodules and worktrees anyway.
-	return os.RemoveAll(submodule.GitDirPath(self.repoPaths.repoGitDirPath))
+	return os.RemoveAll(filepath.Join(self.repoPaths.WorktreeGitDirPath(), "modules", submodule.Path))
 }
 
 func (self *SubmoduleCommands) Add(name string, path string, url string) error {
@@ -187,24 +158,10 @@ func (self *SubmoduleCommands) Add(name string, path string, url string) error {
 	return self.cmd.New(cmdArgs).Run()
 }
 
-func (self *SubmoduleCommands) UpdateUrl(submodule *models.SubmoduleConfig, newUrl string) error {
-	if submodule.ParentModule != nil {
-		wd, err := os.Getwd()
-		if err != nil {
-			return err
-		}
-
-		err = os.Chdir(submodule.ParentModule.FullPath())
-		if err != nil {
-			return err
-		}
-
-		defer func() { _ = os.Chdir(wd) }()
-	}
-
+func (self *SubmoduleCommands) UpdateUrl(name string, path string, newUrl string) error {
 	setUrlCmdStr := NewGitCmd("config").
 		Arg(
-			"--file", ".gitmodules", "submodule."+submodule.Name+".url", newUrl,
+			"--file", ".gitmodules", "submodule."+name+".url", newUrl,
 		).
 		ToArgv()
 
@@ -213,7 +170,7 @@ func (self *SubmoduleCommands) UpdateUrl(submodule *models.SubmoduleConfig, newU
 		return err
 	}
 
-	syncCmdStr := NewGitCmd("submodule").Arg("sync", "--", submodule.Path).
+	syncCmdStr := NewGitCmd("submodule").Arg("sync", "--", path).
 		ToArgv()
 
 	if err := self.cmd.New(syncCmdStr).Run(); err != nil {

pkg/commands/git_commands/working_tree.go

@@ -343,7 +343,7 @@ func (self *WorkingTreeCommands) RemoveUntrackedFiles() error {
 
 // ResetAndClean removes all unstaged changes and removes all untracked files
 func (self *WorkingTreeCommands) ResetAndClean() error {
-	submoduleConfigs, err := self.submodule.GetConfigs(nil)
+	submoduleConfigs, err := self.submodule.GetConfigs()
 	if err != nil {
 		return err
 	}

pkg/commands/models/submodule_config.go

@@ -1,33 +1,13 @@
 package models
 
-import "path/filepath"
-
 type SubmoduleConfig struct {
 	Name string
 	Path string
 	Url  string
-
-	ParentModule *SubmoduleConfig // nil if top-level
-}
-
-func (r *SubmoduleConfig) FullName() string {
-	if r.ParentModule != nil {
-		return r.ParentModule.FullName() + "/" + r.Name
-	}
-
-	return r.Name
-}
-
-func (r *SubmoduleConfig) FullPath() string {
-	if r.ParentModule != nil {
-		return r.ParentModule.FullPath() + "/" + r.Path
-	}
-
-	return r.Path
 }
 
 func (r *SubmoduleConfig) RefName() string {
-	return r.FullName()
+	return r.Name
 }
 
 func (r *SubmoduleConfig) ID() string {
@@ -37,12 +17,3 @@ func (r *SubmoduleConfig) ID() string {
 func (r *SubmoduleConfig) Description() string {
 	return r.RefName()
 }
-
-func (r *SubmoduleConfig) GitDirPath(repoGitDirPath string) string {
-	parentPath := repoGitDirPath
-	if r.ParentModule != nil {
-		parentPath = r.ParentModule.GitDirPath(repoGitDirPath)
-	}
-
-	return filepath.Join(parentPath, "modules", r.Name)
-}

pkg/config/editor_presets.go

@@ -65,13 +65,6 @@ func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset
 		"nano":    standardTerminalEditorPreset("nano"),
 		"kakoune": standardTerminalEditorPreset("kak"),
 		"helix": {
-			editTemplate:              "helix -- {{filename}}",
-			editAtLineTemplate:        "helix -- {{filename}}:{{line}}",
-			editAtLineAndWaitTemplate: "helix -- {{filename}}:{{line}}",
-			openDirInEditorTemplate:   "helix -- {{dir}}",
-			suspend:                   true,
-		},
-		"helix (hx)": {
 			editTemplate:              "hx -- {{filename}}",
 			editAtLineTemplate:        "hx -- {{filename}}:{{line}}",
 			editAtLineAndWaitTemplate: "hx -- {{filename}}:{{line}}",
@@ -110,12 +103,11 @@ func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset
 
 	// Some of our presets have a different name than the editor they are using.
 	editorToPreset := map[string]string{
-		"kak":   "kakoune",
-		"helix": "helix",
-		"hx":    "helix (hx)",
-		"code":  "vscode",
-		"subl":  "sublime",
-		"xed":   "xcode",
+		"kak":  "kakoune",
+		"hx":   "helix",
+		"code": "vscode",
+		"subl": "sublime",
+		"xed":  "xcode",
 	}
 
 	presetName := osConfig.EditPreset

pkg/config/user_config.go

@@ -236,10 +236,6 @@ type PagingConfig struct {
 type CommitConfig struct {
 	// If true, pass '--signoff' flag when committing
 	SignOff bool `yaml:"signOff"`
-	// Automatic WYSIWYG wrapping of the commit message as you type
-	AutoWrapCommitMessage bool `yaml:"autoWrapCommitMessage"`
-	// If autoWrapCommitMessage is true, the width to wrap to
-	AutoWrapWidth int `yaml:"autoWrapWidth"`
 }
 
 type MergingConfig struct {
@@ -662,9 +658,7 @@ func GetDefaultConfig() *UserConfig {
 				ExternalDiffCommand: "",
 			},
 			Commit: CommitConfig{
-				SignOff:               false,
-				AutoWrapCommitMessage: true,
-				AutoWrapWidth:         72,
+				SignOff: false,
 			},
 			Merging: MergingConfig{
 				ManualCommit: false,

pkg/gui/context/local_commits_context.go

@@ -38,14 +38,14 @@ func NewLocalCommitsContext(c *ContextCommon) *LocalCommitsContext {
 		}
 
 		showYouAreHereLabel := c.Model().WorkingTreeStateAtLastCommitRefresh == enums.REBASE_MODE_REBASING
-		hasRebaseUpdateRefsConfig := c.Git().Config.GetRebaseUpdateRefs()
+		showBranchMarkerForHeadCommit := c.Git().Config.GetRebaseUpdateRefs()
 
 		return presentation.GetCommitListDisplayStrings(
 			c.Common,
 			c.Model().Commits,
 			c.Model().Branches,
 			c.Model().CheckedOutBranch,
-			hasRebaseUpdateRefsConfig,
+			showBranchMarkerForHeadCommit,
 			c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL,
 			c.Modes().CherryPicking.SelectedShaSet(),
 			c.Modes().Diffing.Ref,

pkg/gui/context/menu_context.go

@@ -92,8 +92,21 @@ func (self *MenuViewModel) GetDisplayStrings(_ int, _ int) [][]string {
 			return displayStrings
 		}
 
+		// These keys are used for general navigation so we'll strike them out to
+		// avoid confusion
+		reservedKeys := []string{
+			self.c.UserConfig.Keybinding.Universal.Confirm,
+			self.c.UserConfig.Keybinding.Universal.Select,
+			self.c.UserConfig.Keybinding.Universal.Return,
+			self.c.UserConfig.Keybinding.Universal.StartSearch,
+		}
 		keyLabel := keybindings.LabelFromKey(item.Key)
-		displayStrings = utils.Prepend(displayStrings, style.FgCyan.Sprint(keyLabel))
+		keyStyle := style.FgCyan
+		if lo.Contains(reservedKeys, keyLabel) {
+			keyStyle = style.FgDefault.SetStrikethrough()
+		}
+
+		displayStrings = utils.Prepend(displayStrings, keyStyle.Sprint(keyLabel))
 		return displayStrings
 	})
 }

pkg/gui/context/sub_commits_context.go

@@ -55,13 +55,13 @@ func NewSubCommitsContext(
 		if viewModel.GetShowBranchHeads() {
 			branches = c.Model().Branches
 		}
-		hasRebaseUpdateRefsConfig := c.Git().Config.GetRebaseUpdateRefs()
+		showBranchMarkerForHeadCommit := c.Git().Config.GetRebaseUpdateRefs()
 		return presentation.GetCommitListDisplayStrings(
 			c.Common,
 			c.Model().SubCommits,
 			branches,
 			viewModel.GetRef().RefName(),
-			hasRebaseUpdateRefsConfig,
+			showBranchMarkerForHeadCommit,
 			c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL,
 			c.Modes().CherryPicking.SelectedShaSet(),
 			c.Modes().Diffing.Ref,

pkg/gui/context/submodules_context.go

@@ -17,7 +17,7 @@ func NewSubmodulesContext(c *ContextCommon) *SubmodulesContext {
 	viewModel := NewFilteredListViewModel(
 		func() []*models.SubmoduleConfig { return c.Model().Submodules },
 		func(submodule *models.SubmoduleConfig) []string {
-			return []string{submodule.FullName()}
+			return []string{submodule.Name}
 		},
 		nil,
 	)

pkg/gui/controllers.go

@@ -38,14 +38,10 @@ func (gui *Gui) resetHelpersAndControllers() {
 	getCommitDescription := func() string {
 		return strings.TrimSpace(gui.Views.CommitDescription.TextArea.GetContent())
 	}
-	getUnwrappedCommitDescription := func() string {
-		return strings.TrimSpace(gui.Views.CommitDescription.TextArea.GetUnwrappedContent())
-	}
 	commitsHelper := helpers.NewCommitsHelper(helperCommon,
 		getCommitSummary,
 		setCommitSummary,
 		getCommitDescription,
-		getUnwrappedCommitDescription,
 		setCommitDescription,
 	)
 

pkg/gui/controllers/commit_message_controller.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/gui/context"
-	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 
@@ -101,7 +100,7 @@ func (self *CommitMessageController) handleCommitIndexChange(value int) error {
 		self.c.Helpers().Commits.SetMessageAndDescriptionInView(self.context().GetHistoryMessage())
 		return nil
 	} else if currentIndex == context.NoCommitIndex {
-		self.context().SetHistoryMessage(self.c.Helpers().Commits.JoinCommitMessageAndUnwrappedDescription())
+		self.context().SetHistoryMessage(self.c.Helpers().Commits.JoinCommitMessageAndDescription())
 	}
 
 	validCommit, err := self.setCommitMessageAtIndex(newIndex)
@@ -120,9 +119,6 @@ func (self *CommitMessageController) setCommitMessageAtIndex(index int) (bool, e
 		}
 		return false, self.c.ErrorMsg(self.c.Tr.CommitWithoutMessageErr)
 	}
-	if self.c.UserConfig.Git.Commit.AutoWrapCommitMessage {
-		commitMessage = helpers.TryRemoveHardLineBreaks(commitMessage, self.c.UserConfig.Git.Commit.AutoWrapWidth)
-	}
 	self.c.Helpers().Commits.UpdateCommitPanelView(commitMessage)
 	return true, nil
 }

pkg/gui/controllers/helpers/commits_helper.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/samber/lo"
 )
@@ -17,11 +16,10 @@ type ICommitsHelper interface {
 type CommitsHelper struct {
 	c *HelperCommon
 
-	getCommitSummary              func() string
-	setCommitSummary              func(string)
-	getCommitDescription          func() string
-	getUnwrappedCommitDescription func() string
-	setCommitDescription          func(string)
+	getCommitSummary     func() string
+	setCommitSummary     func(string)
+	getCommitDescription func() string
+	setCommitDescription func(string)
 }
 
 var _ ICommitsHelper = &CommitsHelper{}
@@ -31,16 +29,14 @@ func NewCommitsHelper(
 	getCommitSummary func() string,
 	setCommitSummary func(string),
 	getCommitDescription func() string,
-	getUnwrappedCommitDescription func() string,
 	setCommitDescription func(string),
 ) *CommitsHelper {
 	return &CommitsHelper{
-		c:                             c,
-		getCommitSummary:              getCommitSummary,
-		setCommitSummary:              setCommitSummary,
-		getCommitDescription:          getCommitDescription,
-		getUnwrappedCommitDescription: getUnwrappedCommitDescription,
-		setCommitDescription:          setCommitDescription,
+		c:                    c,
+		getCommitSummary:     getCommitSummary,
+		setCommitSummary:     setCommitSummary,
+		getCommitDescription: getCommitDescription,
+		setCommitDescription: setCommitDescription,
 	}
 }
 
@@ -57,36 +53,11 @@ func (self *CommitsHelper) SetMessageAndDescriptionInView(message string) {
 	self.c.Contexts().CommitMessage.RenderCommitLength()
 }
 
-func (self *CommitsHelper) JoinCommitMessageAndUnwrappedDescription() string {
-	if len(self.getUnwrappedCommitDescription()) == 0 {
+func (self *CommitsHelper) JoinCommitMessageAndDescription() string {
+	if len(self.getCommitDescription()) == 0 {
 		return self.getCommitSummary()
 	}
-	return self.getCommitSummary() + "\n" + self.getUnwrappedCommitDescription()
-}
-
-func TryRemoveHardLineBreaks(message string, autoWrapWidth int) string {
-	messageRunes := []rune(message)
-	lastHardLineStart := 0
-	for i, r := range messageRunes {
-		if r == '\n' {
-			// Try to make this a soft linebreak by turning it into a space, and
-			// checking whether it still wraps to the same result then.
-			messageRunes[i] = ' '
-
-			_, cursorMapping := gocui.AutoWrapContent(messageRunes[lastHardLineStart:], autoWrapWidth)
-
-			// Look at the cursorMapping to check whether auto-wrapping inserted
-			// a line break. If it did, there will be a cursorMapping entry with
-			// Orig pointing to the position after the inserted line break.
-			if len(cursorMapping) == 0 || cursorMapping[0].Orig != i-lastHardLineStart+1 {
-				// It didn't, so change it back to a newline
-				messageRunes[i] = '\n'
-			}
-			lastHardLineStart = i + 1
-		}
-	}
-
-	return string(messageRunes)
+	return self.getCommitSummary() + "\n" + self.getCommitDescription()
 }
 
 func (self *CommitsHelper) SwitchToEditor() error {
@@ -183,7 +154,7 @@ func (self *CommitsHelper) HandleCommitConfirm() error {
 
 func (self *CommitsHelper) CloseCommitMessagePanel() error {
 	if self.c.Contexts().CommitMessage.GetPreserveMessage() {
-		message := self.JoinCommitMessageAndUnwrappedDescription()
+		message := self.JoinCommitMessageAndDescription()
 
 		self.c.Contexts().CommitMessage.SetPreservedMessage(message)
 	} else {

pkg/gui/controllers/helpers/commits_helper_test.go

@@ -1,41 +0,0 @@
-package helpers
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestTryRemoveHardLineBreaks(t *testing.T) {
-	scenarios := []struct {
-		name           string
-		message        string
-		autoWrapWidth  int
-		expectedResult string
-	}{
-		{
-			name:           "empty",
-			message:        "",
-			autoWrapWidth:  7,
-			expectedResult: "",
-		},
-		{
-			name:           "all line breaks are needed",
-			message:        "abc\ndef\n\nxyz",
-			autoWrapWidth:  7,
-			expectedResult: "abc\ndef\n\nxyz",
-		},
-		{
-			name:           "some can be unwrapped",
-			message:        "123\nabc def\nghi jkl\nmno\n456\n",
-			autoWrapWidth:  7,
-			expectedResult: "123\nabc def ghi jkl mno\n456\n",
-		},
-	}
-	for _, s := range scenarios {
-		t.Run(s.name, func(t *testing.T) {
-			actualResult := TryRemoveHardLineBreaks(s.message, s.autoWrapWidth)
-			assert.Equal(t, s.expectedResult, actualResult)
-		})
-	}
-}

pkg/gui/controllers/helpers/patch_building_helper.go

@@ -79,6 +79,9 @@ func (self *PatchBuildingHelper) RefreshPatchBuildingPanel(opts types.OnFocusOpt
 	}
 
 	secondaryDiff := self.c.Git().Patch.PatchBuilder.RenderPatchForFile(path, false, false)
+	if err != nil {
+		return err
+	}
 
 	context := self.c.Contexts().CustomPatchBuilder
 

pkg/gui/controllers/helpers/refresh_helper.go

@@ -415,7 +415,7 @@ func (self *RefreshHelper) refreshTags() error {
 }
 
 func (self *RefreshHelper) refreshStateSubmoduleConfigs() error {
-	configs, err := self.c.Git().Submodule.GetConfigs(nil)
+	configs, err := self.c.Git().Submodule.GetConfigs()
 	if err != nil {
 		return err
 	}

pkg/gui/controllers/helpers/repos_helper.go

@@ -48,7 +48,7 @@ func (self *ReposHelper) EnterSubmodule(submodule *models.SubmoduleConfig) error
 	}
 	self.c.State().GetRepoPathStack().Push(wd)
 
-	return self.DispatchSwitchToRepo(submodule.FullPath(), context.NO_CONTEXT)
+	return self.DispatchSwitchToRepo(submodule.Path, context.NO_CONTEXT)
 }
 
 func (self *ReposHelper) getCurrentBranch(path string) string {

pkg/gui/controllers/local_commits_controller.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/fsmiamoto/git-todo-parser/todo"
 	"github.com/go-errors/errors"
@@ -116,6 +115,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
 		{
 			Key:     opts.GetKey(editCommitKey),
 			Handler: self.withItems(self.edit),
+			// TODO: have disabled reason ensure that if we're not rebasing, we only select one commit
 			GetDisabledReason: self.require(
 				self.itemRangeSelected(self.midRebaseCommandEnabled),
 			),
@@ -354,9 +354,7 @@ func (self *LocalCommitsController) reword(commit *models.Commit) error {
 	if err != nil {
 		return self.c.Error(err)
 	}
-	if self.c.UserConfig.Git.Commit.AutoWrapCommitMessage {
-		commitMessage = helpers.TryRemoveHardLineBreaks(commitMessage, self.c.UserConfig.Git.Commit.AutoWrapWidth)
-	}
+
 	return self.c.Helpers().Commits.OpenCommitMessagePanel(
 		&helpers.OpenCommitMessagePanelOpts{
 			CommitIndex:      self.context().GetSelectedLineIdx(),
@@ -459,7 +457,15 @@ func (self *LocalCommitsController) edit(selectedCommits []*models.Commit) error
 		return self.updateTodos(todo.Edit, selectedCommits)
 	}
 
-	return self.startInteractiveRebaseWithEdit(selectedCommits)
+	// TODO: support range select here (start a rebase and set the selected commits
+	// to 'edit' in the todo file)
+	if len(selectedCommits) > 1 {
+		return self.c.ErrorMsg(self.c.Tr.RangeSelectNotSupported)
+	}
+
+	selectedCommit := selectedCommits[0]
+
+	return self.startInteractiveRebaseWithEdit(selectedCommit)
 }
 
 func (self *LocalCommitsController) quickStartInteractiveRebase() error {
@@ -468,11 +474,11 @@ func (self *LocalCommitsController) quickStartInteractiveRebase() error {
 		return self.c.Error(err)
 	}
 
-	return self.startInteractiveRebaseWithEdit([]*models.Commit{commitToEdit})
+	return self.startInteractiveRebaseWithEdit(commitToEdit)
 }
 
 func (self *LocalCommitsController) startInteractiveRebaseWithEdit(
-	commitsToEdit []*models.Commit,
+	commitToEdit *models.Commit,
 ) error {
 	return self.c.WithWaitingStatus(self.c.Tr.RebasingStatus, func(gocui.Task) error {
 		self.c.LogAction(self.c.Tr.Actions.EditCommit)
@@ -480,24 +486,10 @@ func (self *LocalCommitsController) startInteractiveRebaseWithEdit(
 		commits := self.c.Model().Commits
 		selectedSha := commits[selectedIdx].Sha
 		rangeStartSha := commits[rangeStartIdx].Sha
-		err := self.c.Git().Rebase.EditRebase(commitsToEdit[len(commitsToEdit)-1].Sha)
+		err := self.c.Git().Rebase.EditRebase(commitToEdit.Sha)
 		return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions(
 			err,
 			types.RefreshOptions{Mode: types.BLOCK_UI, Then: func() {
-				todos := make([]*models.Commit, 0, len(commitsToEdit)-1)
-				for _, c := range commitsToEdit[:len(commitsToEdit)-1] {
-					// Merge commits can't be set to "edit", so just skip them
-					if !c.IsMerge() {
-						todos = append(todos, &models.Commit{Sha: c.Sha, Action: todo.Pick})
-					}
-				}
-				if len(todos) > 0 {
-					err := self.updateTodos(todo.Edit, todos)
-					if err != nil {
-						_ = self.c.Error(err)
-					}
-				}
-
 				// We need to select the same commit range again because after starting a rebase,
 				// new lines can be added for update-ref commands in the TODO file, due to
 				// stacked branches. So the selected commits may be in different positions in the list.
@@ -814,14 +806,11 @@ func (self *LocalCommitsController) createFixupCommit(commit *models.Commit) err
 		HandleConfirm: func() error {
 			return self.c.Helpers().WorkingTree.WithEnsureCommitableFiles(func() error {
 				self.c.LogAction(self.c.Tr.Actions.CreateFixupCommit)
-				return self.c.WithWaitingStatusSync(self.c.Tr.CreatingFixupCommitStatus, func() error {
-					if err := self.c.Git().Commit.CreateFixupCommit(commit.Sha); err != nil {
-						return self.c.Error(err)
-					}
+				if err := self.c.Git().Commit.CreateFixupCommit(commit.Sha); err != nil {
+					return self.c.Error(err)
+				}
 
-					self.context().MoveSelectedLine(1)
-					return self.c.Refresh(types.RefreshOptions{Mode: types.SYNC})
-				})
+				return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
 			})
 		},
 	})
@@ -850,89 +839,37 @@ func (self *LocalCommitsController) squashFixupCommits() error {
 }
 
 func (self *LocalCommitsController) squashAllFixupsAboveSelectedCommit(commit *models.Commit) error {
-	return self.squashFixupsImpl(commit, self.context().GetSelectedLineIdx())
+	return self.c.WithWaitingStatus(self.c.Tr.SquashingStatus, func(gocui.Task) error {
+		self.c.LogAction(self.c.Tr.Actions.SquashAllAboveFixupCommits)
+		err := self.c.Git().Rebase.SquashAllAboveFixupCommits(commit)
+		return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err)
+	})
 }
 
 func (self *LocalCommitsController) squashAllFixupsInCurrentBranch() error {
-	commit, rebaseStartIdx, err := self.findCommitForSquashFixupsInCurrentBranch()
+	commit, err := self.findCommitForSquashFixupsInCurrentBranch()
 	if err != nil {
 		return self.c.Error(err)
 	}
 
-	return self.squashFixupsImpl(commit, rebaseStartIdx)
-}
-
-func (self *LocalCommitsController) squashFixupsImpl(commit *models.Commit, rebaseStartIdx int) error {
-	selectionOffset := countSquashableCommitsAbove(self.c.Model().Commits, self.context().GetSelectedLineIdx(), rebaseStartIdx)
-	return self.c.WithWaitingStatusSync(self.c.Tr.SquashingStatus, func() error {
+	return self.c.WithWaitingStatus(self.c.Tr.SquashingStatus, func(gocui.Task) error {
 		self.c.LogAction(self.c.Tr.Actions.SquashAllAboveFixupCommits)
 		err := self.c.Git().Rebase.SquashAllAboveFixupCommits(commit)
-		self.context().MoveSelectedLine(-selectionOffset)
-		return self.c.Helpers().MergeAndRebase.CheckMergeOrRebaseWithRefreshOptions(
-			err, types.RefreshOptions{Mode: types.SYNC})
+		return self.c.Helpers().MergeAndRebase.CheckMergeOrRebase(err)
 	})
 }
 
-func (self *LocalCommitsController) findCommitForSquashFixupsInCurrentBranch() (*models.Commit, int, error) {
+func (self *LocalCommitsController) findCommitForSquashFixupsInCurrentBranch() (*models.Commit, error) {
 	commits := self.c.Model().Commits
 	_, index, ok := lo.FindIndexOf(commits, func(c *models.Commit) bool {
 		return c.IsMerge() || c.Status == models.StatusMerged
 	})
 
 	if !ok || index == 0 {
-		return nil, -1, errors.New(self.c.Tr.CannotSquashCommitsInCurrentBranch)
+		return nil, errors.New(self.c.Tr.CannotSquashCommitsInCurrentBranch)
 	}
 
-	return commits[index-1], index - 1, nil
-}
-
-// Anticipate how many commits above the selectedIdx are going to get squashed
-// by the SquashAllAboveFixupCommits call, so that we can adjust the selection
-// afterwards. Let's hope we're matching git's behavior correctly here.
-func countSquashableCommitsAbove(commits []*models.Commit, selectedIdx int, rebaseStartIdx int) int {
-	result := 0
-
-	// For each commit _above_ the selection, ...
-	for i, commit := range commits[0:selectedIdx] {
-		// ... see if it is a fixup commit, and get the base subject it applies to
-		if baseSubject, isFixup := isFixupCommit(commit.Name); isFixup {
-			// Then, for each commit after the fixup, up to and including the
-			// rebase start commit, see if we find the base commit
-			for _, baseCommit := range commits[i+1 : rebaseStartIdx+1] {
-				if strings.HasPrefix(baseCommit.Name, baseSubject) {
-					result++
-				}
-			}
-		}
-	}
-	return result
-}
-
-// Check whether the given subject line is the subject of a fixup commit, and
-// returns (trimmedSubject, true) if so (where trimmedSubject is the subject
-// with all fixup prefixes removed), or (subject, false) if not.
-func isFixupCommit(subject string) (string, bool) {
-	prefixes := []string{"fixup! ", "squash! ", "amend! "}
-	trimPrefix := func(s string) (string, bool) {
-		for _, prefix := range prefixes {
-			if strings.HasPrefix(s, prefix) {
-				return strings.TrimPrefix(s, prefix), true
-			}
-		}
-		return s, false
-	}
-
-	if subject, wasTrimmed := trimPrefix(subject); wasTrimmed {
-		for {
-			// handle repeated prefixes like "fixup! amend! fixup! Subject"
-			if subject, wasTrimmed = trimPrefix(subject); !wasTrimmed {
-				break
-			}
-		}
-		return subject, true
-	}
-
-	return subject, false
+	return commits[index-1], nil
 }
 
 func (self *LocalCommitsController) createTag(commit *models.Commit) error {
@@ -1125,7 +1062,7 @@ func (self *LocalCommitsController) canFindCommitForQuickStart() *types.Disabled
 }
 
 func (self *LocalCommitsController) canFindCommitForSquashFixupsInCurrentBranch() *types.DisabledReason {
-	if _, _, err := self.findCommitForSquashFixupsInCurrentBranch(); err != nil {
+	if _, err := self.findCommitForSquashFixupsInCurrentBranch(); err != nil {
 		return &types.DisabledReason{Text: err.Error()}
 	}
 

pkg/gui/controllers/local_commits_controller_test.go

@@ -1,141 +0,0 @@
-package controllers
-
-import (
-	"testing"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/models"
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_countSquashableCommitsAbove(t *testing.T) {
-	scenarios := []struct {
-		name           string
-		commits        []*models.Commit
-		selectedIdx    int
-		rebaseStartIdx int
-		expectedResult int
-	}{
-		{
-			name: "no squashable commits",
-			commits: []*models.Commit{
-				{Name: "abc"},
-				{Name: "def"},
-				{Name: "ghi"},
-			},
-			selectedIdx:    2,
-			rebaseStartIdx: 2,
-			expectedResult: 0,
-		},
-		{
-			name: "some squashable commits, including for the selected commit",
-			commits: []*models.Commit{
-				{Name: "fixup! def"},
-				{Name: "fixup! ghi"},
-				{Name: "abc"},
-				{Name: "def"},
-				{Name: "ghi"},
-			},
-			selectedIdx:    4,
-			rebaseStartIdx: 4,
-			expectedResult: 2,
-		},
-		{
-			name: "base commit is below rebase start",
-			commits: []*models.Commit{
-				{Name: "fixup! def"},
-				{Name: "abc"},
-				{Name: "def"},
-			},
-			selectedIdx:    1,
-			rebaseStartIdx: 1,
-			expectedResult: 0,
-		},
-		{
-			name: "base commit does not exist at all",
-			commits: []*models.Commit{
-				{Name: "fixup! xyz"},
-				{Name: "abc"},
-				{Name: "def"},
-			},
-			selectedIdx:    2,
-			rebaseStartIdx: 2,
-			expectedResult: 0,
-		},
-		{
-			name: "selected commit is in the middle of fixups",
-			commits: []*models.Commit{
-				{Name: "fixup! def"},
-				{Name: "abc"},
-				{Name: "fixup! ghi"},
-				{Name: "def"},
-				{Name: "ghi"},
-			},
-			selectedIdx:    1,
-			rebaseStartIdx: 4,
-			expectedResult: 1,
-		},
-		{
-			name: "selected commit is after rebase start",
-			commits: []*models.Commit{
-				{Name: "fixup! def"},
-				{Name: "abc"},
-				{Name: "def"},
-				{Name: "ghi"},
-			},
-			selectedIdx:    3,
-			rebaseStartIdx: 2,
-			expectedResult: 1,
-		},
-	}
-	for _, s := range scenarios {
-		t.Run(s.name, func(t *testing.T) {
-			assert.Equal(t, s.expectedResult, countSquashableCommitsAbove(s.commits, s.selectedIdx, s.rebaseStartIdx))
-		})
-	}
-}
-
-func Test_isFixupCommit(t *testing.T) {
-	scenarios := []struct {
-		subject                string
-		expectedTrimmedSubject string
-		expectedIsFixup        bool
-	}{
-		{
-			subject:                "Bla",
-			expectedTrimmedSubject: "Bla",
-			expectedIsFixup:        false,
-		},
-		{
-			subject:                "fixup Bla",
-			expectedTrimmedSubject: "fixup Bla",
-			expectedIsFixup:        false,
-		},
-		{
-			subject:                "fixup! Bla",
-			expectedTrimmedSubject: "Bla",
-			expectedIsFixup:        true,
-		},
-		{
-			subject:                "fixup! fixup! Bla",
-			expectedTrimmedSubject: "Bla",
-			expectedIsFixup:        true,
-		},
-		{
-			subject:                "amend! squash! Bla",
-			expectedTrimmedSubject: "Bla",
-			expectedIsFixup:        true,
-		},
-		{
-			subject:                "fixup!",
-			expectedTrimmedSubject: "fixup!",
-			expectedIsFixup:        false,
-		},
-	}
-	for _, s := range scenarios {
-		t.Run(s.subject, func(t *testing.T) {
-			trimmedSubject, isFixupCommit := isFixupCommit(s.subject)
-			assert.Equal(t, s.expectedTrimmedSubject, trimmedSubject)
-			assert.Equal(t, s.expectedIsFixup, isFixupCommit)
-		})
-	}
-}

pkg/gui/controllers/staging_controller.go

@@ -99,12 +99,6 @@ func (self *StagingController) GetKeybindings(opts types.KeybindingsOpts) []*typ
 			Handler:     self.c.Helpers().WorkingTree.HandleCommitEditorPress,
 			Description: self.c.Tr.CommitChangesWithEditor,
 		},
-		{
-			Key:         opts.GetKey(opts.Config.Files.FindBaseCommitForFixup),
-			Handler:     self.c.Helpers().FixupHelper.HandleFindBaseCommitForFixupPress,
-			Description: self.c.Tr.FindBaseCommitForFixup,
-			Tooltip:     self.c.Tr.FindBaseCommitForFixupTooltip,
-		},
 	}
 }
 

pkg/gui/controllers/submodules_controller.go

@@ -116,8 +116,8 @@ func (self *SubmodulesController) GetOnRenderToMain() func() error {
 			} else {
 				prefix := fmt.Sprintf(
 					"Name: %s\nPath: %s\nUrl:  %s\n\n",
-					style.FgGreen.Sprint(submodule.FullName()),
-					style.FgYellow.Sprint(submodule.FullPath()),
+					style.FgGreen.Sprint(submodule.Name),
+					style.FgYellow.Sprint(submodule.Path),
 					style.FgCyan.Sprint(submodule.Url),
 				)
 
@@ -178,12 +178,12 @@ func (self *SubmodulesController) add() error {
 
 func (self *SubmodulesController) editURL(submodule *models.SubmoduleConfig) error {
 	return self.c.Prompt(types.PromptOpts{
-		Title:          fmt.Sprintf(self.c.Tr.UpdateSubmoduleUrl, submodule.FullName()),
+		Title:          fmt.Sprintf(self.c.Tr.UpdateSubmoduleUrl, submodule.Name),
 		InitialContent: submodule.Url,
 		HandleConfirm: func(newUrl string) error {
 			return self.c.WithWaitingStatus(self.c.Tr.UpdatingSubmoduleUrlStatus, func(gocui.Task) error {
 				self.c.LogAction(self.c.Tr.Actions.UpdateSubmoduleUrl)
-				err := self.c.Git().Submodule.UpdateUrl(submodule, newUrl)
+				err := self.c.Git().Submodule.UpdateUrl(submodule.Name, submodule.Path, newUrl)
 				if err != nil {
 					_ = self.c.Error(err)
 				}
@@ -272,7 +272,7 @@ func (self *SubmodulesController) update(submodule *models.SubmoduleConfig) erro
 func (self *SubmodulesController) remove(submodule *models.SubmoduleConfig) error {
 	return self.c.Confirm(types.ConfirmOpts{
 		Title:  self.c.Tr.RemoveSubmodule,
-		Prompt: fmt.Sprintf(self.c.Tr.RemoveSubmodulePrompt, submodule.FullName()),
+		Prompt: fmt.Sprintf(self.c.Tr.RemoveSubmodulePrompt, submodule.Name),
 		HandleConfirm: func() error {
 			self.c.LogAction(self.c.Tr.Actions.RemoveSubmodule)
 			if err := self.c.Git().Submodule.Delete(submodule); err != nil {

pkg/gui/presentation/commits.go

@@ -41,7 +41,7 @@ func GetCommitListDisplayStrings(
 	commits []*models.Commit,
 	branches []*models.Branch,
 	currentBranchName string,
-	hasRebaseUpdateRefsConfig bool,
+	showBranchMarkerForHeadCommit bool,
 	fullDescription bool,
 	cherryPickedCommitShaSet *set.Set[string],
 	diffName string,
@@ -68,8 +68,8 @@ func GetCommitListDisplayStrings(
 		return nil
 	}
 
-	// this is where my non-TODO commits begin
-	rebaseOffset := utils.Min(indexOfFirstNonTODOCommit(commits), endIdx)
+	// this is where my "normal" commits begin (the non-rebasing ones)
+	rebaseOffset := utils.Min(indexOfFirstNonRebasingCommit(commits), endIdx)
 
 	filteredCommits := commits[startIdx:endIdx]
 
@@ -99,7 +99,7 @@ func GetCommitListDisplayStrings(
 			}
 		}
 	} else {
-		getGraphLine = func(int) string { return "" }
+		getGraphLine = func(idx int) string { return "" }
 	}
 
 	// Determine the hashes of the local branches for which we want to show a
@@ -123,7 +123,7 @@ func GetCommitListDisplayStrings(
 					!lo.Contains(common.UserConfig.Git.MainBranches, b.Name) &&
 					// Don't show a marker for the head commit unless the
 					// rebase.updateRefs config is on
-					(hasRebaseUpdateRefsConfig || b.CommitHash != commits[0].Sha)
+					(showBranchMarkerForHeadCommit || b.CommitHash != commits[0].Sha)
 		}))
 
 	lines := make([][]string, 0, len(filteredCommits))
@@ -145,7 +145,6 @@ func GetCommitListDisplayStrings(
 			common,
 			commit,
 			branchHeadsToVisualize,
-			hasRebaseUpdateRefsConfig,
 			cherryPickedCommitShaSet,
 			isMarkedBaseCommit,
 			willBeRebased,
@@ -188,9 +187,9 @@ func getbisectBounds(commits []*models.Commit, bisectInfo *git_commands.BisectIn
 }
 
 // precondition: slice is not empty
-func indexOfFirstNonTODOCommit(commits []*models.Commit) int {
+func indexOfFirstNonRebasingCommit(commits []*models.Commit) int {
 	for i, commit := range commits {
-		if !commit.IsTODO() {
+		if commit.Status != models.StatusRebasing {
 			return i
 		}
 	}
@@ -297,7 +296,6 @@ func displayCommit(
 	common *common.Common,
 	commit *models.Commit,
 	branchHeadsToVisualize *set.Set[string],
-	hasRebaseUpdateRefsConfig bool,
 	cherryPickedCommitShaSet *set.Set[string],
 	isMarkedBaseCommit bool,
 	willBeRebased bool,
@@ -331,11 +329,7 @@ func displayCommit(
 			tagString = theme.DiffTerminalColor.SetBold().Sprint(strings.Join(commit.Tags, " ")) + " "
 		}
 
-		if branchHeadsToVisualize.Includes(commit.Sha) &&
-			// Don't show branch head on commits that are already merged to a main branch
-			commit.Status != models.StatusMerged &&
-			// Don't show branch head on a "pick" todo if the rebase.updateRefs config is on
-			!(commit.IsTODO() && hasRebaseUpdateRefsConfig) {
+		if branchHeadsToVisualize.Includes(commit.Sha) && commit.Status != models.StatusMerged {
 			tagString = style.FgCyan.SetBold().Sprint(
 				lo.Ternary(icons.IsIconEnabled(), icons.BRANCH_ICON, "*") + " " + tagString)
 		}

pkg/gui/presentation/commits_test.go

@@ -216,8 +216,8 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
 		{
 			testName: "showing graph, including rebase commits",
 			commits: []*models.Commit{
-				{Name: "commit1", Sha: "sha1", Parents: []string{"sha2", "sha3"}, Action: todo.Pick},
-				{Name: "commit2", Sha: "sha2", Parents: []string{"sha3"}, Action: todo.Pick},
+				{Name: "commit1", Sha: "sha1", Parents: []string{"sha2", "sha3"}, Action: todo.Pick, Status: models.StatusRebasing},
+				{Name: "commit2", Sha: "sha2", Parents: []string{"sha3"}, Action: todo.Pick, Status: models.StatusRebasing},
 				{Name: "commit3", Sha: "sha3", Parents: []string{"sha4"}},
 				{Name: "commit4", Sha: "sha4", Parents: []string{"sha5"}},
 				{Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}},
@@ -240,8 +240,8 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
 		{
 			testName: "showing graph, including rebase commits, with offset",
 			commits: []*models.Commit{
-				{Name: "commit1", Sha: "sha1", Parents: []string{"sha2", "sha3"}, Action: todo.Pick},
-				{Name: "commit2", Sha: "sha2", Parents: []string{"sha3"}, Action: todo.Pick},
+				{Name: "commit1", Sha: "sha1", Parents: []string{"sha2", "sha3"}, Action: todo.Pick, Status: models.StatusRebasing},
+				{Name: "commit2", Sha: "sha2", Parents: []string{"sha3"}, Action: todo.Pick, Status: models.StatusRebasing},
 				{Name: "commit3", Sha: "sha3", Parents: []string{"sha4"}},
 				{Name: "commit4", Sha: "sha4", Parents: []string{"sha5"}},
 				{Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}},
@@ -263,8 +263,8 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
 		{
 			testName: "startIdx is past TODO commits",
 			commits: []*models.Commit{
-				{Name: "commit1", Sha: "sha1", Parents: []string{"sha2", "sha3"}, Action: todo.Pick},
-				{Name: "commit2", Sha: "sha2", Parents: []string{"sha3"}, Action: todo.Pick},
+				{Name: "commit1", Sha: "sha1", Parents: []string{"sha2", "sha3"}, Action: todo.Pick, Status: models.StatusRebasing},
+				{Name: "commit2", Sha: "sha2", Parents: []string{"sha3"}, Action: todo.Pick, Status: models.StatusRebasing},
 				{Name: "commit3", Sha: "sha3", Parents: []string{"sha4"}},
 				{Name: "commit4", Sha: "sha4", Parents: []string{"sha5"}},
 				{Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}},
@@ -284,8 +284,8 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
 		{
 			testName: "only showing TODO commits",
 			commits: []*models.Commit{
-				{Name: "commit1", Sha: "sha1", Parents: []string{"sha2", "sha3"}, Action: todo.Pick},
-				{Name: "commit2", Sha: "sha2", Parents: []string{"sha3"}, Action: todo.Pick},
+				{Name: "commit1", Sha: "sha1", Parents: []string{"sha2", "sha3"}, Action: todo.Pick, Status: models.StatusRebasing},
+				{Name: "commit2", Sha: "sha2", Parents: []string{"sha3"}, Action: todo.Pick, Status: models.StatusRebasing},
 				{Name: "commit3", Sha: "sha3", Parents: []string{"sha4"}},
 				{Name: "commit4", Sha: "sha4", Parents: []string{"sha5"}},
 				{Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}},
@@ -325,10 +325,10 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
 		{
 			testName: "only TODO commits except last",
 			commits: []*models.Commit{
-				{Name: "commit1", Sha: "sha1", Parents: []string{"sha2", "sha3"}, Action: todo.Pick},
-				{Name: "commit2", Sha: "sha2", Parents: []string{"sha3"}, Action: todo.Pick},
-				{Name: "commit3", Sha: "sha3", Parents: []string{"sha4"}, Action: todo.Pick},
-				{Name: "commit4", Sha: "sha4", Parents: []string{"sha5"}, Action: todo.Pick},
+				{Name: "commit1", Sha: "sha1", Parents: []string{"sha2", "sha3"}, Action: todo.Pick, Status: models.StatusRebasing},
+				{Name: "commit2", Sha: "sha2", Parents: []string{"sha3"}, Action: todo.Pick, Status: models.StatusRebasing},
+				{Name: "commit3", Sha: "sha3", Parents: []string{"sha4"}, Action: todo.Pick, Status: models.StatusRebasing},
+				{Name: "commit4", Sha: "sha4", Parents: []string{"sha5"}, Action: todo.Pick, Status: models.StatusRebasing},
 				{Name: "commit5", Sha: "sha5", Parents: []string{"sha7"}},
 			},
 			startIdx:                 0,
@@ -346,7 +346,7 @@ func TestGetCommitListDisplayStrings(t *testing.T) {
 		{
 			testName: "don't show YOU ARE HERE label when not asked for (e.g. in branches panel)",
 			commits: []*models.Commit{
-				{Name: "commit1", Sha: "sha1", Parents: []string{"sha2"}, Action: todo.Pick},
+				{Name: "commit1", Sha: "sha1", Parents: []string{"sha2"}, Action: todo.Pick, Status: models.StatusRebasing},
 				{Name: "commit2", Sha: "sha2", Parents: []string{"sha3"}},
 				{Name: "commit3", Sha: "sha3", Parents: []string{"sha4"}},
 			},

pkg/gui/presentation/submodules.go

@@ -13,15 +13,5 @@ func GetSubmoduleListDisplayStrings(submodules []*models.SubmoduleConfig) [][]st
 }
 
 func getSubmoduleDisplayStrings(s *models.SubmoduleConfig) []string {
-	name := s.Name
-	if s.ParentModule != nil {
-		indentation := ""
-		for p := s.ParentModule; p != nil; p = p.ParentModule {
-			indentation += "  "
-		}
-
-		name = indentation + "- " + s.Name
-	}
-
-	return []string{theme.DefaultTextColor.Sprint(name)}
+	return []string{theme.DefaultTextColor.Sprint(s.Name)}
 }

pkg/gui/views.go

@@ -168,8 +168,6 @@ func (gui *Gui) createAllViews() error {
 	gui.Views.CommitDescription.FgColor = theme.GocuiDefaultTextColor
 	gui.Views.CommitDescription.Editable = true
 	gui.Views.CommitDescription.Editor = gocui.EditorFunc(gui.commitDescriptionEditor)
-	gui.Views.CommitDescription.TextArea.AutoWrap = gui.c.UserConfig.Git.Commit.AutoWrapCommitMessage
-	gui.Views.CommitDescription.TextArea.AutoWrapWidth = gui.c.UserConfig.Git.Commit.AutoWrapWidth
 
 	gui.Views.Confirmation.Visible = false
 	gui.Views.Confirmation.Editor = gocui.EditorFunc(gui.promptEditor)

pkg/i18n/english.go

@@ -341,7 +341,6 @@ type TranslationSet struct {
 	CheckingOutStatus                     string
 	CommittingStatus                      string
 	RevertingStatus                       string
-	CreatingFixupCommitStatus             string
 	CommitFiles                           string
 	SubCommitsDynamicTitle                string
 	CommitFilesDynamicTitle               string
@@ -1290,7 +1289,6 @@ func EnglishTranslationSet() TranslationSet {
 		CheckingOutStatus:                   "Checking out",
 		CommittingStatus:                    "Committing",
 		RevertingStatus:                     "Reverting",
-		CreatingFixupCommitStatus:           "Creating fixup commit",
 		CommitFiles:                         "Commit files",
 		SubCommitsDynamicTitle:              "Commits (%s)",
 		CommitFilesDynamicTitle:             "Diff files (%s)",

pkg/integration/components/commit_description_panel_driver.go

@@ -31,16 +31,6 @@ func (self *CommitDescriptionPanelDriver) AddNewline() *CommitDescriptionPanelDr
 	return self
 }
 
-func (self *CommitDescriptionPanelDriver) GoToBeginning() *CommitDescriptionPanelDriver {
-	numLines := len(self.getViewDriver().getView().BufferLines())
-	for i := 0; i < numLines; i++ {
-		self.t.pressFast("<up>")
-	}
-
-	self.t.pressFast("<c-a>")
-	return self
-}
-
 func (self *CommitDescriptionPanelDriver) Title(expected *TextMatcher) *CommitDescriptionPanelDriver {
 	self.getViewDriver().Title(expected)
 

pkg/integration/components/git.go

@@ -2,10 +2,7 @@ package components
 
 import (
 	"fmt"
-	"log"
 	"strings"
-
-	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 )
 
 type Git struct {
@@ -47,11 +44,3 @@ func (self *Git) expect(cmdArgs []string, condition func(string) (bool, string))
 
 	return self
 }
-
-func (self *Git) Version() *git_commands.GitVersion {
-	version, err := getGitVersion()
-	if err != nil {
-		log.Fatalf("Could not get git version: %v", err)
-	}
-	return version
-}

pkg/integration/components/shell.go

@@ -345,9 +345,9 @@ func (self *Shell) CloneIntoRemote(name string) *Shell {
 	return self
 }
 
-func (self *Shell) CloneIntoSubmodule(submoduleName string, submodulePath string) *Shell {
+func (self *Shell) CloneIntoSubmodule(submoduleName string) *Shell {
 	self.Clone("other_repo")
-	self.RunCommand([]string{"git", "submodule", "add", "--name", submoduleName, "../other_repo", submodulePath})
+	self.RunCommand([]string{"git", "submodule", "add", "../other_repo", submoduleName})
 
 	return self
 }

pkg/integration/tests/commit/auto_wrap_message.go

@@ -1,59 +0,0 @@
-package commit
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/config"
-	. "github.com/jesseduffield/lazygit/pkg/integration/components"
-)
-
-var AutoWrapMessage = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Commit, and test how the commit message body is auto-wrapped",
-	ExtraCmdArgs: []string{},
-	Skip:         false,
-	SetupConfig: func(config *config.AppConfig) {
-		// Use a ridiculously small width so that we don't have to use so much test data
-		config.UserConfig.Git.Commit.AutoWrapWidth = 20
-	},
-	SetupRepo: func(shell *Shell) {
-		shell.CreateFile("file", "file content")
-	},
-	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.Views().Commits().
-			IsEmpty()
-
-		t.Views().Files().
-			IsFocused().
-			PressPrimaryAction(). // stage file
-			Press(keys.Files.CommitChanges)
-
-		t.ExpectPopup().CommitMessagePanel().
-			Type("subject").
-			SwitchToDescription().
-			Type("Lorem ipsum dolor sit amet, consectetur adipiscing elit.").
-			// See how it automatically inserted line feeds to wrap the text:
-			Content(Equals("Lorem ipsum dolor \nsit amet, \nconsectetur \nadipiscing elit.")).
-			SwitchToSummary().
-			Confirm()
-
-		t.Views().Commits().
-			Lines(
-				Contains("subject"),
-			).
-			Focus().
-			Tap(func() {
-				t.Views().Main().Content(Contains(
-					"subject\n    \n    Lorem ipsum dolor\n    sit amet,\n    consectetur\n    adipiscing elit."))
-			}).
-			Press(keys.Commits.RenameCommit)
-
-		// Test that when rewording, the hard line breaks are turned back into
-		// soft ones, so that we can insert text at the beginning and have the
-		// paragraph reflow nicely.
-		t.ExpectPopup().CommitMessagePanel().
-			InitialText(Equals("subject")).
-			SwitchToDescription().
-			Content(Equals("Lorem ipsum dolor \nsit amet, \nconsectetur \nadipiscing elit.")).
-			GoToBeginning().
-			Type("More text. ").
-			Content(Equals("More text. Lorem \nipsum dolor sit \namet, consectetur \nadipiscing elit."))
-	},
-})

pkg/integration/tests/interactive_rebase/dont_show_branch_heads_for_todo_items.go

@@ -1,56 +0,0 @@
-package interactive_rebase
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/config"
-	. "github.com/jesseduffield/lazygit/pkg/integration/components"
-)
-
-var DontShowBranchHeadsForTodoItems = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Check that branch heads are shown for normal commits during interactive rebase, but not for todo items",
-	ExtraCmdArgs: []string{},
-	Skip:         false,
-	GitVersion:   AtLeast("2.38.0"),
-	SetupConfig: func(config *config.AppConfig) {
-		config.AppState.GitLogShowGraph = "never"
-	},
-	SetupRepo: func(shell *Shell) {
-		shell.
-			NewBranch("branch1").
-			CreateNCommits(2).
-			NewBranch("branch2").
-			CreateNCommitsStartingAt(4, 3).
-			NewBranch("branch3").
-			CreateNCommitsStartingAt(3, 7)
-
-		shell.SetConfig("rebase.updateRefs", "true")
-	},
-	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.Views().Commits().
-			Focus().
-			Lines(
-				Contains("CI commit 09"),
-				Contains("CI commit 08"),
-				Contains("CI commit 07"),
-				Contains("CI * commit 06"),
-				Contains("CI commit 05"),
-				Contains("CI commit 04"),
-				Contains("CI commit 03"),
-				Contains("CI * commit 02"),
-				Contains("CI commit 01"),
-			).
-			NavigateToLine(Contains("commit 04")).
-			Press(keys.Universal.Edit).
-			Lines(
-				Contains("pick").Contains("CI commit 09"),
-				Contains("pick").Contains("CI commit 08"),
-				Contains("pick").Contains("CI commit 07"),
-				Contains("update-ref").Contains("branch2"),
-				Contains("pick").Contains("CI commit 06"), // no star on this entry, even though branch2 points to it
-				Contains("pick").Contains("CI commit 05"),
-				Contains("CI <-- YOU ARE HERE --- commit 04"),
-				Contains("CI commit 03"),
-				Contains("CI * commit 02"), // this star is fine though
-				Contains("CI commit 01"),
-			)
-	},
-})

pkg/integration/tests/interactive_rebase/drop_todo_commit_with_update_ref.go

@@ -44,7 +44,7 @@ var DropTodoCommitWithUpdateRef = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("pick").Contains("CI commit 06"),
 				Contains("pick").Contains("CI commit 05"),
 				Contains("update-ref").Contains("branch1").DoesNotContain("*"),
-				Contains("pick").Contains("CI commit 04"),
+				Contains("pick").Contains("CI * commit 04"),
 				Contains("pick").Contains("CI commit 03"),
 				Contains("<-- YOU ARE HERE --- commit 02").IsSelected(),
 				Contains("CI commit 01"),

pkg/integration/tests/interactive_rebase/edit_range_select_outside_rebase.go

@@ -1,51 +0,0 @@
-package interactive_rebase
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/config"
-	. "github.com/jesseduffield/lazygit/pkg/integration/components"
-	"github.com/jesseduffield/lazygit/pkg/integration/tests/shared"
-)
-
-var EditRangeSelectOutsideRebase = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Select a range of commits to edit outside of a rebase",
-	ExtraCmdArgs: []string{},
-	Skip:         false,
-	GitVersion:   AtLeast("2.22.0"), // first version that supports the --rebase-merges option
-	SetupConfig:  func(config *config.AppConfig) {},
-	SetupRepo: func(shell *Shell) {
-		shared.CreateMergeCommit(shell)
-	},
-	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.Views().Commits().
-			Focus().
-			TopLines(
-				Contains("Merge branch 'second-change-branch' into first-change-branch").IsSelected(),
-			).
-			Press(keys.Universal.RangeSelectDown).
-			Press(keys.Universal.RangeSelectDown).
-			Press(keys.Universal.RangeSelectDown).
-			Press(keys.Universal.RangeSelectDown).
-			Press(keys.Universal.RangeSelectDown).
-			Lines(
-				Contains("CI ⏣─╮ Merge branch 'second-change-branch' into first-change-branch").IsSelected(),
-				Contains("CI │ ◯ * second-change-branch unrelated change").IsSelected(),
-				Contains("CI │ ◯ second change").IsSelected(),
-				Contains("CI ◯ │ first change").IsSelected(),
-				Contains("CI ◯─╯ * original").IsSelected(),
-				Contains("CI ◯ three").IsSelected(),
-				Contains("CI ◯ two"),
-				Contains("CI ◯ one"),
-			).
-			Press(keys.Universal.Edit).
-			Lines(
-				Contains("merge  CI Merge branch 'second-change-branch' into first-change-branch").IsSelected(),
-				Contains("edit   CI first change").IsSelected(),
-				Contains("edit   CI * second-change-branch unrelated change").IsSelected(),
-				Contains("edit   CI second change").IsSelected(),
-				Contains("edit   CI * original").IsSelected(),
-				Contains("       CI ◯ <-- YOU ARE HERE --- three").IsSelected(),
-				Contains("       CI ◯ two"),
-				Contains("       CI ◯ one"),
-			)
-	},
-})

pkg/integration/tests/interactive_rebase/mid_rebase_range_select.go

@@ -20,6 +20,27 @@ var MidRebaseRangeSelect = NewIntegrationTest(NewIntegrationTestArgs{
 			TopLines(
 				Contains("commit 10").IsSelected(),
 			).
+			NavigateToLine(Contains("commit 07")).
+			Press(keys.Universal.RangeSelectDown).
+			TopLines(
+				Contains("commit 10"),
+				Contains("commit 09"),
+				Contains("commit 08"),
+				Contains("commit 07").IsSelected(),
+				Contains("commit 06").IsSelected(),
+				Contains("commit 05"),
+				Contains("commit 04"),
+			).
+			// Verify we can't perform an edit on multiple commits (it's not supported
+			// yet)
+			Press(keys.Universal.Edit).
+			Tap(func() {
+				// This ought to be a toast but I'm too lazy to implement that right now.
+				t.ExpectPopup().Alert().
+					Title(Equals("Error")).
+					Content(Contains("Action does not support range selection, please select a single item")).
+					Confirm()
+			}).
 			NavigateToLine(Contains("commit 05")).
 			// Start a rebase
 			Press(keys.Universal.Edit).

pkg/integration/tests/interactive_rebase/quick_start_keep_selection.go

@@ -43,7 +43,7 @@ var QuickStartKeepSelection = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("pick").Contains("CI commit 06"),
 				Contains("pick").Contains("CI commit 05"),
 				Contains("update-ref").Contains("branch1"),
-				Contains("pick").Contains("CI commit 04"),
+				Contains("pick").Contains("CI * commit 04"),
 				Contains("pick").Contains("CI commit 03"),
 				Contains("CI commit 02").IsSelected(),
 				Contains("CI <-- YOU ARE HERE --- commit 01"),

pkg/integration/tests/interactive_rebase/quick_start_keep_selection_range.go

@@ -46,10 +46,10 @@ var QuickStartKeepSelectionRange = NewIntegrationTest(NewIntegrationTestArgs{
 				Contains("CI commit 07"),
 				Contains("CI commit 06"),
 				Contains("update-ref").Contains("branch2"),
-				Contains("CI commit 05"),
+				Contains("CI * commit 05"),
 				Contains("CI commit 04").IsSelected(),
 				Contains("update-ref").Contains("branch1").IsSelected(),
-				Contains("CI commit 03").IsSelected(),
+				Contains("CI * commit 03").IsSelected(),
 				Contains("CI commit 02").IsSelected(),
 				Contains("CI <-- YOU ARE HERE --- commit 01"),
 			)

pkg/integration/tests/interactive_rebase/squash_fixups_above.go

@@ -1,56 +0,0 @@
-package interactive_rebase
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/config"
-	. "github.com/jesseduffield/lazygit/pkg/integration/components"
-)
-
-var SquashFixupsAbove = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Squashes all fixups above a commit and checks that the selected line stays correct.",
-	ExtraCmdArgs: []string{},
-	Skip:         false,
-	SetupConfig:  func(config *config.AppConfig) {},
-	SetupRepo: func(shell *Shell) {
-		shell.
-			CreateNCommits(3).
-			CreateFileAndAdd("fixup-file", "fixup content")
-	},
-	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.Views().Commits().
-			Focus().
-			Lines(
-				Contains("commit 03"),
-				Contains("commit 02"),
-				Contains("commit 01"),
-			).
-			NavigateToLine(Contains("commit 02")).
-			Press(keys.Commits.CreateFixupCommit).
-			Tap(func() {
-				t.ExpectPopup().Confirmation().
-					Title(Equals("Create fixup commit")).
-					Content(Contains("Are you sure you want to create a fixup! commit for commit")).
-					Confirm()
-			}).
-			Lines(
-				Contains("fixup! commit 02"),
-				Contains("commit 03"),
-				Contains("commit 02").IsSelected(),
-				Contains("commit 01"),
-			).
-			Press(keys.Commits.SquashAboveCommits).
-			Tap(func() {
-				t.ExpectPopup().Menu().
-					Title(Equals("Apply fixup commits")).
-					Select(Contains("Above the selected commit")).
-					Confirm()
-			}).
-			Lines(
-				Contains("commit 03"),
-				Contains("commit 02").IsSelected(),
-				Contains("commit 01"),
-			)
-
-		t.Views().Main().
-			Content(Contains("fixup content"))
-	},
-})

pkg/integration/tests/interactive_rebase/squash_fixups_in_current_branch.go

@@ -27,12 +27,10 @@ var SquashFixupsInCurrentBranch = NewIntegrationTest(NewIntegrationTestArgs{
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
 		t.Views().Commits().
 			Focus().
-			SelectNextItem().
-			SelectNextItem().
 			Lines(
 				Contains("fixup! commit 01"),
 				Contains("commit 02"),
-				Contains("commit 01").IsSelected(),
+				Contains("commit 01"),
 				Contains("fixup! master commit"),
 				Contains("master commit"),
 			).
@@ -45,10 +43,11 @@ var SquashFixupsInCurrentBranch = NewIntegrationTest(NewIntegrationTestArgs{
 			}).
 			Lines(
 				Contains("commit 02"),
-				Contains("commit 01").IsSelected(),
+				Contains("commit 01"),
 				Contains("fixup! master commit"),
 				Contains("master commit"),
-			)
+			).
+			NavigateToLine(Contains("commit 01"))
 
 		t.Views().Main().
 			Content(Contains("fixup content"))

pkg/integration/tests/interactive_rebase/view_files_of_todo_entries.go

@@ -30,7 +30,7 @@ var ViewFilesOfTodoEntries = NewIntegrationTest(NewIntegrationTestArgs{
 			Lines(
 				Contains("pick").Contains("CI commit 03").IsSelected(),
 				Contains("update-ref").Contains("branch1"),
-				Contains("pick").Contains("CI commit 02"),
+				Contains("pick").Contains("CI * commit 02"),
 				Contains("CI <-- YOU ARE HERE --- commit 01"),
 			).
 			Press(keys.Universal.GoInto)

pkg/integration/tests/submodule/enter.go

@@ -20,7 +20,7 @@ var Enter = NewIntegrationTest(NewIntegrationTestArgs{
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.EmptyCommit("first commit")
-		shell.CloneIntoSubmodule("my_submodule_name", "my_submodule_path")
+		shell.CloneIntoSubmodule("my_submodule")
 		shell.GitAddAll()
 		shell.Commit("add submodule")
 	},
@@ -29,18 +29,14 @@ var Enter = NewIntegrationTest(NewIntegrationTestArgs{
 			t.Views().Status().Content(Contains("repo"))
 		}
 		assertInSubmodule := func() {
-			if t.Git().Version().IsAtLeast(2, 22, 0) {
-				t.Views().Status().Content(Contains("my_submodule_path(my_submodule_name)"))
-			} else {
-				t.Views().Status().Content(Contains("my_submodule_path"))
-			}
+			t.Views().Status().Content(Contains("my_submodule"))
 		}
 
 		assertInParentRepo()
 
 		t.Views().Submodules().Focus().
 			Lines(
-				Contains("my_submodule_name").IsSelected(),
+				Contains("my_submodule").IsSelected(),
 			).
 			// enter the submodule
 			PressEnter()
@@ -64,7 +60,7 @@ var Enter = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.Views().Files().Focus().
 			Lines(
-				MatchesRegexp(` M.*my_submodule_path \(submodule\)`).IsSelected(),
+				MatchesRegexp(` M.*my_submodule \(submodule\)`).IsSelected(),
 			).
 			Tap(func() {
 				// main view also shows the new commit when we're looking at the submodule within the files view

pkg/integration/tests/submodule/enter_nested.go

@@ -1,52 +0,0 @@
-package submodule
-
-import (
-	"github.com/jesseduffield/lazygit/pkg/config"
-	. "github.com/jesseduffield/lazygit/pkg/integration/components"
-)
-
-var EnterNested = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Enter a nested submodule",
-	ExtraCmdArgs: []string{},
-	Skip:         false,
-	SetupConfig:  func(cfg *config.AppConfig) {},
-	SetupRepo: func(shell *Shell) {
-		setupNestedSubmodules(shell)
-	},
-	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.Views().Submodules().Focus().
-			Lines(
-				Equals("outerSubName").IsSelected(),
-				Equals("  - innerSubName"),
-			).
-			Tap(func() {
-				t.Views().Main().ContainsLines(
-					Contains("Name: outerSubName"),
-					Contains("Path: modules/outerSubPath"),
-					Contains("Url:  ../outerSubmodule"),
-				)
-			}).
-			SelectNextItem().
-			Tap(func() {
-				t.Views().Main().ContainsLines(
-					Contains("Name: outerSubName/innerSubName"),
-					Contains("Path: modules/outerSubPath/modules/innerSubPath"),
-					Contains("Url:  ../innerSubmodule"),
-				)
-			}).
-			// enter the nested submodule
-			PressEnter()
-
-		if t.Git().Version().IsAtLeast(2, 22, 0) {
-			t.Views().Status().Content(Contains("innerSubPath(innerSubName)"))
-		} else {
-			t.Views().Status().Content(Contains("innerSubPath"))
-		}
-		t.Views().Commits().ContainsLines(
-			Contains("initial inner commit"),
-		)
-
-		t.Views().Files().PressEscape()
-		t.Views().Status().Content(Contains("repo"))
-	},
-})

pkg/integration/tests/submodule/remove.go

@@ -12,23 +12,20 @@ var Remove = NewIntegrationTest(NewIntegrationTestArgs{
 	SetupConfig:  func(config *config.AppConfig) {},
 	SetupRepo: func(shell *Shell) {
 		shell.EmptyCommit("first commit")
-		shell.CloneIntoSubmodule("my_submodule_name", "my_submodule_path")
+		shell.CloneIntoSubmodule("my_submodule")
 		shell.GitAddAll()
 		shell.Commit("add submodule")
 	},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		gitDirSubmodulePath := ".git/modules/my_submodule_name"
-		t.FileSystem().PathPresent(gitDirSubmodulePath)
-
 		t.Views().Submodules().Focus().
 			Lines(
-				Contains("my_submodule_name").IsSelected(),
+				Contains("my_submodule").IsSelected(),
 			).
 			Press(keys.Universal.Remove).
 			Tap(func() {
 				t.ExpectPopup().Confirmation().
 					Title(Equals("Remove submodule")).
-					Content(Equals("Are you sure you want to remove submodule 'my_submodule_name' and its corresponding directory? This is irreversible.")).
+					Content(Equals("Are you sure you want to remove submodule 'my_submodule' and its corresponding directory? This is irreversible.")).
 					Confirm()
 			}).
 			IsEmpty()
@@ -36,15 +33,13 @@ var Remove = NewIntegrationTest(NewIntegrationTestArgs{
 		t.Views().Files().Focus().
 			Lines(
 				MatchesRegexp(`M.*\.gitmodules`).IsSelected(),
-				MatchesRegexp(`D.*my_submodule_path`),
+				MatchesRegexp(`D.*my_submodule`),
 			)
 
 		t.Views().Main().Content(
-			Contains("-[submodule \"my_submodule_name\"]").
-				Contains("-   path = my_submodule_path").
+			Contains("-[submodule \"my_submodule\"]").
+				Contains("-   path = my_submodule").
 				Contains("-   url = ../other_repo"),
 		)
-
-		t.FileSystem().PathNotPresent(gitDirSubmodulePath)
 	},
 })

pkg/integration/tests/submodule/remove_nested.go

@@ -1,56 +0,0 @@
-package submodule
-
-import (
-	"path/filepath"
-
-	"github.com/jesseduffield/lazygit/pkg/config"
-	. "github.com/jesseduffield/lazygit/pkg/integration/components"
-)
-
-var RemoveNested = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Remove a nested submodule",
-	ExtraCmdArgs: []string{},
-	Skip:         false,
-	SetupConfig:  func(config *config.AppConfig) {},
-	SetupRepo: func(shell *Shell) {
-		setupNestedSubmodules(shell)
-	},
-	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		gitDirSubmodulePath, _ := filepath.Abs(".git/modules/outerSubName/modules/innerSubName")
-		t.FileSystem().PathPresent(gitDirSubmodulePath)
-
-		t.Views().Submodules().Focus().
-			Lines(
-				Equals("outerSubName").IsSelected(),
-				Equals("  - innerSubName"),
-			).
-			SelectNextItem().
-			Press(keys.Universal.Remove).
-			Tap(func() {
-				t.ExpectPopup().Confirmation().
-					Title(Equals("Remove submodule")).
-					Content(Equals("Are you sure you want to remove submodule 'outerSubName/innerSubName' and its corresponding directory? This is irreversible.")).
-					Confirm()
-			}).
-			Lines(
-				Equals("outerSubName").IsSelected(),
-			).
-			Press(keys.Universal.GoInto)
-
-		t.Views().Files().IsFocused().
-			Lines(
-				Contains("modules").IsSelected(),
-				MatchesRegexp(`D.*innerSubPath`),
-				MatchesRegexp(`M.*\.gitmodules`),
-			).
-			NavigateToLine(Contains(".gitmodules"))
-
-		t.Views().Main().Content(
-			Contains("-[submodule \"innerSubName\"]").
-				Contains("-   path = modules/innerSubPath").
-				Contains("-   url = ../innerSubmodule"),
-		)
-
-		t.FileSystem().PathNotPresent(gitDirSubmodulePath)
-	},
-})

pkg/integration/tests/submodule/reset.go

@@ -20,7 +20,7 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
 	},
 	SetupRepo: func(shell *Shell) {
 		shell.EmptyCommit("first commit")
-		shell.CloneIntoSubmodule("my_submodule_name", "my_submodule_path")
+		shell.CloneIntoSubmodule("my_submodule")
 		shell.GitAddAll()
 		shell.Commit("add submodule")
 
@@ -31,24 +31,22 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
 			t.Views().Status().Content(Contains("repo"))
 		}
 		assertInSubmodule := func() {
-			if t.Git().Version().IsAtLeast(2, 22, 0) {
-				t.Views().Status().Content(Contains("my_submodule_path(my_submodule_name)"))
-			} else {
-				t.Views().Status().Content(Contains("my_submodule_path"))
-			}
+			t.Views().Status().Content(Contains("my_submodule"))
 		}
 
 		assertInParentRepo()
 
 		t.Views().Submodules().Focus().
 			Lines(
-				Contains("my_submodule_name").IsSelected(),
+				Contains("my_submodule").IsSelected(),
 			).
 			// enter the submodule
 			PressEnter()
 
 		assertInSubmodule()
 
+		t.Views().Status().Content(Contains("my_submodule"))
+
 		t.Views().Files().IsFocused().
 			Press("e").
 			Tap(func() {
@@ -67,18 +65,18 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.Views().Submodules().IsFocused()
 
-		t.Views().Main().Content(Contains("Submodule my_submodule_path contains modified content"))
+		t.Views().Main().Content(Contains("Submodule my_submodule contains modified content"))
 
 		t.Views().Files().Focus().
 			Lines(
-				MatchesRegexp(` M.*my_submodule_path \(submodule\)`),
+				MatchesRegexp(` M.*my_submodule \(submodule\)`),
 				Contains("other_file").IsSelected(),
 			).
 			// Verify we can't use range select on submodules
 			Press(keys.Universal.ToggleRangeSelect).
 			SelectPreviousItem().
 			Lines(
-				MatchesRegexp(` M.*my_submodule_path \(submodule\)`).IsSelected(),
+				MatchesRegexp(` M.*my_submodule \(submodule\)`).IsSelected(),
 				Contains("other_file").IsSelected(),
 			).
 			Press(keys.Universal.Remove).
@@ -87,13 +85,13 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
 			}).
 			Press(keys.Universal.ToggleRangeSelect).
 			Lines(
-				MatchesRegexp(` M.*my_submodule_path \(submodule\)`).IsSelected(),
+				MatchesRegexp(` M.*my_submodule \(submodule\)`).IsSelected(),
 				Contains("other_file"),
 			).
 			Press(keys.Universal.Remove).
 			Tap(func() {
 				t.ExpectPopup().Menu().
-					Title(Equals("my_submodule_path")).
+					Title(Equals("my_submodule")).
 					Select(Contains("Stash uncommitted submodule changes and update")).
 					Confirm()
 			}).

pkg/integration/tests/submodule/shared.go

@@ -1,39 +0,0 @@
-package submodule
-
-import (
-	. "github.com/jesseduffield/lazygit/pkg/integration/components"
-)
-
-func setupNestedSubmodules(shell *Shell) {
-	// we're going to have a directory structure like this:
-	// project
-	//  - repo/modules/outerSubName/modules/innerSubName/
-	//
-	shell.CreateFileAndAdd("rootFile", "rootStuff")
-	shell.Commit("initial repo commit")
-
-	shell.Chdir("..")
-	shell.CreateDir("innerSubmodule")
-	shell.Chdir("innerSubmodule")
-	shell.Init()
-	shell.CreateFileAndAdd("inner", "inner")
-	shell.Commit("initial inner commit")
-
-	shell.Chdir("..")
-	shell.CreateDir("outerSubmodule")
-	shell.Chdir("outerSubmodule")
-	shell.Init()
-	shell.CreateFileAndAdd("outer", "outer")
-	shell.Commit("initial outer commit")
-	shell.CreateDir("modules")
-	// the git config (-c) parameter below is required
-	// to let git create a file-protocol/path submodule
-	shell.RunCommand([]string{"git", "-c", "protocol.file.allow=always", "submodule", "add", "--name", "innerSubName", "../innerSubmodule", "modules/innerSubPath"})
-	shell.Commit("add dependency as innerSubmodule")
-
-	shell.Chdir("../repo")
-	shell.CreateDir("modules")
-	shell.RunCommand([]string{"git", "-c", "protocol.file.allow=always", "submodule", "add", "--name", "outerSubName", "../outerSubmodule", "modules/outerSubPath"})
-	shell.Commit("add dependency as outerSubmodule")
-	shell.RunCommand([]string{"git", "-c", "protocol.file.allow=always", "submodule", "update", "--init", "--recursive"})
-}

pkg/integration/tests/test_list.go

@@ -65,7 +65,6 @@ var tests = []*components.IntegrationTest{
 	cherry_pick.CherryPickRange,
 	commit.AddCoAuthor,
 	commit.Amend,
-	commit.AutoWrapMessage,
 	commit.Commit,
 	commit.CommitMultiline,
 	commit.CommitSwitchToEditor,
@@ -163,12 +162,10 @@ var tests = []*components.IntegrationTest{
 	interactive_rebase.AmendHeadCommitDuringRebase,
 	interactive_rebase.AmendMerge,
 	interactive_rebase.AmendNonHeadCommitDuringRebase,
-	interactive_rebase.DontShowBranchHeadsForTodoItems,
 	interactive_rebase.DropTodoCommitWithUpdateRef,
 	interactive_rebase.DropWithCustomCommentChar,
 	interactive_rebase.EditFirstCommit,
 	interactive_rebase.EditNonTodoCommitDuringRebase,
-	interactive_rebase.EditRangeSelectOutsideRebase,
 	interactive_rebase.EditTheConflCommit,
 	interactive_rebase.FixupFirstCommit,
 	interactive_rebase.FixupSecondCommit,
@@ -189,7 +186,6 @@ var tests = []*components.IntegrationTest{
 	interactive_rebase.RewordYouAreHereCommitWithEditor,
 	interactive_rebase.SquashDownFirstCommit,
 	interactive_rebase.SquashDownSecondCommit,
-	interactive_rebase.SquashFixupsAbove,
 	interactive_rebase.SquashFixupsAboveFirstCommit,
 	interactive_rebase.SquashFixupsInCurrentBranch,
 	interactive_rebase.SwapInRebaseWithConflict,
@@ -248,9 +244,7 @@ var tests = []*components.IntegrationTest{
 	stash.StashUnstaged,
 	submodule.Add,
 	submodule.Enter,
-	submodule.EnterNested,
 	submodule.Remove,
-	submodule.RemoveNested,
 	submodule.Reset,
 	sync.FetchPrune,
 	sync.FetchWhenSortedByDate,

schema/config.json

@@ -405,16 +405,6 @@
             "signOff": {
               "type": "boolean",
               "description": "If true, pass '--signoff' flag when committing"
-            },
-            "autoWrapCommitMessage": {
-              "type": "boolean",
-              "description": "Automatic WYSIWYG wrapping of the commit message as you type",
-              "default": true
-            },
-            "autoWrapWidth": {
-              "type": "integer",
-              "description": "If autoWrapCommitMessage is true, the width to wrap to",
-              "default": 72
             }
           },
           "additionalProperties": false,

vendor/github.com/gdamore/tcell/v2/cell.go

@@ -1,4 +1,4 @@
-// Copyright 2024 The TCell Authors
+// Copyright 2023 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use file except in compliance with the License.
@@ -16,7 +16,6 @@ package tcell
 
 import (
 	"os"
-	"reflect"
 
 	runewidth "github.com/mattn/go-runewidth"
 )
@@ -54,14 +53,8 @@ func (cb *CellBuffer) SetContent(x int, y int,
 	if x >= 0 && y >= 0 && x < cb.w && y < cb.h {
 		c := &cb.cells[(y*cb.w)+x]
 
-		// Wide characters: we want to mark the "wide" cells
-		// dirty as well as the base cell, to make sure we consider
-		// both cells as dirty together.  We only need to do this
-		// if we're changing content
-		if (c.width > 0) && (mainc != c.currMain || !reflect.DeepEqual(combc, c.currComb)) {
-			for i := 0; i < c.width; i++ {
-				cb.SetDirty(x+i, y, true)
-			}
+		for i := 1; i < c.width; i++ {
+			cb.SetDirty(x+i, y, true)
 		}
 
 		c.currComb = append([]rune{}, combc...)

vendor/github.com/gdamore/tcell/v2/console_win.go

@@ -1,7 +1,7 @@
 //go:build windows
 // +build windows
 
-// Copyright 2024 The TCell Authors
+// Copyright 2023 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use file except in compliance with the License.
@@ -41,7 +41,6 @@ type cScreen struct {
 	vten       bool
 	truecolor  bool
 	running    bool
-	disableAlt bool // disable the alternate screen
 
 	w int
 	h int
@@ -52,7 +51,6 @@ type cScreen struct {
 	oimode      uint32
 	oomode      uint32
 	cells       CellBuffer
-	focusEnable bool
 
 	mouseEnabled bool
 	wg           sync.WaitGroup
@@ -160,10 +158,6 @@ const (
 	vtCursorSteadyUnderline   = "\x1b[4 q"
 	vtCursorBlinkingBar       = "\x1b[5 q"
 	vtCursorSteadyBar         = "\x1b[6 q"
-	vtDisableAm               = "\x1b[?7l"
-	vtEnableAm                = "\x1b[?7h"
-	vtEnterCA                 = "\x1b[?1049h\x1b[22;0;0t"
-	vtExitCA                  = "\x1b[?1049l\x1b[23;0;0t"
 )
 
 var vtCursorStyles = map[CursorStyle]string{
@@ -187,6 +181,7 @@ func (s *cScreen) Init() error {
 	s.eventQ = make(chan Event, 10)
 	s.quit = make(chan struct{})
 	s.scandone = make(chan struct{})
+
 	in, e := syscall.Open("CONIN$", syscall.O_RDWR, 0)
 	if e != nil {
 		return e
@@ -201,22 +196,20 @@ func (s *cScreen) Init() error {
 
 	s.truecolor = true
 
-	// ConEmu handling of colors and scrolling when in VT output mode is extremely poor.
-	// The color palette will scroll even though characters do not, when
-	// emitting stuff for the last character.  In the future we might change this to
-	// look at specific versions of ConEmu if they fix the bug.
-	// We can also try disabling auto margin mode.
-	tryVt := true
+	// ConEmu handling of colors and scrolling when in terminal
+	// mode is extremely problematic at the best.  The color
+	// palette will scroll even though characters do not, when
+	// emitting stuff for the last character.  In the future we
+	// might change this to look at specific versions of ConEmu
+	// if they fix the bug.
 	if os.Getenv("ConEmuPID") != "" {
 		s.truecolor = false
-		tryVt = false
 	}
 	switch os.Getenv("TCELL_TRUECOLOR") {
 	case "disable":
 		s.truecolor = false
 	case "enable":
 		s.truecolor = true
-		tryVt = true
 	}
 
 	s.Lock()
@@ -233,22 +226,9 @@ func (s *cScreen) Init() error {
 	s.fini = false
 	s.setInMode(modeResizeEn | modeExtendFlg)
 
-	// If a user needs to force old style console, they may do so
-	// by setting TCELL_VTMODE to disable.  This is an undocumented safety net for now.
-	// It may be removed in the future.  (This mostly exists because of ConEmu.)
-	switch os.Getenv("TCELL_VTMODE") {
-	case "disable":
-		tryVt = false
-	case "enable":
-		tryVt = true
-	}
-	switch os.Getenv("TCELL_ALTSCREEN") {
-	case "enable":
-		s.disableAlt = false // also the default
-	case "disable":
-		s.disableAlt = true
-	}
-	if tryVt {
+	// 24-bit color is opt-in for now, because we can't figure out
+	// to make it work consistently.
+	if s.truecolor {
 		s.setOutMode(modeVtOutput | modeNoAutoNL | modeCookedOut | modeUnderline)
 		var om uint32
 		s.getOutMode(&om)
@@ -300,17 +280,9 @@ func (s *cScreen) EnablePaste() {}
 
 func (s *cScreen) DisablePaste() {}
 
-func (s *cScreen) EnableFocus() {
-	s.Lock()
-	s.focusEnable = true
-	s.Unlock()
-}
+func (s *cScreen) EnableFocus() {}
 
-func (s *cScreen) DisableFocus() {
-	s.Lock()
-	s.focusEnable = false
-	s.Unlock()
-}
+func (s *cScreen) DisableFocus() {}
 
 func (s *cScreen) Fini() {
 	s.finiOnce.Do(func() {
@@ -335,18 +307,13 @@ func (s *cScreen) disengage() {
 
 	if s.vten {
 		s.emitVtString(vtCursorStyles[CursorStyleDefault])
-		s.emitVtString(vtEnableAm)
-		if !s.disableAlt {
-			s.emitVtString(vtExitCA)
-		}
-	} else if !s.disableAlt {
-		s.clearScreen(StyleDefault, s.vten)
-		s.setCursorPos(0, 0, false)
 	}
-	s.setCursorInfo(&s.ocursor)
-	s.setBufferSize(int(s.oscreen.size.x), int(s.oscreen.size.y))
 	s.setInMode(s.oimode)
 	s.setOutMode(s.oomode)
+	s.setBufferSize(int(s.oscreen.size.x), int(s.oscreen.size.y))
+	s.clearScreen(StyleDefault, false)
+	s.setCursorPos(0, 0, false)
+	s.setCursorInfo(&s.ocursor)
 	_, _, _ = procSetConsoleTextAttribute.Call(
 		uintptr(s.out),
 		uintptr(s.mapStyle(StyleDefault)))
@@ -373,10 +340,6 @@ func (s *cScreen) engage() error {
 
 	if s.vten {
 		s.setOutMode(modeVtOutput | modeNoAutoNL | modeCookedOut | modeUnderline)
-		if !s.disableAlt {
-			s.emitVtString(vtEnterCA)
-		}
-		s.emitVtString(vtDisableAm)
 	} else {
 		s.setOutMode(0)
 	}
@@ -485,8 +448,8 @@ const (
 	keyEvent    uint16 = 1
 	mouseEvent  uint16 = 2
 	resizeEvent uint16 = 4
-	menuEvent   uint16 = 8 // don't use
-	focusEvent  uint16 = 16
+	// menuEvent   uint16 = 8  // don't use
+	// focusEvent  uint16 = 16 // don't use
 )
 
 type mouseRecord struct {
@@ -497,10 +460,6 @@ type mouseRecord struct {
 	flags uint32
 }
 
-type focusRecord struct {
-	focused int32 // actually BOOL
-}
-
 const (
 	mouseHWheeled uint32 = 0x8
 	mouseVWheeled uint32 = 0x4
@@ -795,16 +754,6 @@ func (s *cScreen) getConsoleInput() error {
 			rrec.y = geti16(rec.data[2:])
 			s.postEvent(NewEventResize(int(rrec.x), int(rrec.y)))
 
-		case focusEvent:
-			var focus focusRecord
-			focus.focused = geti32(rec.data[0:])
-			s.Lock()
-			enabled := s.focusEnable
-			s.Unlock()
-			if enabled {
-				s.postEvent(NewEventFocus(focus.focused != 0))
-			}
-
 		default:
 		}
 	default:
@@ -1322,5 +1271,5 @@ func (s *cScreen) EventQ() chan Event {
 }
 
 func (s *cScreen) StopQ() <-chan struct{} {
-	return s.quit
+	return s.stopQ
 }

vendor/github.com/gdamore/tcell/v2/terminfo/a/alacritty/term.go

@@ -8,64 +8,62 @@ func init() {
 
 	// alacritty terminal emulator
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "alacritty",
-		Columns:           80,
-		Lines:             24,
-		Colors:            256,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J",
-		EnterCA:           "\x1b[?1049h\x1b[22;0;0t",
-		ExitCA:            "\x1b[?1049l\x1b[23;0;0t",
-		ShowCursor:        "\x1b[?12l\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b(B\x1b[m",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Dim:               "\x1b[2m",
-		Italic:            "\x1b[3m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h\x1b=",
-		ExitKeypad:        "\x1b[?1l\x1b>",
-		SetFg:             "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
-		SetBg:             "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
-		SetFgBg:           "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
-		ResetFgBg:         "\x1b[39;49m",
-		AltChars:          "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x1b(0",
-		ExitAcs:           "\x1b(B",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		StrikeThrough:     "\x1b[9m",
-		Mouse:             "\x1b[<",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1bOH",
-		KeyEnd:            "\x1bOF",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyBacktab:        "\x1b[Z",
-		Modifiers:         1,
-		AutoMargin:        true,
+		Name:          "alacritty",
+		Columns:       80,
+		Lines:         24,
+		Colors:        256,
+		Bell:          "\a",
+		Clear:         "\x1b[H\x1b[2J",
+		EnterCA:       "\x1b[?1049h\x1b[22;0;0t",
+		ExitCA:        "\x1b[?1049l\x1b[23;0;0t",
+		ShowCursor:    "\x1b[?12l\x1b[?25h",
+		HideCursor:    "\x1b[?25l",
+		AttrOff:       "\x1b(B\x1b[m",
+		Underline:     "\x1b[4m",
+		Bold:          "\x1b[1m",
+		Dim:           "\x1b[2m",
+		Italic:        "\x1b[3m",
+		Blink:         "\x1b[5m",
+		Reverse:       "\x1b[7m",
+		EnterKeypad:   "\x1b[?1h\x1b=",
+		ExitKeypad:    "\x1b[?1l\x1b>",
+		SetFg:         "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
+		SetBg:         "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
+		SetFgBg:       "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
+		ResetFgBg:     "\x1b[39;49m",
+		AltChars:      "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:      "\x1b(0",
+		ExitAcs:       "\x1b(B",
+		StrikeThrough: "\x1b[9m",
+		Mouse:         "\x1b[<",
+		SetCursor:     "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:   "\b",
+		CursorUp1:     "\x1b[A",
+		KeyUp:         "\x1bOA",
+		KeyDown:       "\x1bOB",
+		KeyRight:      "\x1bOC",
+		KeyLeft:       "\x1bOD",
+		KeyInsert:     "\x1b[2~",
+		KeyDelete:     "\x1b[3~",
+		KeyBackspace:  "\u007f",
+		KeyHome:       "\x1bOH",
+		KeyEnd:        "\x1bOF",
+		KeyPgUp:       "\x1b[5~",
+		KeyPgDn:       "\x1b[6~",
+		KeyF1:         "\x1bOP",
+		KeyF2:         "\x1bOQ",
+		KeyF3:         "\x1bOR",
+		KeyF4:         "\x1bOS",
+		KeyF5:         "\x1b[15~",
+		KeyF6:         "\x1b[17~",
+		KeyF7:         "\x1b[18~",
+		KeyF8:         "\x1b[19~",
+		KeyF9:         "\x1b[20~",
+		KeyF10:        "\x1b[21~",
+		KeyF11:        "\x1b[23~",
+		KeyF12:        "\x1b[24~",
+		KeyBacktab:    "\x1b[Z",
+		Modifiers:     1,
+		AutoMargin:    true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/d/dtterm/term.go

@@ -8,64 +8,62 @@ func init() {
 
 	// CDE desktop terminal
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "dtterm",
-		Columns:           80,
-		Lines:             24,
-		Colors:            8,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[J",
-		ShowCursor:        "\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b[m\x0f",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Dim:               "\x1b[2m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		SetFg:             "\x1b[3%p1%dm",
-		SetBg:             "\x1b[4%p1%dm",
-		SetFgBg:           "\x1b[3%p1%d;4%p2%dm",
-		ResetFgBg:         "\x1b[39;49m",
-		PadChar:           "\x00",
-		AltChars:          "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x0e",
-		ExitAcs:           "\x0f",
-		EnableAcs:         "\x1b(B\x1b)0",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1b[A",
-		KeyDown:           "\x1b[B",
-		KeyRight:          "\x1b[C",
-		KeyLeft:           "\x1b[D",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\b",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1b[11~",
-		KeyF2:             "\x1b[12~",
-		KeyF3:             "\x1b[13~",
-		KeyF4:             "\x1b[14~",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyF13:            "\x1b[25~",
-		KeyF14:            "\x1b[26~",
-		KeyF15:            "\x1b[28~",
-		KeyF16:            "\x1b[29~",
-		KeyF17:            "\x1b[31~",
-		KeyF18:            "\x1b[32~",
-		KeyF19:            "\x1b[33~",
-		KeyF20:            "\x1b[34~",
-		KeyHelp:           "\x1b[28~",
-		AutoMargin:        true,
+		Name:         "dtterm",
+		Columns:      80,
+		Lines:        24,
+		Colors:       8,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[J",
+		ShowCursor:   "\x1b[?25h",
+		HideCursor:   "\x1b[?25l",
+		AttrOff:      "\x1b[m\x0f",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Dim:          "\x1b[2m",
+		Blink:        "\x1b[5m",
+		Reverse:      "\x1b[7m",
+		SetFg:        "\x1b[3%p1%dm",
+		SetBg:        "\x1b[4%p1%dm",
+		SetFgBg:      "\x1b[3%p1%d;4%p2%dm",
+		ResetFgBg:    "\x1b[39;49m",
+		PadChar:      "\x00",
+		AltChars:     "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:     "\x0e",
+		ExitAcs:      "\x0f",
+		EnableAcs:    "\x1b(B\x1b)0",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A",
+		KeyUp:        "\x1b[A",
+		KeyDown:      "\x1b[B",
+		KeyRight:     "\x1b[C",
+		KeyLeft:      "\x1b[D",
+		KeyInsert:    "\x1b[2~",
+		KeyDelete:    "\x1b[3~",
+		KeyBackspace: "\b",
+		KeyPgUp:      "\x1b[5~",
+		KeyPgDn:      "\x1b[6~",
+		KeyF1:        "\x1b[11~",
+		KeyF2:        "\x1b[12~",
+		KeyF3:        "\x1b[13~",
+		KeyF4:        "\x1b[14~",
+		KeyF5:        "\x1b[15~",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		KeyF10:       "\x1b[21~",
+		KeyF11:       "\x1b[23~",
+		KeyF12:       "\x1b[24~",
+		KeyF13:       "\x1b[25~",
+		KeyF14:       "\x1b[26~",
+		KeyF15:       "\x1b[28~",
+		KeyF16:       "\x1b[29~",
+		KeyF17:       "\x1b[31~",
+		KeyF18:       "\x1b[32~",
+		KeyF19:       "\x1b[33~",
+		KeyF20:       "\x1b[34~",
+		KeyHelp:      "\x1b[28~",
+		AutoMargin:   true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/e/emacs/term.go

@@ -6,7 +6,7 @@ import "github.com/gdamore/tcell/v2/terminfo"
 
 func init() {
 
-	// GNU Emacs term.el terminal emulation
+	// gnu emacs term.el terminal emulation
 	terminfo.AddTerminfo(&terminfo.Terminfo{
 		Name:        "eterm",
 		Columns:     80,
@@ -34,8 +34,6 @@ func init() {
 		Colors:       8,
 		Bell:         "\a",
 		Clear:        "\x1b[H\x1b[J",
-		EnterCA:      "\x1b7\x1b[?47h",
-		ExitCA:       "\x1b[2J\x1b[?47l\x1b8",
 		AttrOff:      "\x1b[m",
 		Underline:    "\x1b[4m",
 		Bold:         "\x1b[1m",
@@ -55,7 +53,7 @@ func init() {
 		KeyLeft:      "\x1bOD",
 		KeyInsert:    "\x1b[2~",
 		KeyDelete:    "\x1b[3~",
-		KeyBackspace: "\x7f",
+		KeyBackspace: "\u007f",
 		KeyHome:      "\x1b[1~",
 		KeyEnd:       "\x1b[4~",
 		KeyPgUp:      "\x1b[5~",

vendor/github.com/gdamore/tcell/v2/terminfo/extended/extended.go

@@ -1,4 +1,4 @@
-// Copyright 2024 The TCell Authors
+// Copyright 2020 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use file except in compliance with the License.
@@ -39,6 +39,7 @@ import (
 	_ "github.com/gdamore/tcell/v2/terminfo/s/screen"
 	_ "github.com/gdamore/tcell/v2/terminfo/s/simpleterm"
 	_ "github.com/gdamore/tcell/v2/terminfo/s/sun"
+	_ "github.com/gdamore/tcell/v2/terminfo/t/termite"
 	_ "github.com/gdamore/tcell/v2/terminfo/t/tmux"
 	_ "github.com/gdamore/tcell/v2/terminfo/v/vt100"
 	_ "github.com/gdamore/tcell/v2/terminfo/v/vt102"
@@ -53,4 +54,5 @@ import (
 	_ "github.com/gdamore/tcell/v2/terminfo/x/xfce"
 	_ "github.com/gdamore/tcell/v2/terminfo/x/xterm"
 	_ "github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty"
+	_ "github.com/gdamore/tcell/v2/terminfo/x/xterm_termite"
 )

vendor/github.com/gdamore/tcell/v2/terminfo/g/gnome/term.go

@@ -8,127 +8,123 @@ func init() {
 
 	// GNOME Terminal
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "gnome",
-		Columns:           80,
-		Lines:             24,
-		Colors:            8,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J",
-		EnterCA:           "\x1b7\x1b[?47h",
-		ExitCA:            "\x1b[2J\x1b[?47l\x1b8",
-		ShowCursor:        "\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b[0m\x0f",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Dim:               "\x1b[2m",
-		Italic:            "\x1b[3m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h\x1b=",
-		ExitKeypad:        "\x1b[?1l\x1b>",
-		SetFg:             "\x1b[3%p1%dm",
-		SetBg:             "\x1b[4%p1%dm",
-		SetFgBg:           "\x1b[3%p1%d;4%p2%dm",
-		ResetFgBg:         "\x1b[39;49m",
-		PadChar:           "\x00",
-		AltChars:          "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x0e",
-		ExitAcs:           "\x0f",
-		EnableAcs:         "\x1b)0",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		Mouse:             "\x1b[M",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1bOH",
-		KeyEnd:            "\x1bOF",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyBacktab:        "\x1b[Z",
-		Modifiers:         1,
-		AutoMargin:        true,
+		Name:         "gnome",
+		Columns:      80,
+		Lines:        24,
+		Colors:       8,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[2J",
+		EnterCA:      "\x1b7\x1b[?47h",
+		ExitCA:       "\x1b[2J\x1b[?47l\x1b8",
+		ShowCursor:   "\x1b[?25h",
+		HideCursor:   "\x1b[?25l",
+		AttrOff:      "\x1b[0m\x0f",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Dim:          "\x1b[2m",
+		Italic:       "\x1b[3m",
+		Reverse:      "\x1b[7m",
+		EnterKeypad:  "\x1b[?1h\x1b=",
+		ExitKeypad:   "\x1b[?1l\x1b>",
+		SetFg:        "\x1b[3%p1%dm",
+		SetBg:        "\x1b[4%p1%dm",
+		SetFgBg:      "\x1b[3%p1%d;4%p2%dm",
+		ResetFgBg:    "\x1b[39;49m",
+		PadChar:      "\x00",
+		AltChars:     "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:     "\x0e",
+		ExitAcs:      "\x0f",
+		EnableAcs:    "\x1b)0",
+		Mouse:        "\x1b[M",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A",
+		KeyUp:        "\x1bOA",
+		KeyDown:      "\x1bOB",
+		KeyRight:     "\x1bOC",
+		KeyLeft:      "\x1bOD",
+		KeyInsert:    "\x1b[2~",
+		KeyDelete:    "\x1b[3~",
+		KeyBackspace: "\u007f",
+		KeyHome:      "\x1bOH",
+		KeyEnd:       "\x1bOF",
+		KeyPgUp:      "\x1b[5~",
+		KeyPgDn:      "\x1b[6~",
+		KeyF1:        "\x1bOP",
+		KeyF2:        "\x1bOQ",
+		KeyF3:        "\x1bOR",
+		KeyF4:        "\x1bOS",
+		KeyF5:        "\x1b[15~",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		KeyF10:       "\x1b[21~",
+		KeyF11:       "\x1b[23~",
+		KeyF12:       "\x1b[24~",
+		KeyBacktab:   "\x1b[Z",
+		Modifiers:    1,
+		AutoMargin:   true,
 	})
 
 	// GNOME Terminal with xterm 256-colors
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "gnome-256color",
-		Columns:           80,
-		Lines:             24,
-		Colors:            256,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J",
-		EnterCA:           "\x1b7\x1b[?47h",
-		ExitCA:            "\x1b[2J\x1b[?47l\x1b8",
-		ShowCursor:        "\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b[0m\x0f",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Dim:               "\x1b[2m",
-		Italic:            "\x1b[3m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h\x1b=",
-		ExitKeypad:        "\x1b[?1l\x1b>",
-		SetFg:             "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
-		SetBg:             "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
-		SetFgBg:           "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
-		ResetFgBg:         "\x1b[39;49m",
-		PadChar:           "\x00",
-		AltChars:          "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x0e",
-		ExitAcs:           "\x0f",
-		EnableAcs:         "\x1b)0",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		Mouse:             "\x1b[M",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1bOH",
-		KeyEnd:            "\x1bOF",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyBacktab:        "\x1b[Z",
-		Modifiers:         1,
-		AutoMargin:        true,
+		Name:         "gnome-256color",
+		Columns:      80,
+		Lines:        24,
+		Colors:       256,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[2J",
+		EnterCA:      "\x1b7\x1b[?47h",
+		ExitCA:       "\x1b[2J\x1b[?47l\x1b8",
+		ShowCursor:   "\x1b[?25h",
+		HideCursor:   "\x1b[?25l",
+		AttrOff:      "\x1b[0m\x0f",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Dim:          "\x1b[2m",
+		Italic:       "\x1b[3m",
+		Reverse:      "\x1b[7m",
+		EnterKeypad:  "\x1b[?1h\x1b=",
+		ExitKeypad:   "\x1b[?1l\x1b>",
+		SetFg:        "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
+		SetBg:        "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
+		SetFgBg:      "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
+		ResetFgBg:    "\x1b[39;49m",
+		PadChar:      "\x00",
+		AltChars:     "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:     "\x0e",
+		ExitAcs:      "\x0f",
+		EnableAcs:    "\x1b)0",
+		Mouse:        "\x1b[M",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A",
+		KeyUp:        "\x1bOA",
+		KeyDown:      "\x1bOB",
+		KeyRight:     "\x1bOC",
+		KeyLeft:      "\x1bOD",
+		KeyInsert:    "\x1b[2~",
+		KeyDelete:    "\x1b[3~",
+		KeyBackspace: "\u007f",
+		KeyHome:      "\x1bOH",
+		KeyEnd:       "\x1bOF",
+		KeyPgUp:      "\x1b[5~",
+		KeyPgDn:      "\x1b[6~",
+		KeyF1:        "\x1bOP",
+		KeyF2:        "\x1bOQ",
+		KeyF3:        "\x1bOR",
+		KeyF4:        "\x1bOS",
+		KeyF5:        "\x1b[15~",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		KeyF10:       "\x1b[21~",
+		KeyF11:       "\x1b[23~",
+		KeyF12:       "\x1b[24~",
+		KeyBacktab:   "\x1b[Z",
+		Modifiers:    1,
+		AutoMargin:   true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/h/hpterm/term.go

@@ -6,7 +6,7 @@ import "github.com/gdamore/tcell/v2/terminfo"
 
 func init() {
 
-	// HP X11 terminal emulator (old)
+	// hp X11 terminal emulator
 	terminfo.AddTerminfo(&terminfo.Terminfo{
 		Name:         "hpterm",
 		Aliases:      []string{"X-hpterm"},

vendor/github.com/gdamore/tcell/v2/terminfo/k/konsole/term.go

@@ -8,129 +8,123 @@ func init() {
 
 	// KDE console window
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "konsole",
-		Columns:           80,
-		Lines:             24,
-		Colors:            8,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J",
-		EnterCA:           "\x1b7\x1b[?47h",
-		ExitCA:            "\x1b[2J\x1b[?47l\x1b8",
-		ShowCursor:        "\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b[0m\x0f",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Dim:               "\x1b[2m",
-		Italic:            "\x1b[3m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h\x1b=",
-		ExitKeypad:        "\x1b[?1l\x1b>",
-		SetFg:             "\x1b[3%p1%dm",
-		SetBg:             "\x1b[4%p1%dm",
-		SetFgBg:           "\x1b[3%p1%d;4%p2%dm",
-		ResetFgBg:         "\x1b[39;49m",
-		AltChars:          "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x0e",
-		ExitAcs:           "\x0f",
-		EnableAcs:         "\x1b)0",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		StrikeThrough:     "\x1b[9m",
-		Mouse:             "\x1b[<",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1bOH",
-		KeyEnd:            "\x1bOF",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyBacktab:        "\x1b[Z",
-		Modifiers:         1,
-		AutoMargin:        true,
+		Name:          "konsole",
+		Columns:       80,
+		Lines:         24,
+		Colors:        8,
+		Clear:         "\x1b[H\x1b[2J",
+		EnterCA:       "\x1b7\x1b[?47h",
+		ExitCA:        "\x1b[2J\x1b[?47l\x1b8",
+		ShowCursor:    "\x1b[?25h",
+		HideCursor:    "\x1b[?25l",
+		AttrOff:       "\x1b[0m\x0f",
+		Underline:     "\x1b[4m",
+		Bold:          "\x1b[1m",
+		Dim:           "\x1b[2m",
+		Italic:        "\x1b[3m",
+		Blink:         "\x1b[5m",
+		Reverse:       "\x1b[7m",
+		EnterKeypad:   "\x1b[?1h\x1b=",
+		ExitKeypad:    "\x1b[?1l\x1b>",
+		SetFg:         "\x1b[3%p1%dm",
+		SetBg:         "\x1b[4%p1%dm",
+		SetFgBg:       "\x1b[3%p1%d;4%p2%dm",
+		ResetFgBg:     "\x1b[39;49m",
+		AltChars:      "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:      "\x0e",
+		ExitAcs:       "\x0f",
+		EnableAcs:     "\x1b)0",
+		StrikeThrough: "\x1b[9m",
+		Mouse:         "\x1b[<",
+		SetCursor:     "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:   "\b",
+		CursorUp1:     "\x1b[A",
+		KeyUp:         "\x1bOA",
+		KeyDown:       "\x1bOB",
+		KeyRight:      "\x1bOC",
+		KeyLeft:       "\x1bOD",
+		KeyInsert:     "\x1b[2~",
+		KeyDelete:     "\x1b[3~",
+		KeyBackspace:  "\u007f",
+		KeyHome:       "\x1bOH",
+		KeyEnd:        "\x1bOF",
+		KeyPgUp:       "\x1b[5~",
+		KeyPgDn:       "\x1b[6~",
+		KeyF1:         "\x1bOP",
+		KeyF2:         "\x1bOQ",
+		KeyF3:         "\x1bOR",
+		KeyF4:         "\x1bOS",
+		KeyF5:         "\x1b[15~",
+		KeyF6:         "\x1b[17~",
+		KeyF7:         "\x1b[18~",
+		KeyF8:         "\x1b[19~",
+		KeyF9:         "\x1b[20~",
+		KeyF10:        "\x1b[21~",
+		KeyF11:        "\x1b[23~",
+		KeyF12:        "\x1b[24~",
+		KeyBacktab:    "\x1b[Z",
+		Modifiers:     1,
+		AutoMargin:    true,
 	})
 
 	// KDE console window with xterm 256-colors
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "konsole-256color",
-		Columns:           80,
-		Lines:             24,
-		Colors:            256,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J",
-		EnterCA:           "\x1b7\x1b[?47h",
-		ExitCA:            "\x1b[2J\x1b[?47l\x1b8",
-		ShowCursor:        "\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b[0m\x0f",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Dim:               "\x1b[2m",
-		Italic:            "\x1b[3m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h\x1b=",
-		ExitKeypad:        "\x1b[?1l\x1b>",
-		SetFg:             "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
-		SetBg:             "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
-		SetFgBg:           "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
-		ResetFgBg:         "\x1b[39;49m",
-		AltChars:          "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x0e",
-		ExitAcs:           "\x0f",
-		EnableAcs:         "\x1b)0",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		StrikeThrough:     "\x1b[9m",
-		Mouse:             "\x1b[<",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1bOH",
-		KeyEnd:            "\x1bOF",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyBacktab:        "\x1b[Z",
-		Modifiers:         1,
-		AutoMargin:        true,
+		Name:          "konsole-256color",
+		Columns:       80,
+		Lines:         24,
+		Colors:        256,
+		Clear:         "\x1b[H\x1b[2J",
+		EnterCA:       "\x1b7\x1b[?47h",
+		ExitCA:        "\x1b[2J\x1b[?47l\x1b8",
+		ShowCursor:    "\x1b[?25h",
+		HideCursor:    "\x1b[?25l",
+		AttrOff:       "\x1b[0m\x0f",
+		Underline:     "\x1b[4m",
+		Bold:          "\x1b[1m",
+		Dim:           "\x1b[2m",
+		Italic:        "\x1b[3m",
+		Blink:         "\x1b[5m",
+		Reverse:       "\x1b[7m",
+		EnterKeypad:   "\x1b[?1h\x1b=",
+		ExitKeypad:    "\x1b[?1l\x1b>",
+		SetFg:         "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
+		SetBg:         "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
+		SetFgBg:       "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
+		ResetFgBg:     "\x1b[39;49m",
+		AltChars:      "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:      "\x0e",
+		ExitAcs:       "\x0f",
+		EnableAcs:     "\x1b)0",
+		StrikeThrough: "\x1b[9m",
+		Mouse:         "\x1b[<",
+		SetCursor:     "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:   "\b",
+		CursorUp1:     "\x1b[A",
+		KeyUp:         "\x1bOA",
+		KeyDown:       "\x1bOB",
+		KeyRight:      "\x1bOC",
+		KeyLeft:       "\x1bOD",
+		KeyInsert:     "\x1b[2~",
+		KeyDelete:     "\x1b[3~",
+		KeyBackspace:  "\u007f",
+		KeyHome:       "\x1bOH",
+		KeyEnd:        "\x1bOF",
+		KeyPgUp:       "\x1b[5~",
+		KeyPgDn:       "\x1b[6~",
+		KeyF1:         "\x1bOP",
+		KeyF2:         "\x1bOQ",
+		KeyF3:         "\x1bOR",
+		KeyF4:         "\x1bOS",
+		KeyF5:         "\x1b[15~",
+		KeyF6:         "\x1b[17~",
+		KeyF7:         "\x1b[18~",
+		KeyF8:         "\x1b[19~",
+		KeyF9:         "\x1b[20~",
+		KeyF10:        "\x1b[21~",
+		KeyF11:        "\x1b[23~",
+		KeyF12:        "\x1b[24~",
+		KeyBacktab:    "\x1b[Z",
+		Modifiers:     1,
+		AutoMargin:    true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/k/kterm/term.go

@@ -8,63 +8,61 @@ func init() {
 
 	// kterm kanji terminal emulator (X window system)
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "kterm",
-		Columns:           80,
-		Lines:             24,
-		Colors:            8,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J",
-		EnterCA:           "\x1b7\x1b[?47h",
-		ExitCA:            "\x1b[2J\x1b[?47l\x1b8",
-		AttrOff:           "\x1b[m\x1b(B",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h\x1b=",
-		ExitKeypad:        "\x1b[?1l\x1b>",
-		SetFg:             "\x1b[3%p1%dm",
-		SetBg:             "\x1b[4%p1%dm",
-		SetFgBg:           "\x1b[3%p1%d;4%p2%dm",
-		ResetFgBg:         "\x1b[39;49m",
-		PadChar:           "\x00",
-		AltChars:          "``aajjkkllmmnnooppqqrrssttuuvvwwxx~~",
-		EnterAcs:          "\x1b(0",
-		ExitAcs:           "\x1b(B",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		Mouse:             "\x1b[M",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1b[11~",
-		KeyF2:             "\x1b[12~",
-		KeyF3:             "\x1b[13~",
-		KeyF4:             "\x1b[14~",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyF13:            "\x1b[25~",
-		KeyF14:            "\x1b[26~",
-		KeyF15:            "\x1b[28~",
-		KeyF16:            "\x1b[29~",
-		KeyF17:            "\x1b[31~",
-		KeyF18:            "\x1b[32~",
-		KeyF19:            "\x1b[33~",
-		KeyF20:            "\x1b[34~",
-		AutoMargin:        true,
+		Name:         "kterm",
+		Columns:      80,
+		Lines:        24,
+		Colors:       8,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[2J",
+		EnterCA:      "\x1b7\x1b[?47h",
+		ExitCA:       "\x1b[2J\x1b[?47l\x1b8",
+		AttrOff:      "\x1b[m\x1b(B",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Reverse:      "\x1b[7m",
+		EnterKeypad:  "\x1b[?1h\x1b=",
+		ExitKeypad:   "\x1b[?1l\x1b>",
+		SetFg:        "\x1b[3%p1%dm",
+		SetBg:        "\x1b[4%p1%dm",
+		SetFgBg:      "\x1b[3%p1%d;4%p2%dm",
+		ResetFgBg:    "\x1b[39;49m",
+		PadChar:      "\x00",
+		AltChars:     "``aajjkkllmmnnooppqqrrssttuuvvwwxx~~",
+		EnterAcs:     "\x1b(0",
+		ExitAcs:      "\x1b(B",
+		Mouse:        "\x1b[M",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A",
+		KeyUp:        "\x1bOA",
+		KeyDown:      "\x1bOB",
+		KeyRight:     "\x1bOC",
+		KeyLeft:      "\x1bOD",
+		KeyInsert:    "\x1b[2~",
+		KeyDelete:    "\x1b[3~",
+		KeyBackspace: "\u007f",
+		KeyPgUp:      "\x1b[5~",
+		KeyPgDn:      "\x1b[6~",
+		KeyF1:        "\x1b[11~",
+		KeyF2:        "\x1b[12~",
+		KeyF3:        "\x1b[13~",
+		KeyF4:        "\x1b[14~",
+		KeyF5:        "\x1b[15~",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		KeyF10:       "\x1b[21~",
+		KeyF11:       "\x1b[23~",
+		KeyF12:       "\x1b[24~",
+		KeyF13:       "\x1b[25~",
+		KeyF14:       "\x1b[26~",
+		KeyF15:       "\x1b[28~",
+		KeyF16:       "\x1b[29~",
+		KeyF17:       "\x1b[31~",
+		KeyF18:       "\x1b[32~",
+		KeyF19:       "\x1b[33~",
+		KeyF20:       "\x1b[34~",
+		AutoMargin:   true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/l/linux/term.go

@@ -6,68 +6,66 @@ import "github.com/gdamore/tcell/v2/terminfo"
 
 func init() {
 
-	// Linux console
+	// linux console
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "linux",
-		Colors:            8,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[J",
-		ShowCursor:        "\x1b[?25h\x1b[?0c",
-		HideCursor:        "\x1b[?25l\x1b[?1c",
-		AttrOff:           "\x1b[m\x0f",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Dim:               "\x1b[2m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		SetFg:             "\x1b[3%p1%dm",
-		SetBg:             "\x1b[4%p1%dm",
-		SetFgBg:           "\x1b[3%p1%d;4%p2%dm",
-		ResetFgBg:         "\x1b[39;49m",
-		PadChar:           "\x00",
-		AltChars:          "++,,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x0e",
-		ExitAcs:           "\x0f",
-		EnableAcs:         "\x1b)0",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		Mouse:             "\x1b[M",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1b[A",
-		KeyDown:           "\x1b[B",
-		KeyRight:          "\x1b[C",
-		KeyLeft:           "\x1b[D",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1b[1~",
-		KeyEnd:            "\x1b[4~",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1b[[A",
-		KeyF2:             "\x1b[[B",
-		KeyF3:             "\x1b[[C",
-		KeyF4:             "\x1b[[D",
-		KeyF5:             "\x1b[[E",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyF13:            "\x1b[25~",
-		KeyF14:            "\x1b[26~",
-		KeyF15:            "\x1b[28~",
-		KeyF16:            "\x1b[29~",
-		KeyF17:            "\x1b[31~",
-		KeyF18:            "\x1b[32~",
-		KeyF19:            "\x1b[33~",
-		KeyF20:            "\x1b[34~",
-		KeyBacktab:        "\x1b\t",
-		AutoMargin:        true,
-		InsertChar:        "\x1b[@",
+		Name:         "linux",
+		Colors:       8,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[J",
+		ShowCursor:   "\x1b[?25h\x1b[?0c",
+		HideCursor:   "\x1b[?25l\x1b[?1c",
+		AttrOff:      "\x1b[m\x0f",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Dim:          "\x1b[2m",
+		Blink:        "\x1b[5m",
+		Reverse:      "\x1b[7m",
+		SetFg:        "\x1b[3%p1%dm",
+		SetBg:        "\x1b[4%p1%dm",
+		SetFgBg:      "\x1b[3%p1%d;4%p2%dm",
+		ResetFgBg:    "\x1b[39;49m",
+		PadChar:      "\x00",
+		AltChars:     "++,,--..00__``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}c~~",
+		EnterAcs:     "\x0e",
+		ExitAcs:      "\x0f",
+		EnableAcs:    "\x1b)0",
+		Mouse:        "\x1b[M",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A",
+		KeyUp:        "\x1b[A",
+		KeyDown:      "\x1b[B",
+		KeyRight:     "\x1b[C",
+		KeyLeft:      "\x1b[D",
+		KeyInsert:    "\x1b[2~",
+		KeyDelete:    "\x1b[3~",
+		KeyBackspace: "\u007f",
+		KeyHome:      "\x1b[1~",
+		KeyEnd:       "\x1b[4~",
+		KeyPgUp:      "\x1b[5~",
+		KeyPgDn:      "\x1b[6~",
+		KeyF1:        "\x1b[[A",
+		KeyF2:        "\x1b[[B",
+		KeyF3:        "\x1b[[C",
+		KeyF4:        "\x1b[[D",
+		KeyF5:        "\x1b[[E",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		KeyF10:       "\x1b[21~",
+		KeyF11:       "\x1b[23~",
+		KeyF12:       "\x1b[24~",
+		KeyF13:       "\x1b[25~",
+		KeyF14:       "\x1b[26~",
+		KeyF15:       "\x1b[28~",
+		KeyF16:       "\x1b[29~",
+		KeyF17:       "\x1b[31~",
+		KeyF18:       "\x1b[32~",
+		KeyF19:       "\x1b[33~",
+		KeyF20:       "\x1b[34~",
+		KeyBacktab:   "\x1b[Z",
+		AutoMargin:   true,
+		InsertChar:   "\x1b[@",
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/models.txt

@@ -14,6 +14,7 @@ pcansi
 rxvt,rxvt-256color,rxvt-88color,rxvt-unicode,rxvt-unicode-256color
 screen,screen-256color
 st,st-256color|simpleterm
+termite
 tmux
 vt52
 vt100

vendor/github.com/gdamore/tcell/v2/terminfo/p/pcansi/term.go

@@ -6,7 +6,7 @@ import "github.com/gdamore/tcell/v2/terminfo"
 
 func init() {
 
-	// ibm-pc terminal programs claiming to be ANSI
+	// ibm-pc terminal programs claiming to be ansi
 	terminfo.AddTerminfo(&terminfo.Terminfo{
 		Name:         "pcansi",
 		Columns:      80,

vendor/github.com/gdamore/tcell/v2/terminfo/r/rxvt/term.go

@@ -9,7 +9,6 @@ func init() {
 	// rxvt terminal emulator (X Window System)
 	terminfo.AddTerminfo(&terminfo.Terminfo{
 		Name:         "rxvt",
-		Aliases:      []string{"rxvt-color"},
 		Columns:      80,
 		Lines:        24,
 		Colors:       8,
@@ -45,7 +44,7 @@ func init() {
 		KeyLeft:      "\x1b[D",
 		KeyInsert:    "\x1b[2~",
 		KeyDelete:    "\x1b[3~",
-		KeyBackspace: "\x7f",
+		KeyBackspace: "\u007f",
 		KeyHome:      "\x1b[7~",
 		KeyEnd:       "\x1b[8~",
 		KeyPgUp:      "\x1b[5~",
@@ -101,7 +100,6 @@ func init() {
 		KeyShfDown:   "\x1b[b",
 		KeyShfHome:   "\x1b[7$",
 		KeyShfEnd:    "\x1b[8$",
-		KeyShfInsert: "\x1b[2$",
 		KeyShfDelete: "\x1b[3$",
 		KeyCtrlUp:    "\x1b[Oa",
 		KeyCtrlDown:  "\x1b[Ob",
@@ -110,6 +108,7 @@ func init() {
 		KeyCtrlHome:  "\x1b[7^",
 		KeyCtrlEnd:   "\x1b[8^",
 		AutoMargin:   true,
+		InsertChar:   "\x1b[@",
 	})
 
 	// rxvt 2.7.9 with xterm 256-colors
@@ -150,7 +149,7 @@ func init() {
 		KeyLeft:      "\x1b[D",
 		KeyInsert:    "\x1b[2~",
 		KeyDelete:    "\x1b[3~",
-		KeyBackspace: "\x7f",
+		KeyBackspace: "\u007f",
 		KeyHome:      "\x1b[7~",
 		KeyEnd:       "\x1b[8~",
 		KeyPgUp:      "\x1b[5~",
@@ -206,7 +205,6 @@ func init() {
 		KeyShfDown:   "\x1b[b",
 		KeyShfHome:   "\x1b[7$",
 		KeyShfEnd:    "\x1b[8$",
-		KeyShfInsert: "\x1b[2$",
 		KeyShfDelete: "\x1b[3$",
 		KeyCtrlUp:    "\x1b[Oa",
 		KeyCtrlDown:  "\x1b[Ob",
@@ -215,6 +213,7 @@ func init() {
 		KeyCtrlHome:  "\x1b[7^",
 		KeyCtrlEnd:   "\x1b[8^",
 		AutoMargin:   true,
+		InsertChar:   "\x1b[@",
 	})
 
 	// rxvt 2.7.9 with xterm 88-colors
@@ -255,7 +254,7 @@ func init() {
 		KeyLeft:      "\x1b[D",
 		KeyInsert:    "\x1b[2~",
 		KeyDelete:    "\x1b[3~",
-		KeyBackspace: "\x7f",
+		KeyBackspace: "\u007f",
 		KeyHome:      "\x1b[7~",
 		KeyEnd:       "\x1b[8~",
 		KeyPgUp:      "\x1b[5~",
@@ -311,6 +310,86 @@ func init() {
 		KeyShfDown:   "\x1b[b",
 		KeyShfHome:   "\x1b[7$",
 		KeyShfEnd:    "\x1b[8$",
+		KeyShfDelete: "\x1b[3$",
+		KeyCtrlUp:    "\x1b[Oa",
+		KeyCtrlDown:  "\x1b[Ob",
+		KeyCtrlRight: "\x1b[Oc",
+		KeyCtrlLeft:  "\x1b[Od",
+		KeyCtrlHome:  "\x1b[7^",
+		KeyCtrlEnd:   "\x1b[8^",
+		AutoMargin:   true,
+		InsertChar:   "\x1b[@",
+	})
+
+	// rxvt-unicode terminal (X Window System)
+	terminfo.AddTerminfo(&terminfo.Terminfo{
+		Name:         "rxvt-unicode",
+		Columns:      80,
+		Lines:        24,
+		Colors:       88,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[2J",
+		EnterCA:      "\x1b[?1049h",
+		ExitCA:       "\x1b[r\x1b[?1049l",
+		ShowCursor:   "\x1b[?12l\x1b[?25h",
+		HideCursor:   "\x1b[?25l",
+		AttrOff:      "\x1b[m\x1b(B",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Italic:       "\x1b[3m",
+		Blink:        "\x1b[5m",
+		Reverse:      "\x1b[7m",
+		EnterKeypad:  "\x1b=",
+		ExitKeypad:   "\x1b>",
+		SetFg:        "\x1b[38;5;%p1%dm",
+		SetBg:        "\x1b[48;5;%p1%dm",
+		SetFgBg:      "\x1b[38;5;%p1%d;48;5;%p2%dm",
+		ResetFgBg:    "\x1b[39;49m",
+		AltChars:     "+C,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:     "\x1b(0",
+		ExitAcs:      "\x1b(B",
+		Mouse:        "\x1b[M",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A",
+		KeyUp:        "\x1b[A",
+		KeyDown:      "\x1b[B",
+		KeyRight:     "\x1b[C",
+		KeyLeft:      "\x1b[D",
+		KeyInsert:    "\x1b[2~",
+		KeyDelete:    "\x1b[3~",
+		KeyBackspace: "\u007f",
+		KeyHome:      "\x1b[7~",
+		KeyEnd:       "\x1b[8~",
+		KeyPgUp:      "\x1b[5~",
+		KeyPgDn:      "\x1b[6~",
+		KeyF1:        "\x1b[11~",
+		KeyF2:        "\x1b[12~",
+		KeyF3:        "\x1b[13~",
+		KeyF4:        "\x1b[14~",
+		KeyF5:        "\x1b[15~",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		KeyF10:       "\x1b[21~",
+		KeyF11:       "\x1b[23~",
+		KeyF12:       "\x1b[24~",
+		KeyF13:       "\x1b[25~",
+		KeyF14:       "\x1b[26~",
+		KeyF15:       "\x1b[28~",
+		KeyF16:       "\x1b[29~",
+		KeyF17:       "\x1b[31~",
+		KeyF18:       "\x1b[32~",
+		KeyF19:       "\x1b[33~",
+		KeyF20:       "\x1b[34~",
+		KeyBacktab:   "\x1b[Z",
+		KeyShfLeft:   "\x1b[d",
+		KeyShfRight:  "\x1b[c",
+		KeyShfUp:     "\x1b[a",
+		KeyShfDown:   "\x1b[b",
+		KeyShfHome:   "\x1b[7$",
+		KeyShfEnd:    "\x1b[8$",
 		KeyShfInsert: "\x1b[2$",
 		KeyShfDelete: "\x1b[3$",
 		KeyCtrlUp:    "\x1b[Oa",
@@ -320,171 +399,87 @@ func init() {
 		KeyCtrlHome:  "\x1b[7^",
 		KeyCtrlEnd:   "\x1b[8^",
 		AutoMargin:   true,
-	})
-
-	// rxvt-unicode terminal (X Window System)
-	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "rxvt-unicode",
-		Columns:           80,
-		Lines:             24,
-		Colors:            88,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J",
-		EnterCA:           "\x1b[?1049h",
-		ExitCA:            "\x1b[r\x1b[?1049l",
-		ShowCursor:        "\x1b[?12l\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b[m\x1b(B",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Italic:            "\x1b[3m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b=",
-		ExitKeypad:        "\x1b>",
-		SetFg:             "\x1b[38;5;%p1%dm",
-		SetBg:             "\x1b[48;5;%p1%dm",
-		SetFgBg:           "\x1b[38;5;%p1%d;48;5;%p2%dm",
-		ResetFgBg:         "\x1b[39;49m",
-		AltChars:          "+C,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x1b(0",
-		ExitAcs:           "\x1b(B",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		Mouse:             "\x1b[M",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1b[A",
-		KeyDown:           "\x1b[B",
-		KeyRight:          "\x1b[C",
-		KeyLeft:           "\x1b[D",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1b[7~",
-		KeyEnd:            "\x1b[8~",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1b[11~",
-		KeyF2:             "\x1b[12~",
-		KeyF3:             "\x1b[13~",
-		KeyF4:             "\x1b[14~",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyF13:            "\x1b[25~",
-		KeyF14:            "\x1b[26~",
-		KeyF15:            "\x1b[28~",
-		KeyF16:            "\x1b[29~",
-		KeyF17:            "\x1b[31~",
-		KeyF18:            "\x1b[32~",
-		KeyF19:            "\x1b[33~",
-		KeyF20:            "\x1b[34~",
-		KeyBacktab:        "\x1b[Z",
-		KeyShfLeft:        "\x1b[d",
-		KeyShfRight:       "\x1b[c",
-		KeyShfUp:          "\x1b[a",
-		KeyShfDown:        "\x1b[b",
-		KeyShfHome:        "\x1b[7$",
-		KeyShfEnd:         "\x1b[8$",
-		KeyShfInsert:      "\x1b[2$",
-		KeyShfDelete:      "\x1b[3$",
-		KeyCtrlUp:         "\x1b[Oa",
-		KeyCtrlDown:       "\x1b[Ob",
-		KeyCtrlRight:      "\x1b[Oc",
-		KeyCtrlLeft:       "\x1b[Od",
-		KeyCtrlHome:       "\x1b[7^",
-		KeyCtrlEnd:        "\x1b[8^",
-		AutoMargin:        true,
-		InsertChar:        "\x1b[@",
+		InsertChar:   "\x1b[@",
 	})
 
 	// rxvt-unicode terminal with 256 colors (X Window System)
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "rxvt-unicode-256color",
-		Columns:           80,
-		Lines:             24,
-		Colors:            256,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J",
-		EnterCA:           "\x1b[?1049h",
-		ExitCA:            "\x1b[r\x1b[?1049l",
-		ShowCursor:        "\x1b[?12l\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b[m\x1b(B",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Italic:            "\x1b[3m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b=",
-		ExitKeypad:        "\x1b>",
-		SetFg:             "\x1b[38;5;%p1%dm",
-		SetBg:             "\x1b[48;5;%p1%dm",
-		SetFgBg:           "\x1b[38;5;%p1%d;48;5;%p2%dm",
-		ResetFgBg:         "\x1b[39;49m",
-		AltChars:          "+C,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x1b(0",
-		ExitAcs:           "\x1b(B",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		Mouse:             "\x1b[M",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1b[A",
-		KeyDown:           "\x1b[B",
-		KeyRight:          "\x1b[C",
-		KeyLeft:           "\x1b[D",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1b[7~",
-		KeyEnd:            "\x1b[8~",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1b[11~",
-		KeyF2:             "\x1b[12~",
-		KeyF3:             "\x1b[13~",
-		KeyF4:             "\x1b[14~",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyF13:            "\x1b[25~",
-		KeyF14:            "\x1b[26~",
-		KeyF15:            "\x1b[28~",
-		KeyF16:            "\x1b[29~",
-		KeyF17:            "\x1b[31~",
-		KeyF18:            "\x1b[32~",
-		KeyF19:            "\x1b[33~",
-		KeyF20:            "\x1b[34~",
-		KeyBacktab:        "\x1b[Z",
-		KeyShfLeft:        "\x1b[d",
-		KeyShfRight:       "\x1b[c",
-		KeyShfUp:          "\x1b[a",
-		KeyShfDown:        "\x1b[b",
-		KeyShfHome:        "\x1b[7$",
-		KeyShfEnd:         "\x1b[8$",
-		KeyShfInsert:      "\x1b[2$",
-		KeyShfDelete:      "\x1b[3$",
-		KeyCtrlUp:         "\x1b[Oa",
-		KeyCtrlDown:       "\x1b[Ob",
-		KeyCtrlRight:      "\x1b[Oc",
-		KeyCtrlLeft:       "\x1b[Od",
-		KeyCtrlHome:       "\x1b[7^",
-		KeyCtrlEnd:        "\x1b[8^",
-		AutoMargin:        true,
-		InsertChar:        "\x1b[@",
+		Name:         "rxvt-unicode-256color",
+		Columns:      80,
+		Lines:        24,
+		Colors:       256,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[2J",
+		EnterCA:      "\x1b[?1049h",
+		ExitCA:       "\x1b[r\x1b[?1049l",
+		ShowCursor:   "\x1b[?12l\x1b[?25h",
+		HideCursor:   "\x1b[?25l",
+		AttrOff:      "\x1b[m\x1b(B",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Italic:       "\x1b[3m",
+		Blink:        "\x1b[5m",
+		Reverse:      "\x1b[7m",
+		EnterKeypad:  "\x1b=",
+		ExitKeypad:   "\x1b>",
+		SetFg:        "\x1b[38;5;%p1%dm",
+		SetBg:        "\x1b[48;5;%p1%dm",
+		SetFgBg:      "\x1b[38;5;%p1%d;48;5;%p2%dm",
+		ResetFgBg:    "\x1b[39;49m",
+		AltChars:     "+C,D-A.B0E``aaffgghFiGjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:     "\x1b(0",
+		ExitAcs:      "\x1b(B",
+		Mouse:        "\x1b[M",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A",
+		KeyUp:        "\x1b[A",
+		KeyDown:      "\x1b[B",
+		KeyRight:     "\x1b[C",
+		KeyLeft:      "\x1b[D",
+		KeyInsert:    "\x1b[2~",
+		KeyDelete:    "\x1b[3~",
+		KeyBackspace: "\u007f",
+		KeyHome:      "\x1b[7~",
+		KeyEnd:       "\x1b[8~",
+		KeyPgUp:      "\x1b[5~",
+		KeyPgDn:      "\x1b[6~",
+		KeyF1:        "\x1b[11~",
+		KeyF2:        "\x1b[12~",
+		KeyF3:        "\x1b[13~",
+		KeyF4:        "\x1b[14~",
+		KeyF5:        "\x1b[15~",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		KeyF10:       "\x1b[21~",
+		KeyF11:       "\x1b[23~",
+		KeyF12:       "\x1b[24~",
+		KeyF13:       "\x1b[25~",
+		KeyF14:       "\x1b[26~",
+		KeyF15:       "\x1b[28~",
+		KeyF16:       "\x1b[29~",
+		KeyF17:       "\x1b[31~",
+		KeyF18:       "\x1b[32~",
+		KeyF19:       "\x1b[33~",
+		KeyF20:       "\x1b[34~",
+		KeyBacktab:   "\x1b[Z",
+		KeyShfLeft:   "\x1b[d",
+		KeyShfRight:  "\x1b[c",
+		KeyShfUp:     "\x1b[a",
+		KeyShfDown:   "\x1b[b",
+		KeyShfHome:   "\x1b[7$",
+		KeyShfEnd:    "\x1b[8$",
+		KeyShfInsert: "\x1b[2$",
+		KeyShfDelete: "\x1b[3$",
+		KeyCtrlUp:    "\x1b[Oa",
+		KeyCtrlDown:  "\x1b[Ob",
+		KeyCtrlRight: "\x1b[Oc",
+		KeyCtrlLeft:  "\x1b[Od",
+		KeyCtrlHome:  "\x1b[7^",
+		KeyCtrlEnd:   "\x1b[8^",
+		AutoMargin:   true,
+		InsertChar:   "\x1b[@",
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/s/screen/term.go

@@ -45,7 +45,7 @@ func init() {
 		KeyLeft:      "\x1bOD",
 		KeyInsert:    "\x1b[2~",
 		KeyDelete:    "\x1b[3~",
-		KeyBackspace: "\x7f",
+		KeyBackspace: "\u007f",
 		KeyHome:      "\x1b[1~",
 		KeyEnd:       "\x1b[4~",
 		KeyPgUp:      "\x1b[5~",
@@ -105,7 +105,7 @@ func init() {
 		KeyLeft:      "\x1bOD",
 		KeyInsert:    "\x1b[2~",
 		KeyDelete:    "\x1b[3~",
-		KeyBackspace: "\x7f",
+		KeyBackspace: "\u007f",
 		KeyHome:      "\x1b[1~",
 		KeyEnd:       "\x1b[4~",
 		KeyPgUp:      "\x1b[5~",

vendor/github.com/gdamore/tcell/v2/terminfo/s/simpleterm/term.go

@@ -6,10 +6,9 @@ import "github.com/gdamore/tcell/v2/terminfo"
 
 func init() {
 
-	// aka simpleterm
+	//  simpleterm
 	terminfo.AddTerminfo(&terminfo.Terminfo{
 		Name:          "st",
-		Aliases:       []string{"stterm"},
 		Columns:       80,
 		Lines:         24,
 		Colors:        8,
@@ -17,7 +16,7 @@ func init() {
 		Clear:         "\x1b[H\x1b[2J",
 		EnterCA:       "\x1b[?1049h",
 		ExitCA:        "\x1b[?1049l",
-		ShowCursor:    "\x1b[?25h",
+		ShowCursor:    "\x1b[?12l\x1b[?25h",
 		HideCursor:    "\x1b[?25l",
 		AttrOff:       "\x1b[0m",
 		Underline:     "\x1b[4m",
@@ -47,7 +46,7 @@ func init() {
 		KeyLeft:       "\x1bOD",
 		KeyInsert:     "\x1b[2~",
 		KeyDelete:     "\x1b[3~",
-		KeyBackspace:  "\x7f",
+		KeyBackspace:  "\u007f",
 		KeyHome:       "\x1b[1~",
 		KeyEnd:        "\x1b[4~",
 		KeyPgUp:       "\x1b[5~",
@@ -65,14 +64,15 @@ func init() {
 		KeyF11:        "\x1b[23~",
 		KeyF12:        "\x1b[24~",
 		KeyClear:      "\x1b[3;5~",
+		KeyBacktab:    "\x1b[Z",
 		Modifiers:     1,
+		TrueColor:     true,
 		AutoMargin:    true,
 	})
 
-	// simpleterm with 256 colors
+	//  simpleterm with 256 colors
 	terminfo.AddTerminfo(&terminfo.Terminfo{
 		Name:          "st-256color",
-		Aliases:       []string{"stterm-256color"},
 		Columns:       80,
 		Lines:         24,
 		Colors:        256,
@@ -80,7 +80,7 @@ func init() {
 		Clear:         "\x1b[H\x1b[2J",
 		EnterCA:       "\x1b[?1049h",
 		ExitCA:        "\x1b[?1049l",
-		ShowCursor:    "\x1b[?25h",
+		ShowCursor:    "\x1b[?12l\x1b[?25h",
 		HideCursor:    "\x1b[?25l",
 		AttrOff:       "\x1b[0m",
 		Underline:     "\x1b[4m",
@@ -110,7 +110,7 @@ func init() {
 		KeyLeft:       "\x1bOD",
 		KeyInsert:     "\x1b[2~",
 		KeyDelete:     "\x1b[3~",
-		KeyBackspace:  "\x7f",
+		KeyBackspace:  "\u007f",
 		KeyHome:       "\x1b[1~",
 		KeyEnd:        "\x1b[4~",
 		KeyPgUp:       "\x1b[5~",
@@ -128,7 +128,9 @@ func init() {
 		KeyF11:        "\x1b[23~",
 		KeyF12:        "\x1b[24~",
 		KeyClear:      "\x1b[3;5~",
+		KeyBacktab:    "\x1b[Z",
 		Modifiers:     1,
+		TrueColor:     true,
 		AutoMargin:    true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/t/termite/term.go

@@ -0,0 +1,67 @@
+// Generated automatically.  DO NOT HAND-EDIT.
+
+package termite
+
+import "github.com/gdamore/tcell/v2/terminfo"
+
+func init() {
+
+	// VTE-based terminal
+	terminfo.AddTerminfo(&terminfo.Terminfo{
+		Name:         "termite",
+		Columns:      80,
+		Lines:        24,
+		Colors:       256,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[2J",
+		EnterCA:      "\x1b[?1049h",
+		ExitCA:       "\x1b[?1049l",
+		ShowCursor:   "\x1b[?12l\x1b[?25h",
+		HideCursor:   "\x1b[?25l",
+		AttrOff:      "\x1b(B\x1b[m",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Italic:       "\x1b[3m",
+		Reverse:      "\x1b[7m",
+		EnterKeypad:  "\x1b[?1h\x1b=",
+		ExitKeypad:   "\x1b[?1l\x1b>",
+		SetFg:        "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
+		SetBg:        "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
+		SetFgBg:      "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
+		ResetFgBg:    "\x1b[39;49m",
+		AltChars:     "++,,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:     "\x1b(0",
+		ExitAcs:      "\x1b(B",
+		Mouse:        "\x1b[M",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A",
+		KeyUp:        "\x1bOA",
+		KeyDown:      "\x1bOB",
+		KeyRight:     "\x1bOC",
+		KeyLeft:      "\x1bOD",
+		KeyInsert:    "\x1b[2~",
+		KeyDelete:    "\x1b[3~",
+		KeyBackspace: "\u007f",
+		KeyHome:      "\x1bOH",
+		KeyEnd:       "\x1bOF",
+		KeyPgUp:      "\x1b[5~",
+		KeyPgDn:      "\x1b[6~",
+		KeyF1:        "\x1bOP",
+		KeyF2:        "\x1bOQ",
+		KeyF3:        "\x1bOR",
+		KeyF4:        "\x1bOS",
+		KeyF5:        "\x1b[15~",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		KeyF10:       "\x1b[21~",
+		KeyF11:       "\x1b[23~",
+		KeyF12:       "\x1b[24~",
+		KeyBacktab:   "\x1b[Z",
+		Modifiers:    1,
+		AutoMargin:   true,
+		InsertChar:   "\x1b[@",
+	})
+}

vendor/github.com/gdamore/tcell/v2/terminfo/t/tmux/term.go

@@ -47,7 +47,68 @@ func init() {
 		KeyLeft:       "\x1bOD",
 		KeyInsert:     "\x1b[2~",
 		KeyDelete:     "\x1b[3~",
-		KeyBackspace:  "\x7f",
+		KeyBackspace:  "\u007f",
+		KeyHome:       "\x1b[1~",
+		KeyEnd:        "\x1b[4~",
+		KeyPgUp:       "\x1b[5~",
+		KeyPgDn:       "\x1b[6~",
+		KeyF1:         "\x1bOP",
+		KeyF2:         "\x1bOQ",
+		KeyF3:         "\x1bOR",
+		KeyF4:         "\x1bOS",
+		KeyF5:         "\x1b[15~",
+		KeyF6:         "\x1b[17~",
+		KeyF7:         "\x1b[18~",
+		KeyF8:         "\x1b[19~",
+		KeyF9:         "\x1b[20~",
+		KeyF10:        "\x1b[21~",
+		KeyF11:        "\x1b[23~",
+		KeyF12:        "\x1b[24~",
+		KeyBacktab:    "\x1b[Z",
+		Modifiers:     1,
+		AutoMargin:    true,
+	})
+	terminfo.AddTerminfo(&terminfo.Terminfo{
+		Name:          "tmux-256color",
+		Columns:       80,
+		Lines:         24,
+		Colors:        256,
+		Bell:          "\a",
+		Clear:         "\x1b[H\x1b[J",
+		EnterCA:       "\x1b[?1049h",
+		ExitCA:        "\x1b[?1049l",
+		ShowCursor:    "\x1b[34h\x1b[?25h",
+		HideCursor:    "\x1b[?25l",
+		AttrOff:       "\x1b[m\x0f",
+		Underline:     "\x1b[4m",
+		Bold:          "\x1b[1m",
+		Dim:           "\x1b[2m",
+		Italic:        "\x1b[3m",
+		Blink:         "\x1b[5m",
+		Reverse:       "\x1b[7m",
+		EnterKeypad:   "\x1b[?1h\x1b=",
+		ExitKeypad:    "\x1b[?1l\x1b>",
+		SetFg:         "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
+		SetBg:         "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
+		SetFgBg:       "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
+		ResetFgBg:     "\x1b[39;49m",
+		PadChar:       "\x00",
+		AltChars:      "++,,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:      "\x0e",
+		ExitAcs:       "\x0f",
+		EnableAcs:     "\x1b(B\x1b)0",
+		StrikeThrough: "\x1b[9m",
+		Mouse:         "\x1b[M",
+		SetCursor:     "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:   "\b",
+		CursorUp1:     "\x1bM",
+		KeyUp:         "\x1bOA",
+		KeyDown:       "\x1bOB",
+		KeyRight:      "\x1bOC",
+		KeyLeft:       "\x1bOD",
+		KeyInsert:     "\x1b[2~",
+		KeyDelete:     "\x1b[3~",
+		KeyBackspace:  "\u007f",
 		KeyHome:       "\x1b[1~",
 		KeyEnd:        "\x1b[4~",
 		KeyPgUp:       "\x1b[5~",

vendor/github.com/gdamore/tcell/v2/terminfo/terminfo.go

@@ -1,4 +1,4 @@
-// Copyright 2024 The TCell Authors
+// Copyright 2022 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use file except in compliance with the License.
@@ -232,8 +232,6 @@ type Terminfo struct {
 	SetWindowSize           string
 	EnableFocusReporting    string
 	DisableFocusReporting   string
-	DisableAutoMargin       string // smam
-	EnableAutoMargin        string // rmam
 }
 
 const (

vendor/github.com/gdamore/tcell/v2/terminfo/v/vt100/term.go

@@ -6,46 +6,44 @@ import "github.com/gdamore/tcell/v2/terminfo"
 
 func init() {
 
-	// DEC VT100 (w/advanced video)
+	// dec vt100 (w/advanced video)
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "vt100",
-		Aliases:           []string{"vt100-am"},
-		Columns:           80,
-		Lines:             24,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[J$<50>",
-		AttrOff:           "\x1b[m\x0f$<2>",
-		Underline:         "\x1b[4m$<2>",
-		Bold:              "\x1b[1m$<2>",
-		Blink:             "\x1b[5m$<2>",
-		Reverse:           "\x1b[7m$<2>",
-		EnterKeypad:       "\x1b[?1h\x1b=",
-		ExitKeypad:        "\x1b[?1l\x1b>",
-		PadChar:           "\x00",
-		AltChars:          "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x0e",
-		ExitAcs:           "\x0f",
-		EnableAcs:         "\x1b(B\x1b)0",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH$<5>",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A$<2>",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyBackspace:      "\b",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1bOt",
-		KeyF6:             "\x1bOu",
-		KeyF7:             "\x1bOv",
-		KeyF8:             "\x1bOl",
-		KeyF9:             "\x1bOw",
-		KeyF10:            "\x1bOx",
-		AutoMargin:        true,
+		Name:         "vt100",
+		Aliases:      []string{"vt100-am"},
+		Columns:      80,
+		Lines:        24,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[J$<50>",
+		AttrOff:      "\x1b[m\x0f$<2>",
+		Underline:    "\x1b[4m$<2>",
+		Bold:         "\x1b[1m$<2>",
+		Blink:        "\x1b[5m$<2>",
+		Reverse:      "\x1b[7m$<2>",
+		EnterKeypad:  "\x1b[?1h\x1b=",
+		ExitKeypad:   "\x1b[?1l\x1b>",
+		PadChar:      "\x00",
+		AltChars:     "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:     "\x0e",
+		ExitAcs:      "\x0f",
+		EnableAcs:    "\x1b(B\x1b)0",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH$<5>",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A$<2>",
+		KeyUp:        "\x1bOA",
+		KeyDown:      "\x1bOB",
+		KeyRight:     "\x1bOC",
+		KeyLeft:      "\x1bOD",
+		KeyBackspace: "\b",
+		KeyF1:        "\x1bOP",
+		KeyF2:        "\x1bOQ",
+		KeyF3:        "\x1bOR",
+		KeyF4:        "\x1bOS",
+		KeyF5:        "\x1bOt",
+		KeyF6:        "\x1bOu",
+		KeyF7:        "\x1bOv",
+		KeyF8:        "\x1bOl",
+		KeyF9:        "\x1bOw",
+		KeyF10:       "\x1bOx",
+		AutoMargin:   true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/v/vt102/term.go

@@ -6,45 +6,43 @@ import "github.com/gdamore/tcell/v2/terminfo"
 
 func init() {
 
-	// DEC VT102
+	// dec vt102
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "vt102",
-		Columns:           80,
-		Lines:             24,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[J$<50>",
-		AttrOff:           "\x1b[m\x0f$<2>",
-		Underline:         "\x1b[4m$<2>",
-		Bold:              "\x1b[1m$<2>",
-		Blink:             "\x1b[5m$<2>",
-		Reverse:           "\x1b[7m$<2>",
-		EnterKeypad:       "\x1b[?1h\x1b=",
-		ExitKeypad:        "\x1b[?1l\x1b>",
-		PadChar:           "\x00",
-		AltChars:          "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x0e",
-		ExitAcs:           "\x0f",
-		EnableAcs:         "\x1b(B\x1b)0",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH$<5>",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A$<2>",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyBackspace:      "\b",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1bOt",
-		KeyF6:             "\x1bOu",
-		KeyF7:             "\x1bOv",
-		KeyF8:             "\x1bOl",
-		KeyF9:             "\x1bOw",
-		KeyF10:            "\x1bOx",
-		AutoMargin:        true,
+		Name:         "vt102",
+		Columns:      80,
+		Lines:        24,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[J$<50>",
+		AttrOff:      "\x1b[m\x0f$<2>",
+		Underline:    "\x1b[4m$<2>",
+		Bold:         "\x1b[1m$<2>",
+		Blink:        "\x1b[5m$<2>",
+		Reverse:      "\x1b[7m$<2>",
+		EnterKeypad:  "\x1b[?1h\x1b=",
+		ExitKeypad:   "\x1b[?1l\x1b>",
+		PadChar:      "\x00",
+		AltChars:     "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:     "\x0e",
+		ExitAcs:      "\x0f",
+		EnableAcs:    "\x1b(B\x1b)0",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH$<5>",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A$<2>",
+		KeyUp:        "\x1bOA",
+		KeyDown:      "\x1bOB",
+		KeyRight:     "\x1bOC",
+		KeyLeft:      "\x1bOD",
+		KeyBackspace: "\b",
+		KeyF1:        "\x1bOP",
+		KeyF2:        "\x1bOQ",
+		KeyF3:        "\x1bOR",
+		KeyF4:        "\x1bOS",
+		KeyF5:        "\x1bOt",
+		KeyF6:        "\x1bOu",
+		KeyF7:        "\x1bOv",
+		KeyF8:        "\x1bOl",
+		KeyF9:        "\x1bOw",
+		KeyF10:       "\x1bOx",
+		AutoMargin:   true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/v/vt220/term.go

@@ -6,58 +6,54 @@ import "github.com/gdamore/tcell/v2/terminfo"
 
 func init() {
 
-	// DEC VT220
+	// dec vt220
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "vt220",
-		Aliases:           []string{"vt200"},
-		Columns:           80,
-		Lines:             24,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[J",
-		ShowCursor:        "\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b[m\x1b(B",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		PadChar:           "\x00",
-		AltChars:          "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x1b(0$<2>",
-		ExitAcs:           "\x1b(B$<4>",
-		EnableAcs:         "\x1b)0",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1b[A",
-		KeyDown:           "\x1b[B",
-		KeyRight:          "\x1b[C",
-		KeyLeft:           "\x1b[D",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\b",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyF13:            "\x1b[25~",
-		KeyF14:            "\x1b[26~",
-		KeyF17:            "\x1b[31~",
-		KeyF18:            "\x1b[32~",
-		KeyF19:            "\x1b[33~",
-		KeyF20:            "\x1b[34~",
-		KeyHelp:           "\x1b[28~",
-		AutoMargin:        true,
+		Name:         "vt220",
+		Aliases:      []string{"vt200"},
+		Columns:      80,
+		Lines:        24,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[J",
+		AttrOff:      "\x1b[m\x1b(B",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Blink:        "\x1b[5m",
+		Reverse:      "\x1b[7m",
+		PadChar:      "\x00",
+		AltChars:     "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:     "\x1b(0$<2>",
+		ExitAcs:      "\x1b(B$<4>",
+		EnableAcs:    "\x1b)0",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A",
+		KeyUp:        "\x1b[A",
+		KeyDown:      "\x1b[B",
+		KeyRight:     "\x1b[C",
+		KeyLeft:      "\x1b[D",
+		KeyInsert:    "\x1b[2~",
+		KeyDelete:    "\x1b[3~",
+		KeyBackspace: "\b",
+		KeyPgUp:      "\x1b[5~",
+		KeyPgDn:      "\x1b[6~",
+		KeyF1:        "\x1bOP",
+		KeyF2:        "\x1bOQ",
+		KeyF3:        "\x1bOR",
+		KeyF4:        "\x1bOS",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		KeyF10:       "\x1b[21~",
+		KeyF11:       "\x1b[23~",
+		KeyF12:       "\x1b[24~",
+		KeyF13:       "\x1b[25~",
+		KeyF14:       "\x1b[26~",
+		KeyF17:       "\x1b[31~",
+		KeyF18:       "\x1b[32~",
+		KeyF19:       "\x1b[33~",
+		KeyF20:       "\x1b[34~",
+		KeyHelp:      "\x1b[28~",
+		AutoMargin:   true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/v/vt320/term.go

@@ -6,61 +6,59 @@ import "github.com/gdamore/tcell/v2/terminfo"
 
 func init() {
 
-	// DEC VT320 7 bit terminal
+	// dec vt320 7 bit terminal
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "vt320",
-		Aliases:           []string{"vt300"},
-		Columns:           80,
-		Lines:             24,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J",
-		ShowCursor:        "\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b[m\x1b(B",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h\x1b=",
-		ExitKeypad:        "\x1b[?1l\x1b>",
-		PadChar:           "\x00",
-		AltChars:          "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x1b(0",
-		ExitAcs:           "\x1b(B",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1b[1~",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyF13:            "\x1b[25~",
-		KeyF14:            "\x1b[26~",
-		KeyF15:            "\x1b[28~",
-		KeyF16:            "\x1b[29~",
-		KeyF17:            "\x1b[31~",
-		KeyF18:            "\x1b[32~",
-		KeyF19:            "\x1b[33~",
-		KeyF20:            "\x1b[34~",
-		AutoMargin:        true,
+		Name:         "vt320",
+		Aliases:      []string{"vt300"},
+		Columns:      80,
+		Lines:        24,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[2J",
+		ShowCursor:   "\x1b[?25h",
+		HideCursor:   "\x1b[?25l",
+		AttrOff:      "\x1b[m\x1b(B",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Blink:        "\x1b[5m",
+		Reverse:      "\x1b[7m",
+		EnterKeypad:  "\x1b[?1h\x1b=",
+		ExitKeypad:   "\x1b[?1l\x1b>",
+		PadChar:      "\x00",
+		AltChars:     "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:     "\x1b(0",
+		ExitAcs:      "\x1b(B",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A",
+		KeyUp:        "\x1bOA",
+		KeyDown:      "\x1bOB",
+		KeyRight:     "\x1bOC",
+		KeyLeft:      "\x1bOD",
+		KeyInsert:    "\x1b[2~",
+		KeyDelete:    "\x1b[3~",
+		KeyBackspace: "\u007f",
+		KeyHome:      "\x1b[1~",
+		KeyPgUp:      "\x1b[5~",
+		KeyPgDn:      "\x1b[6~",
+		KeyF1:        "\x1bOP",
+		KeyF2:        "\x1bOQ",
+		KeyF3:        "\x1bOR",
+		KeyF4:        "\x1bOS",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		KeyF10:       "\x1b[21~",
+		KeyF11:       "\x1b[23~",
+		KeyF12:       "\x1b[24~",
+		KeyF13:       "\x1b[25~",
+		KeyF14:       "\x1b[26~",
+		KeyF15:       "\x1b[28~",
+		KeyF16:       "\x1b[29~",
+		KeyF17:       "\x1b[31~",
+		KeyF18:       "\x1b[32~",
+		KeyF19:       "\x1b[33~",
+		KeyF20:       "\x1b[34~",
+		AutoMargin:   true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/v/vt400/term.go

@@ -6,45 +6,43 @@ import "github.com/gdamore/tcell/v2/terminfo"
 
 func init() {
 
-	// DEC VT400 24x80 column autowrap
+	// dec vt400 24x80 column autowrap
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "vt400",
-		Aliases:           []string{"vt400-24", "dec-vt400"},
-		Columns:           80,
-		Lines:             24,
-		Clear:             "\x1b[H\x1b[J$<10/>",
-		ShowCursor:        "\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b[m\x1b(B",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h\x1b=",
-		ExitKeypad:        "\x1b[?1l\x1b>",
-		PadChar:           "\x00",
-		AltChars:          "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x1b(0",
-		ExitAcs:           "\x1b(B",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyBackspace:      "\b",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		AutoMargin:        true,
-		InsertChar:        "\x1b[@",
+		Name:         "vt400",
+		Aliases:      []string{"vt400-24", "dec-vt400"},
+		Columns:      80,
+		Lines:        24,
+		Clear:        "\x1b[H\x1b[J$<10/>",
+		ShowCursor:   "\x1b[?25h",
+		HideCursor:   "\x1b[?25l",
+		AttrOff:      "\x1b[m\x1b(B",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Blink:        "\x1b[5m",
+		Reverse:      "\x1b[7m",
+		EnterKeypad:  "\x1b[?1h\x1b=",
+		ExitKeypad:   "\x1b[?1l\x1b>",
+		PadChar:      "\x00",
+		AltChars:     "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:     "\x1b(0",
+		ExitAcs:      "\x1b(B",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A",
+		KeyUp:        "\x1bOA",
+		KeyDown:      "\x1bOB",
+		KeyRight:     "\x1bOC",
+		KeyLeft:      "\x1bOD",
+		KeyBackspace: "\b",
+		KeyF1:        "\x1bOP",
+		KeyF2:        "\x1bOQ",
+		KeyF3:        "\x1bOR",
+		KeyF4:        "\x1bOS",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		AutoMargin:   true,
+		InsertChar:   "\x1b[@",
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/v/vt420/term.go

@@ -8,49 +8,47 @@ func init() {
 
 	// DEC VT420
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "vt420",
-		Columns:           80,
-		Lines:             24,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J$<50>",
-		ShowCursor:        "\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b[m\x1b(B$<2>",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m$<2>",
-		Blink:             "\x1b[5m$<2>",
-		Reverse:           "\x1b[7m$<2>",
-		EnterKeypad:       "\x1b=",
-		ExitKeypad:        "\x1b>",
-		PadChar:           "\x00",
-		AltChars:          "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x1b(0$<2>",
-		ExitAcs:           "\x1b(B$<4>",
-		EnableAcs:         "\x1b)0",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH$<10>",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1b[A",
-		KeyDown:           "\x1b[B",
-		KeyRight:          "\x1b[C",
-		KeyLeft:           "\x1b[D",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\b",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1b[17~",
-		KeyF6:             "\x1b[18~",
-		KeyF7:             "\x1b[19~",
-		KeyF8:             "\x1b[20~",
-		KeyF9:             "\x1b[21~",
-		KeyF10:            "\x1b[29~",
-		AutoMargin:        true,
+		Name:         "vt420",
+		Columns:      80,
+		Lines:        24,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[2J$<50>",
+		ShowCursor:   "\x1b[?25h",
+		HideCursor:   "\x1b[?25l",
+		AttrOff:      "\x1b[m\x1b(B$<2>",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m$<2>",
+		Blink:        "\x1b[5m$<2>",
+		Reverse:      "\x1b[7m$<2>",
+		EnterKeypad:  "\x1b=",
+		ExitKeypad:   "\x1b>",
+		PadChar:      "\x00",
+		AltChars:     "``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:     "\x1b(0$<2>",
+		ExitAcs:      "\x1b(B$<4>",
+		EnableAcs:    "\x1b)0",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH$<10>",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A",
+		KeyUp:        "\x1b[A",
+		KeyDown:      "\x1b[B",
+		KeyRight:     "\x1b[C",
+		KeyLeft:      "\x1b[D",
+		KeyInsert:    "\x1b[2~",
+		KeyDelete:    "\x1b[3~",
+		KeyBackspace: "\b",
+		KeyPgUp:      "\x1b[5~",
+		KeyPgDn:      "\x1b[6~",
+		KeyF1:        "\x1bOP",
+		KeyF2:        "\x1bOQ",
+		KeyF3:        "\x1bOR",
+		KeyF4:        "\x1bOS",
+		KeyF5:        "\x1b[17~",
+		KeyF6:        "\x1b[18~",
+		KeyF7:        "\x1b[19~",
+		KeyF8:        "\x1b[20~",
+		KeyF9:        "\x1b[21~",
+		KeyF10:       "\x1b[29~",
+		AutoMargin:   true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/v/vt52/term.go

@@ -6,15 +6,13 @@ import "github.com/gdamore/tcell/v2/terminfo"
 
 func init() {
 
-	// DEC VT52
+	// dec vt52
 	terminfo.AddTerminfo(&terminfo.Terminfo{
 		Name:         "vt52",
 		Columns:      80,
 		Lines:        24,
 		Bell:         "\a",
 		Clear:        "\x1bH\x1bJ",
-		EnterKeypad:  "\x1b=",
-		ExitKeypad:   "\x1b>",
 		PadChar:      "\x00",
 		AltChars:     "+h.k0affggolpnqprrss",
 		EnterAcs:     "\x1bF",
@@ -27,13 +25,5 @@ func init() {
 		KeyRight:     "\x1bC",
 		KeyLeft:      "\x1bD",
 		KeyBackspace: "\b",
-		KeyF1:        "\x1bP",
-		KeyF2:        "\x1bQ",
-		KeyF3:        "\x1bR",
-		KeyF5:        "\x1b?t",
-		KeyF6:        "\x1b?u",
-		KeyF7:        "\x1b?v",
-		KeyF8:        "\x1b?w",
-		KeyF9:        "\x1b?x",
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/w/wy60/term.go

@@ -8,59 +8,57 @@ func init() {
 
 	// Wyse 60
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "wy60",
-		Aliases:           []string{"wyse60"},
-		Columns:           80,
-		Lines:             24,
-		Bell:              "\a",
-		Clear:             "\x1b+$<100>",
-		EnterCA:           "\x1bw0",
-		ExitCA:            "\x1bw1",
-		ShowCursor:        "\x1b`1",
-		HideCursor:        "\x1b`0",
-		AttrOff:           "\x1b(\x1bH\x03\x1bG0\x1bcD",
-		Underline:         "\x1bG8",
-		Dim:               "\x1bGp",
-		Blink:             "\x1bG2",
-		Reverse:           "\x1bG4",
-		PadChar:           "\x00",
-		AltChars:          "+/,.0[a2fxgqh1ihjYk?lZm@nEqDtCu4vAwBx3yszr{c~~",
-		EnterAcs:          "\x1bcE",
-		ExitAcs:           "\x1bcD",
-		EnableAutoMargin:  "\x1bd/",
-		DisableAutoMargin: "\x1bd.",
-		SetCursor:         "\x1b=%p1%' '%+%c%p2%' '%+%c",
-		CursorBack1:       "\b",
-		CursorUp1:         "\v",
-		KeyUp:             "\v",
-		KeyDown:           "\n",
-		KeyRight:          "\f",
-		KeyLeft:           "\b",
-		KeyInsert:         "\x1bQ",
-		KeyDelete:         "\x1bW",
-		KeyBackspace:      "\b",
-		KeyHome:           "\x1e",
-		KeyPgUp:           "\x1bJ",
-		KeyPgDn:           "\x1bK",
-		KeyF1:             "\x01@\r",
-		KeyF2:             "\x01A\r",
-		KeyF3:             "\x01B\r",
-		KeyF4:             "\x01C\r",
-		KeyF5:             "\x01D\r",
-		KeyF6:             "\x01E\r",
-		KeyF7:             "\x01F\r",
-		KeyF8:             "\x01G\r",
-		KeyF9:             "\x01H\r",
-		KeyF10:            "\x01I\r",
-		KeyF11:            "\x01J\r",
-		KeyF12:            "\x01K\r",
-		KeyF13:            "\x01L\r",
-		KeyF14:            "\x01M\r",
-		KeyF15:            "\x01N\r",
-		KeyF16:            "\x01O\r",
-		KeyPrint:          "\x1bP",
-		KeyBacktab:        "\x1bI",
-		KeyShfHome:        "\x1b{",
-		AutoMargin:        true,
+		Name:         "wy60",
+		Aliases:      []string{"wyse60"},
+		Columns:      80,
+		Lines:        24,
+		Bell:         "\a",
+		Clear:        "\x1b+$<100>",
+		EnterCA:      "\x1bw0",
+		ExitCA:       "\x1bw1",
+		ShowCursor:   "\x1b`1",
+		HideCursor:   "\x1b`0",
+		AttrOff:      "\x1b(\x1bH\x03\x1bG0\x1bcD",
+		Underline:    "\x1bG8",
+		Dim:          "\x1bGp",
+		Blink:        "\x1bG2",
+		Reverse:      "\x1bG4",
+		PadChar:      "\x00",
+		AltChars:     "+/,.0[a2fxgqh1ihjYk?lZm@nEqDtCu4vAwBx3yszr{c~~",
+		EnterAcs:     "\x1bcE",
+		ExitAcs:      "\x1bcD",
+		SetCursor:    "\x1b=%p1%' '%+%c%p2%' '%+%c",
+		CursorBack1:  "\b",
+		CursorUp1:    "\v",
+		KeyUp:        "\v",
+		KeyDown:      "\n",
+		KeyRight:     "\f",
+		KeyLeft:      "\b",
+		KeyInsert:    "\x1bQ",
+		KeyDelete:    "\x1bW",
+		KeyBackspace: "\b",
+		KeyHome:      "\x1e",
+		KeyPgUp:      "\x1bJ",
+		KeyPgDn:      "\x1bK",
+		KeyF1:        "\x01@\r",
+		KeyF2:        "\x01A\r",
+		KeyF3:        "\x01B\r",
+		KeyF4:        "\x01C\r",
+		KeyF5:        "\x01D\r",
+		KeyF6:        "\x01E\r",
+		KeyF7:        "\x01F\r",
+		KeyF8:        "\x01G\r",
+		KeyF9:        "\x01H\r",
+		KeyF10:       "\x01I\r",
+		KeyF11:       "\x01J\r",
+		KeyF12:       "\x01K\r",
+		KeyF13:       "\x01L\r",
+		KeyF14:       "\x01M\r",
+		KeyF15:       "\x01N\r",
+		KeyF16:       "\x01O\r",
+		KeyPrint:     "\x1bP",
+		KeyBacktab:   "\x1bI",
+		KeyShfHome:   "\x1b{",
+		AutoMargin:   true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/w/wy99_ansi/term.go

@@ -6,115 +6,111 @@ import "github.com/gdamore/tcell/v2/terminfo"
 
 func init() {
 
-	// Wyse WY-99GT in ANSI mode (int'l PC keyboard)
+	// Wyse WY-99GT in ansi mode (int'l PC keyboard)
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "wy99-ansi",
-		Columns:           80,
-		Lines:             25,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[J$<200>",
-		ShowCursor:        "\x1b[34h\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b[m\x0f\x1b[\"q",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Dim:               "\x1b[2m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h",
-		ExitKeypad:        "\x1b[?1l",
-		PadChar:           "\x00",
-		AltChars:          "``aaffggjjkkllmmnnooqqssttuuvvwwxx{{||}}~~",
-		EnterAcs:          "\x0e",
-		ExitAcs:           "\x0f",
-		EnableAcs:         "\x1b)0",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b$<1>",
-		CursorUp1:         "\x1bM",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyBackspace:      "\b",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1b[M",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyF17:            "\x1b[K",
-		KeyF18:            "\x1b[31~",
-		KeyF19:            "\x1b[32~",
-		KeyF20:            "\x1b[33~",
-		KeyF21:            "\x1b[34~",
-		KeyF22:            "\x1b[35~",
-		KeyF23:            "\x1b[1~",
-		KeyF24:            "\x1b[2~",
-		KeyBacktab:        "\x1b[z",
-		AutoMargin:        true,
+		Name:         "wy99-ansi",
+		Columns:      80,
+		Lines:        25,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[J$<200>",
+		ShowCursor:   "\x1b[34h\x1b[?25h",
+		HideCursor:   "\x1b[?25l",
+		AttrOff:      "\x1b[m\x0f\x1b[\"q",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Dim:          "\x1b[2m",
+		Blink:        "\x1b[5m",
+		Reverse:      "\x1b[7m",
+		EnterKeypad:  "\x1b[?1h",
+		ExitKeypad:   "\x1b[?1l",
+		PadChar:      "\x00",
+		AltChars:     "``aaffggjjkkllmmnnooqqssttuuvvwwxx{{||}}~~",
+		EnterAcs:     "\x0e",
+		ExitAcs:      "\x0f",
+		EnableAcs:    "\x1b)0",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b$<1>",
+		CursorUp1:    "\x1bM",
+		KeyUp:        "\x1bOA",
+		KeyDown:      "\x1bOB",
+		KeyRight:     "\x1bOC",
+		KeyLeft:      "\x1bOD",
+		KeyBackspace: "\b",
+		KeyF1:        "\x1bOP",
+		KeyF2:        "\x1bOQ",
+		KeyF3:        "\x1bOR",
+		KeyF4:        "\x1bOS",
+		KeyF5:        "\x1b[M",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		KeyF10:       "\x1b[21~",
+		KeyF11:       "\x1b[23~",
+		KeyF12:       "\x1b[24~",
+		KeyF17:       "\x1b[K",
+		KeyF18:       "\x1b[31~",
+		KeyF19:       "\x1b[32~",
+		KeyF20:       "\x1b[33~",
+		KeyF21:       "\x1b[34~",
+		KeyF22:       "\x1b[35~",
+		KeyF23:       "\x1b[1~",
+		KeyF24:       "\x1b[2~",
+		KeyBacktab:   "\x1b[z",
+		AutoMargin:   true,
 	})
 
-	// Wyse WY-99GT in ANSI mode (US PC keyboard)
+	// Wyse WY-99GT in ansi mode (US PC keyboard)
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "wy99a-ansi",
-		Columns:           80,
-		Lines:             25,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[J$<200>",
-		ShowCursor:        "\x1b[34h\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b[m\x0f\x1b[\"q",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Dim:               "\x1b[2m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h",
-		ExitKeypad:        "\x1b[?1l",
-		PadChar:           "\x00",
-		AltChars:          "``aaffggjjkkllmmnnooqqssttuuvvwwxx{{||}}~~",
-		EnterAcs:          "\x0e",
-		ExitAcs:           "\x0f",
-		EnableAcs:         "\x1b)0",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b$<1>",
-		CursorUp1:         "\x1bM",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyBackspace:      "\b",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1b[M",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyF17:            "\x1b[K",
-		KeyF18:            "\x1b[31~",
-		KeyF19:            "\x1b[32~",
-		KeyF20:            "\x1b[33~",
-		KeyF21:            "\x1b[34~",
-		KeyF22:            "\x1b[35~",
-		KeyF23:            "\x1b[1~",
-		KeyF24:            "\x1b[2~",
-		KeyBacktab:        "\x1b[z",
-		AutoMargin:        true,
+		Name:         "wy99a-ansi",
+		Columns:      80,
+		Lines:        25,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[J$<200>",
+		ShowCursor:   "\x1b[34h\x1b[?25h",
+		HideCursor:   "\x1b[?25l",
+		AttrOff:      "\x1b[m\x0f\x1b[\"q",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Dim:          "\x1b[2m",
+		Blink:        "\x1b[5m",
+		Reverse:      "\x1b[7m",
+		EnterKeypad:  "\x1b[?1h",
+		ExitKeypad:   "\x1b[?1l",
+		PadChar:      "\x00",
+		AltChars:     "``aaffggjjkkllmmnnooqqssttuuvvwwxx{{||}}~~",
+		EnterAcs:     "\x0e",
+		ExitAcs:      "\x0f",
+		EnableAcs:    "\x1b)0",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b$<1>",
+		CursorUp1:    "\x1bM",
+		KeyUp:        "\x1bOA",
+		KeyDown:      "\x1bOB",
+		KeyRight:     "\x1bOC",
+		KeyLeft:      "\x1bOD",
+		KeyBackspace: "\b",
+		KeyF1:        "\x1bOP",
+		KeyF2:        "\x1bOQ",
+		KeyF3:        "\x1bOR",
+		KeyF4:        "\x1bOS",
+		KeyF5:        "\x1b[M",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		KeyF10:       "\x1b[21~",
+		KeyF11:       "\x1b[23~",
+		KeyF12:       "\x1b[24~",
+		KeyF17:       "\x1b[K",
+		KeyF18:       "\x1b[31~",
+		KeyF19:       "\x1b[32~",
+		KeyF20:       "\x1b[33~",
+		KeyF21:       "\x1b[34~",
+		KeyF22:       "\x1b[35~",
+		KeyF23:       "\x1b[1~",
+		KeyF24:       "\x1b[2~",
+		KeyBacktab:   "\x1b[z",
+		AutoMargin:   true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/x/xfce/term.go

@@ -8,62 +8,60 @@ func init() {
 
 	// Xfce Terminal
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "xfce",
-		Columns:           80,
-		Lines:             24,
-		Colors:            8,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J",
-		EnterCA:           "\x1b7\x1b[?47h",
-		ExitCA:            "\x1b[2J\x1b[?47l\x1b8",
-		ShowCursor:        "\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b[0m\x0f",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h\x1b=",
-		ExitKeypad:        "\x1b[?1l\x1b>",
-		SetFg:             "\x1b[3%p1%dm",
-		SetBg:             "\x1b[4%p1%dm",
-		SetFgBg:           "\x1b[3%p1%d;4%p2%dm",
-		ResetFgBg:         "\x1b[39;49m",
-		PadChar:           "\x00",
-		AltChars:          "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x0e",
-		ExitAcs:           "\x0f",
-		EnableAcs:         "\x1b)0",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		Mouse:             "\x1b[M",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1bOH",
-		KeyEnd:            "\x1bOF",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyBacktab:        "\x1b[Z",
-		Modifiers:         1,
-		AutoMargin:        true,
+		Name:         "xfce",
+		Columns:      80,
+		Lines:        24,
+		Colors:       8,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[2J",
+		EnterCA:      "\x1b7\x1b[?47h",
+		ExitCA:       "\x1b[2J\x1b[?47l\x1b8",
+		ShowCursor:   "\x1b[?25h",
+		HideCursor:   "\x1b[?25l",
+		AttrOff:      "\x1b[0m\x0f",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Reverse:      "\x1b[7m",
+		EnterKeypad:  "\x1b[?1h\x1b=",
+		ExitKeypad:   "\x1b[?1l\x1b>",
+		SetFg:        "\x1b[3%p1%dm",
+		SetBg:        "\x1b[4%p1%dm",
+		SetFgBg:      "\x1b[3%p1%d;4%p2%dm",
+		ResetFgBg:    "\x1b[39;49m",
+		PadChar:      "\x00",
+		AltChars:     "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:     "\x0e",
+		ExitAcs:      "\x0f",
+		EnableAcs:    "\x1b)0",
+		Mouse:        "\x1b[M",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A",
+		KeyUp:        "\x1bOA",
+		KeyDown:      "\x1bOB",
+		KeyRight:     "\x1bOC",
+		KeyLeft:      "\x1bOD",
+		KeyInsert:    "\x1b[2~",
+		KeyDelete:    "\x1b[3~",
+		KeyBackspace: "\u007f",
+		KeyHome:      "\x1bOH",
+		KeyEnd:       "\x1bOF",
+		KeyPgUp:      "\x1b[5~",
+		KeyPgDn:      "\x1b[6~",
+		KeyF1:        "\x1bOP",
+		KeyF2:        "\x1bOQ",
+		KeyF3:        "\x1bOR",
+		KeyF4:        "\x1bOS",
+		KeyF5:        "\x1b[15~",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		KeyF10:       "\x1b[21~",
+		KeyF11:       "\x1b[23~",
+		KeyF12:       "\x1b[24~",
+		KeyBacktab:   "\x1b[Z",
+		Modifiers:    1,
+		AutoMargin:   true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm/term.go

@@ -6,193 +6,187 @@ import "github.com/gdamore/tcell/v2/terminfo"
 
 func init() {
 
-	// xterm terminal emulator (X Window System)
+	// X11 terminal emulator
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "xterm",
-		Aliases:           []string{"xterm-debian"},
-		Columns:           80,
-		Lines:             24,
-		Colors:            8,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J",
-		EnterCA:           "\x1b[?1049h\x1b[22;0;0t",
-		ExitCA:            "\x1b[?1049l\x1b[23;0;0t",
-		ShowCursor:        "\x1b[?12l\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b(B\x1b[m",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Dim:               "\x1b[2m",
-		Italic:            "\x1b[3m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h\x1b=",
-		ExitKeypad:        "\x1b[?1l\x1b>",
-		SetFg:             "\x1b[3%p1%dm",
-		SetBg:             "\x1b[4%p1%dm",
-		SetFgBg:           "\x1b[3%p1%d;4%p2%dm",
-		ResetFgBg:         "\x1b[39;49m",
-		AltChars:          "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x1b(0",
-		ExitAcs:           "\x1b(B",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		StrikeThrough:     "\x1b[9m",
-		Mouse:             "\x1b[<",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1bOH",
-		KeyEnd:            "\x1bOF",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyBacktab:        "\x1b[Z",
-		Modifiers:         1,
-		AutoMargin:        true,
+		Name:          "xterm",
+		Aliases:       []string{"xterm-debian"},
+		Columns:       80,
+		Lines:         24,
+		Colors:        8,
+		Bell:          "\a",
+		Clear:         "\x1b[H\x1b[2J",
+		EnterCA:       "\x1b[?1049h\x1b[22;0;0t",
+		ExitCA:        "\x1b[?1049l\x1b[23;0;0t",
+		ShowCursor:    "\x1b[?12l\x1b[?25h",
+		HideCursor:    "\x1b[?25l",
+		AttrOff:       "\x1b(B\x1b[m",
+		Underline:     "\x1b[4m",
+		Bold:          "\x1b[1m",
+		Dim:           "\x1b[2m",
+		Italic:        "\x1b[3m",
+		Blink:         "\x1b[5m",
+		Reverse:       "\x1b[7m",
+		EnterKeypad:   "\x1b[?1h\x1b=",
+		ExitKeypad:    "\x1b[?1l\x1b>",
+		SetFg:         "\x1b[3%p1%dm",
+		SetBg:         "\x1b[4%p1%dm",
+		SetFgBg:       "\x1b[3%p1%d;4%p2%dm",
+		ResetFgBg:     "\x1b[39;49m",
+		AltChars:      "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:      "\x1b(0",
+		ExitAcs:       "\x1b(B",
+		StrikeThrough: "\x1b[9m",
+		Mouse:         "\x1b[M",
+		SetCursor:     "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:   "\b",
+		CursorUp1:     "\x1b[A",
+		KeyUp:         "\x1bOA",
+		KeyDown:       "\x1bOB",
+		KeyRight:      "\x1bOC",
+		KeyLeft:       "\x1bOD",
+		KeyInsert:     "\x1b[2~",
+		KeyDelete:     "\x1b[3~",
+		KeyBackspace:  "\u007f",
+		KeyHome:       "\x1bOH",
+		KeyEnd:        "\x1bOF",
+		KeyPgUp:       "\x1b[5~",
+		KeyPgDn:       "\x1b[6~",
+		KeyF1:         "\x1bOP",
+		KeyF2:         "\x1bOQ",
+		KeyF3:         "\x1bOR",
+		KeyF4:         "\x1bOS",
+		KeyF5:         "\x1b[15~",
+		KeyF6:         "\x1b[17~",
+		KeyF7:         "\x1b[18~",
+		KeyF8:         "\x1b[19~",
+		KeyF9:         "\x1b[20~",
+		KeyF10:        "\x1b[21~",
+		KeyF11:        "\x1b[23~",
+		KeyF12:        "\x1b[24~",
+		KeyBacktab:    "\x1b[Z",
+		Modifiers:     1,
+		AutoMargin:    true,
 	})
 
 	// xterm with 88 colors
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "xterm-88color",
-		Columns:           80,
-		Lines:             24,
-		Colors:            88,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J",
-		EnterCA:           "\x1b[?1049h\x1b[22;0;0t",
-		ExitCA:            "\x1b[?1049l\x1b[23;0;0t",
-		ShowCursor:        "\x1b[?12l\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b(B\x1b[m",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Dim:               "\x1b[2m",
-		Italic:            "\x1b[3m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h\x1b=",
-		ExitKeypad:        "\x1b[?1l\x1b>",
-		SetFg:             "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
-		SetBg:             "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
-		SetFgBg:           "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
-		ResetFgBg:         "\x1b[39;49m",
-		AltChars:          "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x1b(0",
-		ExitAcs:           "\x1b(B",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		StrikeThrough:     "\x1b[9m",
-		Mouse:             "\x1b[<",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1bOH",
-		KeyEnd:            "\x1bOF",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyBacktab:        "\x1b[Z",
-		Modifiers:         1,
-		AutoMargin:        true,
+		Name:          "xterm-88color",
+		Columns:       80,
+		Lines:         24,
+		Colors:        88,
+		Bell:          "\a",
+		Clear:         "\x1b[H\x1b[2J",
+		EnterCA:       "\x1b[?1049h\x1b[22;0;0t",
+		ExitCA:        "\x1b[?1049l\x1b[23;0;0t",
+		ShowCursor:    "\x1b[?12l\x1b[?25h",
+		HideCursor:    "\x1b[?25l",
+		AttrOff:       "\x1b(B\x1b[m",
+		Underline:     "\x1b[4m",
+		Bold:          "\x1b[1m",
+		Dim:           "\x1b[2m",
+		Italic:        "\x1b[3m",
+		Blink:         "\x1b[5m",
+		Reverse:       "\x1b[7m",
+		EnterKeypad:   "\x1b[?1h\x1b=",
+		ExitKeypad:    "\x1b[?1l\x1b>",
+		SetFg:         "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
+		SetBg:         "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
+		SetFgBg:       "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
+		ResetFgBg:     "\x1b[39;49m",
+		AltChars:      "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:      "\x1b(0",
+		ExitAcs:       "\x1b(B",
+		StrikeThrough: "\x1b[9m",
+		Mouse:         "\x1b[M",
+		SetCursor:     "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:   "\b",
+		CursorUp1:     "\x1b[A",
+		KeyUp:         "\x1bOA",
+		KeyDown:       "\x1bOB",
+		KeyRight:      "\x1bOC",
+		KeyLeft:       "\x1bOD",
+		KeyInsert:     "\x1b[2~",
+		KeyDelete:     "\x1b[3~",
+		KeyBackspace:  "\u007f",
+		KeyHome:       "\x1bOH",
+		KeyEnd:        "\x1bOF",
+		KeyPgUp:       "\x1b[5~",
+		KeyPgDn:       "\x1b[6~",
+		KeyF1:         "\x1bOP",
+		KeyF2:         "\x1bOQ",
+		KeyF3:         "\x1bOR",
+		KeyF4:         "\x1bOS",
+		KeyF5:         "\x1b[15~",
+		KeyF6:         "\x1b[17~",
+		KeyF7:         "\x1b[18~",
+		KeyF8:         "\x1b[19~",
+		KeyF9:         "\x1b[20~",
+		KeyF10:        "\x1b[21~",
+		KeyF11:        "\x1b[23~",
+		KeyF12:        "\x1b[24~",
+		KeyBacktab:    "\x1b[Z",
+		Modifiers:     1,
+		AutoMargin:    true,
 	})
 
 	// xterm with 256 colors
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "xterm-256color",
-		Columns:           80,
-		Lines:             24,
-		Colors:            256,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J",
-		EnterCA:           "\x1b[?1049h\x1b[22;0;0t",
-		ExitCA:            "\x1b[?1049l\x1b[23;0;0t",
-		ShowCursor:        "\x1b[?12l\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b(B\x1b[m",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Dim:               "\x1b[2m",
-		Italic:            "\x1b[3m",
-		Blink:             "\x1b[5m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h\x1b=",
-		ExitKeypad:        "\x1b[?1l\x1b>",
-		SetFg:             "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
-		SetBg:             "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
-		SetFgBg:           "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
-		ResetFgBg:         "\x1b[39;49m",
-		AltChars:          "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x1b(0",
-		ExitAcs:           "\x1b(B",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		StrikeThrough:     "\x1b[9m",
-		Mouse:             "\x1b[<",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1bOH",
-		KeyEnd:            "\x1bOF",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyBacktab:        "\x1b[Z",
-		Modifiers:         1,
-		AutoMargin:        true,
+		Name:          "xterm-256color",
+		Columns:       80,
+		Lines:         24,
+		Colors:        256,
+		Bell:          "\a",
+		Clear:         "\x1b[H\x1b[2J",
+		EnterCA:       "\x1b[?1049h\x1b[22;0;0t",
+		ExitCA:        "\x1b[?1049l\x1b[23;0;0t",
+		ShowCursor:    "\x1b[?12l\x1b[?25h",
+		HideCursor:    "\x1b[?25l",
+		AttrOff:       "\x1b(B\x1b[m",
+		Underline:     "\x1b[4m",
+		Bold:          "\x1b[1m",
+		Dim:           "\x1b[2m",
+		Italic:        "\x1b[3m",
+		Blink:         "\x1b[5m",
+		Reverse:       "\x1b[7m",
+		EnterKeypad:   "\x1b[?1h\x1b=",
+		ExitKeypad:    "\x1b[?1l\x1b>",
+		SetFg:         "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
+		SetBg:         "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
+		SetFgBg:       "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
+		ResetFgBg:     "\x1b[39;49m",
+		AltChars:      "``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:      "\x1b(0",
+		ExitAcs:       "\x1b(B",
+		StrikeThrough: "\x1b[9m",
+		Mouse:         "\x1b[M",
+		SetCursor:     "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:   "\b",
+		CursorUp1:     "\x1b[A",
+		KeyUp:         "\x1bOA",
+		KeyDown:       "\x1bOB",
+		KeyRight:      "\x1bOC",
+		KeyLeft:       "\x1bOD",
+		KeyInsert:     "\x1b[2~",
+		KeyDelete:     "\x1b[3~",
+		KeyBackspace:  "\u007f",
+		KeyHome:       "\x1bOH",
+		KeyEnd:        "\x1bOF",
+		KeyPgUp:       "\x1b[5~",
+		KeyPgDn:       "\x1b[6~",
+		KeyF1:         "\x1bOP",
+		KeyF2:         "\x1bOQ",
+		KeyF3:         "\x1bOR",
+		KeyF4:         "\x1bOS",
+		KeyF5:         "\x1b[15~",
+		KeyF6:         "\x1b[17~",
+		KeyF7:         "\x1b[18~",
+		KeyF8:         "\x1b[19~",
+		KeyF9:         "\x1b[20~",
+		KeyF10:        "\x1b[21~",
+		KeyF11:        "\x1b[23~",
+		KeyF12:        "\x1b[24~",
+		KeyBacktab:    "\x1b[Z",
+		Modifiers:     1,
+		AutoMargin:    true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty/term.go

@@ -8,64 +8,62 @@ func init() {
 
 	// KovIdTTY
 	terminfo.AddTerminfo(&terminfo.Terminfo{
-		Name:              "xterm-kitty",
-		Columns:           80,
-		Lines:             24,
-		Colors:            256,
-		Bell:              "\a",
-		Clear:             "\x1b[H\x1b[2J",
-		EnterCA:           "\x1b[?1049h",
-		ExitCA:            "\x1b[?1049l",
-		ShowCursor:        "\x1b[?12h\x1b[?25h",
-		HideCursor:        "\x1b[?25l",
-		AttrOff:           "\x1b(B\x1b[m",
-		Underline:         "\x1b[4m",
-		Bold:              "\x1b[1m",
-		Dim:               "\x1b[2m",
-		Italic:            "\x1b[3m",
-		Reverse:           "\x1b[7m",
-		EnterKeypad:       "\x1b[?1h",
-		ExitKeypad:        "\x1b[?1l",
-		SetFg:             "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
-		SetBg:             "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
-		SetFgBg:           "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
-		ResetFgBg:         "\x1b[39;49m",
-		AltChars:          "++,,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
-		EnterAcs:          "\x1b(0",
-		ExitAcs:           "\x1b(B",
-		EnableAutoMargin:  "\x1b[?7h",
-		DisableAutoMargin: "\x1b[?7l",
-		StrikeThrough:     "\x1b[9m",
-		Mouse:             "\x1b[M",
-		SetCursor:         "\x1b[%i%p1%d;%p2%dH",
-		CursorBack1:       "\b",
-		CursorUp1:         "\x1b[A",
-		KeyUp:             "\x1bOA",
-		KeyDown:           "\x1bOB",
-		KeyRight:          "\x1bOC",
-		KeyLeft:           "\x1bOD",
-		KeyInsert:         "\x1b[2~",
-		KeyDelete:         "\x1b[3~",
-		KeyBackspace:      "\x7f",
-		KeyHome:           "\x1bOH",
-		KeyEnd:            "\x1bOF",
-		KeyPgUp:           "\x1b[5~",
-		KeyPgDn:           "\x1b[6~",
-		KeyF1:             "\x1bOP",
-		KeyF2:             "\x1bOQ",
-		KeyF3:             "\x1bOR",
-		KeyF4:             "\x1bOS",
-		KeyF5:             "\x1b[15~",
-		KeyF6:             "\x1b[17~",
-		KeyF7:             "\x1b[18~",
-		KeyF8:             "\x1b[19~",
-		KeyF9:             "\x1b[20~",
-		KeyF10:            "\x1b[21~",
-		KeyF11:            "\x1b[23~",
-		KeyF12:            "\x1b[24~",
-		KeyBacktab:        "\x1b[Z",
-		Modifiers:         1,
-		TrueColor:         true,
-		AutoMargin:        true,
+		Name:          "xterm-kitty",
+		Columns:       80,
+		Lines:         24,
+		Colors:        256,
+		Bell:          "\a",
+		Clear:         "\x1b[H\x1b[2J",
+		EnterCA:       "\x1b[?1049h",
+		ExitCA:        "\x1b[?1049l",
+		ShowCursor:    "\x1b[?12l\x1b[?25h",
+		HideCursor:    "\x1b[?25l",
+		AttrOff:       "\x1b(B\x1b[m",
+		Underline:     "\x1b[4m",
+		Bold:          "\x1b[1m",
+		Dim:           "\x1b[2m",
+		Italic:        "\x1b[3m",
+		Reverse:       "\x1b[7m",
+		EnterKeypad:   "\x1b[?1h",
+		ExitKeypad:    "\x1b[?1l",
+		SetFg:         "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
+		SetBg:         "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
+		SetFgBg:       "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
+		ResetFgBg:     "\x1b[39;49m",
+		AltChars:      "++,,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:      "\x1b(0",
+		ExitAcs:       "\x1b(B",
+		StrikeThrough: "\x1b[9m",
+		Mouse:         "\x1b[M",
+		SetCursor:     "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:   "\b",
+		CursorUp1:     "\x1b[A",
+		KeyUp:         "\x1bOA",
+		KeyDown:       "\x1bOB",
+		KeyRight:      "\x1bOC",
+		KeyLeft:       "\x1bOD",
+		KeyInsert:     "\x1b[2~",
+		KeyDelete:     "\x1b[3~",
+		KeyBackspace:  "\u007f",
+		KeyHome:       "\x1bOH",
+		KeyEnd:        "\x1bOF",
+		KeyPgUp:       "\x1b[5~",
+		KeyPgDn:       "\x1b[6~",
+		KeyF1:         "\x1bOP",
+		KeyF2:         "\x1bOQ",
+		KeyF3:         "\x1bOR",
+		KeyF4:         "\x1bOS",
+		KeyF5:         "\x1b[15~",
+		KeyF6:         "\x1b[17~",
+		KeyF7:         "\x1b[18~",
+		KeyF8:         "\x1b[19~",
+		KeyF9:         "\x1b[20~",
+		KeyF10:        "\x1b[21~",
+		KeyF11:        "\x1b[23~",
+		KeyF12:        "\x1b[24~",
+		KeyBacktab:    "\x1b[Z",
+		Modifiers:     1,
+		TrueColor:     true,
+		AutoMargin:    true,
 	})
 }

vendor/github.com/gdamore/tcell/v2/terminfo/x/xterm_termite/term.go

@@ -0,0 +1,66 @@
+// Generated automatically.  DO NOT HAND-EDIT.
+
+package xterm_termite
+
+import "github.com/gdamore/tcell/v2/terminfo"
+
+func init() {
+
+	// VTE-based terminal
+	terminfo.AddTerminfo(&terminfo.Terminfo{
+		Name:         "xterm-termite",
+		Columns:      80,
+		Lines:        24,
+		Colors:       256,
+		Bell:         "\a",
+		Clear:        "\x1b[H\x1b[2J",
+		EnterCA:      "\x1b[?1049h",
+		ExitCA:       "\x1b[?1049l",
+		ShowCursor:   "\x1b[?12l\x1b[?25h",
+		HideCursor:   "\x1b[?25l",
+		AttrOff:      "\x1b(B\x1b[m",
+		Underline:    "\x1b[4m",
+		Bold:         "\x1b[1m",
+		Dim:          "\x1b[2m",
+		Italic:       "\x1b[3m",
+		Reverse:      "\x1b[7m",
+		EnterKeypad:  "\x1b[?1h\x1b=",
+		ExitKeypad:   "\x1b[?1l\x1b>",
+		SetFg:        "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m",
+		SetBg:        "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m",
+		SetFgBg:      "\x1b[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;;%?%p2%{8}%<%t4%p2%d%e%p2%{16}%<%t10%p2%{8}%-%d%e48;5;%p2%d%;m",
+		ResetFgBg:    "\x1b[39;49m",
+		AltChars:     "++,,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~",
+		EnterAcs:     "\x1b(0",
+		ExitAcs:      "\x1b(B",
+		Mouse:        "\x1b[M",
+		SetCursor:    "\x1b[%i%p1%d;%p2%dH",
+		CursorBack1:  "\b",
+		CursorUp1:    "\x1b[A",
+		KeyUp:        "\x1bOA",
+		KeyDown:      "\x1bOB",
+		KeyRight:     "\x1bOC",
+		KeyLeft:      "\x1bOD",
+		KeyInsert:    "\x1b[2~",
+		KeyDelete:    "\x1b[3~",
+		KeyBackspace: "\u007f",
+		KeyHome:      "\x1bOH",
+		KeyEnd:       "\x1bOF",
+		KeyPgUp:      "\x1b[5~",
+		KeyPgDn:      "\x1b[6~",
+		KeyF1:        "\x1bOP",
+		KeyF2:        "\x1bOQ",
+		KeyF3:        "\x1bOR",
+		KeyF4:        "\x1bOS",
+		KeyF5:        "\x1b[15~",
+		KeyF6:        "\x1b[17~",
+		KeyF7:        "\x1b[18~",
+		KeyF8:        "\x1b[19~",
+		KeyF9:        "\x1b[20~",
+		KeyF10:       "\x1b[21~",
+		KeyF11:       "\x1b[23~",
+		KeyF12:       "\x1b[24~",
+		KeyBacktab:   "\x1b[Z",
+		Modifiers:    1,
+	})
+}

vendor/github.com/gdamore/tcell/v2/tscreen.go

@@ -1,4 +1,4 @@
-// Copyright 2024 The TCell Authors
+// Copyright 2023 The TCell Authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use file except in compliance with the License.
@@ -715,7 +715,7 @@ func (t *tScreen) drawCell(x, y int) int {
 		return width
 	}
 
-	if y == t.h-1 && x == t.w-1 && t.ti.AutoMargin && ti.DisableAutoMargin == "" && ti.InsertChar != "" {
+	if y == t.h-1 && x == t.w-1 && t.ti.AutoMargin && ti.InsertChar != "" {
 		// our solution is somewhat goofy.
 		// we write to the second to the last cell what we want in the last cell, then we
 		// insert a character at that 2nd to last position to shift the last column into
@@ -1822,18 +1822,10 @@ func (t *tScreen) engage() error {
 	}
 
 	ti := t.ti
-	if os.Getenv("TCELL_ALTSCREEN") != "disable" {
-		// Technically this may not be right, but every terminal we know about
-		// (even Wyse 60) uses this to enter the alternate screen buffer, and
-		// possibly save and restore the window title and/or icon.
-		// (In theory there could be terminals that don't support X,Y cursor
-		// positions without a setup command, but we don't support them.)
-		t.TPuts(ti.EnterCA)
-	}
+	t.TPuts(ti.EnterCA)
 	t.TPuts(ti.EnterKeypad)
 	t.TPuts(ti.HideCursor)
 	t.TPuts(ti.EnableAcs)
-	t.TPuts(ti.DisableAutoMargin)
 	t.TPuts(ti.Clear)
 
 	t.wg.Add(2)
@@ -1872,12 +1864,9 @@ func (t *tScreen) disengage() {
 	}
 	t.TPuts(ti.ResetFgBg)
 	t.TPuts(ti.AttrOff)
+	t.TPuts(ti.Clear)
+	t.TPuts(ti.ExitCA)
 	t.TPuts(ti.ExitKeypad)
-	t.TPuts(ti.EnableAutoMargin)
-	if os.Getenv("TCELL_ALTSCREEN") != "disable" {
-		t.TPuts(ti.Clear) // only needed if ExitCA is empty
-		t.TPuts(ti.ExitCA)
-	}
 	t.enableMouse(0)
 	t.enablePasting(false)
 	t.disableFocusReporting()
@@ -1899,7 +1888,7 @@ func (t *tScreen) finalize() {
 }
 
 func (t *tScreen) StopQ() <-chan struct{} {
-	return t.quit
+	return t.stopQ
 }
 
 func (t *tScreen) EventQ() chan Event {

vendor/github.com/jesseduffield/gocui/text_area.go

@@ -11,59 +11,11 @@ const (
 	WORD_SEPARATORS = "*?_+-.[]~=/&;!#$%^(){}<>"
 )
 
-type CursorMapping struct {
-	Orig    int
-	Wrapped int
-}
-
 type TextArea struct {
-	content        []rune
-	wrappedContent []rune
-	cursorMapping  []CursorMapping
-	cursor         int
-	overwrite      bool
-	clipboard      string
-	AutoWrap       bool
-	AutoWrapWidth  int
-}
-
-func AutoWrapContent(content []rune, autoWrapWidth int) ([]rune, []CursorMapping) {
-	estimatedNumberOfSoftLineBreaks := len(content) / autoWrapWidth
-	cursorMapping := make([]CursorMapping, 0, estimatedNumberOfSoftLineBreaks)
-	wrappedContent := make([]rune, 0, len(content)+estimatedNumberOfSoftLineBreaks)
-	startOfLine := 0
-	indexOfLastWhitespace := -1
-
-	for currentPos, r := range content {
-		if r == '\n' {
-			wrappedContent = append(wrappedContent, content[startOfLine:currentPos+1]...)
-			startOfLine = currentPos + 1
-			indexOfLastWhitespace = -1
-		} else {
-			if r == ' ' {
-				indexOfLastWhitespace = currentPos + 1
-			} else if currentPos-startOfLine >= autoWrapWidth && indexOfLastWhitespace >= 0 {
-				wrapAt := indexOfLastWhitespace
-				wrappedContent = append(wrappedContent, content[startOfLine:wrapAt]...)
-				wrappedContent = append(wrappedContent, '\n')
-				cursorMapping = append(cursorMapping, CursorMapping{wrapAt, len(wrappedContent)})
-				startOfLine = wrapAt
-				indexOfLastWhitespace = -1
-			}
-		}
-	}
-
-	wrappedContent = append(wrappedContent, content[startOfLine:]...)
-
-	return wrappedContent, cursorMapping
-}
-
-func (self *TextArea) autoWrapContent() {
-	if self.AutoWrap {
-		self.wrappedContent, self.cursorMapping = AutoWrapContent(self.content, self.AutoWrapWidth)
-	} else {
-		self.wrappedContent, self.cursorMapping = self.content, []CursorMapping{}
-	}
+	content   []rune
+	cursor    int
+	overwrite bool
+	clipboard string
 }
 
 func (self *TextArea) TypeRune(r rune) {
@@ -75,7 +27,6 @@ func (self *TextArea) TypeRune(r rune) {
 			append([]rune{r}, self.content[self.cursor:]...)...,
 		)
 	}
-	self.autoWrapContent()
 
 	self.cursor++
 }
@@ -86,7 +37,6 @@ func (self *TextArea) BackSpaceChar() {
 	}
 
 	self.content = append(self.content[:self.cursor-1], self.content[self.cursor:]...)
-	self.autoWrapContent()
 	self.cursor--
 }
 
@@ -96,7 +46,6 @@ func (self *TextArea) DeleteChar() {
 	}
 
 	self.content = append(self.content[:self.cursor], self.content[self.cursor+1:]...)
-	self.autoWrapContent()
 }
 
 func (self *TextArea) MoveCursorLeft() {
@@ -174,10 +123,6 @@ func (self *TextArea) MoveCursorDown() {
 }
 
 func (self *TextArea) GetContent() string {
-	return string(self.wrappedContent)
-}
-
-func (self *TextArea) GetUnwrappedContent() string {
 	return string(self.content)
 }
 
@@ -199,24 +144,14 @@ func (self *TextArea) DeleteToStartOfLine() {
 
 		self.content = append(self.content[:self.cursor-1], self.content[self.cursor:]...)
 		self.cursor--
-		self.autoWrapContent()
 		return
 	}
 
-	// otherwise, if we're at a soft line start, skip left past the soft line
-	// break, so we'll end up deleting the previous line. This seems like the
-	// only reasonable behavior in this case, as you can't delete just the soft
-	// line break.
-	if self.atSoftLineStart() {
-		self.cursor--
-	}
-
 	// otherwise, you delete everything up to the start of the current line, without
 	// deleting the newline character
 	newlineIndex := self.closestNewlineOnLeft()
 	self.clipboard = string(self.content[newlineIndex+1 : self.cursor])
 	self.content = append(self.content[:newlineIndex+1], self.content[self.cursor:]...)
-	self.autoWrapContent()
 	self.cursor = newlineIndex + 1
 }
 
@@ -224,30 +159,18 @@ func (self *TextArea) DeleteToEndOfLine() {
 	if self.atEnd() {
 		return
 	}
-
-	// if we're at the end of the line, delete just the newline character
 	if self.atLineEnd() {
 		self.content = append(self.content[:self.cursor], self.content[self.cursor+1:]...)
-		self.autoWrapContent()
 		return
 	}
 
-	// otherwise, if we're at a soft line end, skip right past the soft line
-	// break, so we'll end up deleting the next line. This seems like the
-	// only reasonable behavior in this case, as you can't delete just the soft
-	// line break.
-	if self.atSoftLineEnd() {
-		self.cursor++
-	}
-
 	lineEndIndex := self.closestNewlineOnRight()
 	self.clipboard = string(self.content[self.cursor:lineEndIndex])
 	self.content = append(self.content[:self.cursor], self.content[lineEndIndex:]...)
-	self.autoWrapContent()
 }
 
 func (self *TextArea) GoToStartOfLine() {
-	if self.atSoftLineStart() {
+	if self.atLineStart() {
 		return
 	}
 
@@ -258,21 +181,15 @@ func (self *TextArea) GoToStartOfLine() {
 }
 
 func (self *TextArea) closestNewlineOnLeft() int {
-	wrappedCursor := self.origCursorToWrappedCursor(self.cursor)
-
 	newlineIndex := -1
 
-	for i, r := range self.wrappedContent[0:wrappedCursor] {
+	for i, r := range self.content[0:self.cursor] {
 		if r == '\n' {
 			newlineIndex = i
 		}
 	}
 
-	unwrappedNewlineIndex := self.wrappedCursorToOrigCursor(newlineIndex)
-	if unwrappedNewlineIndex >= 0 && self.content[unwrappedNewlineIndex] != '\n' {
-		unwrappedNewlineIndex--
-	}
-	return unwrappedNewlineIndex
+	return newlineIndex
 }
 
 func (self *TextArea) GoToEndOfLine() {
@@ -281,22 +198,12 @@ func (self *TextArea) GoToEndOfLine() {
 	}
 
 	self.cursor = self.closestNewlineOnRight()
-
-	// If the end of line is a soft line break, we need to move left by one so
-	// that we end up at the last whitespace before the line break. Otherwise
-	// we'd be at the start of the next line, since the newline character
-	// doesn't really exist in the real content.
-	if self.cursor < len(self.content) && self.content[self.cursor] != '\n' {
-		self.cursor--
-	}
 }
 
 func (self *TextArea) closestNewlineOnRight() int {
-	wrappedCursor := self.origCursorToWrappedCursor(self.cursor)
-
-	for i, r := range self.wrappedContent[wrappedCursor:] {
+	for i, r := range self.content[self.cursor:] {
 		if r == '\n' {
-			return self.wrappedCursorToOrigCursor(wrappedCursor + i)
+			return self.cursor + i
 		}
 	}
 
@@ -308,23 +215,11 @@ func (self *TextArea) atLineStart() bool {
 		(len(self.content) > self.cursor-1 && self.content[self.cursor-1] == '\n')
 }
 
-func (self *TextArea) atSoftLineStart() bool {
-	wrappedCursor := self.origCursorToWrappedCursor(self.cursor)
-	return wrappedCursor == 0 ||
-		(len(self.wrappedContent) > wrappedCursor-1 && self.wrappedContent[wrappedCursor-1] == '\n')
-}
-
 func (self *TextArea) atLineEnd() bool {
 	return self.atEnd() ||
 		(len(self.content) > self.cursor && self.content[self.cursor] == '\n')
 }
 
-func (self *TextArea) atSoftLineEnd() bool {
-	wrappedCursor := self.origCursorToWrappedCursor(self.cursor)
-	return wrappedCursor == len(self.wrappedContent) ||
-		(len(self.wrappedContent) > wrappedCursor+1 && self.wrappedContent[wrappedCursor+1] == '\n')
-}
-
 func (self *TextArea) BackSpaceWord() {
 	if self.cursor == 0 {
 		return
@@ -351,50 +246,16 @@ func (self *TextArea) BackSpaceWord() {
 
 	self.clipboard = string(self.content[self.cursor:right])
 	self.content = append(self.content[:self.cursor], self.content[right:]...)
-	self.autoWrapContent()
 }
 
 func (self *TextArea) Yank() {
 	self.TypeString(self.clipboard)
 }
 
-func origCursorToWrappedCursor(origCursor int, cursorMapping []CursorMapping) int {
-	prevMapping := CursorMapping{0, 0}
-	for _, mapping := range cursorMapping {
-		if origCursor < mapping.Orig {
-			break
-		}
-		prevMapping = mapping
-	}
-
-	return origCursor + prevMapping.Wrapped - prevMapping.Orig
-}
-
-func (self *TextArea) origCursorToWrappedCursor(origCursor int) int {
-	return origCursorToWrappedCursor(origCursor, self.cursorMapping)
-}
-
-func wrappedCursorToOrigCursor(wrappedCursor int, cursorMapping []CursorMapping) int {
-	prevMapping := CursorMapping{0, 0}
-	for _, mapping := range cursorMapping {
-		if wrappedCursor < mapping.Wrapped {
-			break
-		}
-		prevMapping = mapping
-	}
-
-	return wrappedCursor + prevMapping.Orig - prevMapping.Wrapped
-}
-
-func (self *TextArea) wrappedCursorToOrigCursor(wrappedCursor int) int {
-	return wrappedCursorToOrigCursor(wrappedCursor, self.cursorMapping)
-}
-
 func (self *TextArea) GetCursorXY() (int, int) {
 	cursorX := 0
 	cursorY := 0
-	wrappedCursor := self.origCursorToWrappedCursor(self.cursor)
-	for _, r := range self.wrappedContent[0:wrappedCursor] {
+	for _, r := range self.content[0:self.cursor] {
 		if r == '\n' {
 			cursorY++
 			cursorX = 0
@@ -417,15 +278,15 @@ func (self *TextArea) SetCursor2D(x int, y int) {
 	}
 
 	newCursor := 0
-	for _, r := range self.wrappedContent {
+	for _, r := range self.content {
 		if x <= 0 && y == 0 {
-			self.cursor = self.wrappedCursorToOrigCursor(newCursor)
+			self.cursor = newCursor
 			return
 		}
 
 		if r == '\n' {
 			if y == 0 {
-				self.cursor = self.wrappedCursorToOrigCursor(newCursor)
+				self.cursor = newCursor
 				return
 			}
 			y--
@@ -443,12 +304,11 @@ func (self *TextArea) SetCursor2D(x int, y int) {
 		return
 	}
 
-	self.cursor = self.wrappedCursorToOrigCursor(newCursor)
+	self.cursor = newCursor
 }
 
 func (self *TextArea) Clear() {
 	self.content = []rune{}
-	self.wrappedContent = []rune{}
 	self.cursor = 0
 }
 

vendor/github.com/rivo/uniseg/grapheme.go

@@ -13,10 +13,9 @@ import "unicode/utf8"
 // well as boundary information and character width is available via the various
 // methods (see examples below).
 //
-// This class basically wraps the [StepString] parser and provides a convenient
-// interface to it. If you are only interested in some parts of this package's
-// functionality, using the specialized functions starting with "First" is
-// almost always faster.
+// Using this class to iterate over a string is convenient but it is much slower
+// than using this package's [Step] or [StepString] functions or any of the
+// other specialized functions starting with "First".
 type Graphemes struct {
 	// The original string.
 	original string
@@ -253,14 +252,16 @@ func FirstGraphemeCluster(b []byte, state int) (cluster, rest []byte, width, new
 			return b[:length], b[length:], width, state | (prop << shiftGraphemePropState)
 		}
 
-		if firstProp == prExtendedPictographic {
+		if r == vs16 {
+			width = 2
+		} else if firstProp != prExtendedPictographic && firstProp != prRegionalIndicator && firstProp != prL {
+			width += runeWidth(r, prop)
+		} else if firstProp == prExtendedPictographic {
 			if r == vs15 {
 				width = 1
-			} else if r == vs16 {
+			} else {
 				width = 2
 			}
-		} else if firstProp != prRegionalIndicator && firstProp != prL {
-			width += runeWidth(r, prop)
 		}
 
 		length += l
@@ -313,14 +314,16 @@ func FirstGraphemeClusterInString(str string, state int) (cluster, rest string,
 			return str[:length], str[length:], width, state | (prop << shiftGraphemePropState)
 		}
 
-		if firstProp == prExtendedPictographic {
+		if r == vs16 {
+			width = 2
+		} else if firstProp != prExtendedPictographic && firstProp != prRegionalIndicator && firstProp != prL {
+			width += runeWidth(r, prop)
+		} else if firstProp == prExtendedPictographic {
 			if r == vs15 {
 				width = 1
-			} else if r == vs16 {
+			} else {
 				width = 2
 			}
-		} else if firstProp != prRegionalIndicator && firstProp != prL {
-			width += runeWidth(r, prop)
 		}
 
 		length += l

vendor/github.com/rivo/uniseg/step.go

@@ -150,14 +150,16 @@ func Step(b []byte, state int) (cluster, rest []byte, boundaries int, newState i
 			return b[:length], b[length:], boundary, graphemeState | (wordState << shiftWordState) | (sentenceState << shiftSentenceState) | (lineState << shiftLineState) | (prop << shiftPropState)
 		}
 
-		if firstProp == prExtendedPictographic {
+		if r == vs16 {
+			width = 2
+		} else if firstProp != prExtendedPictographic && firstProp != prRegionalIndicator && firstProp != prL {
+			width += runeWidth(r, prop)
+		} else if firstProp == prExtendedPictographic {
 			if r == vs15 {
 				width = 1
-			} else if r == vs16 {
+			} else {
 				width = 2
 			}
-		} else if firstProp != prRegionalIndicator && firstProp != prL {
-			width += runeWidth(r, prop)
 		}
 
 		length += l
@@ -224,14 +226,16 @@ func StepString(str string, state int) (cluster, rest string, boundaries int, ne
 			return str[:length], str[length:], boundary, graphemeState | (wordState << shiftWordState) | (sentenceState << shiftSentenceState) | (lineState << shiftLineState) | (prop << shiftPropState)
 		}
 
-		if firstProp == prExtendedPictographic {
+		if r == vs16 {
+			width = 2
+		} else if firstProp != prExtendedPictographic && firstProp != prRegionalIndicator && firstProp != prL {
+			width += runeWidth(r, prop)
+		} else if firstProp == prExtendedPictographic {
 			if r == vs15 {
 				width = 1
-			} else if r == vs16 {
+			} else {
 				width = 2
 			}
-		} else if firstProp != prRegionalIndicator && firstProp != prL {
-			width += runeWidth(r, prop)
 		}
 
 		length += l

vendor/golang.org/x/sys/unix/aliases.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+//go:build (aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos) && go1.9
 
 package unix