Remove the need of osascript hack to get term size

Author: rs

main.go

@@ -12,7 +12,6 @@ import (
 	"github.com/rs/jplot/data"
 	"github.com/rs/jplot/graph"
 	"github.com/rs/jplot/osc"
-	"github.com/rs/jplot/window"
 )
 
 func main() {
@@ -61,7 +60,7 @@ func main() {
 		signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 		i := 0
 		for {
-			width, height, err := window.Size()
+			size, err := osc.Size()
 			if err != nil {
 				fatal("Cannot get window size: ", err)
 			}
@@ -72,9 +71,9 @@ func main() {
 					// Clear scrollback to avoid iTerm from eating all the memory.
 					osc.ClearScrollback()
 				}
-				render(dash, width, height)
+				render(dash, size.Width, size.Height)
 			case <-exit:
-				render(dash, width, height)
+				render(dash, size.Width, size.Height)
 				return
 			case <-c:
 				osc.ShowCursor()

window/go110.go renamed to osc/go110.go

@@ -1,6 +1,6 @@
 // +build go1.10
 
-package window
+package osc
 
 import (
 	"os"

osc/iterm2.go

@@ -5,14 +5,46 @@ import (
 	"encoding/base64"
 	"fmt"
 	"io"
+	"os"
 	"sync"
+	"time"
+
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 // ClearScrollback clears iTerm2 scrollback.
 func ClearScrollback() {
 	print("\033]1337;ClearScrollback\007")
 }
 
+// TermSize contains sizing information of the terminal.
+type TermSize struct {
+	Row    int
+	Col    int
+	Width  int
+	Height int
+}
+
+// Size gathers sizing information of the current session's controling terminal.
+func Size() (size TermSize, err error) {
+	size.Col, size.Row, err = terminal.GetSize(1)
+	if err != nil {
+		return
+	}
+	s, err := terminal.MakeRaw(1)
+	if err != nil {
+		return
+	}
+	defer terminal.Restore(1, s)
+	var cellWidth, cellHeight float64
+	fmt.Fprint(os.Stdout, "\033]1337;ReportCellSize\033\\")
+	fileSetReadDeadline(os.Stdout, time.Now().Add(time.Second))
+	defer fileSetReadDeadline(os.Stdout, time.Time{})
+	_, err = fmt.Fscanf(os.Stdout, "\033]1337;ReportCellSize=%f;%f\033\\", &cellHeight, &cellWidth)
+	size.Width, size.Height = size.Col*int(cellWidth), size.Row*int(cellHeight)
+	return
+}
+
 // ImageWriter is a writer that write into iTerm2 terminal the PNG data written
 // to it.
 type ImageWriter struct {

window/not_go110.go renamed to osc/not_go110.go

@@ -1,6 +1,6 @@
 // +build !go1.10
 
-package window
+package osc
 
 import (
 	"os"