Import stefanhaller's tcell fork for real rather than just replacing it (#2888)

go.mod

@@ -9,14 +9,13 @@ 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.6.0
 	github.com/go-errors/errors v1.4.2
 	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.20230802092815-ae0a5c181634
+	github.com/jesseduffield/gocui v0.3.1-0.20230806095321-ac7b03108825
 	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
@@ -34,6 +33,7 @@ require (
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/afero v1.9.5
 	github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad
+	github.com/stefanhaller/tcell/v2 v2.6.2-0.20230806061358-2dfa11eddb68
 	github.com/stretchr/testify v1.8.0
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778
 	golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8
@@ -67,10 +67,8 @@ require (
 	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.10.0 // indirect
-	golang.org/x/term v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/term v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
-
-replace github.com/gdamore/tcell/v2 v2.6.0 => github.com/stefanhaller/tcell/v2 v2.6.1

go.sum

@@ -179,8 +179,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.20230802092815-ae0a5c181634 h1:tL9DS59Po4kw1fR+wFn0zUYQhrgxMskTatLcYQl7MMU=
-github.com/jesseduffield/gocui v0.3.1-0.20230802092815-ae0a5c181634/go.mod h1:pArPLsN1+S6jDrBDukTkpnH89rdhw44wzKdXFICGH3Q=
+github.com/jesseduffield/gocui v0.3.1-0.20230806095321-ac7b03108825 h1:4Ea8qV/BbZAGcXd8MAufDsbwwfz2pbRZdqIodC/XHZs=
+github.com/jesseduffield/gocui v0.3.1-0.20230806095321-ac7b03108825/go.mod h1:trXE7RRGL2hTsv+Ntk+SHLtRobg9JE138n3Ug/X2Cf4=
 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=
@@ -268,8 +268,8 @@ github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
 github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad h1:fiWzISvDn0Csy5H0iwgAuJGQTUpVfEMJJd4nRFXogbc=
 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
-github.com/stefanhaller/tcell/v2 v2.6.1 h1:Qo4k5SOUc09q9xyA8juH4jFJy+neM9aQwJHgVO2/zBM=
-github.com/stefanhaller/tcell/v2 v2.6.1/go.mod h1:PuJ7T6QKbsU7iVOHlhRoV3D/ipIAJsyiV4dbwcVaYj8=
+github.com/stefanhaller/tcell/v2 v2.6.2-0.20230806061358-2dfa11eddb68 h1:NSTj9xAKUu85d6pAdNFyblL84BfiOB1rVnzxQO/cYUk=
+github.com/stefanhaller/tcell/v2 v2.6.2-0.20230806061358-2dfa11eddb68/go.mod h1:PuJ7T6QKbsU7iVOHlhRoV3D/ipIAJsyiV4dbwcVaYj8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
@@ -451,13 +451,13 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 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.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 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.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
-golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
+golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0=
+golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
 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=
@@ -467,8 +467,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
+golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

pkg/gui/gui_driver.go

@@ -6,13 +6,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gdamore/tcell/v2"
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	integrationTypes "github.com/jesseduffield/lazygit/pkg/integration/types"
+	"github.com/stefanhaller/tcell/v2"
 )
 
 // this gives our integration test a way of interacting with the gui for sending keypresses

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

@@ -1,58 +0,0 @@
-// 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.
-// You may obtain a copy of the license at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package extended contains an extended set of terminal descriptions.
-// Applications desiring to have a better chance of Just Working by
-// default should include this package.  This will significantly increase
-// the size of the program.
-package extended
-
-import (
-	// The following imports just register themselves --
-	// these are the terminal types we aggregate in this package.
-	_ "github.com/gdamore/tcell/v2/terminfo/a/aixterm"
-	_ "github.com/gdamore/tcell/v2/terminfo/a/alacritty"
-	_ "github.com/gdamore/tcell/v2/terminfo/a/ansi"
-	_ "github.com/gdamore/tcell/v2/terminfo/b/beterm"
-	_ "github.com/gdamore/tcell/v2/terminfo/c/cygwin"
-	_ "github.com/gdamore/tcell/v2/terminfo/d/dtterm"
-	_ "github.com/gdamore/tcell/v2/terminfo/e/emacs"
-	_ "github.com/gdamore/tcell/v2/terminfo/f/foot"
-	_ "github.com/gdamore/tcell/v2/terminfo/g/gnome"
-	_ "github.com/gdamore/tcell/v2/terminfo/h/hpterm"
-	_ "github.com/gdamore/tcell/v2/terminfo/k/konsole"
-	_ "github.com/gdamore/tcell/v2/terminfo/k/kterm"
-	_ "github.com/gdamore/tcell/v2/terminfo/l/linux"
-	_ "github.com/gdamore/tcell/v2/terminfo/p/pcansi"
-	_ "github.com/gdamore/tcell/v2/terminfo/r/rxvt"
-	_ "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"
-	_ "github.com/gdamore/tcell/v2/terminfo/v/vt220"
-	_ "github.com/gdamore/tcell/v2/terminfo/v/vt320"
-	_ "github.com/gdamore/tcell/v2/terminfo/v/vt400"
-	_ "github.com/gdamore/tcell/v2/terminfo/v/vt420"
-	_ "github.com/gdamore/tcell/v2/terminfo/v/vt52"
-	_ "github.com/gdamore/tcell/v2/terminfo/w/wy50"
-	_ "github.com/gdamore/tcell/v2/terminfo/w/wy60"
-	_ "github.com/gdamore/tcell/v2/terminfo/w/wy99_ansi"
-	_ "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/jesseduffield/gocui/attribute.go

@@ -4,7 +4,7 @@
 
 package gocui
 
-import "github.com/gdamore/tcell/v2"
+import "github.com/stefanhaller/tcell/v2"
 
 // Attribute affects the presentation of characters, such as color, boldness, etc.
 type Attribute uint64

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

@@ -12,9 +12,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gdamore/tcell/v2"
 	"github.com/go-errors/errors"
 	"github.com/mattn/go-runewidth"
+	"github.com/stefanhaller/tcell/v2"
 )
 
 // OutputMode represents an output mode, which determines how colors

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

@@ -7,7 +7,7 @@ package gocui
 import (
 	"strings"
 
-	"github.com/gdamore/tcell/v2"
+	"github.com/stefanhaller/tcell/v2"
 )
 
 // Key represents special keys or keys combinations.

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

@@ -5,8 +5,8 @@
 package gocui
 
 import (
-	"github.com/gdamore/tcell/v2"
 	"github.com/mattn/go-runewidth"
+	"github.com/stefanhaller/tcell/v2"
 )
 
 // We probably don't want this being a global variable for YOLO for now

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

@@ -13,9 +13,9 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/gdamore/tcell/v2"
 	"github.com/go-errors/errors"
 	"github.com/mattn/go-runewidth"
+	"github.com/stefanhaller/tcell/v2"
 )
 
 // Constants for overlapping edges

