Clear webgl renderer texture on OS resume

Tyriar · Tyriar · commit ae71b56fc0b9 · 2020-09-06T18:57:41.000-07:00
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -35,6 +35,7 @@ import { TerminalProcessManager } from 'vs/workbench/contrib/terminal/browser/te
 import type { Terminal as XTermTerminal, IBuffer, ITerminalAddon } from 'xterm';
 import type { SearchAddon, ISearchOptions } from 'xterm-addon-search';
 import type { Unicode11Addon } from 'xterm-addon-unicode11';
+import type { WebglAddon } from 'xterm-addon-webgl';
 import { CommandTrackerAddon } from 'vs/workbench/contrib/terminal/browser/addons/commandTrackerAddon';
 import { NavigationModeAddon } from 'vs/workbench/contrib/terminal/browser/addons/navigationModeAddon';
 import { XTermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
@@ -105,6 +106,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 	private _widgetManager: TerminalWidgetManager = this._instantiationService.createInstance(TerminalWidgetManager);
 	private _linkManager: TerminalLinkManager | undefined;
 	private _environmentInfo: { widget: EnvironmentVariableInfoWidget, disposable: IDisposable } | undefined;
+	private _webglAddon: WebglAddon | undefined;
 	private _commandTrackerAddon: CommandTrackerAddon | undefined;
 	private _navigationModeAddon: INavigationMode & ITerminalAddon | undefined;
 
@@ -497,7 +499,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		xterm.open(this._xtermElement);
 		if (this._configHelper.config.rendererType === 'experimentalWebgl') {
 			this._terminalInstanceService.getXtermWebglConstructor().then(Addon => {
-				xterm.loadAddon(new Addon());
+				this._webglAddon = new Addon();
+				xterm.loadAddon(this._webglAddon);
 			});
 		}
 
@@ -767,7 +770,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		if (!this._xterm) {
 			return;
 		}
-		this._xterm.refresh(0, this._xterm.rows - 1);
+		this._webglAddon?.clearTextureAtlas();
+		// TODO: Do other renderers?
 	}
 
 	public focus(force?: boolean): void {
@@ -1228,6 +1232,8 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		this._safeSetOption('rightClickSelectsWord', config.rightClickBehavior === 'selectWord');
 		this._safeSetOption('wordSeparator', config.wordSeparators);
 		if (config.rendererType !== 'experimentalWebgl') {
+			// TODO: Unset/dispose this._webglAddon
+
 			// Never set webgl as it's an addon not a rendererType
 			this._safeSetOption('rendererType', config.rendererType === 'auto' ? 'canvas' : config.rendererType);
 		}
diff --git a/src/vs/workbench/contrib/terminal/electron-browser/terminalNativeContribution.ts b/src/vs/workbench/contrib/terminal/electron-browser/terminalNativeContribution.ts
@@ -46,11 +46,7 @@ export class TerminalNativeContribution extends Disposable implements IWorkbench
 	}
 
 	private _onOsResume(): void {
-		const activeTab = this._terminalService.getActiveTab();
-		if (!activeTab) {
-			return;
-		}
-		activeTab.terminalInstances.forEach(instance => instance.forceRedraw());
+		this._terminalService.terminalInstances.forEach(instance => instance.forceRedraw());
 	}
 
 	private async _onOpenFileRequest(request: INativeOpenFileRequest): Promise<void> {

Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,7 @@ export class TerminalNativeContribution extends Disposable implements IWorkbench`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`private _onOsResume(): void {`
`49`		`- const activeTab = this._terminalService.getActiveTab();`
`50`		`- if (!activeTab) {`
`51`		`- return;`
`52`		`- }`
`53`		`- activeTab.terminalInstances.forEach(instance => instance.forceRedraw());`
	`49`	`+ this._terminalService.terminalInstances.forEach(instance => instance.forceRedraw());`
`54`	`50`	`}`
`55`	`51`
`56`	`52`	`private async _onOpenFileRequest(request: INativeOpenFileRequest): Promise<void> {`