diff options
Diffstat (limited to 'vendor/github.com/gdamore/tcell/v2/tscreen.go')
| -rw-r--r-- | vendor/github.com/gdamore/tcell/v2/tscreen.go | 145 |
1 files changed, 133 insertions, 12 deletions
diff --git a/vendor/github.com/gdamore/tcell/v2/tscreen.go b/vendor/github.com/gdamore/tcell/v2/tscreen.go index 38fc4391b..de2338cc9 100644 --- a/vendor/github.com/gdamore/tcell/v2/tscreen.go +++ b/vendor/github.com/gdamore/tcell/v2/tscreen.go @@ -16,6 +16,7 @@ package tcell import ( "bytes" + "errors" "io" "os" "strconv" @@ -42,6 +43,14 @@ import ( // $COLUMNS environment variables can be set to the actual window size, // otherwise defaults taken from the terminal database are used. func NewTerminfoScreen() (Screen, error) { + return NewTerminfoScreenFromTty(nil) +} + +// NewTerminfoScreenFromTty returns a Screen using a custom Tty implementation. +// If the passed in tty is nil, then a reasonable default (typically /dev/tty) +// is presumed, at least on UNIX hosts. (Windows hosts will typically fail this +// call altogether.) +func NewTerminfoScreenFromTty(tty Tty) (Screen, error) { ti, e := terminfo.LookupTerminfo(os.Getenv("TERM")) if e != nil { ti, e = loadDynamicTerminfo(os.Getenv("TERM")) @@ -50,7 +59,7 @@ func NewTerminfoScreen() (Screen, error) { } terminfo.AddTerminfo(ti) } - t := &tScreen{ti: ti} + t := &tScreen{ti: ti, tty: tty} t.keyexist = make(map[Key]bool) t.keycodes = make(map[string]*tKeyCode) @@ -59,7 +68,7 @@ func NewTerminfoScreen() (Screen, error) { } t.prepareKeys() t.buildAcsMap() - t.sigwinch = make(chan os.Signal, 10) + t.resizeQ = make(chan bool, 1) t.fallback = make(map[rune]string) for k, v := range RuneFallbacks { t.fallback[k] = v @@ -77,18 +86,17 @@ type tKeyCode struct { // tScreen represents a screen backed by a terminfo implementation. type tScreen struct { ti *terminfo.Terminfo + tty Tty h int w int fini bool cells CellBuffer - in *os.File - out *os.File buffering bool // true if we are collecting writes to buf instead of sending directly to out buf bytes.Buffer curstyle Style style Style evch chan Event - sigwinch chan os.Signal + resizeQ chan bool quit chan struct{} keyexist map[Key]bool keycodes map[string]*tKeyCode @@ -117,6 +125,7 @@ type tScreen struct { disablePaste string saved *term.State stopQ chan struct{} + running bool wg sync.WaitGroup mouseFlags MouseFlags pasteEnabled bool @@ -619,7 +628,24 @@ func (t *tScreen) drawCell(x, y int) int { return width } - if t.cy != y || t.cx != x { + if y == t.h-1 && x == t.w-1 && t.ti.AutoMargin && ti.InsertChar != "" { + // our solution is somewhat goofy. + // we write to the second to the last cell what we want in the last cell, then we + // insert a character at that 2nd to last position to shift the last column into + // place, then we rewrite that 2nd to last cell. Old terminals suck. + t.TPuts(ti.TGoto(x-1, y)) + defer func() { + t.TPuts(ti.TGoto(x-1, y)) + t.TPuts(ti.InsertChar) + t.cy = y + t.cx = x-1 + t.cells.SetDirty(x-1, y, true) + _ = t.drawCell(x-1, y) + t.TPuts(t.ti.TGoto(0, 0)) + t.cy = 0 + t.cx = 0 + }() + } else if t.cy != y || t.cx != x { t.TPuts(ti.TGoto(x, y)) t.cx = x t.cy = y @@ -731,7 +757,7 @@ func (t *tScreen) writeString(s string) { if t.buffering { _, _ = io.WriteString(&t.buf, s) } else { - _, _ = io.WriteString(t.out, s) + _, _ = io.WriteString(t.tty, s) } } @@ -739,7 +765,7 @@ func (t *tScreen) TPuts(s string) { if t.buffering { t.ti.TPuts(&t.buf, s) } else { - t.ti.TPuts(t.out, s) + t.ti.TPuts(t.tty, s) } } @@ -807,7 +833,7 @@ func (t *tScreen) draw() { // restore the cursor t.showCursor() - _, _ = t.buf.WriteTo(t.out) + _, _ = t.buf.WriteTo(t.tty) } func (t *tScreen) EnableMouse(flags ...MouseFlags) { @@ -885,7 +911,7 @@ func (t *tScreen) Size() (int, int) { } func (t *tScreen) resize() { - if w, h, e := t.getWinSize(); e == nil { + if w, h, e := t.tty.WindowSize(); e == nil { if w != t.w || h != t.h { t.cx = -1 t.cy = -1 @@ -924,6 +950,10 @@ func (t *tScreen) PollEvent() Event { } } +func (t *tScreen) HasPendingEvent() bool { + return len(t.evch) > 0 +} + // vtACSNames is a map of bytes defined by terminfo that are used in // the terminals Alternate Character Set to represent other glyphs. // For example, the upper left corner of the box drawing set can be @@ -1437,7 +1467,7 @@ func (t *tScreen) mainLoop(stopQ chan struct{}) { return case <-t.quit: return - case <-t.sigwinch: + case <-t.resizeQ: t.Lock() t.cx = -1 t.cy = -1 @@ -1493,7 +1523,7 @@ func (t *tScreen) inputLoop(stopQ chan struct{}) { default: } chunk := make([]byte, 128) - n, e := t.in.Read(chunk) + n, e := t.tty.Read(chunk) switch e { case nil: default: @@ -1583,3 +1613,94 @@ func (t *tScreen) Suspend() error { func (t *tScreen) Resume() error { return t.engage() } + +// engage is used to place the terminal in raw mode and establish screen size, etc. +// Thing of this is as tcell "engaging" the clutch, as it's going to be driving the +// terminal interface. +func (t *tScreen) engage() error { + t.Lock() + defer t.Unlock() + if t.tty == nil { + return ErrNoScreen + } + t.tty.NotifyResize(func() { + select { + case t.resizeQ <- true: + default: + } + }) + if t.running { + return errors.New("already engaged") + } + if err := t.tty.Start(); err != nil { + return err + } + t.running = true + if w, h, err := t.tty.WindowSize(); err == nil && w != 0 && h != 0 { + t.cells.Resize(w, h) + } + stopQ := make(chan struct{}) + t.stopQ = stopQ + t.enableMouse(t.mouseFlags) + t.enablePasting(t.pasteEnabled) + + ti := t.ti + t.TPuts(ti.EnterCA) + t.TPuts(ti.EnterKeypad) + t.TPuts(ti.HideCursor) + t.TPuts(ti.EnableAcs) + t.TPuts(ti.Clear) + + t.wg.Add(2) + go t.inputLoop(stopQ) + go t.mainLoop(stopQ) + return nil +} + +// disengage is used to release the terminal back to support from the caller. +// Think of this as tcell disengaging the clutch, so that another application +// can take over the terminal interface. This restores the TTY mode that was +// present when the application was first started. +func (t *tScreen) disengage() { + + t.Lock() + if !t.running { + t.Unlock() + return + } + t.running = false + stopQ := t.stopQ + close(stopQ) + _ = t.tty.Drain() + t.Unlock() + + t.tty.NotifyResize(nil) + // wait for everything to shut down + t.wg.Wait() + + // shutdown the screen and disable special modes (e.g. mouse and bracketed paste) + ti := t.ti + t.cells.Resize(0, 0) + t.TPuts(ti.ShowCursor) + t.TPuts(ti.AttrOff) + t.TPuts(ti.Clear) + t.TPuts(ti.ExitCA) + t.TPuts(ti.ExitKeypad) + t.enableMouse(0) + t.enablePasting(false) + + _ = t.tty.Stop() +} + +// Beep emits a beep to the terminal. +func (t *tScreen) Beep() error { + t.writeString(string(byte(7))) + return nil +} + +// finalize is used to at application shutdown, and restores the terminal +// to it's initial state. It should not be called more than once. +func (t *tScreen) finalize() { + t.disengage() + _ = t.tty.Close() +} |