Remove unnecessary font calls

jstarks · jstarks · commit 8652dd352586 · 2015-07-10T20:49:21.000-07:00
diff --git a/pkg/term/term_windows.go b/pkg/term/term_windows.go
@@ -52,16 +52,11 @@ func GetWinsize(fd uintptr) (*Winsize, error) {
 		return nil, err
 	}
 
-	font, err := winterm.GetCurrentConsoleFont(fd)
-	if err != nil {
-		return nil, err
-	}
-
 	winsize := &Winsize{
 		Width:  uint16(info.Window.Right - info.Window.Left + 1),
 		Height: uint16(info.Window.Bottom - info.Window.Top + 1),
-		x:      uint16(font.FontSize.X),
-		y:      uint16(font.FontSize.Y)}
+		x:      0,
+		y:      0}
 
 	// Note: GetWinsize is called frequently -- uncomment only for excessive details
 	// logrus.Debugf("[windows] GetWinsize: Console(%v)", info.String())
diff --git a/vendor/src/github.com/Azure/go-ansiterm/winterm/api.go b/vendor/src/github.com/Azure/go-ansiterm/winterm/api.go
@@ -40,7 +40,6 @@ var (
 	scrollConsoleScreenBufferProc  = kernel32DLL.NewProc("ScrollConsoleScreenBufferA")
 	setConsoleTextAttributeProc    = kernel32DLL.NewProc("SetConsoleTextAttribute")
 	setConsoleWindowInfoProc       = kernel32DLL.NewProc("SetConsoleWindowInfo")
-	getCurrentConsoleFontProc      = kernel32DLL.NewProc("GetCurrentConsoleFont")
 	writeConsoleOutputProc         = kernel32DLL.NewProc("WriteConsoleOutputW")
 	readConsoleInputProc           = kernel32DLL.NewProc("ReadConsoleInputW")
 	waitForSingleObjectProc        = kernel32DLL.NewProc("WaitForSingleObject")
@@ -125,11 +124,6 @@ type (
 		Visible BOOL
 	}
 
-	CONSOLE_FONT_INFO struct {
-		Font     DWORD
-		FontSize COORD
-	}
-
 	CONSOLE_SCREEN_BUFFER_INFO struct {
 		Size              COORD
 		CursorPosition    COORD
@@ -264,17 +258,6 @@ func SetConsoleWindowInfo(handle uintptr, isAbsolute bool, rect SMALL_RECT) erro
 	return checkError(r1, r2, err)
 }
 
-// GetCurrentConsoleFont retrieves the pixel dimensions of the font for the current window.
-// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms683176(v=vs.85).aspx.
-func GetCurrentConsoleFont(handle uintptr) (*CONSOLE_FONT_INFO, error) {
-	info := CONSOLE_FONT_INFO{}
-	err := checkError(getCurrentConsoleFontProc.Call(handle, uintptr(BOOL(0)), uintptr(unsafe.Pointer(&info))))
-	if err != nil {
-		return nil, err
-	}
-	return &info, nil
-}
-
 // WriteConsoleOutput writes the CHAR_INFOs from the provided buffer to the active console buffer.
 // See https://msdn.microsoft.com/en-us/library/windows/desktop/ms687404(v=vs.85).aspx.
 func WriteConsoleOutput(handle uintptr, buffer []CHAR_INFO, bufferSize COORD, bufferCoord COORD, writeRegion *SMALL_RECT) error {
