diff options
-rw-r--r-- | go.mod | 1 | ||||
-rw-r--r-- | go.sum | 3 | ||||
-rw-r--r-- | lib/ui/ui.go | 1 | ||||
-rw-r--r-- | main.go | 28 |
4 files changed, 1 insertions, 32 deletions
@@ -30,7 +30,6 @@ require ( github.com/riywo/loginshell v0.0.0-20200815045211-7d26008be1ab github.com/stretchr/testify v1.8.4 github.com/syndtr/goleveldb v1.0.0 - github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e golang.org/x/image v0.13.0 golang.org/x/oauth2 v0.7.0 golang.org/x/sys v0.15.0 @@ -145,10 +145,7 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= -github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= -github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc= golang.org/x/image v0.13.0 h1:3cge/F/QTkNLauhf2QoE9zp+7sr+ZcL4HnoZmdwg9sg= golang.org/x/image v0.13.0/go.mod h1:6mmbMOeV28HuMTgA6OSRkdXKYw/t5W9Uwn2Yv1r3Yxk= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= diff --git a/lib/ui/ui.go b/lib/ui/ui.go index a7233f49..ce0a7e93 100644 --- a/lib/ui/ui.go +++ b/lib/ui/ui.go @@ -63,6 +63,7 @@ func Initialize(content DrawableInteractive) error { state.content = content state.vx = vx state.ctx = NewContext(state.vx, onPopover) + vx.SetTitle("aerc") Invalidate() if beeper, ok := content.(DrawableInteractiveBeeper); ok { @@ -1,7 +1,6 @@ package main import ( - "bytes" "context" "errors" "fmt" @@ -14,8 +13,6 @@ import ( "time" "git.sr.ht/~rjarry/go-opt" - "github.com/mattn/go-isatty" - "github.com/xo/terminfo" "git.sr.ht/~rjarry/aerc/app" "git.sr.ht/~rjarry/aerc/commands" @@ -98,27 +95,6 @@ func buildInfo() string { return info } -func setWindowTitle() { - log.Tracef("Parsing terminfo") - ti, err := terminfo.LoadFromEnv() - if err != nil { - log.Warnf("Cannot get terminfo: %v", err) - return - } - - if !ti.Has(terminfo.HasStatusLine) { - log.Infof("Terminal does not have status line support") - return - } - - log.Debugf("Setting terminal title") - buf := new(bytes.Buffer) - ti.Fprintf(buf, terminfo.ToStatusLine) - fmt.Fprint(buf, "aerc") - ti.Fprintf(buf, terminfo.FromStatusLine) - os.Stderr.Write(buf.Bytes()) -} - type Opts struct { Help bool `opt:"-h" action:"ShowHelp"` Version bool `opt:"-v" action:"ShowVersion"` @@ -248,10 +224,6 @@ func main() { } } - if isatty.IsTerminal(os.Stderr.Fd()) { - setWindowTitle() - } - go func() { defer log.PanicHandler() err := hooks.RunHook(&hooks.AercStartup{Version: Version}) |