diff options
| author | Ahmet Alp Balkan <ahmetalpbalkan@gmail.com> | 2015-04-06 14:31:42 -0700 |
|---|---|---|
| committer | Jessica Frazelle <jess@docker.com> | 2015-04-06 16:55:38 -0700 |
| commit | ceb72fab342505f25ad2c942d9cb98add75d081b (patch) | |
| tree | 90f33f81f8e6c726f512386cab0eda340513ec92 | |
| parent | c6ea062a262aa8496127f060854a63e1a57bf69f (diff) | |
| download | docker-ceb72fab342505f25ad2c942d9cb98add75d081b.tar.gz | |
Swap width/height in GetWinsize and monitorTtySize
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
(cherry picked from commit 6e44246fed43341938a41c6db9b115e1e64d332a)
| -rw-r--r-- | api/client/utils.go | 6 | ||||
| -rw-r--r-- | pkg/term/term_windows.go | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/api/client/utils.go b/api/client/utils.go index 83d1e21775..e638a8723e 100644 --- a/api/client/utils.go +++ b/api/client/utils.go @@ -281,16 +281,16 @@ func (cli *DockerCli) monitorTtySize(id string, isExec bool) error { if runtime.GOOS == "windows" { go func() { - prevW, prevH := cli.getTtySize() + prevH, prevW := cli.getTtySize() for { time.Sleep(time.Millisecond * 250) - w, h := cli.getTtySize() + h, w := cli.getTtySize() if prevW != w || prevH != h { cli.resizeTty(id, isExec) } - prevW = w prevH = h + prevW = w } }() } else { diff --git a/pkg/term/term_windows.go b/pkg/term/term_windows.go index f43721c6a0..5b637928fa 100644 --- a/pkg/term/term_windows.go +++ b/pkg/term/term_windows.go @@ -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) return &Winsize{ - Width: uint16(info.Window.Bottom - info.Window.Top + 1), - Height: uint16(info.Window.Right - info.Window.Left + 1), + Width: uint16(info.Window.Right - info.Window.Left + 1), + Height: uint16(info.Window.Bottom - info.Window.Top + 1), x: 0, y: 0}, nil } |