1da3239345
Terminal.damage is accessed when drawing and when invalidating the widget. For this reason we need to protect it with a mutex. This seems to fix various damage issues I've been experiencing (where some regions of the terminal weren't correctly repainted). Race detector trace: Read at 0x00c0000c6670 by main goroutine: git.sr.ht/~sircmpwn/aerc/widgets.(*Terminal).Draw() /home/simon/src/aerc/widgets/terminal.go:292 +0x191 git.sr.ht/~sircmpwn/aerc/lib/ui.(*Grid).Draw() /home/simon/src/aerc/lib/ui/grid.go:117 +0x575 git.sr.ht/~sircmpwn/aerc/lib/ui.(*Grid).Draw() /home/simon/src/aerc/lib/ui/grid.go:117 +0x575 git.sr.ht/~sircmpwn/aerc/widgets.(*MessageViewer).Draw() /home/simon/src/aerc/widgets/msgviewer.go:231 +0x253 git.sr.ht/~sircmpwn/aerc/lib/ui.(*TabContent).Draw() /home/simon/src/aerc/lib/ui/tab.go:124 +0x12e git.sr.ht/~sircmpwn/aerc/lib/ui.(*Grid).Draw() /home/simon/src/aerc/lib/ui/grid.go:117 +0x575 git.sr.ht/~sircmpwn/aerc/widgets.(*Aerc).Draw() /home/simon/src/aerc/widgets/aerc.go:95 +0x5a git.sr.ht/~sircmpwn/aerc/lib/ui.(*UI).Tick() /home/simon/src/aerc/lib/ui/ui.go:93 +0x1dd main.main() /home/simon/src/aerc/aerc.go:105 +0x539 Previous write at 0x00c0000c6670 by goroutine 37: git.sr.ht/~sircmpwn/aerc/widgets.(*Terminal).onDamage-fm() /home/simon/src/aerc/widgets/terminal.go:429 +0x131 git.sr.ht/~sircmpwn/go-libvterm._go_handle_damage() /home/simon/go/pkg/mod/git.sr.ht/~sircmpwn/go-libvterm@v0.0.0-20190421201021-3184f6f13687/vterm.go:481 +0xf9 git.sr.ht/~sircmpwn/go-libvterm._cgoexpwrap_5e22200b58b7__go_handle_damage() _cgo_gotypes.go:731 +0x58 runtime.call32() /usr/lib/go/src/runtime/asm_amd64.s:519 +0x3a git.sr.ht/~sircmpwn/go-libvterm.(*VTerm).Write.func1() /home/simon/go/pkg/mod/git.sr.ht/~sircmpwn/go-libvterm@v0.0.0-20190421201021-3184f6f13687/vterm.go:329 +0x9d git.sr.ht/~sircmpwn/go-libvterm.(*VTerm).Write() /home/simon/go/pkg/mod/git.sr.ht/~sircmpwn/go-libvterm@v0.0.0-20190421201021-3184f6f13687/vterm.go:329 +0x7f git.sr.ht/~sircmpwn/aerc/widgets.NewTerminal.func1() /home/simon/src/aerc/widgets/terminal.go:131 +0x18c Goroutine 37 (running) created at: git.sr.ht/~sircmpwn/aerc/widgets.NewTerminal() /home/simon/src/aerc/widgets/terminal.go:121 +0x23f git.sr.ht/~sircmpwn/aerc/widgets.NewMessageViewer() /home/simon/src/aerc/widgets/msgviewer.go:147 +0xfbe git.sr.ht/~sircmpwn/aerc/commands/account.ViewMessage() /home/simon/src/aerc/commands/account/view-message.go:26 +0x4a4 git.sr.ht/~sircmpwn/aerc/commands.(*Commands).ExecuteCommand() /home/simon/src/aerc/commands/commands.go:47 +0x1f0 main.main.func1() /home/simon/src/aerc/aerc.go:76 +0x205 git.sr.ht/~sircmpwn/aerc/widgets.(*Aerc).BeginExCommand.func1() /home/simon/src/aerc/widgets/aerc.go:262 +0x89 git.sr.ht/~sircmpwn/aerc/widgets.(*ExLine).Event() /home/simon/src/aerc/widgets/exline.go:47 +0x222 git.sr.ht/~sircmpwn/aerc/widgets.(*Aerc).Event() /home/simon/src/aerc/widgets/aerc.go:133 +0x83c git.sr.ht/~sircmpwn/aerc/widgets.(*Aerc).simulate() /home/simon/src/aerc/widgets/aerc.go:126 +0x12a git.sr.ht/~sircmpwn/aerc/widgets.(*Aerc).Event() /home/simon/src/aerc/widgets/aerc.go:148 +0x766 git.sr.ht/~sircmpwn/aerc/lib/ui.(*UI).Tick() /home/simon/src/aerc/lib/ui/ui.go:86 +0x11b main.main() /home/simon/src/aerc/aerc.go:105 +0x539
469 lines
11 KiB
Go
469 lines
11 KiB
Go
package widgets
|
|
|
|
import (
|
|
gocolor "image/color"
|
|
"os"
|
|
"os/exec"
|
|
"sync"
|
|
|
|
"git.sr.ht/~sircmpwn/aerc/lib/ui"
|
|
|
|
"git.sr.ht/~sircmpwn/go-libvterm"
|
|
"git.sr.ht/~sircmpwn/pty"
|
|
"github.com/gdamore/tcell"
|
|
)
|
|
|
|
type vtermKey struct {
|
|
Key vterm.Key
|
|
Rune rune
|
|
Mod vterm.Modifier
|
|
}
|
|
|
|
var keyMap map[tcell.Key]vtermKey
|
|
|
|
func directKey(key vterm.Key) vtermKey {
|
|
return vtermKey{key, 0, vterm.ModNone}
|
|
}
|
|
|
|
func runeMod(r rune, mod vterm.Modifier) vtermKey {
|
|
return vtermKey{vterm.KeyNone, r, mod}
|
|
}
|
|
|
|
func keyMod(key vterm.Key, mod vterm.Modifier) vtermKey {
|
|
return vtermKey{key, 0, mod}
|
|
}
|
|
|
|
func init() {
|
|
keyMap = make(map[tcell.Key]vtermKey)
|
|
keyMap[tcell.KeyCtrlSpace] = runeMod(' ', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlA] = runeMod('a', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlB] = runeMod('b', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlC] = runeMod('c', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlD] = runeMod('d', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlE] = runeMod('e', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlF] = runeMod('f', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlG] = runeMod('g', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlH] = runeMod('h', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlI] = runeMod('i', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlJ] = runeMod('j', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlK] = runeMod('k', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlL] = runeMod('l', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlM] = runeMod('m', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlN] = runeMod('n', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlO] = runeMod('o', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlP] = runeMod('p', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlQ] = runeMod('q', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlR] = runeMod('r', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlS] = runeMod('s', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlT] = runeMod('t', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlU] = runeMod('u', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlV] = runeMod('v', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlW] = runeMod('w', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlX] = runeMod('x', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlY] = runeMod('y', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlZ] = runeMod('z', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlBackslash] = runeMod('\\', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlCarat] = runeMod('^', vterm.ModCtrl)
|
|
keyMap[tcell.KeyCtrlUnderscore] = runeMod('_', vterm.ModCtrl)
|
|
keyMap[tcell.KeyEnter] = directKey(vterm.KeyEnter)
|
|
keyMap[tcell.KeyTab] = directKey(vterm.KeyTab)
|
|
keyMap[tcell.KeyBackspace] = directKey(vterm.KeyBackspace)
|
|
keyMap[tcell.KeyEscape] = directKey(vterm.KeyEscape)
|
|
keyMap[tcell.KeyUp] = directKey(vterm.KeyUp)
|
|
keyMap[tcell.KeyDown] = directKey(vterm.KeyDown)
|
|
keyMap[tcell.KeyLeft] = directKey(vterm.KeyLeft)
|
|
keyMap[tcell.KeyRight] = directKey(vterm.KeyRight)
|
|
keyMap[tcell.KeyInsert] = directKey(vterm.KeyIns)
|
|
keyMap[tcell.KeyDelete] = directKey(vterm.KeyDel)
|
|
keyMap[tcell.KeyHome] = directKey(vterm.KeyHome)
|
|
keyMap[tcell.KeyEnd] = directKey(vterm.KeyEnd)
|
|
keyMap[tcell.KeyPgUp] = directKey(vterm.KeyPageUp)
|
|
keyMap[tcell.KeyPgDn] = directKey(vterm.KeyPageDown)
|
|
for i := 0; i < 64; i++ {
|
|
keyMap[tcell.Key(int(tcell.KeyF1)+i)] =
|
|
directKey(vterm.Key(int(vterm.KeyFunction0) + i))
|
|
}
|
|
keyMap[tcell.KeyTAB] = directKey(vterm.KeyTab)
|
|
keyMap[tcell.KeyESC] = directKey(vterm.KeyEscape)
|
|
keyMap[tcell.KeyDEL] = directKey(vterm.KeyBackspace)
|
|
}
|
|
|
|
type Terminal struct {
|
|
ui.Invalidatable
|
|
closed bool
|
|
cmd *exec.Cmd
|
|
colors map[tcell.Color]tcell.Color
|
|
ctx *ui.Context
|
|
cursorPos vterm.Pos
|
|
cursorShown bool
|
|
destroyed bool
|
|
err error
|
|
focus bool
|
|
pty *os.File
|
|
start chan interface{}
|
|
vterm *vterm.VTerm
|
|
|
|
damage []vterm.Rect // protected by mutex
|
|
mutex sync.Mutex
|
|
|
|
OnClose func(err error)
|
|
OnEvent func(event tcell.Event) bool
|
|
OnStart func()
|
|
OnTitle func(title string)
|
|
}
|
|
|
|
func NewTerminal(cmd *exec.Cmd) (*Terminal, error) {
|
|
term := &Terminal{
|
|
cursorShown: true,
|
|
}
|
|
term.cmd = cmd
|
|
term.vterm = vterm.New(24, 80)
|
|
term.vterm.SetUTF8(true)
|
|
term.start = make(chan interface{})
|
|
screen := term.vterm.ObtainScreen()
|
|
go func() {
|
|
<-term.start
|
|
buf := make([]byte, 4096)
|
|
for {
|
|
n, err := term.pty.Read(buf)
|
|
if err != nil || term.closed {
|
|
// These are generally benine errors when the process exits
|
|
term.Close(nil)
|
|
return
|
|
}
|
|
n, err = term.vterm.Write(buf[:n])
|
|
if err != nil {
|
|
term.Close(err)
|
|
return
|
|
}
|
|
screen.Flush()
|
|
term.flushTerminal()
|
|
term.invalidate()
|
|
}
|
|
}()
|
|
screen.OnDamage = term.onDamage
|
|
screen.OnMoveCursor = term.onMoveCursor
|
|
screen.OnSetTermProp = term.onSetTermProp
|
|
screen.EnableAltScreen(true)
|
|
screen.Reset(true)
|
|
|
|
state := term.vterm.ObtainState()
|
|
term.colors = make(map[tcell.Color]tcell.Color)
|
|
for i := 0; i < 256; i += 1 {
|
|
tcolor := tcell.Color(i)
|
|
var r uint8 = 0
|
|
var g uint8 = 0
|
|
var b uint8 = uint8(i + 1)
|
|
if i < 16 {
|
|
// Set the first 16 colors to predictable near-black RGB values
|
|
state.SetPaletteColor(i,
|
|
vterm.NewVTermColorRGB(gocolor.RGBA{r, g, b, 255}))
|
|
} else {
|
|
// The rest use RGB
|
|
vcolor := state.GetPaletteColor(i)
|
|
r, g, b = vcolor.GetRGB()
|
|
}
|
|
term.colors[tcell.NewRGBColor(int32(r), int32(g), int32(b))] = tcolor
|
|
}
|
|
fg, bg := state.GetDefaultColors()
|
|
r, g, b := bg.GetRGB()
|
|
term.colors[tcell.NewRGBColor(
|
|
int32(r), int32(g), int32(b))] = tcell.ColorDefault
|
|
r, g, b = fg.GetRGB()
|
|
term.colors[tcell.NewRGBColor(
|
|
int32(r), int32(g), int32(b))] = tcell.ColorDefault
|
|
|
|
return term, nil
|
|
}
|
|
|
|
func (term *Terminal) flushTerminal() {
|
|
buf := make([]byte, 4096)
|
|
for {
|
|
n, err := term.vterm.Read(buf)
|
|
if err != nil {
|
|
term.Close(err)
|
|
return
|
|
}
|
|
if n == 0 {
|
|
break
|
|
}
|
|
n, err = term.pty.Write(buf[:n])
|
|
if err != nil {
|
|
term.Close(err)
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
func (term *Terminal) Close(err error) {
|
|
if term.closed {
|
|
return
|
|
}
|
|
term.err = err
|
|
if term.pty != nil {
|
|
term.pty.Close()
|
|
term.pty = nil
|
|
}
|
|
if term.cmd != nil && term.cmd.Process != nil {
|
|
term.cmd.Process.Kill()
|
|
term.cmd = nil
|
|
}
|
|
if !term.closed && term.OnClose != nil {
|
|
term.OnClose(err)
|
|
}
|
|
term.closed = true
|
|
term.ctx.HideCursor()
|
|
}
|
|
|
|
func (term *Terminal) Destroy() {
|
|
if term.destroyed {
|
|
return
|
|
}
|
|
if term.vterm != nil {
|
|
term.vterm.Close()
|
|
term.vterm = nil
|
|
}
|
|
if term.ctx != nil {
|
|
term.ctx.HideCursor()
|
|
}
|
|
term.destroyed = true
|
|
}
|
|
|
|
func (term *Terminal) Invalidate() {
|
|
if term.vterm != nil {
|
|
width, height := term.vterm.Size()
|
|
rect := vterm.NewRect(0, width, 0, height)
|
|
term.mutex.Lock()
|
|
term.damage = append(term.damage, *rect)
|
|
term.mutex.Unlock()
|
|
}
|
|
term.invalidate()
|
|
}
|
|
|
|
func (term *Terminal) invalidate() {
|
|
term.DoInvalidate(term)
|
|
}
|
|
|
|
func (term *Terminal) Draw(ctx *ui.Context) {
|
|
if term.destroyed {
|
|
return
|
|
}
|
|
|
|
term.ctx = ctx // gross
|
|
|
|
if !term.closed {
|
|
winsize := pty.Winsize{
|
|
Cols: uint16(ctx.Width()),
|
|
Rows: uint16(ctx.Height()),
|
|
}
|
|
|
|
if term.pty == nil {
|
|
term.vterm.SetSize(ctx.Height(), ctx.Width())
|
|
tty, err := pty.StartWithSize(term.cmd, &winsize)
|
|
term.pty = tty
|
|
if err != nil {
|
|
term.Close(err)
|
|
return
|
|
}
|
|
term.start <- nil
|
|
if term.OnStart != nil {
|
|
term.OnStart()
|
|
}
|
|
}
|
|
|
|
rows, cols, err := pty.Getsize(term.pty)
|
|
if err != nil {
|
|
return
|
|
}
|
|
if ctx.Width() != cols || ctx.Height() != rows {
|
|
pty.Setsize(term.pty, &winsize)
|
|
term.vterm.SetSize(ctx.Height(), ctx.Width())
|
|
rect := vterm.NewRect(0, ctx.Width(), 0, ctx.Height())
|
|
term.mutex.Lock()
|
|
term.damage = append(term.damage, *rect)
|
|
term.mutex.Unlock()
|
|
return
|
|
}
|
|
}
|
|
|
|
screen := term.vterm.ObtainScreen()
|
|
|
|
type coords struct {
|
|
x int
|
|
y int
|
|
}
|
|
|
|
// naive optimization
|
|
visited := make(map[coords]interface{})
|
|
|
|
term.mutex.Lock()
|
|
for _, rect := range term.damage {
|
|
for x := rect.StartCol(); x < rect.EndCol() && x < ctx.Width(); x += 1 {
|
|
|
|
for y := rect.StartRow(); y < rect.EndRow() && y < ctx.Height(); y += 1 {
|
|
|
|
coords := coords{x, y}
|
|
if _, ok := visited[coords]; ok {
|
|
continue
|
|
}
|
|
visited[coords] = nil
|
|
|
|
cell, err := screen.GetCellAt(y, x)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
style := term.styleFromCell(cell)
|
|
ctx.Printf(x, y, style, "%s", string(cell.Chars()))
|
|
}
|
|
}
|
|
}
|
|
|
|
term.damage = nil
|
|
term.mutex.Unlock()
|
|
|
|
if term.focus && !term.closed {
|
|
if !term.cursorShown {
|
|
ctx.HideCursor()
|
|
} else {
|
|
state := term.vterm.ObtainState()
|
|
row, col := state.GetCursorPos()
|
|
ctx.SetCursor(col, row)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (term *Terminal) Focus(focus bool) {
|
|
if term.closed {
|
|
return
|
|
}
|
|
term.focus = focus
|
|
if term.ctx != nil {
|
|
if !term.focus {
|
|
term.ctx.HideCursor()
|
|
} else {
|
|
state := term.vterm.ObtainState()
|
|
row, col := state.GetCursorPos()
|
|
term.ctx.SetCursor(col, row)
|
|
term.Invalidate()
|
|
}
|
|
}
|
|
}
|
|
|
|
func convertMods(mods tcell.ModMask) vterm.Modifier {
|
|
var (
|
|
ret uint = 0
|
|
mask uint = uint(mods)
|
|
)
|
|
if mask&uint(tcell.ModShift) > 0 {
|
|
ret |= uint(vterm.ModShift)
|
|
}
|
|
if mask&uint(tcell.ModCtrl) > 0 {
|
|
ret |= uint(vterm.ModCtrl)
|
|
}
|
|
if mask&uint(tcell.ModAlt) > 0 {
|
|
ret |= uint(vterm.ModAlt)
|
|
}
|
|
return vterm.Modifier(ret)
|
|
}
|
|
|
|
func (term *Terminal) Event(event tcell.Event) bool {
|
|
if term.OnEvent != nil {
|
|
if term.OnEvent(event) {
|
|
return true
|
|
}
|
|
}
|
|
if term.closed {
|
|
return false
|
|
}
|
|
switch event := event.(type) {
|
|
case *tcell.EventKey:
|
|
if event.Key() == tcell.KeyRune {
|
|
term.vterm.KeyboardUnichar(
|
|
event.Rune(), convertMods(event.Modifiers()))
|
|
} else {
|
|
if key, ok := keyMap[event.Key()]; ok {
|
|
if key.Key == vterm.KeyNone {
|
|
term.vterm.KeyboardUnichar(
|
|
key.Rune, key.Mod)
|
|
} else if key.Mod == vterm.ModNone {
|
|
term.vterm.KeyboardKey(key.Key,
|
|
convertMods(event.Modifiers()))
|
|
} else {
|
|
term.vterm.KeyboardKey(key.Key, key.Mod)
|
|
}
|
|
}
|
|
}
|
|
term.flushTerminal()
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (term *Terminal) styleFromCell(cell *vterm.ScreenCell) tcell.Style {
|
|
style := tcell.StyleDefault
|
|
|
|
background := cell.Bg()
|
|
r, g, b := background.GetRGB()
|
|
bg := tcell.NewRGBColor(int32(r), int32(g), int32(b))
|
|
foreground := cell.Fg()
|
|
r, g, b = foreground.GetRGB()
|
|
fg := tcell.NewRGBColor(int32(r), int32(g), int32(b))
|
|
|
|
if color, ok := term.colors[bg]; ok {
|
|
style = style.Background(color)
|
|
} else {
|
|
style = style.Background(bg)
|
|
}
|
|
if color, ok := term.colors[fg]; ok {
|
|
style = style.Foreground(color)
|
|
} else {
|
|
style = style.Foreground(fg)
|
|
}
|
|
|
|
if cell.Attrs().Bold != 0 {
|
|
style = style.Bold(true)
|
|
}
|
|
if cell.Attrs().Underline != 0 {
|
|
style = style.Underline(true)
|
|
}
|
|
if cell.Attrs().Blink != 0 {
|
|
style = style.Blink(true)
|
|
}
|
|
if cell.Attrs().Reverse != 0 {
|
|
style = style.Reverse(true)
|
|
}
|
|
return style
|
|
}
|
|
|
|
func (term *Terminal) onDamage(rect *vterm.Rect) int {
|
|
term.mutex.Lock()
|
|
term.damage = append(term.damage, *rect)
|
|
term.mutex.Unlock()
|
|
term.invalidate()
|
|
return 1
|
|
}
|
|
|
|
func (term *Terminal) onMoveCursor(old *vterm.Pos,
|
|
pos *vterm.Pos, visible bool) int {
|
|
|
|
rows, cols, _ := pty.Getsize(term.pty)
|
|
if pos.Row() >= rows || pos.Col() >= cols {
|
|
return 1
|
|
}
|
|
|
|
term.cursorPos = *pos
|
|
term.invalidate()
|
|
return 1
|
|
}
|
|
|
|
func (term *Terminal) onSetTermProp(prop int, val *vterm.VTermValue) int {
|
|
switch prop {
|
|
case vterm.VTERM_PROP_TITLE:
|
|
if term.OnTitle != nil {
|
|
term.OnTitle(val.String)
|
|
}
|
|
case vterm.VTERM_PROP_CURSORVISIBLE:
|
|
term.cursorShown = val.Boolean
|
|
term.invalidate()
|
|
}
|
|
return 1
|
|
}
|