Merge pull request #21 from liamg/liamg-fix-rendering-osx

Fix rendering on osx and intellij

Author: liamg

pkg/proxy/csi.go

@@ -20,6 +20,8 @@ func (p *Proxy) handleCSI(pty chan byte) (output []byte, original []byte, redraw
 		'l': p.csiResetModeHandler,
 		'J': p.csiEraseInDisplayHandler,
 		'r': p.csiSetMarginHandler,
+		's': p.csiSavePositionHandler,
+		'u': p.csiRestorePositionHandler,
 	}
 
 	var final byte
@@ -140,8 +142,8 @@ func (p *Proxy) csiLinePositionAbsolute(params []string, intermediate string) (o
 // CSI Pt Pb r
 func (p *Proxy) csiSetMarginHandler(params []string, intermediate string) (output []byte, redraw bool, err error) {
 	// pass through command, and inject reset position afterwards
-	row, col := p.HandleCoordinates(0, 0)
-	return []byte(fmt.Sprintf("\033[%d;%dH", row+1, col+1)), true, ErrorCommandNotSupported
+	row, col := p.HandleCoordinates(1, 1)
+	return []byte(fmt.Sprintf("\033[%d;%dH", row, col)), true, ErrorCommandNotSupported
 }
 
 // CSI Ps J
@@ -158,8 +160,8 @@ func (p *Proxy) csiEraseInDisplayHandler(params []string, intermediate string) (
 
 	switch n {
 	case "2", "3":
-		row, col := p.HandleCoordinates(0, 0)
-		return []byte(fmt.Sprintf("\033[%d;%dH", row+1, col+1)), true, ErrorCommandNotSupported
+		row, col := p.HandleCoordinates(1, 1)
+		return []byte(fmt.Sprintf("\033[%d;%dH", row, col)), true, ErrorCommandNotSupported
 	}
 
 	return nil, false, ErrorCommandNotSupported
@@ -213,3 +215,15 @@ func (p *Proxy) csiSetMode(modeStr string, enabled bool) (output []byte, redraw
 
 	return nil, redraw, ErrorCommandNotSupported
 }
+
+// CSI Ps s
+func (p *Proxy) csiSavePositionHandler(params []string, intermediate string) (output []byte, redraw bool, err error) {
+	p.pauseDrawing = true
+	return nil, false, ErrorCommandNotSupported
+}
+
+// CSI Ps u
+func (p *Proxy) csiRestorePositionHandler(params []string, intermediate string) (output []byte, redraw bool, err error) {
+	p.pauseDrawing = false
+	return nil, false, ErrorCommandNotSupported
+}

pkg/proxy/proxy.go

@@ -27,6 +27,7 @@ type Proxy struct {
 	realCols              uint16
 	canRender             bool
 	redrawChan            chan struct{}
+	pauseDrawing          bool
 }
 
 // NewProxy creates a new proxy instance
@@ -220,19 +221,19 @@ func (p *Proxy) requestRedraw() {
 func (p *Proxy) redraw() {
 	p.decMutex.Lock()
 	defer p.decMutex.Unlock()
-	if !p.canRender {
+	if !p.canRender || p.pauseDrawing {
 		return
 	}
 	//save cursor pos
-	p.writeOutput([]byte("\x1b[s"))
+	p.writeOutput([]byte("\x1b7"))
 	for _, decorator := range p.decorators {
 		if !decorator.IsVisible() {
 			continue
 		}
 		decorator.Draw(p.realRows, p.realCols, p.writeOutput)
 	}
 	// restore cursor position
-	p.writeOutput([]byte(fmt.Sprintf("\x1b[u")))
+	p.writeOutput([]byte(fmt.Sprintf("\x1b8")))
 }
 
 func (p *Proxy) writeOutput(data []byte) {