Commita8360d1

committed

Support starting PTY with a size

You get unexpected padding in screen if you try to resize afterward.

1 parent0c73164 commita8360d1Copy full SHA for a8360d1

File tree

+20

-1

lines changed

+20

-1

lines changed

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -80,13 +80,19 @@ type WithFlags interface {`
`80`	`80`	`EchoEnabled() (bool,error)`
`81`	`81`	`}`
`82`	`82`
`83`		`-// Options representsaan option for a PTY.`
	`83`	`+// Options represents an option for a PTY.`
`84`	`84`	`typeOptionfunc(*ptyOptions)`
`85`	`85`
	`86`	`+typeWinsizestruct {`
	`87`	`+Heightuint16`
	`88`	`+Widthuint16`
	`89`	`+}`
	`90`	`+`
`86`	`91`	`typeptyOptionsstruct {`
`87`	`92`	`logger*log.Logger`
`88`	`93`	`sshReq*ssh.Pty`
`89`	`94`	`setGPGTTYbool`
	`95`	`+size*Winsize`
`90`	`96`	`}`
`91`	`97`
`92`	`98`	`// WithSSHRequest applies the ssh.Pty request to the PTY.`
`@@ -113,6 +119,13 @@ func WithGPGTTY() Option {`
`113`	`119`	`}`
`114`	`120`	`}`
`115`	`121`
	`122`	`+// WithSize sets the initial size at which to spawn the PTY.`
	`123`	`+funcWithSize(size*Winsize)Option {`
	`124`	`+returnfunc(opts*ptyOptions) {`
	`125`	`+opts.size=size`
	`126`	`+}`
	`127`	`+}`
	`128`	`+`
`116`	`129`	`// New constructs a new Pty.`
`117`	`130`	`funcNew(opts...Option) (PTY,error) {`
`118`	`131`	`returnnewPty(opts...)`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,12 @@ func newPty(opt ...Option) (retPTY *otherPty, err error) {`
`26`	`26`	`iferr!=nil {`
`27`	`27`	`returnnil,err`
`28`	`28`	`}`
	`29`	`+ifopts.size!=nil {`
	`30`	`+_=pty.Setsize(ptyFile,&pty.Winsize{`
	`31`	`+Rows:opts.size.Height,`
	`32`	`+Cols:opts.size.Width,`
	`33`	`+})`
	`34`	`+}`
`29`	`35`	`opty:=&otherPty{`
`30`	`36`	`pty:ptyFile,`
`31`	`37`	`tty:ttyFile,`

Comments

(0)