From e46a9e12d0107085ec3f0db73aaf938a8d2389b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= Date: Tue, 6 Dec 2022 13:40:25 +0100 Subject: [PATCH 1/3] fix demo in epiphany --- .../xterm-addon-canvas/src/BaseRenderLayer.ts | 3 +++ demo/client.ts | 24 +++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/addons/xterm-addon-canvas/src/BaseRenderLayer.ts b/addons/xterm-addon-canvas/src/BaseRenderLayer.ts index d2a7a4ed2d..fb1468842b 100644 --- a/addons/xterm-addon-canvas/src/BaseRenderLayer.ts +++ b/addons/xterm-addon-canvas/src/BaseRenderLayer.ts @@ -373,6 +373,9 @@ export abstract class BaseRenderLayer extends Disposable implements IRenderLayer } else { glyph = this._charAtlas.getRasterizedGlyph(cell.getCode() || WHITESPACE_CELL_CODE, this._cellColorResolver.result.bg, this._cellColorResolver.result.fg, this._cellColorResolver.result.ext); } + if (!glyph.size.x || !glyph.size.y) { + return; + } this._ctx.save(); this._clipRow(y); // Draw the image, use the bitmap if it's available diff --git a/demo/client.ts b/demo/client.ts index 38c4748a0b..280b5e561c 100644 --- a/demo/client.ts +++ b/demo/client.ts @@ -273,22 +273,22 @@ function createTerminal(): void { socketURL = protocol + location.hostname + ((location.port) ? (':' + location.port) : '') + '/terminals/'; addons.fit.instance!.fit(); - typedTerm.loadAddon(addons.webgl.instance); - setTimeout(() => { - if (addons.webgl.instance !== undefined) { - setTextureAtlas(addons.webgl.instance.textureAtlas); - addons.webgl.instance.onChangeTextureAtlas(e => setTextureAtlas(e)); - addons.webgl.instance.onAddTextureAtlasCanvas(e => appendTextureAtlas(e)); - addons.webgl.instance.onRemoveTextureAtlasCanvas(e => removeTextureAtlas(e)); - } - }, 0); - try { // try-catch to allow the demo to load if webgl is not supported + // try to start with webgl renderer (might throw on older safari/webkit) + try { + typedTerm.loadAddon(addons.webgl.instance); term.open(terminalContainer); - } - catch { + setTextureAtlas(addons.webgl.instance.textureAtlas); + addons.webgl.instance.onChangeTextureAtlas(e => setTextureAtlas(e)); + addons.webgl.instance.onAddTextureAtlasCanvas(e => appendTextureAtlas(e)); + addons.webgl.instance.onRemoveTextureAtlasCanvas(e => removeTextureAtlas(e)); + } catch (e) { + console.log(e); + addons.webgl.instance.dispose(); addons.webgl.instance = undefined; + term.open(terminalContainer); } + term.focus(); addDomListener(paddingElement, 'change', setPadding); From 0b56b56c069ab257a9ce55a642d5369dbc04f3ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= Date: Wed, 7 Dec 2022 22:55:45 +0100 Subject: [PATCH 2/3] skipping renderer on NUL and SP --- addons/xterm-addon-canvas/src/TextRenderLayer.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/xterm-addon-canvas/src/TextRenderLayer.ts b/addons/xterm-addon-canvas/src/TextRenderLayer.ts index 66fc5106bb..b429e8c226 100644 --- a/addons/xterm-addon-canvas/src/TextRenderLayer.ts +++ b/addons/xterm-addon-canvas/src/TextRenderLayer.ts @@ -95,6 +95,12 @@ export class TextRenderLayer extends BaseRenderLayer { continue; } + // exit early for NULL and SP + const code = cell.getCode(); + if (code === 0 || code === 32) { + continue; + } + // Process any joined character ranges as needed. Because of how the // ranges are produced, we know that they are valid for the characters // and attributes of our input. From d2298d84a0b2846d146dcf232d791bd1632d20ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= Date: Wed, 7 Dec 2022 23:56:43 +0100 Subject: [PATCH 3/3] move safari check to WebglAddon ctor --- addons/xterm-addon-webgl/src/WebglAddon.ts | 8 ++--- demo/client.ts | 34 +++++++++++++--------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/addons/xterm-addon-webgl/src/WebglAddon.ts b/addons/xterm-addon-webgl/src/WebglAddon.ts index 6dbbeca927..97e2ce0cb3 100644 --- a/addons/xterm-addon-webgl/src/WebglAddon.ts +++ b/addons/xterm-addon-webgl/src/WebglAddon.ts @@ -9,7 +9,6 @@ import { EventEmitter, forwardEvent } from 'common/EventEmitter'; import { Disposable, toDisposable } from 'common/Lifecycle'; import { getSafariVersion, isSafari } from 'common/Platform'; import { ICoreService, IDecorationService, IOptionsService } from 'common/services/Services'; -import { ICoreTerminal } from 'common/Types'; import { ITerminalAddon, Terminal } from 'xterm'; import { WebglRenderer } from './WebglRenderer'; @@ -29,14 +28,13 @@ export class WebglAddon extends Disposable implements ITerminalAddon { constructor( private _preserveDrawingBuffer?: boolean ) { - super(); - } - - public activate(terminal: Terminal): void { if (isSafari && getSafariVersion() < 16) { throw new Error('Webgl2 is only supported on Safari 16 and above'); } + super(); + } + public activate(terminal: Terminal): void { const core = (terminal as any)._core as ITerminal; if (!terminal.element) { this.register(core.onWillOpen(() => this.activate(terminal))); diff --git a/demo/client.ts b/demo/client.ts index 280b5e561c..7c04bb2a1c 100644 --- a/demo/client.ts +++ b/demo/client.ts @@ -250,7 +250,11 @@ function createTerminal(): void { addons.serialize.instance = new SerializeAddon(); addons.fit.instance = new FitAddon(); addons.unicode11.instance = new Unicode11Addon(); - addons.webgl.instance = new WebglAddon(); + try { // try to start with webgl renderer (might throw on older safari/webkit) + addons.webgl.instance = new WebglAddon(); + } catch (e) { + console.warn(e); + } addons['web-links'].instance = new WebLinksAddon(); typedTerm.loadAddon(addons.fit.instance); typedTerm.loadAddon(addons.search.instance); @@ -274,18 +278,22 @@ function createTerminal(): void { addons.fit.instance!.fit(); - // try to start with webgl renderer (might throw on older safari/webkit) - try { - typedTerm.loadAddon(addons.webgl.instance); - term.open(terminalContainer); - setTextureAtlas(addons.webgl.instance.textureAtlas); - addons.webgl.instance.onChangeTextureAtlas(e => setTextureAtlas(e)); - addons.webgl.instance.onAddTextureAtlasCanvas(e => appendTextureAtlas(e)); - addons.webgl.instance.onRemoveTextureAtlasCanvas(e => removeTextureAtlas(e)); - } catch (e) { - console.log(e); - addons.webgl.instance.dispose(); - addons.webgl.instance = undefined; + if (addons.webgl.instance) { + try { + typedTerm.loadAddon(addons.webgl.instance); + term.open(terminalContainer); + setTextureAtlas(addons.webgl.instance.textureAtlas); + addons.webgl.instance.onChangeTextureAtlas(e => setTextureAtlas(e)); + addons.webgl.instance.onAddTextureAtlasCanvas(e => appendTextureAtlas(e)); + addons.webgl.instance.onRemoveTextureAtlasCanvas(e => removeTextureAtlas(e)); + } catch (e) { + console.warn('error during loading webgl addon:', e); + addons.webgl.instance.dispose(); + addons.webgl.instance = undefined; + } + } + if (!typedTerm.element) { + // webgl loading failed for some reason, attach with DOM renderer term.open(terminalContainer); }