vendor/github.com/stefanhaller/tcell/v2/TUTORIAL.md

@@ -172,7 +172,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/gdamore/tcell/v2"
+	"github.com/stefanhaller/tcell/v2"
 )
 
 func drawText(s tcell.Screen, x1, y1, x2, y2 int, style tcell.Style, text string) {

vendor/github.com/stefanhaller/tcell/v2/errors.go

@@ -18,7 +18,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/gdamore/tcell/v2/terminfo"
+	"github.com/stefanhaller/tcell/v2/terminfo"
 )
 
 var (

vendor/github.com/stefanhaller/tcell/v2/terminfo/a/aixterm/term.go

@@ -2,7 +2,7 @@
 
 package aixterm
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

vendor/github.com/stefanhaller/tcell/v2/terminfo/a/alacritty/direct.go

@@ -2,7 +2,7 @@
 
 package alacritty
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package alacritty
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

vendor/github.com/stefanhaller/tcell/v2/terminfo/a/ansi/term.go

@@ -2,7 +2,7 @@
 
 package ansi
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

vendor/github.com/stefanhaller/tcell/v2/terminfo/b/beterm/term.go

@@ -2,7 +2,7 @@
 
 package beterm
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

vendor/github.com/stefanhaller/tcell/v2/terminfo/base/base.go

@@ -24,9 +24,9 @@ package base
 import (
 	// The following imports just register themselves --
 	// thse are the terminal types we aggregate in this package.
-	_ "github.com/gdamore/tcell/v2/terminfo/a/ansi"
-	_ "github.com/gdamore/tcell/v2/terminfo/v/vt100"
-	_ "github.com/gdamore/tcell/v2/terminfo/v/vt102"
-	_ "github.com/gdamore/tcell/v2/terminfo/v/vt220"
-	_ "github.com/gdamore/tcell/v2/terminfo/x/xterm"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/a/ansi"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt100"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt102"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt220"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/x/xterm"
 )

vendor/github.com/stefanhaller/tcell/v2/terminfo/c/cygwin/term.go

@@ -2,7 +2,7 @@
 
 package cygwin
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package dtterm
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

vendor/github.com/stefanhaller/tcell/v2/terminfo/dynamic/dynamic.go

@@ -29,7 +29,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/gdamore/tcell/v2/terminfo"
+	"github.com/stefanhaller/tcell/v2/terminfo"
 )
 
 type termcap struct {

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

@@ -2,7 +2,7 @@
 
 package emacs
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -0,0 +1,58 @@
+// 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.
+// You may obtain a copy of the license at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package extended contains an extended set of terminal descriptions.
+// Applications desiring to have a better chance of Just Working by
+// default should include this package.  This will significantly increase
+// the size of the program.
+package extended
+
+import (
+	// The following imports just register themselves --
+	// these are the terminal types we aggregate in this package.
+	_ "github.com/stefanhaller/tcell/v2/terminfo/a/aixterm"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/a/alacritty"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/a/ansi"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/b/beterm"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/c/cygwin"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/d/dtterm"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/e/emacs"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/f/foot"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/g/gnome"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/h/hpterm"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/k/konsole"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/k/kterm"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/l/linux"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/p/pcansi"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/r/rxvt"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/s/screen"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/s/simpleterm"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/s/sun"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/t/termite"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/t/tmux"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt100"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt102"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt220"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt320"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt400"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt420"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/v/vt52"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/w/wy50"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/w/wy60"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/w/wy99_ansi"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/x/xfce"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/x/xterm"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/x/xterm_kitty"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/x/xterm_termite"
+)

vendor/github.com/stefanhaller/tcell/v2/terminfo/f/foot/foot.go

@@ -2,7 +2,7 @@
 
 package foot
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package gnome
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package hpterm
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package konsole
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package kterm
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package linux
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package pcansi
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package rxvt
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package screen
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package simpleterm
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

vendor/github.com/stefanhaller/tcell/v2/terminfo/s/sun/term.go

@@ -20,7 +20,7 @@
 
 package sun
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package termite
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package tmux
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package vt100
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package vt102
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package vt220
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package vt320
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package vt400
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package vt420
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package vt52
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

vendor/github.com/stefanhaller/tcell/v2/terminfo/w/wy50/term.go

@@ -2,7 +2,7 @@
 
 package wy50
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package wy60
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package wy99_ansi
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package xfce
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

vendor/github.com/stefanhaller/tcell/v2/terminfo/x/xterm/direct.go

@@ -20,7 +20,7 @@
 
 package xterm
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package xterm
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package xterm_kitty
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

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

@@ -2,7 +2,7 @@
 
 package xterm_termite
 
-import "github.com/gdamore/tcell/v2/terminfo"
+import "github.com/stefanhaller/tcell/v2/terminfo"
 
 func init() {
 

vendor/github.com/stefanhaller/tcell/v2/terms_default.go

@@ -20,5 +20,5 @@ package tcell
 import (
 	// This imports the default terminal entries.  To disable, use the
 	// tcell_minimal build tag.
-	_ "github.com/gdamore/tcell/v2/terminfo/extended"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/extended"
 )

vendor/github.com/stefanhaller/tcell/v2/terms_dynamic.go

@@ -25,8 +25,8 @@ import (
 	// also don't support Android here, because you really don't want
 	// to run external programs there.  Generally the android terminals
 	// will be automatically included anyway.
-	"github.com/gdamore/tcell/v2/terminfo"
-	"github.com/gdamore/tcell/v2/terminfo/dynamic"
+	"github.com/stefanhaller/tcell/v2/terminfo"
+	"github.com/stefanhaller/tcell/v2/terminfo/dynamic"
 )
 
 func loadDynamicTerminfo(term string) (*terminfo.Terminfo, error) {

vendor/github.com/stefanhaller/tcell/v2/terms_static.go

@@ -20,7 +20,7 @@ package tcell
 import (
 	"errors"
 
-	"github.com/gdamore/tcell/v2/terminfo"
+	"github.com/stefanhaller/tcell/v2/terminfo"
 )
 
 func loadDynamicTerminfo(_ string) (*terminfo.Terminfo, error) {

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

@@ -31,10 +31,10 @@ import (
 	"golang.org/x/term"
 	"golang.org/x/text/transform"
 
-	"github.com/gdamore/tcell/v2/terminfo"
+	"github.com/stefanhaller/tcell/v2/terminfo"
 
 	// import the stock terminals
-	_ "github.com/gdamore/tcell/v2/terminfo/base"
+	_ "github.com/stefanhaller/tcell/v2/terminfo/base"
 )
 
 // NewTerminfoScreen returns a Screen that uses the stock TTY interface

vendor/golang.org/x/sys/unix/mkerrors.sh

@@ -624,7 +624,7 @@ ccflags="$@"
 		$2 ~ /^MEM/ ||
 		$2 ~ /^WG/ ||
 		$2 ~ /^FIB_RULE_/ ||
-		$2 ~ /^BLK[A-Z]*(GET$|SET$|BUF$|PART$|SIZE)/ {printf("\t%s = C.%s\n", $2, $2)}
+		$2 ~ /^BLK[A-Z]*(GET$|SET$|BUF$|PART$|SIZE|IOMIN$|IOOPT$|ALIGNOFF$|DISCARD|ROTATIONAL$|ZEROOUT$|GETDISKSEQ$)/ {printf("\t%s = C.%s\n", $2, $2)}
 		$2 ~ /^__WCOREFLAG$/ {next}
 		$2 ~ /^__W[A-Z0-9]+$/ {printf("\t%s = C.%s\n", substr($2,3), $2)}
 

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

@@ -0,0 +1,14 @@
+// Copyright 2023 The Go Authors. All rights reserved.
+// 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 || openbsd || solaris
+// +build aix darwin dragonfly freebsd openbsd solaris
+
+package unix
+
+var mapper = &mmapper{
+	active: make(map[*byte][]byte),
+	mmap:   mmap,
+	munmap: munmap,
+}

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

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build linux || netbsd
+// +build linux netbsd
 
 package unix
 
@@ -14,8 +14,17 @@ type mremapMmapper struct {
 	mremap func(oldaddr uintptr, oldlength uintptr, newlength uintptr, flags int, newaddr uintptr) (xaddr uintptr, err error)
 }
 
+var mapper = &mremapMmapper{
+	mmapper: mmapper{
+		active: make(map[*byte][]byte),
+		mmap:   mmap,
+		munmap: munmap,
+	},
+	mremap: mremap,
+}
+
 func (m *mremapMmapper) Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) {
-	if newLength <= 0 || len(oldData) == 0 || len(oldData) != cap(oldData) || flags&MREMAP_FIXED != 0 {
+	if newLength <= 0 || len(oldData) == 0 || len(oldData) != cap(oldData) || flags&mremapFixed != 0 {
 		return nil, EINVAL
 	}
 
@@ -32,9 +41,13 @@ func (m *mremapMmapper) Mremap(oldData []byte, newLength int, flags int) (data [
 	}
 	bNew := unsafe.Slice((*byte)(unsafe.Pointer(newAddr)), newLength)
 	pNew := &bNew[cap(bNew)-1]
-	if flags&MREMAP_DONTUNMAP == 0 {
+	if flags&mremapDontunmap == 0 {
 		delete(m.active, pOld)
 	}
 	m.active[pNew] = bNew
 	return bNew, nil
 }
+
+func Mremap(oldData []byte, newLength int, flags int) (data []byte, err error) {
+	return mapper.Mremap(oldData, newLength, flags)
+}