瀏覽代碼

Merge pull request #11840 from ahmetalpbalkan/win-cli/term-resize-fix

term/winconsole: Identify tty correctly, fix resize problem
Jessie Frazelle 10 年之前
父節點
當前提交
cf7104a0e8
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      pkg/term/winconsole/console_windows.go

+ 6 - 2
pkg/term/winconsole/console_windows.go

@@ -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
 }