chore!: change to use v3 of Tcell

app.go

@@ -268,7 +268,7 @@ func (app *app) loop() {
 		serverChan = readExpr()
 	}
 
-	app.ui.readExpr()
+	go app.ui.readEvents()
 
 	if gConfigPath != "" {
 		if _, err := os.Stat(gConfigPath); !os.IsNotExist(err) {

client.go

@@ -11,7 +11,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gdamore/tcell/v2"
+	"github.com/gdamore/tcell/v3"
 )
 
 type State struct {

colors.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/gdamore/tcell/v2"
+	"github.com/gdamore/tcell/v3"
 )
 
 type styleMap struct {

colors_test.go

@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	"github.com/gdamore/tcell/v2"
+	"github.com/gdamore/tcell/v3"
 )
 
 func TestParseColor(t *testing.T) {

doc.md

@@ -236,7 +236,7 @@ The following Command-line mode commands are provided by lf:
 	cmd-home                 (default '<c-a>' and '<home>')
 	cmd-end                  (default '<c-e>' and '<end>')
 	cmd-delete               (default '<c-d>' and '<delete>')
-	cmd-delete-back          (default '<backspace>' and '<backspace2>')
+	cmd-delete-back          (default '<backspace>')
 	cmd-delete-home          (default '<c-u>')
 	cmd-delete-end           (default '<c-k>')
 	cmd-delete-unix-word     (default '<c-w>')
@@ -246,7 +246,7 @@ The following Command-line mode commands are provided by lf:
 	cmd-word                 (default '<a-f>')
 	cmd-word-back            (default '<a-b>')
 	cmd-delete-word          (default '<a-d>')
-	cmd-delete-word-back     (default '<a-backspace>' and '<a-backspace2>')
+	cmd-delete-word-back     (default '<a-backspace>')
 	cmd-capitalize-word      (default '<a-c>')
 	cmd-uppercase-word       (default '<a-u>')
 	cmd-lowercase-word       (default '<a-l>')
@@ -798,7 +798,7 @@ Move the cursor to the beginning/end of the line.
 
 Delete the next character.
 
-## cmd-delete-back (default `<backspace>` and `<backspace2>`)
+## cmd-delete-back (default `<backspace>`)
 
 Delete the previous character.
 When at the beginning of a prompt, returns either to Normal mode or to `:` mode.
@@ -827,7 +827,7 @@ Move the cursor by one word in the forward/backward direction.
 
 Delete the next word in the forward direction.
 
-## cmd-delete-word-back (default `<a-backspace>` and `<a-backspace2>`)
+## cmd-delete-word-back (default `<a-backspace>`)
 
 Delete the previous word in the backward direction.
 

doc.txt

@@ -248,7 +248,7 @@ The following Command-line mode commands are provided by lf:
     cmd-home                 (default '<c-a>' and '<home>')
     cmd-end                  (default '<c-e>' and '<end>')
     cmd-delete               (default '<c-d>' and '<delete>')
-    cmd-delete-back          (default '<backspace>' and '<backspace2>')
+    cmd-delete-back          (default '<backspace>')
     cmd-delete-home          (default '<c-u>')
     cmd-delete-end           (default '<c-k>')
     cmd-delete-unix-word     (default '<c-w>')
@@ -258,7 +258,7 @@ The following Command-line mode commands are provided by lf:
     cmd-word                 (default '<a-f>')
     cmd-word-back            (default '<a-b>')
     cmd-delete-word          (default '<a-d>')
-    cmd-delete-word-back     (default '<a-backspace>' and '<a-backspace2>')
+    cmd-delete-word-back     (default '<a-backspace>')
     cmd-capitalize-word      (default '<a-c>')
     cmd-uppercase-word       (default '<a-u>')
     cmd-lowercase-word       (default '<a-l>')
@@ -848,7 +848,7 @@ cmd-delete (default <c-d> and <delete>)
 
 Delete the next character.
 
-cmd-delete-back (default <backspace> and <backspace2>)
+cmd-delete-back (default <backspace>)
 
 Delete the previous character. When at the beginning of a prompt,
 returns either to Normal mode or to : mode.
@@ -877,7 +877,7 @@ cmd-delete-word (default <a-d>)
 
 Delete the next word in the forward direction.
 
-cmd-delete-word-back (default <a-backspace> and <a-backspace2>)
+cmd-delete-word-back (default <a-backspace>)
 
 Delete the previous word in the backward direction.
 

eval.go

@@ -14,7 +14,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/gdamore/tcell/v2"
+	"github.com/gdamore/tcell/v3"
 )
 
 func applyBoolOpt(opt *bool, e *setExpr) error {
@@ -1713,7 +1713,7 @@ func (e *callExpr) eval(app *app, _ []string) {
 		}
 		log.Println("pushing keys", e.args[0])
 		for _, val := range splitKeys(e.args[0]) {
-			app.ui.keyChan <- val
+			app.ui.evChan <- parseKey(val)
 		}
 	case "addcustominfo":
 		var k, v string

go.mod

@@ -5,15 +5,17 @@ go 1.24.0
 require (
 	github.com/djherbis/times v1.6.0
 	github.com/fsnotify/fsnotify v1.9.0
-	github.com/gdamore/tcell/v2 v2.9.0
+	github.com/gdamore/tcell/v3 v3.0.2
 	github.com/mattn/go-runewidth v0.0.19
 	golang.org/x/sys v0.38.0
 	golang.org/x/term v0.37.0
 )
 
 require (
-	github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
+	github.com/clipperhouse/stringish v0.1.1 // indirect
+	github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
 	github.com/gdamore/encoding v1.0.1 // indirect
 	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
-	golang.org/x/text v0.29.0 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	golang.org/x/text v0.31.0 // indirect
 )

go.sum

@@ -1,17 +1,25 @@
+github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
+github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
 github.com/clipperhouse/uax29/v2 v2.2.0 h1:ChwIKnQN3kcZteTXMgb1wztSgaU+ZemkgWdohwgs8tY=
 github.com/clipperhouse/uax29/v2 v2.2.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
+github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
+github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
 github.com/djherbis/times v1.6.0 h1:w2ctJ92J8fBvWPxugmXIv7Nz7Q3iDMKNx9v5ocVH20c=
 github.com/djherbis/times v1.6.0/go.mod h1:gOHeRAz2h+VJNZ5Gmc/o7iD9k4wW7NMVqieYCY99oc0=
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw=
 github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
-github.com/gdamore/tcell/v2 v2.9.0 h1:N6t+eqK7/xwtRPwxzs1PXeRWnm0H9l02CrgJ7DLn1ys=
-github.com/gdamore/tcell/v2 v2.9.0/go.mod h1:8/ZoqM9rxzYphT9tH/9LnunhV9oPBqwS8WHGYm5nrmo=
+github.com/gdamore/tcell/v3 v3.0.0 h1:Ycu66eWmaUD/AFqV1pfE4sseUo0H9TlIcaaAcnMC968=
+github.com/gdamore/tcell/v3 v3.0.0/go.mod h1:OoJxRXVKR7ROCFzAIUkHHy/7mWTkz9sNfWLhdEsNHVM=
+github.com/gdamore/tcell/v3 v3.0.2 h1:1sM7T9uc/iqQiJCliTBuqGcWAWksI355ejAfkPYHmVs=
+github.com/gdamore/tcell/v3 v3.0.2/go.mod h1:OoJxRXVKR7ROCFzAIUkHHy/7mWTkz9sNfWLhdEsNHVM=
 github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
 github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
 github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -43,8 +51,8 @@ golang.org/x/text v0.3.3/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.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
-golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

icons.go

@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/gdamore/tcell/v2"
+	"github.com/gdamore/tcell/v3"
 )
 
 type iconDef struct {