development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-06-30 23:04:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use webgl in terminal sticky scroll

Browse Source 
Fixes #216817
Fixes #218427
This commit is contained in:
Daniel Imms 2024-06-27 11:00:50 -07:00
parent 973dc3065b
commit 4b28f5d48c
No known key found for this signature in database
GPG Key ID: 5F0FF45B19E3A5D2
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.ts
View File

@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import type { SerializeAddon as SerializeAddonType } from '@xterm/addon-serialize';
import type { WebglAddon as WebglAddonType } from '@xterm/addon-webgl';
import type { IBufferLine, IMarker, ITerminalOptions, ITheme, Terminal as RawXtermTerminal, Terminal as XTermTerminal } from '@xterm/xterm';
import { importAMDNodeModule } from 'vs/amdX';
import { $, addDisposableListener, addStandardDisposableListener, getWindow } from 'vs/base/browser/dom';
@ -21,7 +22,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { ICommandDetectionCapability, ITerminalCommand } from 'vs/platform/terminal/common/capabilities/capabilities';
import { ICurrentPartialCommand } from 'vs/platform/terminal/common/capabilities/commandDetection/terminalCommand';
import { IThemeService } from 'vs/platform/theme/common/themeService';
import { ITerminalInstance, IXtermColorProvider, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
import { ITerminalConfigurationService, ITerminalInstance, IXtermColorProvider, IXtermTerminal } from 'vs/workbench/contrib/terminal/browser/terminal';
import { openContextMenu } from 'vs/workbench/contrib/terminal/browser/terminalContextMenu';
import { IXtermCore } from 'vs/workbench/contrib/terminal/browser/xterm-private';
import { TERMINAL_CONFIG_SECTION, TerminalCommandId } from 'vs/workbench/contrib/terminal/common/terminal';
@ -46,6 +47,7 @@ const enum Constants {
export class TerminalStickyScrollOverlay extends Disposable {
private _stickyScrollOverlay?: RawXtermTerminal;
private _serializeAddon?: SerializeAddonType;
private _webglAddon?: WebglAddonType;
private _element?: HTMLElement;
private _currentStickyCommand?: ITerminalCommand | ICurrentPartialCommand;
@ -69,6 +71,7 @@ export class TerminalStickyScrollOverlay extends Disposable {
@IContextMenuService private readonly _contextMenuService: IContextMenuService,
@IKeybindingService private readonly _keybindingService: IKeybindingService,
@IMenuService menuService: IMenuService,
@ITerminalConfigurationService private readonly _terminalConfigurationService: ITerminalConfigurationService,
@IThemeService private readonly _themeService: IThemeService,
) {
super();
@ -101,6 +104,7 @@ export class TerminalStickyScrollOverlay extends Disposable {
allowProposedApi: true,
...this._getOptions()
}));
this._refreshGpuAcceleration();
this._register(configurationService.onDidChangeConfiguration(e => {
if (e.affectsConfiguration(TERMINAL_CONFIG_SECTION)) {
this._syncOptions();
@ -413,6 +417,7 @@ export class TerminalStickyScrollOverlay extends Disposable {
}
this._stickyScrollOverlay.resize(this._xterm.raw.cols, this._stickyScrollOverlay.rows);
this._stickyScrollOverlay.options = this._getOptions();
this._refreshGpuAcceleration();
}
private _getOptions(): ITerminalOptions {
@ -435,9 +440,29 @@ export class TerminalStickyScrollOverlay extends Disposable {
minimumContrastRatio: o.minimumContrastRatio,
tabStopWidth: o.tabStopWidth,
overviewRulerWidth: o.overviewRulerWidth,
customGlyphs: o.customGlyphs,
};
}
@throttle(0)
private async _refreshGpuAcceleration() {
if (this._shouldLoadWebgl() && !this._webglAddon) {
const WebglAddon = await this._getWebglAddonConstructor();
if (this._store.isDisposed) {
return;
}
this._webglAddon = this._register(new WebglAddon());
this._stickyScrollOverlay?.loadAddon(this._webglAddon);
} else if (!this._shouldLoadWebgl() && this._webglAddon) {
this._webglAddon.dispose();
this._webglAddon = undefined;
}
}
private _shouldLoadWebgl(): boolean {
return this._terminalConfigurationService.config.gpuAcceleration === 'auto' || this._terminalConfigurationService.config.gpuAcceleration === 'on';
}
private _getTheme(isHovering: boolean): ITheme {
const theme = this._themeService.getColorTheme();
return {
@ -452,8 +477,12 @@ export class TerminalStickyScrollOverlay extends Disposable {
@memoize
private async _getSerializeAddonConstructor(): Promise<typeof SerializeAddonType> {
const m = await importAMDNodeModule<typeof import('@xterm/addon-serialize')>('@xterm/addon-serialize', 'lib/addon-serialize.js');
return m.SerializeAddon;
return (await importAMDNodeModule<typeof import('@xterm/addon-serialize')>('@xterm/addon-serialize', 'lib/addon-serialize.js')).SerializeAddon;
}
@memoize
private async _getWebglAddonConstructor(): Promise<typeof WebglAddonType> {
return (await importAMDNodeModule<typeof import('@xterm/addon-webgl')>('@xterm/addon-webgl', 'lib/addon-webgl.js')).WebglAddon;
}
}