From 6e14e824f4b2788acb1af158a53eca1062f338a8 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Thu, 16 Feb 2017 12:17:26 -0800
Subject: [PATCH] Set pty process dimensions on terminal start

Fixes #6733
---
 .../electron-browser/terminalInstance.ts      | 71 ++++++++++++++-----
 1 file changed, 52 insertions(+), 19 deletions(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index 2e94eeed986..3d22b6a6a7b 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -104,6 +104,7 @@ export class TerminalInstance implements ITerminalInstance {
 		this._onProcessIdReady = new Emitter<TerminalInstance>();
 		this._onTitleChanged = new Emitter<string>();
 
+		this._initDimensions();
 		this._createProcess(this._contextService.getWorkspace(), this._shellLaunchConfig);
 		this._createXterm();
 
@@ -117,6 +118,54 @@ export class TerminalInstance implements ITerminalInstance {
 		this._instanceDisposables.push(disposable);
 	}
 
+	private _initDimensions(): void {
+		// The terminal panel needs to have been created
+		if (!this._container) {
+			return;
+		}
+
+		const computedStyle = window.getComputedStyle(this._container);
+		const width = parseInt(computedStyle.getPropertyValue('width').replace('px', ''), 10);
+		const height = parseInt(computedStyle.getPropertyValue('height').replace('px', ''), 10);
+		this._evaluateColsAndRows(width, height);
+	}
+
+	/**
+	 * Evaluates and sets the cols and rows of the terminal if possible.
+	 * @param width The width of the container.
+	 * @param height The height of the container.
+	 * @return Whether cols and rows were set.
+	 */
+	private _evaluateColsAndRows(width: number, height: number): boolean {
+		// The font needs to have been initialized
+		const font = this._configHelper.getFont();
+		if (!font || !font.charWidth || !font.charHeight) {
+			return false;
+		}
+
+		// TODO: Fetch size from panel so initial size is correct
+		// The panel is minimized
+		if (!height) {
+			return false;
+		} else {
+			// Trigger scroll event manually so that the viewport's scroll area is synced. This
+			// needs to happen otherwise its scrollTop value is invalid when the panel is toggled as
+			// it gets removed and then added back to the DOM (resetting scrollTop to 0).
+			// Upstream issue: https://github.com/sourcelair/xterm.js/issues/291
+			if (this._xterm) {
+				this._xterm.emit('scroll', this._xterm.ydisp);
+			}
+		}
+
+		const padding = parseInt(getComputedStyle(document.querySelector('.terminal-outer-container')).paddingLeft.split('px')[0], 10);
+		// Use left padding as right padding, right padding is not defined in CSS just in case
+		// xterm.js causes an unexpected overflow.
+		const innerWidth = width - padding * 2;
+		this._cols = Math.floor(innerWidth / font.charWidth);
+		this._rows = Math.floor(height / font.charHeight);
+		return true;
+	}
+
 	/**
 	 * Create xterm.js instance and attach data listeners.
 	 */
@@ -632,31 +681,15 @@ export class TerminalInstance implements ITerminalInstance {
 
 	private _setScrollback(lineCount: number): void {
 		if (this._xterm && this._xterm.getOption('scrollback') !== lineCount) {
-			console.log('set scrollback to: ' + lineCount);
 			this._xterm.setOption('scrollback', lineCount);
 		}
 	}
 
-	public layout(dimension: { width: number, height: number }): void {
-		const font = this._configHelper.getFont();
-		if (!font || !font.charWidth || !font.charHeight) {
-			return;
-		}
-		if (!dimension.height) { // Minimized
+	public layout(dimension: Dimension): void {
+		const needsLayout = this._evaluateColsAndRows(dimension.width, dimension.height);
+		if (!needsLayout) {
 			return;
-		} else {
-			// Trigger scroll event manually so that the viewport's scroll area is synced. This
-			// needs to happen otherwise its scrollTop value is invalid when the panel is toggled as
-			// it gets removed and then added back to the DOM (resetting scrollTop to 0).
-			// Upstream issue: https://github.com/sourcelair/xterm.js/issues/291
-			this._xterm.emit('scroll', this._xterm.ydisp);
 		}
-		const padding = parseInt(getComputedStyle(document.querySelector('.terminal-outer-container')).paddingLeft.split('px')[0], 10);
-		// Use left padding as right padding, right padding is not defined in CSS just in case
-		// xterm.js causes an unexpected overflow.
-		const innerWidth = dimension.width - padding * 2;
-		this._cols = Math.floor(innerWidth / font.charWidth);
-		this._rows = Math.floor(dimension.height / font.charHeight);
 		if (this._xterm) {
 			this._xterm.resize(this._cols, this._rows);
 			this._xterm.element.style.width = innerWidth + 'px';
-- 
GitLab