Get canvas renderer addon working
This commit is contained in:
@@ -3,40 +3,44 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import { IRenderService } from 'browser/services/Services';
|
||||||
|
import { IColorSet } from 'browser/Types';
|
||||||
|
import { CanvasRenderer } from './CanvasRenderer';
|
||||||
|
import { IBufferService, IInstantiationService } from 'common/services/Services';
|
||||||
import { ITerminalAddon, Terminal } from 'xterm';
|
import { ITerminalAddon, Terminal } from 'xterm';
|
||||||
|
|
||||||
export class CanvasAddon implements ITerminalAddon {
|
export class CanvasAddon implements ITerminalAddon {
|
||||||
private _terminal?: Terminal;
|
private _terminal?: Terminal;
|
||||||
// private _renderer?: WebglRenderer;
|
private _renderer?: CanvasRenderer;
|
||||||
// private _onContextLoss = new EventEmitter<void>();
|
// private _onContextLoss = new EventEmitter<void>();
|
||||||
// public get onContextLoss(): IEvent<void> { return this._onContextLoss.event; }
|
// public get onContextLoss(): IEvent<void> { return this._onContextLoss.event; }
|
||||||
|
|
||||||
public activate(terminal: Terminal): void {
|
public activate(terminal: Terminal): void {
|
||||||
// if (!terminal.element) {
|
if (!terminal.element) {
|
||||||
// throw new Error('Cannot activate WebglAddon before Terminal.open');
|
throw new Error('Cannot activate CanvasAddon before Terminal.open');
|
||||||
// }
|
}
|
||||||
// if (isSafari) {
|
|
||||||
// throw new Error('Webgl is not currently supported on Safari');
|
|
||||||
// }
|
|
||||||
this._terminal = terminal;
|
this._terminal = terminal;
|
||||||
// const renderService: IRenderService = (terminal as any)._core._renderService;
|
const instantiationService: IInstantiationService = (terminal as any)._core._instantiationService;
|
||||||
// const characterJoinerService: ICharacterJoinerService = (terminal as any)._core._characterJoinerService;
|
const bufferService: IBufferService = (terminal as any)._core._renderService;
|
||||||
// const decorationService: IDecorationService = (terminal as any)._core._decorationService;
|
const renderService: IRenderService = (terminal as any)._core._renderService;
|
||||||
// const colors: IColorSet = (terminal as any)._core._colorManager.colors;
|
const colors: IColorSet = (terminal as any)._core._colorManager.colors;
|
||||||
// this._renderer = new WebglRenderer(terminal, colors, characterJoinerService, decorationService, this._preserveDrawingBuffer);
|
const screenElement: HTMLElement = (terminal as any)._core.screenElement;
|
||||||
|
const linkifier = (terminal as any)._core.linkifier2;
|
||||||
|
this._renderer = instantiationService.createInstance(CanvasRenderer, colors, screenElement, linkifier);
|
||||||
// this._renderer.onContextLoss(() => this._onContextLoss.fire());
|
// this._renderer.onContextLoss(() => this._onContextLoss.fire());
|
||||||
// renderService.setRenderer(this._renderer);
|
renderService.setRenderer(this._renderer);
|
||||||
|
renderService.onResize(bufferService.cols, bufferService.rows);
|
||||||
}
|
}
|
||||||
|
|
||||||
public dispose(): void {
|
public dispose(): void {
|
||||||
// if (!this._terminal) {
|
if (!this._terminal) {
|
||||||
// throw new Error('Cannot dispose WebglAddon because it is activated');
|
throw new Error('Cannot dispose CanvasAddon because it is activated');
|
||||||
// }
|
}
|
||||||
// const renderService: IRenderService = (this._terminal as any)._core._renderService;
|
const renderService: IRenderService = (this._terminal as any)._core._renderService;
|
||||||
// renderService.setRenderer((this._terminal as any)._core._createRenderer());
|
renderService.setRenderer((this._terminal as any)._core._createRenderer());
|
||||||
// renderService.onResize(this._terminal.cols, this._terminal.rows);
|
renderService.onResize(this._terminal.cols, this._terminal.rows);
|
||||||
// this._renderer?.dispose();
|
this._renderer?.dispose();
|
||||||
// this._renderer = undefined;
|
this._renderer = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
// public get textureAtlas(): HTMLCanvasElement | undefined {
|
// public get textureAtlas(): HTMLCanvasElement | undefined {
|
||||||
|
|||||||
+1
-1
@@ -18,7 +18,7 @@ import { EventEmitter, IEvent } from 'common/EventEmitter';
|
|||||||
|
|
||||||
let nextRendererId = 1;
|
let nextRendererId = 1;
|
||||||
|
|
||||||
export class Renderer extends Disposable implements IRenderer {
|
export class CanvasRenderer extends Disposable implements IRenderer {
|
||||||
private _id = nextRendererId++;
|
private _id = nextRendererId++;
|
||||||
|
|
||||||
private _renderLayers: IRenderLayer[];
|
private _renderLayers: IRenderLayer[];
|
||||||
+5
-3
@@ -54,7 +54,7 @@ let socketURL;
|
|||||||
let socket;
|
let socket;
|
||||||
let pid;
|
let pid;
|
||||||
|
|
||||||
type AddonType = 'attach' | 'fit' | 'search' | 'serialize' | 'unicode11' | 'web-links' | 'webgl' | 'ligatures';
|
type AddonType = 'attach' | 'canvas' | 'fit' | 'search' | 'serialize' | 'unicode11' | 'web-links' | 'webgl' | 'ligatures';
|
||||||
|
|
||||||
interface IDemoAddon<T extends AddonType> {
|
interface IDemoAddon<T extends AddonType> {
|
||||||
name: T;
|
name: T;
|
||||||
@@ -84,6 +84,7 @@ interface IDemoAddon<T extends AddonType> {
|
|||||||
|
|
||||||
const addons: { [T in AddonType]: IDemoAddon<T>} = {
|
const addons: { [T in AddonType]: IDemoAddon<T>} = {
|
||||||
attach: { name: 'attach', ctor: AttachAddon, canChange: false },
|
attach: { name: 'attach', ctor: AttachAddon, canChange: false },
|
||||||
|
canvas: { name: 'canvas', ctor: CanvasAddon, canChange: true },
|
||||||
fit: { name: 'fit', ctor: FitAddon, canChange: false },
|
fit: { name: 'fit', ctor: FitAddon, canChange: false },
|
||||||
search: { name: 'search', ctor: SearchAddon, canChange: true },
|
search: { name: 'search', ctor: SearchAddon, canChange: true },
|
||||||
serialize: { name: 'serialize', ctor: SerializeAddon, canChange: true },
|
serialize: { name: 'serialize', ctor: SerializeAddon, canChange: true },
|
||||||
@@ -153,6 +154,7 @@ const disposeRecreateButtonHandler = () => {
|
|||||||
window.term = null;
|
window.term = null;
|
||||||
socket = null;
|
socket = null;
|
||||||
addons.attach.instance = undefined;
|
addons.attach.instance = undefined;
|
||||||
|
addons.canvas.instance = undefined;
|
||||||
addons.fit.instance = undefined;
|
addons.fit.instance = undefined;
|
||||||
addons.search.instance = undefined;
|
addons.search.instance = undefined;
|
||||||
addons.serialize.instance = undefined;
|
addons.serialize.instance = undefined;
|
||||||
@@ -630,7 +632,7 @@ function writeCustomGlyphHandler() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function loadTest() {
|
function loadTest() {
|
||||||
const isWebglEnabled = !!addons.webgl.instance;
|
const rendererName = addons.webgl.instance ? 'webgl' : !!addons.canvas.instance ? 'canvas' : 'dom';
|
||||||
const testData = [];
|
const testData = [];
|
||||||
let byteCount = 0;
|
let byteCount = 0;
|
||||||
for (let i = 0; i < 50; i++) {
|
for (let i = 0; i < 50; i++) {
|
||||||
@@ -656,7 +658,7 @@ function loadTest() {
|
|||||||
term.write('', () => {
|
term.write('', () => {
|
||||||
const time = Math.round(performance.now() - start);
|
const time = Math.round(performance.now() - start);
|
||||||
const mbs = ((byteCount / 1024) * (1 / (time / 1000))).toFixed(2);
|
const mbs = ((byteCount / 1024) * (1 / (time / 1000))).toFixed(2);
|
||||||
term.write(`\n\r\nWrote ${byteCount}kB in ${time}ms (${mbs}MB/s) using the (${isWebglEnabled ? 'webgl' : 'canvas'} renderer)`);
|
term.write(`\n\r\nWrote ${byteCount}kB in ${time}ms (${mbs}MB/s) using the (${rendererName} renderer)`);
|
||||||
// Send ^C to get a new prompt
|
// Send ^C to get a new prompt
|
||||||
term._core._onData.fire('\x03');
|
term._core._onData.fire('\x03');
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user