mirror of
https://github.com/docker/cli.git
synced 2026-01-16 20:22:36 +03:00
Merge pull request #11840 from ahmetalpbalkan/win-cli/term-resize-fix
term/winconsole: Identify tty correctly, fix resize problem Upstream-commit: cf7104a0e853c453f08d052cb222b7071d4c27a2 Component: engine
This commit is contained in:
@@ -241,8 +241,6 @@ func StdStreams() (stdIn io.ReadCloser, stdOut io.Writer, stdErr io.Writer) {
|
||||
}
|
||||
handler.screenBufferInfo = screenBufferInfo
|
||||
|
||||
// Set the window size
|
||||
SetWindowSize(stdoutHandle, DEFAULT_WIDTH, DEFAULT_HEIGHT, DEFAULT_HEIGHT)
|
||||
buffer = make([]CHAR_INFO, screenBufferInfo.MaximumWindowSize.X*screenBufferInfo.MaximumWindowSize.Y)
|
||||
|
||||
stdOut = &terminalWriter{
|
||||
@@ -283,6 +281,12 @@ func GetHandleInfo(in interface{}) (uintptr, bool) {
|
||||
isTerminalIn = IsTerminal(inFd)
|
||||
}
|
||||
}
|
||||
if tr, ok := in.(*terminalWriter); ok {
|
||||
if file, ok := tr.wrappedWriter.(*os.File); ok {
|
||||
inFd = file.Fd()
|
||||
isTerminalIn = IsTerminal(inFd)
|
||||
}
|
||||
}
|
||||
return inFd, isTerminalIn
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user