Use upstream tcell

tulir · Feb 21, 2024 · 5017f77 · 5017f77
1 parent 562ac8f
commit 5017f77
Show file tree

Hide file tree

Showing 21 changed files with 41 additions and 36 deletions.
diff --git a/application.go b/application.go
@@ -15,7 +15,7 @@ import (
 	"sync"
 	"time"
 
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 type Component interface {

diff --git a/box.go b/box.go
@@ -8,7 +8,7 @@
 package mauview
 
 import (
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 type KeyCaptureFunc func(event KeyEvent) KeyEvent

diff --git a/button.go b/button.go
@@ -8,7 +8,7 @@
 package mauview
 
 import (
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 type Button struct {

diff --git a/center.go b/center.go
@@ -8,7 +8,7 @@
 package mauview
 
 import (
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 type FractionalCenterer struct {

diff --git a/eventhandler.go b/eventhandler.go
@@ -8,7 +8,7 @@
 package mauview
 
 import (
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 // KeyEvent is an interface of the *tcell.EventKey type.

diff --git a/flex.go b/flex.go
@@ -8,7 +8,7 @@
 package mauview
 
 import (
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 type FlexDirection int

diff --git a/form.go b/form.go
@@ -8,7 +8,7 @@
 package mauview
 
 import (
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 type Form struct {

diff --git a/go.mod b/go.mod
@@ -3,16 +3,16 @@ module go.mau.fi/mauview
 go 1.18
 
 require (
-	github.com/mattn/go-runewidth v0.0.14
-	github.com/rivo/uniseg v0.4.2
+	github.com/gdamore/tcell/v2 v2.4.0
+	github.com/mattn/go-runewidth v0.0.15
+	github.com/rivo/uniseg v0.4.3
 	github.com/zyedidia/clipboard v1.0.4
-	go.mau.fi/tcell v0.4.0
 )
 
 require (
 	github.com/gdamore/encoding v1.0.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	golang.org/x/sys v0.2.0 // indirect
-	golang.org/x/term v0.2.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/term v0.17.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,20 +1,25 @@
 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.4.0 h1:W6dxJEmaxYvhICFoTY3WrLLEXsQ11SaFnKGVEXW57KM=
+github.com/gdamore/tcell/v2 v2.4.0/go.mod h1:cTTuF84Dlj/RqmaCIV5p4w8uG1zWdk0SF6oBpwHp4fU=
+github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
-github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8=
-github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
+github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/zyedidia/clipboard v1.0.4 h1:r6GUQOyPtIaApRLeD56/U+2uJbXis6ANGbKWCljULEo=
 github.com/zyedidia/clipboard v1.0.4/go.mod h1:zykFnZUXX0ErxqvYLUFEq7QDJKId8rmh2FgD0/Y8cjA=
-go.mau.fi/tcell v0.4.0 h1:IPFKhkzF3yZkcRYjzgYBWWiW0JWPTwEBoXlWTBT8o/4=
-go.mau.fi/tcell v0.4.0/go.mod h1:77zV/6KL4Zip1u9ndjswACmu/LWwZ/oe3BE188uWMrA=
-golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM=
-golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
diff --git a/grid.go b/grid.go
@@ -8,7 +8,7 @@
 package mauview
 
 import (
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 type gridChild struct {

diff --git a/inputarea.go b/inputarea.go
@@ -14,7 +14,7 @@ import (
 	"github.com/mattn/go-runewidth"
 	"github.com/zyedidia/clipboard"
 
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 // InputArea is a multi-line user-editable text area.

diff --git a/inputfield.go b/inputfield.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/mattn/go-runewidth"
 
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 // InputField is a single-line user-editable text field.

diff --git a/main b/main
diff --git a/mauview-test/main.go b/mauview-test/main.go
@@ -8,7 +8,7 @@
 package main
 
 import (
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 
 	"go.mau.fi/mauview"
 )

diff --git a/progress.go b/progress.go
@@ -12,7 +12,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 type ProgressBar struct {

diff --git a/screen.go b/screen.go
@@ -8,7 +8,7 @@
 package mauview
 
 import (
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 // Screen is a subset of the tcell Screen.

diff --git a/semigraphics.go b/semigraphics.go
@@ -4,7 +4,7 @@
 
 package mauview
 
-import "go.mau.fi/tcell"
+import "github.com/gdamore/tcell/v2"
 
 // Semigraphics provides an easy way to access unicode characters for drawing.
 //

diff --git a/styles.go b/styles.go
@@ -4,7 +4,7 @@
 
 package mauview
 
-import "go.mau.fi/tcell"
+import "github.com/gdamore/tcell/v2"
 
 // Styles defines various colors used when primitives are initialized. These
 // may be changed to accommodate a different look and feel.

diff --git a/textfield.go b/textfield.go
@@ -10,7 +10,7 @@ package mauview
 import (
 	"sync"
 
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 type TextField struct {

diff --git a/textview.go b/textview.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/mattn/go-runewidth"
 
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 // TabSize is the number of spaces with which a tab character will be replaced.

diff --git a/util.go b/util.go
@@ -13,7 +13,7 @@ import (
 	"github.com/mattn/go-runewidth"
 	"github.com/rivo/uniseg"
 
-	"go.mau.fi/tcell"
+	"github.com/gdamore/tcell/v2"
 )
 
 // Text alignment within a box.
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ import ( @@
     	"sync"
     	"time"
-    	"go.mau.fi/tcell"
+    	"github.com/gdamore/tcell/v2"
     )
     type Component interface {
@@ Expand Down @@