Bump Ultraviolet and update input handling (#1493)

* feat(core): use uv input scanner

* chore: bump ultraviolet

* feat(input): use uv new input api

* chore: update ultraviolet dependency

* chore: bump ultraviolet to v0.0.0-20250810001545-aa2a3c4457a6 to fix esc
timeout

* chore: bump: update ultraviolet to v0.0.0-20250811190745-12cb2616ad77

* feat: enable Win32 Input Mode on Windows to get paste support

* chore: bump ultraviolet to a28b1e47903f to fix win32-input-mode paste

* Revert "feat: enable Win32 Input Mode on Windows to get paste support"

This reverts commit 6c5845ae7a.

* chore: bump ultraviolet to fix win32-input-mode issues

* fix(termios): windows console optimizations
This commit is contained in:
Ayman Bagabas 2025-09-09 16:30:16 -04:00 committed by GitHub
parent 5cc219db88
commit 0db2eabd6d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 59 additions and 54 deletions

View file

@ -7,7 +7,7 @@ replace github.com/charmbracelet/bubbletea/v2 => ../
require (
github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250526131538-b3f0c9e42318
github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.1.0.20250420102230-7ecd51915026
github.com/charmbracelet/colorprofile v0.3.1
github.com/charmbracelet/colorprofile v0.3.2
github.com/charmbracelet/glamour/v2 v2.0.0-20250513163904-eeeced3bb3c6
github.com/charmbracelet/harmonica v0.2.0
github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20250716211347-10c048e36112
@ -25,13 +25,13 @@ require (
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aymanbagabas/go-udiff v0.2.0 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/charmbracelet/ultraviolet v0.0.0-20250805213125-4167e4d7080b // indirect
github.com/charmbracelet/ultraviolet v0.0.0-20250909162800-526253ea8b6f // indirect
github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa // indirect
github.com/charmbracelet/x/exp/golden v0.0.0-20250207160936-21c02780d27a // indirect
github.com/charmbracelet/x/exp/slice v0.0.0-20250327172914-2fdc97757edf // indirect
github.com/charmbracelet/x/term v0.2.1 // indirect
github.com/charmbracelet/x/termios v0.1.1 // indirect
github.com/charmbracelet/x/windows v0.2.1 // indirect
github.com/charmbracelet/x/windows v0.2.2 // indirect
github.com/dlclark/regexp2 v1.11.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/gorilla/css v1.0.1 // indirect
@ -44,7 +44,7 @@ require (
github.com/yuin/goldmark v1.7.8 // indirect
github.com/yuin/goldmark-emoji v1.0.5 // indirect
golang.org/x/net v0.39.0 // indirect
golang.org/x/sync v0.16.0 // indirect
golang.org/x/sys v0.34.0 // indirect
golang.org/x/sync v0.17.0 // indirect
golang.org/x/sys v0.36.0 // indirect
golang.org/x/text v0.24.0 // indirect
)

View file

@ -14,16 +14,16 @@ github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuP
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250526131538-b3f0c9e42318 h1:f8Q0ybZGxT+St1JfPM7yoz/XFpbmtodcIehaom/9XT8=
github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250526131538-b3f0c9e42318/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw=
github.com/charmbracelet/colorprofile v0.3.1 h1:k8dTHMd7fgw4bnFd7jXTLZrSU/CQrKnL3m+AxCzDz40=
github.com/charmbracelet/colorprofile v0.3.1/go.mod h1:/GkGusxNs8VB/RSOh3fu0TJmQ4ICMMPApIIVn0KszZ0=
github.com/charmbracelet/colorprofile v0.3.2 h1:9J27WdztfJQVAQKX2WOlSSRB+5gaKqqITmrvb1uTIiI=
github.com/charmbracelet/colorprofile v0.3.2/go.mod h1:mTD5XzNeWHj8oqHb+S1bssQb7vIHbepiebQ2kPKVKbI=
github.com/charmbracelet/glamour/v2 v2.0.0-20250513163904-eeeced3bb3c6 h1:AKhOV8dSRU3KpqMgpGME9JU7ouumB2S6hMmD6PRJeTc=
github.com/charmbracelet/glamour/v2 v2.0.0-20250513163904-eeeced3bb3c6/go.mod h1:7xBAUTCSADx9mHG0uBf4NDoVpYxMzIQ2j/NMLGdFsFM=
github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20250716211347-10c048e36112 h1:SyZEoqRe2oiKZI+h93lgJYXtcBgcS/OsJIOYC7KbR7s=
github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20250716211347-10c048e36112/go.mod h1:BXY7j7rZgAprFwzNcO698++5KTd6GKI6lU83Pr4o0r0=
github.com/charmbracelet/ultraviolet v0.0.0-20250805213125-4167e4d7080b h1:O4kDJZ74yIJhlpGtwTJxq4UKW5fVCcli/lyJJ1N8MlI=
github.com/charmbracelet/ultraviolet v0.0.0-20250805213125-4167e4d7080b/go.mod h1:AshnDFI8jyRVhAoBZ5C6OdW36HODv3ZQhbiYwwsh3Jk=
github.com/charmbracelet/ultraviolet v0.0.0-20250909162800-526253ea8b6f h1:YQjUX3ku52kf3hkWYXHbvgnZtfMarE231UzOCT4nIx0=
github.com/charmbracelet/ultraviolet v0.0.0-20250909162800-526253ea8b6f/go.mod h1:V21rZtvULxJyG8tUsRC8caTBvKNHOuRJVxH+G6ghH0Y=
github.com/charmbracelet/x/ansi v0.10.1 h1:rL3Koar5XvX0pHGfovN03f5cxLbCF2YvLeyz7D2jVDQ=
github.com/charmbracelet/x/ansi v0.10.1/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa h1:lphz0Z3rsiOtMYiz8axkT24i9yFiueDhJbzyNUADmME=
@ -40,8 +40,8 @@ github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQ
github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=
github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo=
github.com/charmbracelet/x/windows v0.2.1 h1:3x7vnbpQrjpuq/4L+I4gNsG5htYoCiA5oe9hLjAij5I=
github.com/charmbracelet/x/windows v0.2.1/go.mod h1:ptZp16h40gDYqs5TSawSVW+yiLB13j4kSMA0lSCHL0M=
github.com/charmbracelet/x/windows v0.2.2 h1:IofanmuvaxnKHuV04sC0eBy/smG6kIKrWG2/jYn2GuM=
github.com/charmbracelet/x/windows v0.2.2/go.mod h1:/8XtdKZzedat74NQFn0NGlGL4soHB0YQZrETF96h75k=
github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
@ -82,10 +82,10 @@ golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=

6
go.mod
View file

@ -8,14 +8,13 @@ toolchain go1.24.4
require (
github.com/charmbracelet/colorprofile v0.3.2
github.com/charmbracelet/ultraviolet v0.0.0-20250813213450-50737e162af5
github.com/charmbracelet/ultraviolet v0.0.0-20250909162800-526253ea8b6f
github.com/charmbracelet/x/ansi v0.10.1
github.com/charmbracelet/x/exp/golden v0.0.0-20241212170349-ad4b7ae0f25f
github.com/charmbracelet/x/term v0.2.1
github.com/lucasb-eyer/go-colorful v1.2.0
github.com/muesli/cancelreader v0.2.2
golang.org/x/sync v0.16.0
golang.org/x/sys v0.35.0
golang.org/x/sys v0.36.0
)
require (
@ -25,4 +24,5 @@ require (
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
golang.org/x/sync v0.17.0 // indirect
)

20
go.sum
View file

@ -1,13 +1,9 @@
github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWpi6yML8=
github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=
github.com/charmbracelet/colorprofile v0.3.1 h1:k8dTHMd7fgw4bnFd7jXTLZrSU/CQrKnL3m+AxCzDz40=
github.com/charmbracelet/colorprofile v0.3.1/go.mod h1:/GkGusxNs8VB/RSOh3fu0TJmQ4ICMMPApIIVn0KszZ0=
github.com/charmbracelet/colorprofile v0.3.2 h1:9J27WdztfJQVAQKX2WOlSSRB+5gaKqqITmrvb1uTIiI=
github.com/charmbracelet/colorprofile v0.3.2/go.mod h1:mTD5XzNeWHj8oqHb+S1bssQb7vIHbepiebQ2kPKVKbI=
github.com/charmbracelet/ultraviolet v0.0.0-20250805213125-4167e4d7080b h1:O4kDJZ74yIJhlpGtwTJxq4UKW5fVCcli/lyJJ1N8MlI=
github.com/charmbracelet/ultraviolet v0.0.0-20250805213125-4167e4d7080b/go.mod h1:AshnDFI8jyRVhAoBZ5C6OdW36HODv3ZQhbiYwwsh3Jk=
github.com/charmbracelet/ultraviolet v0.0.0-20250813213450-50737e162af5 h1:7FlxuSTw5paY5Km8AK1WwfSVjAIOW4UiZI6Okva83pY=
github.com/charmbracelet/ultraviolet v0.0.0-20250813213450-50737e162af5/go.mod h1:uQXXTlOPWiN05pLfSdajBj5FaaszPUrrr9qRFmmQ79M=
github.com/charmbracelet/ultraviolet v0.0.0-20250909162800-526253ea8b6f h1:YQjUX3ku52kf3hkWYXHbvgnZtfMarE231UzOCT4nIx0=
github.com/charmbracelet/ultraviolet v0.0.0-20250909162800-526253ea8b6f/go.mod h1:V21rZtvULxJyG8tUsRC8caTBvKNHOuRJVxH+G6ghH0Y=
github.com/charmbracelet/x/ansi v0.10.1 h1:rL3Koar5XvX0pHGfovN03f5cxLbCF2YvLeyz7D2jVDQ=
github.com/charmbracelet/x/ansi v0.10.1/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
github.com/charmbracelet/x/exp/golden v0.0.0-20241212170349-ad4b7ae0f25f h1:UytXHv0UxnsDFmL/7Z9Q5SBYPwSuRLXHbwx+6LycZ2w=
@ -16,8 +12,6 @@ github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQ
github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=
github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo=
github.com/charmbracelet/x/windows v0.2.1 h1:3x7vnbpQrjpuq/4L+I4gNsG5htYoCiA5oe9hLjAij5I=
github.com/charmbracelet/x/windows v0.2.1/go.mod h1:ptZp16h40gDYqs5TSawSVW+yiLB13j4kSMA0lSCHL0M=
github.com/charmbracelet/x/windows v0.2.2 h1:IofanmuvaxnKHuV04sC0eBy/smG6kIKrWG2/jYn2GuM=
github.com/charmbracelet/x/windows v0.2.2/go.mod h1:/8XtdKZzedat74NQFn0NGlGL4soHB0YQZrETF96h75k=
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
@ -33,9 +27,7 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavM
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=

18
tea.go
View file

@ -32,6 +32,7 @@ import (
"github.com/charmbracelet/x/ansi"
"github.com/charmbracelet/x/term"
"github.com/lucasb-eyer/go-colorful"
"github.com/muesli/cancelreader"
)
// ErrProgramPanic is returned by [Program.Run] when the program recovers from a panic.
@ -322,7 +323,8 @@ type Program struct {
// ttyInput is null if input is not a TTY.
ttyInput term.File
previousTtyInputState *term.State
inputReader *uv.TerminalReader
cancelReader cancelreader.CancelReader
inputScanner *uv.TerminalReader
readLoopDone chan struct{}
mouseMode bool // indicates whether we should enable mouse on Windows
@ -1204,14 +1206,14 @@ func (p *Program) shutdown(kill bool) {
p.handlers.shutdown()
// Check if the cancel reader has been setup before waiting and closing.
if p.inputReader != nil {
if p.cancelReader != nil {
// Wait for input loop to finish.
if p.inputReader.Cancel() {
if p.cancelReader.Cancel() {
if !kill {
p.waitForReadLoop()
}
}
_ = p.inputReader.Close()
_ = p.cancelReader.Close()
}
if p.renderer != nil {
@ -1256,8 +1258,8 @@ func (p *Program) ReleaseTerminal() error {
func (p *Program) releaseTerminal(reset bool) error {
atomic.StoreUint32(&p.ignoreSignals, 1)
if p.inputReader != nil {
p.inputReader.Cancel()
if p.cancelReader != nil {
p.cancelReader.Cancel()
}
p.waitForReadLoop()
@ -1447,7 +1449,7 @@ func (p *Program) enableMouse(all bool) {
// work.
if !p.mouseMode {
p.mouseMode = true
if p.inputReader != nil {
if p.inputScanner != nil {
// Only reinitialize if the input reader has been initialized.
_ = p.initInputReader(true)
}
@ -1472,7 +1474,7 @@ func (p *Program) disableMouse() {
// mouse events.
if p.mouseMode {
p.mouseMode = false
if p.inputReader != nil {
if p.inputScanner != nil {
// Only reinitialize if the input reader has been initialized.
_ = p.initInputReader(true)
}

View file

@ -1,5 +1,5 @@
//go:build !darwin && !dragonfly && !freebsd && !linux && !solaris && !aix
// +build !darwin,!dragonfly,!freebsd,!linux,!solaris,!aix
//go:build !windows && !darwin && !dragonfly && !freebsd && !linux && !solaris && !aix
// +build !windows,!darwin,!dragonfly,!freebsd,!linux,!solaris,!aix
package tea

11
termios_windows.go Normal file
View file

@ -0,0 +1,11 @@
//go:build windows
// +build windows
package tea
import "github.com/charmbracelet/x/term"
func (p *Program) checkOptimizedMovements(*term.State) {
p.useHardTabs = true
p.useBackspace = true
}

24
tty.go
View file

@ -1,15 +1,12 @@
package tea
import (
"errors"
"fmt"
"io"
"time"
uv "github.com/charmbracelet/ultraviolet"
"github.com/charmbracelet/x/ansi"
"github.com/charmbracelet/x/term"
"github.com/muesli/cancelreader"
)
func (p *Program) suspend() {
@ -103,8 +100,8 @@ func (p *Program) restoreInput() error {
// initInputReader (re)commences reading inputs.
func (p *Program) initInputReader(cancel bool) error {
if cancel && p.inputReader != nil {
p.inputReader.Cancel()
if cancel && p.cancelReader != nil {
p.cancelReader.Cancel()
p.waitForReadLoop()
}
@ -114,17 +111,20 @@ func (p *Program) initInputReader(cancel bool) error {
// This need to be done after the terminal has been initialized and set to
// raw mode.
drv := uv.NewTerminalReader(p.input, term)
var err error
p.cancelReader, err = uv.NewCancelReader(p.input)
if err != nil {
return err
}
drv := uv.NewTerminalReader(p.cancelReader, term)
drv.SetLogger(p.logger)
if p.mouseMode {
mouseMode := uv.ButtonMouseMode | uv.DragMouseMode | uv.AllMouseMode
drv.MouseMode = &mouseMode
}
p.inputReader = drv
p.inputScanner = drv
p.readLoopDone = make(chan struct{})
if err := p.inputReader.Start(); err != nil {
return fmt.Errorf("bubbletea: error starting input reader: %w", err)
}
go p.readLoop()
@ -134,10 +134,10 @@ func (p *Program) initInputReader(cancel bool) error {
func (p *Program) readLoop() {
defer close(p.readLoopDone)
err := p.inputReader.ReceiveEvents(p.ctx, p.msgs)
if !errors.Is(err, io.EOF) && !errors.Is(err, cancelreader.ErrCanceled) {
if err := p.inputScanner.StreamEvents(p.ctx, p.msgs); err != nil {
select {
case <-p.ctx.Done():
return
case p.errs <- err:
}
}