0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12127 from ahmetalpbalkan/win-cli/termsize-fix

Browse source 
Swap width/height in GetWinsize and monitorTtySize
This commit is contained in:
Jessie Frazelle 2015-04-06 16:54:29 -07:00
commit 9ede3f9fc1
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
api/client/utils.go
View file

@ -283,16 +283,16 @@ func (cli *DockerCli) monitorTtySize(id string, isExec bool) error {
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
go func() { go func() {
prevW, prevH := cli.getTtySize() prevH, prevW := cli.getTtySize()
for { for {
time.Sleep(time.Millisecond * 250) time.Sleep(time.Millisecond * 250)
w, h := cli.getTtySize() h, w := cli.getTtySize()
if prevW != w || prevH != h { if prevW != w || prevH != h {
cli.resizeTty(id, isExec) cli.resizeTty(id, isExec)
} }
prevW = w
prevH = h prevH = h
prevW = w
} }
}() }()
} else { } else {

4
pkg/term/term_windows.go
View file

@ -48,8 +48,8 @@ func GetWinsize(fd uintptr) (*Winsize, error) {
// TODO(azlinux): Set the pixel width / height of the console (currently unused by any caller) // TODO(azlinux): Set the pixel width / height of the console (currently unused by any caller)
return &Winsize{ return &Winsize{
Width: uint16(info.Window.Bottom - info.Window.Top + 1), Width: uint16(info.Window.Right - info.Window.Left + 1),
Height: uint16(info.Window.Right - info.Window.Left + 1), Height: uint16(info.Window.Bottom - info.Window.Top + 1),
x: 0, x: 0,
y: 0}, nil y: 0}, nil
} }