move safari check to WebglAddon ctor

xtermjs · Dec 7, 2022 · d2298d8 · d2298d8
1 parent 0b56b56
commit d2298d8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git 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
@@ -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);
   }