@xterm/addon-webgl 0.17.0-beta.2 → 0.17.0-beta.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xterm/addon-webgl",
-  "version": "0.17.0-beta.2",
+  "version": "0.17.0-beta.21",
   "author": {
     "name": "The xterm.js authors",
     "url": "https://xtermjs.org/"

package/src/WebglAddon.ts

@@ -3,17 +3,19 @@
  * @license MIT
  */
 
+import type { ITerminalAddon, Terminal } from '@xterm/xterm';
+import type { WebglAddon as IWebglApi } from '@xterm/addon-webgl';
 import { ICharacterJoinerService, ICharSizeService, ICoreBrowserService, IRenderService, IThemeService } from 'browser/services/Services';
 import { ITerminal } from 'browser/Types';
 import { EventEmitter, forwardEvent } from 'common/EventEmitter';
 import { Disposable, toDisposable } from 'common/Lifecycle';
 import { getSafariVersion, isSafari } from 'common/Platform';
 import { ICoreService, IDecorationService, ILogService, IOptionsService } from 'common/services/Services';
-import { ITerminalAddon, Terminal } from '@xterm/xterm';
+import { IWebGL2RenderingContext } from './Types';
 import { WebglRenderer } from './WebglRenderer';
 import { setTraceLogger } from 'common/services/LogService';
 
-export class WebglAddon extends Disposable implements ITerminalAddon {
+export class WebglAddon extends Disposable implements ITerminalAddon , IWebglApi {
   private _terminal?: Terminal;
   private _renderer?: WebglRenderer;
 
@@ -30,7 +32,16 @@ export class WebglAddon extends Disposable implements ITerminalAddon {
     private _preserveDrawingBuffer?: boolean
   ) {
     if (isSafari && getSafariVersion() < 16) {
-      throw new Error('Webgl2 is only supported on Safari 16 and above');
+      // Perform an extra check to determine if Webgl2 is manually enabled in developer settings
+      const contextAttributes = {
+        antialias: false,
+        depth: false,
+        preserveDrawingBuffer: true
+      };
+      const gl = document.createElement('canvas').getContext('webgl2', contextAttributes) as IWebGL2RenderingContext;
+      if (!gl) {
+        throw new Error('Webgl2 is only supported on Safari 16 and above');
+      }
     }
     super();
   }

package/src/WebglRenderer.ts

@@ -33,6 +33,7 @@ export class WebglRenderer extends Disposable implements IRenderer {
   private _charAtlasDisposable = this.register(new MutableDisposable());
   private _charAtlas: ITextureAtlas | undefined;
   private _devicePixelRatio: number;
+  private _observerDisposable = this.register(new MutableDisposable());
 
   private _model: RenderModel = new RenderModel();
   private _workCell: CellData = new CellData();
@@ -75,12 +76,12 @@ export class WebglRenderer extends Disposable implements IRenderer {
 
     this.register(this._themeService.onChangeColors(() => this._handleColorChange()));
 
-    this._cellColorResolver = new CellColorResolver(this._terminal, this._model.selection, this._decorationService, this._coreBrowserService, this._themeService);
+    this._cellColorResolver = new CellColorResolver(this._terminal, this._optionsService, this._model.selection, this._decorationService, this._coreBrowserService, this._themeService);
 
     this._core = (this._terminal as any)._core;
 
     this._renderLayers = [
-      new LinkRenderLayer(this._core.screenElement!, 2, this._terminal, this._core.linkifier2, this._coreBrowserService, _optionsService, this._themeService)
+      new LinkRenderLayer(this._core.screenElement!, 2, this._terminal, this._core.linkifier!, this._coreBrowserService, _optionsService, this._themeService)
     ];
     this.dimensions = createRenderDimensions();
     this._devicePixelRatio = this._coreBrowserService.dpr;
@@ -123,7 +124,10 @@ export class WebglRenderer extends Disposable implements IRenderer {
       this._requestRedrawViewport();
     }));
 
-    this.register(observeDevicePixelDimensions(this._canvas, this._coreBrowserService.window, (w, h) => this._setCanvasDevicePixelDimensions(w, h)));
+    this._observerDisposable.value = observeDevicePixelDimensions(this._canvas, this._coreBrowserService.window, (w, h) => this._setCanvasDevicePixelDimensions(w, h));
+    this.register(this._coreBrowserService.onWindowChange(w => {
+      this._observerDisposable.value = observeDevicePixelDimensions(this._canvas, w, (w, h) => this._setCanvasDevicePixelDimensions(w, h));
+    }));
 
     this._core.screenElement!.appendChild(this._canvas);
 
@@ -219,7 +223,7 @@ export class WebglRenderer extends Disposable implements IRenderer {
     for (const l of this._renderLayers) {
       l.handleSelectionChanged(this._terminal, start, end, columnSelectMode);
     }
-    this._model.selection.update(this._terminal, start, end, columnSelectMode);
+    this._model.selection.update(this._core, start, end, columnSelectMode);
     this._requestRedrawViewport();
   }
 
@@ -391,6 +395,7 @@ export class WebglRenderer extends Disposable implements IRenderer {
     end = clamp(end, terminal.rows - 1, 0);
 
     const cursorY = this._terminal.buffer.active.baseY + this._terminal.buffer.active.cursorY;
+    const viewportRelativeCursorY = cursorY - terminal.buffer.ydisp;
     // in case cursor.x == cols adjust visual cursor to cols - 1
     const cursorX = Math.min(this._terminal.buffer.active.cursorX, terminal.cols - 1);
     let lastCursorX = -1;
@@ -442,14 +447,14 @@ export class WebglRenderer extends Disposable implements IRenderer {
         i = ((y * terminal.cols) + x) * RENDER_MODEL_INDICIES_PER_CELL;
 
         // Load colors/resolve overrides into work colors
-        this._cellColorResolver.resolve(cell, x, row);
+        this._cellColorResolver.resolve(cell, x, row, this.dimensions.device.cell.width);
 
         // Override colors for cursor cell
         if (isCursorVisible && row === cursorY) {
           if (x === cursorX) {
             this._model.cursor = {
               x: cursorX,
-              y: this._terminal.buffer.active.cursorY,
+              y: viewportRelativeCursorY,
               width: cell.getWidth(),
               style: this._coreBrowserService.isFocused ?
                 (terminal.options.cursorStyle || 'block') : terminal.options.cursorInactiveStyle,