fix: Swap height and width for TTY size (#1161)

kylecarbs · web-flow · commit 587cbac4988d · 2022-04-25T15:30:02.000-05:00
This was causing the TTY to be real wonky on Windows.
It didn't seem to have an effect on Linux, but I suspect
that's because of escape codes.
diff --git a/agent/agent.go b/agent/agent.go
@@ -333,7 +333,7 @@ func (a *agent) handleSSHSession(session ssh.Session) error {
 		}
 		go func() {
 			for win := range windowSize {
-				err = ptty.Resize(uint16(win.Width), uint16(win.Height))
+				err = ptty.Resize(uint16(win.Height), uint16(win.Width))
 				if err != nil {
 					a.logger.Warn(context.Background(), "failed to resize tty", slog.Error(err))
 				}
diff --git a/pty/pty.go b/pty/pty.go
@@ -25,7 +25,7 @@ type PTY interface {
 	Input() io.ReadWriter
 
 	// Resize sets the size of the PTY.
-	Resize(cols uint16, rows uint16) error
+	Resize(height uint16, width uint16) error
 }
 
 // New constructs a new Pty.
diff --git a/pty/pty_other.go b/pty/pty_other.go
@@ -42,12 +42,12 @@ func (p *otherPty) Output() io.ReadWriter {
 	}
 }
 
-func (p *otherPty) Resize(cols uint16, rows uint16) error {
+func (p *otherPty) Resize(height uint16, width uint16) error {
 	p.mutex.Lock()
 	defer p.mutex.Unlock()
 	return pty.Setsize(p.pty, &pty.Winsize{
-		Rows: rows,
-		Cols: cols,
+		Rows: width,
+		Cols: height,
 	})
 }
 
diff --git a/pty/pty_windows.go b/pty/pty_windows.go
@@ -81,11 +81,11 @@ func (p *ptyWindows) Input() io.ReadWriter {
 	}
 }
 
-func (p *ptyWindows) Resize(cols uint16, rows uint16) error {
+func (p *ptyWindows) Resize(height uint16, width uint16) error {
 	// Taken from: https://github.com/microsoft/hcsshim/blob/54a5ad86808d761e3e396aff3e2022840f39f9a8/internal/winapi/zsyscall_windows.go#L144
 	ret, _, err := procResizePseudoConsole.Call(uintptr(p.console), uintptr(*((*uint32)(unsafe.Pointer(&windows.Coord{
-		X: int16(rows),
-		Y: int16(cols),
+		Y: int16(height),
+		X: int16(width),
 	})))))
 	if ret != 0 {
 		return err

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ func (a *agent) handleSSHSession(session ssh.Session) error {`
`333`	`333`	`}`
`334`	`334`	`go func() {`
`335`	`335`	`for win := range windowSize {`
`336`		`- err = ptty.Resize(uint16(win.Width), uint16(win.Height))`
	`336`	`+ err = ptty.Resize(uint16(win.Height), uint16(win.Width))`
`337`	`337`	`if err != nil {`
`338`	`338`	`a.logger.Warn(context.Background(), "failed to resize tty", slog.Error(err))`
`339`	`339`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ type PTY interface {`
`25`	`25`	`Input() io.ReadWriter`
`26`	`26`
`27`	`27`	`// Resize sets the size of the PTY.`
`28`		`- Resize(cols uint16, rows uint16) error`
	`28`	`+ Resize(height uint16, width uint16) error`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// New constructs a new Pty.`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,12 @@ func (p *otherPty) Output() io.ReadWriter {`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`-func (p *otherPty) Resize(cols uint16, rows uint16) error {`
	`45`	`+func (p *otherPty) Resize(height uint16, width uint16) error {`
`46`	`46`	`p.mutex.Lock()`
`47`	`47`	`defer p.mutex.Unlock()`
`48`	`48`	`return pty.Setsize(p.pty, &pty.Winsize{`
`49`		`- Rows: rows,`
`50`		`- Cols: cols,`
	`49`	`+ Rows: width,`
	`50`	`+ Cols: height,`
`51`	`51`	`})`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,11 @@ func (p *ptyWindows) Input() io.ReadWriter {`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`84`		`-func (p *ptyWindows) Resize(cols uint16, rows uint16) error {`
	`84`	`+func (p *ptyWindows) Resize(height uint16, width uint16) error {`
`85`	`85`	`// Taken from: https://github.com/microsoft/hcsshim/blob/54a5ad86808d761e3e396aff3e2022840f39f9a8/internal/winapi/zsyscall_windows.go#L144`
`86`	`86`	`ret, _, err := procResizePseudoConsole.Call(uintptr(p.console), uintptr(((uint32)(unsafe.Pointer(&windows.Coord{`
`87`		`- X: int16(rows),`
`88`		`- Y: int16(cols),`
	`87`	`+ Y: int16(height),`
	`88`	`+ X: int16(width),`
`89`	`89`	`})))))`
`90`	`90`	`if ret != 0 {`
`91`	`91`	`return err`