Do not use \e[s and \e[u

Excerpt from http://www.tldp.org/HOWTO/Bash-Prompt-HOWTO/x361.html:

> - Save cursor position:
>   \033[s
> - Restore cursor position:
>   \033[u
>
> The latter two codes are NOT honoured by many terminal emulators. The
> only ones that I'm aware of that do are xterm and nxterm - even though
> the majority of terminal emulators are based on xterm code. As far as
> I can tell, rxvt, kvt, xiterm, and Eterm do not support them. They are
> supported on the console.

They are also unsupported by Neovim terminal.
This commit is contained in:
Junegunn Choi 2017-01-09 19:09:30 +09:00
parent d18b8e0d2c
commit 78a3f81972
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627

View File

@ -33,7 +33,7 @@ func (r *LightRenderer) stderr(str string) {
runes := []rune{}
for len(bytes) > 0 {
r, sz := utf8.DecodeRune(bytes)
if r == utf8.RuneError || r != '\x1b' && r != '\n' && r < 32 {
if r == utf8.RuneError || r != '\x1b' && r != '\n' && r != '\r' && r < 32 {
runes = append(runes, '?')
} else {
runes = append(runes, r)
@ -71,6 +71,8 @@ type LightRenderer struct {
escDelay int
upOneLine bool
queued string
y int
x int
maxHeightFunc func(int) int
}
@ -182,10 +184,29 @@ func (r *LightRenderer) Init() {
}
r.csi(fmt.Sprintf("%dA", r.MaxY()-1))
r.csi("G")
r.csi("s")
// r.csi("s")
r.yoffset, _ = r.findOffset()
}
func (r *LightRenderer) move(y int, x int) {
// w.csi("u")
if r.y < y {
r.csi(fmt.Sprintf("%dB", y-r.y))
} else if r.y > y {
r.csi(fmt.Sprintf("%dA", r.y-y))
}
r.stderr("\r")
if x > 0 {
r.csi(fmt.Sprintf("%dC", x))
}
r.y = y
r.x = x
}
func (r *LightRenderer) origin() {
r.move(0, 0)
}
func (r *LightRenderer) updateTerminalSize() {
sizes := strings.Split(stty("size"), " ")
if len(sizes) < 2 {
@ -470,7 +491,8 @@ func (r *LightRenderer) Resume() bool {
}
func (r *LightRenderer) Clear() {
r.csi("u")
// r.csi("u")
r.origin()
r.csi("J")
r.flush()
}
@ -484,7 +506,8 @@ func (r *LightRenderer) Refresh() {
}
func (r *LightRenderer) Close() {
r.csi("u")
// r.csi("u")
r.origin()
r.csi("J")
if r.mouse {
r.csi("?1000l")
@ -584,15 +607,7 @@ func (w *LightWindow) Move(y int, x int) {
w.posx = x
w.posy = y
w.csi("u")
y += w.Top()
if y > 0 {
w.csi(fmt.Sprintf("%dB", y))
}
x += w.Left()
if x > 0 {
w.csi(fmt.Sprintf("%dC", x))
}
w.renderer.move(w.Top()+y, w.Left()+x)
}
func (w *LightWindow) MoveAndClear(y int, x int) {