Merge branch 'master' into parser_colon_notation
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { createProgram, PROJECTION_MATRIX } from './WebglUtils';
|
import { createProgram, PROJECTION_MATRIX, throwIfFalsy } from './WebglUtils';
|
||||||
import { WebglCharAtlas } from './atlas/WebglCharAtlas';
|
import { WebglCharAtlas } from './atlas/WebglCharAtlas';
|
||||||
import { IWebGL2RenderingContext, IWebGLVertexArrayObject, IRenderModel, IRasterizedGlyph } from './Types';
|
import { IWebGL2RenderingContext, IWebGLVertexArrayObject, IRenderModel, IRasterizedGlyph } from './Types';
|
||||||
import { INDICIES_PER_CELL } from './WebglRenderer';
|
import { INDICIES_PER_CELL } from './WebglRenderer';
|
||||||
@@ -75,7 +75,7 @@ const BYTES_PER_CELL = INDICES_PER_CELL * Float32Array.BYTES_PER_ELEMENT;
|
|||||||
const CELL_POSITION_INDICES = 2;
|
const CELL_POSITION_INDICES = 2;
|
||||||
|
|
||||||
export class GlyphRenderer {
|
export class GlyphRenderer {
|
||||||
private _atlas: WebglCharAtlas;
|
private _atlas: WebglCharAtlas | undefined;
|
||||||
|
|
||||||
private _program: WebGLProgram;
|
private _program: WebGLProgram;
|
||||||
private _vertexArrayObject: IWebGLVertexArrayObject;
|
private _vertexArrayObject: IWebGLVertexArrayObject;
|
||||||
@@ -104,12 +104,16 @@ export class GlyphRenderer {
|
|||||||
) {
|
) {
|
||||||
const gl = this._gl;
|
const gl = this._gl;
|
||||||
|
|
||||||
this._program = createProgram(gl, vertexShaderSource, fragmentShaderSource);
|
const program = throwIfFalsy(createProgram(gl, vertexShaderSource, fragmentShaderSource));
|
||||||
|
if (program === undefined) {
|
||||||
|
throw new Error('Could not create WebGL program');
|
||||||
|
}
|
||||||
|
this._program = program;
|
||||||
|
|
||||||
// Uniform locations
|
// Uniform locations
|
||||||
this._projectionLocation = gl.getUniformLocation(this._program, 'u_projection');
|
this._projectionLocation = throwIfFalsy(gl.getUniformLocation(this._program, 'u_projection'));
|
||||||
this._resolutionLocation = gl.getUniformLocation(this._program, 'u_resolution');
|
this._resolutionLocation = throwIfFalsy(gl.getUniformLocation(this._program, 'u_resolution'));
|
||||||
this._textureLocation = gl.getUniformLocation(this._program, 'u_texture');
|
this._textureLocation = throwIfFalsy(gl.getUniformLocation(this._program, 'u_texture'));
|
||||||
|
|
||||||
// Create and set the vertex array object
|
// Create and set the vertex array object
|
||||||
this._vertexArrayObject = gl.createVertexArray();
|
this._vertexArrayObject = gl.createVertexArray();
|
||||||
@@ -131,7 +135,7 @@ export class GlyphRenderer {
|
|||||||
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, unitQuadElementIndices, gl.STATIC_DRAW);
|
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, unitQuadElementIndices, gl.STATIC_DRAW);
|
||||||
|
|
||||||
// Setup attributes
|
// Setup attributes
|
||||||
this._attributesBuffer = gl.createBuffer();
|
this._attributesBuffer = throwIfFalsy(gl.createBuffer());
|
||||||
gl.bindBuffer(gl.ARRAY_BUFFER, this._attributesBuffer);
|
gl.bindBuffer(gl.ARRAY_BUFFER, this._attributesBuffer);
|
||||||
gl.enableVertexAttribArray(VertexAttribLocations.OFFSET);
|
gl.enableVertexAttribArray(VertexAttribLocations.OFFSET);
|
||||||
gl.vertexAttribPointer(VertexAttribLocations.OFFSET, 2, gl.FLOAT, false, BYTES_PER_CELL, 0);
|
gl.vertexAttribPointer(VertexAttribLocations.OFFSET, 2, gl.FLOAT, false, BYTES_PER_CELL, 0);
|
||||||
@@ -150,7 +154,7 @@ export class GlyphRenderer {
|
|||||||
gl.vertexAttribDivisor(VertexAttribLocations.CELL_POSITION, 1);
|
gl.vertexAttribDivisor(VertexAttribLocations.CELL_POSITION, 1);
|
||||||
|
|
||||||
// Setup empty texture atlas
|
// Setup empty texture atlas
|
||||||
this._atlasTexture = gl.createTexture();
|
this._atlasTexture = throwIfFalsy(gl.createTexture());
|
||||||
gl.bindTexture(gl.TEXTURE_2D, this._atlasTexture);
|
gl.bindTexture(gl.TEXTURE_2D, this._atlasTexture);
|
||||||
gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 1, 1, 0, gl.RGBA, gl.UNSIGNED_BYTE, new Uint8Array([0, 0, 255, 255]));
|
gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 1, 1, 0, gl.RGBA, gl.UNSIGNED_BYTE, new Uint8Array([0, 0, 255, 255]));
|
||||||
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
|
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
|
||||||
@@ -165,7 +169,7 @@ export class GlyphRenderer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public beginFrame(): boolean {
|
public beginFrame(): boolean {
|
||||||
return this._atlas.beginFrame();
|
return this._atlas ? this._atlas.beginFrame() : true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public updateCell(x: number, y: number, code: number, attr: number, bg: number, fg: number, chars: string): void {
|
public updateCell(x: number, y: number, code: number, attr: number, bg: number, fg: number, chars: string): void {
|
||||||
@@ -184,6 +188,9 @@ export class GlyphRenderer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let rasterizedGlyph: IRasterizedGlyph;
|
let rasterizedGlyph: IRasterizedGlyph;
|
||||||
|
if (!this._atlas) {
|
||||||
|
throw new Error('atlas must be set before updating cell');
|
||||||
|
}
|
||||||
if (chars && chars.length > 1) {
|
if (chars && chars.length > 1) {
|
||||||
rasterizedGlyph = this._atlas.getRasterizedGlyphCombinedChar(chars, attr, bg, fg);
|
rasterizedGlyph = this._atlas.getRasterizedGlyphCombinedChar(chars, attr, bg, fg);
|
||||||
} else {
|
} else {
|
||||||
@@ -264,7 +271,7 @@ export class GlyphRenderer {
|
|||||||
if (!line) {
|
if (!line) {
|
||||||
line = terminal.buffer.getLine(row);
|
line = terminal.buffer.getLine(row);
|
||||||
}
|
}
|
||||||
const chars = line.getCell(x).char;
|
const chars = line!.getCell(x)!.char;
|
||||||
this._updateCell(this._vertices.selectionAttributes, x, y, model.cells[offset], attr, bg, fg, chars);
|
this._updateCell(this._vertices.selectionAttributes, x, y, model.cells[offset], attr, bg, fg, chars);
|
||||||
} else {
|
} else {
|
||||||
this._updateCell(this._vertices.selectionAttributes, x, y, model.cells[offset], attr, bg, fg);
|
this._updateCell(this._vertices.selectionAttributes, x, y, model.cells[offset], attr, bg, fg);
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { createProgram, expandFloat32Array, PROJECTION_MATRIX } from './WebglUtils';
|
import { createProgram, expandFloat32Array, PROJECTION_MATRIX, throwIfFalsy } from './WebglUtils';
|
||||||
import { IRenderModel, IWebGLVertexArrayObject, IWebGL2RenderingContext, ISelectionRenderModel } from './Types';
|
import { IRenderModel, IWebGLVertexArrayObject, IWebGL2RenderingContext, ISelectionRenderModel } from './Types';
|
||||||
import { fill } from 'common/TypedArrayUtils';
|
import { fill } from 'common/TypedArrayUtils';
|
||||||
import { INVERTED_DEFAULT_COLOR } from 'browser/renderer/atlas/Constants';
|
import { INVERTED_DEFAULT_COLOR } from 'browser/renderer/atlas/Constants';
|
||||||
@@ -66,8 +66,8 @@ export class RectangleRenderer {
|
|||||||
private _resolutionLocation: WebGLUniformLocation;
|
private _resolutionLocation: WebGLUniformLocation;
|
||||||
private _attributesBuffer: WebGLBuffer;
|
private _attributesBuffer: WebGLBuffer;
|
||||||
private _projectionLocation: WebGLUniformLocation;
|
private _projectionLocation: WebGLUniformLocation;
|
||||||
private _bgFloat: Float32Array;
|
private _bgFloat!: Float32Array;
|
||||||
private _selectionFloat: Float32Array;
|
private _selectionFloat!: Float32Array;
|
||||||
|
|
||||||
private _vertices: IVertices = {
|
private _vertices: IVertices = {
|
||||||
count: 0,
|
count: 0,
|
||||||
@@ -83,11 +83,11 @@ export class RectangleRenderer {
|
|||||||
) {
|
) {
|
||||||
const gl = this._gl;
|
const gl = this._gl;
|
||||||
|
|
||||||
this._program = createProgram(gl, vertexShaderSource, fragmentShaderSource);
|
this._program = throwIfFalsy(createProgram(gl, vertexShaderSource, fragmentShaderSource));
|
||||||
|
|
||||||
// Uniform locations
|
// Uniform locations
|
||||||
this._resolutionLocation = gl.getUniformLocation(this._program, 'u_resolution');
|
this._resolutionLocation = throwIfFalsy(gl.getUniformLocation(this._program, 'u_resolution'));
|
||||||
this._projectionLocation = gl.getUniformLocation(this._program, 'u_projection');
|
this._projectionLocation = throwIfFalsy(gl.getUniformLocation(this._program, 'u_projection'));
|
||||||
|
|
||||||
// Create and set the vertex array object
|
// Create and set the vertex array object
|
||||||
this._vertexArrayObject = gl.createVertexArray();
|
this._vertexArrayObject = gl.createVertexArray();
|
||||||
@@ -109,7 +109,7 @@ export class RectangleRenderer {
|
|||||||
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, unitQuadElementIndices, gl.STATIC_DRAW);
|
gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, unitQuadElementIndices, gl.STATIC_DRAW);
|
||||||
|
|
||||||
// Setup attributes
|
// Setup attributes
|
||||||
this._attributesBuffer = gl.createBuffer();
|
this._attributesBuffer = throwIfFalsy(gl.createBuffer());
|
||||||
gl.bindBuffer(gl.ARRAY_BUFFER, this._attributesBuffer);
|
gl.bindBuffer(gl.ARRAY_BUFFER, this._attributesBuffer);
|
||||||
gl.enableVertexAttribArray(VertexAttribLocations.POSITION);
|
gl.enableVertexAttribArray(VertexAttribLocations.POSITION);
|
||||||
gl.vertexAttribPointer(VertexAttribLocations.POSITION, 2, gl.FLOAT, false, BYTES_PER_RECTANGLE, 0);
|
gl.vertexAttribPointer(VertexAttribLocations.POSITION, 2, gl.FLOAT, false, BYTES_PER_RECTANGLE, 0);
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ export const INDICIES_PER_CELL = 4;
|
|||||||
|
|
||||||
export class WebglRenderer extends Disposable implements IRenderer {
|
export class WebglRenderer extends Disposable implements IRenderer {
|
||||||
private _renderLayers: IRenderLayer[];
|
private _renderLayers: IRenderLayer[];
|
||||||
private _charAtlas: WebglCharAtlas;
|
private _charAtlas: WebglCharAtlas | undefined;
|
||||||
private _devicePixelRatio: number;
|
private _devicePixelRatio: number;
|
||||||
|
|
||||||
private _model: RenderModel = new RenderModel();
|
private _model: RenderModel = new RenderModel();
|
||||||
@@ -57,18 +57,18 @@ export class WebglRenderer extends Disposable implements IRenderer {
|
|||||||
new CursorRenderLayer(this._core.screenElement, 3, this._colors)
|
new CursorRenderLayer(this._core.screenElement, 3, this._colors)
|
||||||
];
|
];
|
||||||
this.dimensions = {
|
this.dimensions = {
|
||||||
scaledCharWidth: null,
|
scaledCharWidth: 0,
|
||||||
scaledCharHeight: null,
|
scaledCharHeight: 0,
|
||||||
scaledCellWidth: null,
|
scaledCellWidth: 0,
|
||||||
scaledCellHeight: null,
|
scaledCellHeight: 0,
|
||||||
scaledCharLeft: null,
|
scaledCharLeft: 0,
|
||||||
scaledCharTop: null,
|
scaledCharTop: 0,
|
||||||
scaledCanvasWidth: null,
|
scaledCanvasWidth: 0,
|
||||||
scaledCanvasHeight: null,
|
scaledCanvasHeight: 0,
|
||||||
canvasWidth: null,
|
canvasWidth: 0,
|
||||||
canvasHeight: null,
|
canvasHeight: 0,
|
||||||
actualCellWidth: null,
|
actualCellWidth: 0,
|
||||||
actualCellHeight: null
|
actualCellHeight: 0
|
||||||
};
|
};
|
||||||
this._devicePixelRatio = window.devicePixelRatio;
|
this._devicePixelRatio = window.devicePixelRatio;
|
||||||
this._updateDimensions();
|
this._updateDimensions();
|
||||||
@@ -252,7 +252,7 @@ export class WebglRenderer extends Disposable implements IRenderer {
|
|||||||
|
|
||||||
for (let y = start; y <= end; y++) {
|
for (let y = start; y <= end; y++) {
|
||||||
const row = y + terminal.buffer.ydisp;
|
const row = y + terminal.buffer.ydisp;
|
||||||
const line = terminal.buffer.lines.get(row);
|
const line = terminal.buffer.lines.get(row)!;
|
||||||
this._model.lineLengths[y] = 0;
|
this._model.lineLengths[y] = 0;
|
||||||
for (let x = 0; x < terminal.cols; x++) {
|
for (let x = 0; x < terminal.cols; x++) {
|
||||||
const charData = line.get(x);
|
const charData = line.get(x);
|
||||||
|
|||||||
@@ -15,9 +15,9 @@ export const PROJECTION_MATRIX = new Float32Array([
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
export function createProgram(gl: WebGLRenderingContext, vertexSource: string, fragmentSource: string): WebGLProgram | undefined {
|
export function createProgram(gl: WebGLRenderingContext, vertexSource: string, fragmentSource: string): WebGLProgram | undefined {
|
||||||
const program = gl.createProgram();
|
const program = throwIfFalsy(gl.createProgram());
|
||||||
gl.attachShader(program, createShader(gl, gl.VERTEX_SHADER, vertexSource));
|
gl.attachShader(program, throwIfFalsy(createShader(gl, gl.VERTEX_SHADER, vertexSource)));
|
||||||
gl.attachShader(program, createShader(gl, gl.FRAGMENT_SHADER, fragmentSource));
|
gl.attachShader(program, throwIfFalsy(createShader(gl, gl.FRAGMENT_SHADER, fragmentSource)));
|
||||||
gl.linkProgram(program);
|
gl.linkProgram(program);
|
||||||
const success = gl.getProgramParameter(program, gl.LINK_STATUS);
|
const success = gl.getProgramParameter(program, gl.LINK_STATUS);
|
||||||
if (success) {
|
if (success) {
|
||||||
@@ -29,7 +29,7 @@ export function createProgram(gl: WebGLRenderingContext, vertexSource: string, f
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function createShader(gl: WebGLRenderingContext, type: number, source: string): WebGLShader | undefined {
|
export function createShader(gl: WebGLRenderingContext, type: number, source: string): WebGLShader | undefined {
|
||||||
const shader = gl.createShader(type);
|
const shader = throwIfFalsy(gl.createShader(type));
|
||||||
gl.shaderSource(shader, source);
|
gl.shaderSource(shader, source);
|
||||||
gl.compileShader(shader);
|
gl.compileShader(shader);
|
||||||
const success = gl.getShaderParameter(shader, gl.COMPILE_STATUS);
|
const success = gl.getShaderParameter(shader, gl.COMPILE_STATUS);
|
||||||
@@ -49,3 +49,10 @@ export function expandFloat32Array(source: Float32Array, max: number): Float32Ar
|
|||||||
}
|
}
|
||||||
return newArray;
|
return newArray;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function throwIfFalsy<T>(value: T | undefined | null): T {
|
||||||
|
if (!value) {
|
||||||
|
throw new Error('value must not be falsy');
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,56 +0,0 @@
|
|||||||
/**
|
|
||||||
* Copyright (c) 2017 The xterm.js authors. All rights reserved.
|
|
||||||
* @license MIT
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { IGlyphIdentifier } from './Types';
|
|
||||||
import { IDisposable } from 'xterm';
|
|
||||||
|
|
||||||
export abstract class BaseCharAtlas implements IDisposable {
|
|
||||||
private _didWarmUp: boolean = false;
|
|
||||||
|
|
||||||
public dispose(): void { }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Perform any work needed to warm the cache before it can be used. May be called multiple times.
|
|
||||||
* Implement _doWarmUp instead if you only want to get called once.
|
|
||||||
*/
|
|
||||||
public warmUp(): void {
|
|
||||||
if (!this._didWarmUp) {
|
|
||||||
this._doWarmUp();
|
|
||||||
this._didWarmUp = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Perform any work needed to warm the cache before it can be used. Used by the default
|
|
||||||
* implementation of warmUp(), and will only be called once.
|
|
||||||
*/
|
|
||||||
protected _doWarmUp(): void { }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called when we start drawing a new frame.
|
|
||||||
*
|
|
||||||
* TODO: We rely on this getting called by TextRenderLayer. This should really be called by
|
|
||||||
* Renderer instead, but we need to make Renderer the source-of-truth for the char atlas, instead
|
|
||||||
* of BaseRenderLayer.
|
|
||||||
*/
|
|
||||||
public beginFrame(): void { }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* May be called before warmUp finishes, however it is okay for the implementation to
|
|
||||||
* do nothing and return false in that case.
|
|
||||||
*
|
|
||||||
* @param ctx Where to draw the character onto.
|
|
||||||
* @param glyph Information about what to draw
|
|
||||||
* @param x The position on the context to start drawing at
|
|
||||||
* @param y The position on the context to start drawing at
|
|
||||||
* @returns The success state. True if we drew the character.
|
|
||||||
*/
|
|
||||||
public abstract draw(
|
|
||||||
ctx: CanvasRenderingContext2D,
|
|
||||||
glyph: IGlyphIdentifier,
|
|
||||||
x: number,
|
|
||||||
y: number
|
|
||||||
): boolean;
|
|
||||||
}
|
|
||||||
@@ -4,14 +4,13 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { generateConfig, configEquals } from './CharAtlasUtils';
|
import { generateConfig, configEquals } from './CharAtlasUtils';
|
||||||
import { BaseCharAtlas } from './BaseCharAtlas';
|
|
||||||
import { WebglCharAtlas } from './WebglCharAtlas';
|
import { WebglCharAtlas } from './WebglCharAtlas';
|
||||||
import { ICharAtlasConfig } from './Types';
|
import { ICharAtlasConfig } from './Types';
|
||||||
import { Terminal } from 'xterm';
|
import { Terminal } from 'xterm';
|
||||||
import { IColorSet } from 'browser/Types';
|
import { IColorSet } from 'browser/Types';
|
||||||
|
|
||||||
interface ICharAtlasCacheEntry {
|
interface ICharAtlasCacheEntry {
|
||||||
atlas: BaseCharAtlas;
|
atlas: WebglCharAtlas;
|
||||||
config: ICharAtlasConfig;
|
config: ICharAtlasConfig;
|
||||||
// N.B. This implementation potentially holds onto copies of the terminal forever, so
|
// N.B. This implementation potentially holds onto copies of the terminal forever, so
|
||||||
// this may cause memory leaks.
|
// this may cause memory leaks.
|
||||||
@@ -31,7 +30,7 @@ export function acquireCharAtlas(
|
|||||||
colors: IColorSet,
|
colors: IColorSet,
|
||||||
scaledCharWidth: number,
|
scaledCharWidth: number,
|
||||||
scaledCharHeight: number
|
scaledCharHeight: number
|
||||||
): BaseCharAtlas {
|
): WebglCharAtlas {
|
||||||
const newConfig = generateConfig(scaledCharWidth, scaledCharHeight, terminal, colors);
|
const newConfig = generateConfig(scaledCharWidth, scaledCharHeight, terminal, colors);
|
||||||
|
|
||||||
// Check to see if the terminal already owns this config
|
// Check to see if the terminal already owns this config
|
||||||
|
|||||||
@@ -6,16 +6,21 @@
|
|||||||
import { ICharAtlasConfig } from './Types';
|
import { ICharAtlasConfig } from './Types';
|
||||||
import { DEFAULT_COLOR } from 'common/buffer/Constants';
|
import { DEFAULT_COLOR } from 'common/buffer/Constants';
|
||||||
import { Terminal, FontWeight } from 'xterm';
|
import { Terminal, FontWeight } from 'xterm';
|
||||||
import { IColorSet } from 'browser/Types';
|
import { IColorSet, IColor } from 'browser/Types';
|
||||||
|
|
||||||
|
const NULL_COLOR: IColor = {
|
||||||
|
css: '',
|
||||||
|
rgba: 0
|
||||||
|
};
|
||||||
|
|
||||||
export function generateConfig(scaledCharWidth: number, scaledCharHeight: number, terminal: Terminal, colors: IColorSet): ICharAtlasConfig {
|
export function generateConfig(scaledCharWidth: number, scaledCharHeight: number, terminal: Terminal, colors: IColorSet): ICharAtlasConfig {
|
||||||
// null out some fields that don't matter
|
// null out some fields that don't matter
|
||||||
const clonedColors: IColorSet = {
|
const clonedColors: IColorSet = {
|
||||||
foreground: colors.foreground,
|
foreground: colors.foreground,
|
||||||
background: colors.background,
|
background: colors.background,
|
||||||
cursor: null,
|
cursor: NULL_COLOR,
|
||||||
cursorAccent: null,
|
cursorAccent: NULL_COLOR,
|
||||||
selection: null,
|
selection: NULL_COLOR,
|
||||||
// For the static char atlas, we only use the first 16 colors, but we need all 256 for the
|
// For the static char atlas, we only use the first 16 colors, but we need all 256 for the
|
||||||
// dynamic character atlas.
|
// dynamic character atlas.
|
||||||
ansi: colors.ansi.slice()
|
ansi: colors.ansi.slice()
|
||||||
|
|||||||
@@ -3,14 +3,15 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { IGlyphIdentifier, ICharAtlasConfig } from './Types';
|
import { ICharAtlasConfig } from './Types';
|
||||||
import { DIM_OPACITY, INVERTED_DEFAULT_COLOR } from 'browser/renderer/atlas/Constants';
|
import { DIM_OPACITY, INVERTED_DEFAULT_COLOR } from 'browser/renderer/atlas/Constants';
|
||||||
import { BaseCharAtlas } from './BaseCharAtlas';
|
|
||||||
import { IRasterizedGlyph, IBoundingBox, IRasterizedGlyphSet } from '../Types';
|
import { IRasterizedGlyph, IBoundingBox, IRasterizedGlyphSet } from '../Types';
|
||||||
import { DEFAULT_COLOR, DEFAULT_ATTR } from 'common/buffer/Constants';
|
import { DEFAULT_COLOR, DEFAULT_ATTR } from 'common/buffer/Constants';
|
||||||
import { is256Color } from './CharAtlasUtils';
|
import { is256Color } from './CharAtlasUtils';
|
||||||
|
import { throwIfFalsy } from '../WebglUtils';
|
||||||
import { IColor } from 'browser/Types';
|
import { IColor } from 'browser/Types';
|
||||||
import { FLAGS } from '../Constants';
|
import { FLAGS } from '../Constants';
|
||||||
|
import { IDisposable } from 'xterm';
|
||||||
|
|
||||||
// In practice we're probably never going to exhaust a texture this large. For debugging purposes,
|
// In practice we're probably never going to exhaust a texture this large. For debugging purposes,
|
||||||
// however, it can be useful to set this to a really tiny value, to verify that LRU eviction works.
|
// however, it can be useful to set this to a really tiny value, to verify that LRU eviction works.
|
||||||
@@ -42,7 +43,9 @@ const NULL_RASTERIZED_GLYPH: IRasterizedGlyph = {
|
|||||||
|
|
||||||
const TMP_CANVAS_GLYPH_PADDING = 2;
|
const TMP_CANVAS_GLYPH_PADDING = 2;
|
||||||
|
|
||||||
export class WebglCharAtlas extends BaseCharAtlas {
|
export class WebglCharAtlas implements IDisposable {
|
||||||
|
private _didWarmUp: boolean = false;
|
||||||
|
|
||||||
private _cacheMap: { [code: number]: IRasterizedGlyphSet } = {};
|
private _cacheMap: { [code: number]: IRasterizedGlyphSet } = {};
|
||||||
private _cacheMapCombined: { [chars: string]: IRasterizedGlyphSet } = {};
|
private _cacheMapCombined: { [chars: string]: IRasterizedGlyphSet } = {};
|
||||||
|
|
||||||
@@ -67,20 +70,18 @@ export class WebglCharAtlas extends BaseCharAtlas {
|
|||||||
private _workBoundingBox: IBoundingBox = { top: 0, left: 0, bottom: 0, right: 0 };
|
private _workBoundingBox: IBoundingBox = { top: 0, left: 0, bottom: 0, right: 0 };
|
||||||
|
|
||||||
constructor(document: Document, private _config: ICharAtlasConfig) {
|
constructor(document: Document, private _config: ICharAtlasConfig) {
|
||||||
super();
|
|
||||||
|
|
||||||
this.cacheCanvas = document.createElement('canvas');
|
this.cacheCanvas = document.createElement('canvas');
|
||||||
this.cacheCanvas.width = TEXTURE_WIDTH;
|
this.cacheCanvas.width = TEXTURE_WIDTH;
|
||||||
this.cacheCanvas.height = TEXTURE_HEIGHT;
|
this.cacheCanvas.height = TEXTURE_HEIGHT;
|
||||||
// The canvas needs alpha because we use clearColor to convert the background color to alpha.
|
// The canvas needs alpha because we use clearColor to convert the background color to alpha.
|
||||||
// It might also contain some characters with transparent backgrounds if allowTransparency is
|
// It might also contain some characters with transparent backgrounds if allowTransparency is
|
||||||
// set.
|
// set.
|
||||||
this._cacheCtx = this.cacheCanvas.getContext('2d', {alpha: true});
|
this._cacheCtx = throwIfFalsy(this.cacheCanvas.getContext('2d', {alpha: true}));
|
||||||
|
|
||||||
this._tmpCanvas = document.createElement('canvas');
|
this._tmpCanvas = document.createElement('canvas');
|
||||||
this._tmpCanvas.width = this._config.scaledCharWidth * 2 + TMP_CANVAS_GLYPH_PADDING * 2;
|
this._tmpCanvas.width = this._config.scaledCharWidth * 2 + TMP_CANVAS_GLYPH_PADDING * 2;
|
||||||
this._tmpCanvas.height = this._config.scaledCharHeight + TMP_CANVAS_GLYPH_PADDING * 2;
|
this._tmpCanvas.height = this._config.scaledCharHeight + TMP_CANVAS_GLYPH_PADDING * 2;
|
||||||
this._tmpCtx = this._tmpCanvas.getContext('2d', {alpha: this._config.allowTransparency});
|
this._tmpCtx = throwIfFalsy(this._tmpCanvas.getContext('2d', {alpha: this._config.allowTransparency}));
|
||||||
|
|
||||||
// This is useful for debugging
|
// This is useful for debugging
|
||||||
document.body.appendChild(this.cacheCanvas);
|
document.body.appendChild(this.cacheCanvas);
|
||||||
@@ -92,6 +93,13 @@ export class WebglCharAtlas extends BaseCharAtlas {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public warmUp(): void {
|
||||||
|
if (!this._didWarmUp) {
|
||||||
|
this._doWarmUp();
|
||||||
|
this._didWarmUp = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected _doWarmUp(): void {
|
protected _doWarmUp(): void {
|
||||||
// Pre-fill with ASCII 33-126
|
// Pre-fill with ASCII 33-126
|
||||||
for (let i = 33; i < 126; i++) {
|
for (let i = 33; i < 126; i++) {
|
||||||
@@ -146,15 +154,6 @@ export class WebglCharAtlas extends BaseCharAtlas {
|
|||||||
return rasterizedGlyph;
|
return rasterizedGlyph;
|
||||||
}
|
}
|
||||||
|
|
||||||
public draw(
|
|
||||||
ctx: CanvasRenderingContext2D,
|
|
||||||
glyph: IGlyphIdentifier,
|
|
||||||
x: number,
|
|
||||||
y: number
|
|
||||||
): boolean {
|
|
||||||
throw new Error('WebglCharAtlas is only compatible with the webgl renderer');
|
|
||||||
}
|
|
||||||
|
|
||||||
private _getColorFromAnsiIndex(idx: number): IColor {
|
private _getColorFromAnsiIndex(idx: number): IColor {
|
||||||
if (idx >= this._config.colors.ansi.length) {
|
if (idx >= this._config.colors.ansi.length) {
|
||||||
throw new Error('No color found for idx ' + idx);
|
throw new Error('No color found for idx ' + idx);
|
||||||
|
|||||||
@@ -8,17 +8,18 @@ import { ICellData } from 'common/Types';
|
|||||||
import { DEFAULT_COLOR, WHITESPACE_CELL_CHAR, WHITESPACE_CELL_CODE } from 'common/buffer/Constants';
|
import { DEFAULT_COLOR, WHITESPACE_CELL_CHAR, WHITESPACE_CELL_CODE } from 'common/buffer/Constants';
|
||||||
import { IGlyphIdentifier } from '../atlas/Types';
|
import { IGlyphIdentifier } from '../atlas/Types';
|
||||||
import { DIM_OPACITY, INVERTED_DEFAULT_COLOR } from 'browser/renderer/atlas/Constants';
|
import { DIM_OPACITY, INVERTED_DEFAULT_COLOR } from 'browser/renderer/atlas/Constants';
|
||||||
import { BaseCharAtlas } from '../atlas/BaseCharAtlas';
|
|
||||||
import { acquireCharAtlas } from '../atlas/CharAtlasCache';
|
import { acquireCharAtlas } from '../atlas/CharAtlasCache';
|
||||||
import { Terminal } from 'xterm';
|
import { Terminal } from 'xterm';
|
||||||
import { IColorSet } from 'browser/Types';
|
import { IColorSet } from 'browser/Types';
|
||||||
import { IRenderDimensions } from 'browser/renderer/Types';
|
import { IRenderDimensions } from 'browser/renderer/Types';
|
||||||
import { CellData } from 'common/buffer/CellData';
|
import { CellData } from 'common/buffer/CellData';
|
||||||
import { AttributeData } from 'common/buffer/AttributeData';
|
import { AttributeData } from 'common/buffer/AttributeData';
|
||||||
|
import { WebglCharAtlas } from 'atlas/WebglCharAtlas';
|
||||||
|
import { throwIfFalsy } from '../WebglUtils';
|
||||||
|
|
||||||
export abstract class BaseRenderLayer implements IRenderLayer {
|
export abstract class BaseRenderLayer implements IRenderLayer {
|
||||||
private _canvas: HTMLCanvasElement;
|
private _canvas: HTMLCanvasElement;
|
||||||
protected _ctx: CanvasRenderingContext2D;
|
protected _ctx!: CanvasRenderingContext2D;
|
||||||
private _scaledCharWidth: number = 0;
|
private _scaledCharWidth: number = 0;
|
||||||
private _scaledCharHeight: number = 0;
|
private _scaledCharHeight: number = 0;
|
||||||
private _scaledCellWidth: number = 0;
|
private _scaledCellWidth: number = 0;
|
||||||
@@ -26,7 +27,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
|
|||||||
private _scaledCharLeft: number = 0;
|
private _scaledCharLeft: number = 0;
|
||||||
private _scaledCharTop: number = 0;
|
private _scaledCharTop: number = 0;
|
||||||
|
|
||||||
protected _charAtlas: BaseCharAtlas;
|
protected _charAtlas: WebglCharAtlas | undefined;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An object that's reused when drawing glyphs in order to reduce GC.
|
* An object that's reused when drawing glyphs in order to reduce GC.
|
||||||
@@ -63,7 +64,7 @@ export abstract class BaseRenderLayer implements IRenderLayer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private _initCanvas(): void {
|
private _initCanvas(): void {
|
||||||
this._ctx = this._canvas.getContext('2d', {alpha: this._alpha});
|
this._ctx = throwIfFalsy(this._canvas.getContext('2d', {alpha: this._alpha}));
|
||||||
// Draw the background if this is an opaque layer
|
// Draw the background if this is an opaque layer
|
||||||
if (!this._alpha) {
|
if (!this._alpha) {
|
||||||
this._clearAll();
|
this._clearAll();
|
||||||
@@ -249,115 +250,6 @@ export abstract class BaseRenderLayer implements IRenderLayer {
|
|||||||
y * this._scaledCellHeight + this._scaledCharTop + this._scaledCharHeight / 2);
|
y * this._scaledCellHeight + this._scaledCharTop + this._scaledCharHeight / 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Draws one or more characters at a cell. If possible this will draw using
|
|
||||||
* the character atlas to reduce draw time.
|
|
||||||
* @param terminal The terminal.
|
|
||||||
* @param chars The character or characters.
|
|
||||||
* @param code The character code.
|
|
||||||
* @param width The width of the characters.
|
|
||||||
* @param x The column to draw at.
|
|
||||||
* @param y The row to draw at.
|
|
||||||
* @param fg The foreground color, in the format stored within the attributes.
|
|
||||||
* @param bg The background color, in the format stored within the attributes.
|
|
||||||
* This is used to validate whether a cached image can be used.
|
|
||||||
* @param bold Whether the text is bold.
|
|
||||||
*/
|
|
||||||
protected _drawChars(terminal: Terminal, cell: ICellData, x: number, y: number): void {
|
|
||||||
|
|
||||||
// skip cache right away if we draw in RGB
|
|
||||||
// Note: to avoid bad runtime JoinedCellData will be skipped
|
|
||||||
// in the cache handler itself (atlasDidDraw == false) and
|
|
||||||
// fall through to uncached later down below
|
|
||||||
if (cell.isFgRGB() || cell.isBgRGB()) {
|
|
||||||
this._drawUncachedChars(terminal, cell, x, y);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let fg;
|
|
||||||
let bg;
|
|
||||||
if (cell.isInverse()) {
|
|
||||||
fg = (cell.isBgDefault()) ? INVERTED_DEFAULT_COLOR : cell.getBgColor();
|
|
||||||
bg = (cell.isFgDefault()) ? INVERTED_DEFAULT_COLOR : cell.getFgColor();
|
|
||||||
} else {
|
|
||||||
bg = (cell.isBgDefault()) ? DEFAULT_COLOR : cell.getBgColor();
|
|
||||||
fg = (cell.isFgDefault()) ? DEFAULT_COLOR : cell.getFgColor();
|
|
||||||
}
|
|
||||||
|
|
||||||
const drawInBrightColor = terminal.getOption('drawBoldTextInBrightColors') && cell.isBold() && fg < 8 && fg !== INVERTED_DEFAULT_COLOR;
|
|
||||||
|
|
||||||
fg += drawInBrightColor ? 8 : 0;
|
|
||||||
this._currentGlyphIdentifier.chars = cell.getChars() || WHITESPACE_CELL_CHAR;
|
|
||||||
this._currentGlyphIdentifier.code = cell.getCode() || WHITESPACE_CELL_CODE;
|
|
||||||
this._currentGlyphIdentifier.bg = bg;
|
|
||||||
this._currentGlyphIdentifier.fg = fg;
|
|
||||||
this._currentGlyphIdentifier.bold = !!cell.isBold();
|
|
||||||
this._currentGlyphIdentifier.dim = !!cell.isDim();
|
|
||||||
this._currentGlyphIdentifier.italic = !!cell.isItalic();
|
|
||||||
const atlasDidDraw = this._charAtlas && this._charAtlas.draw(
|
|
||||||
this._ctx,
|
|
||||||
this._currentGlyphIdentifier,
|
|
||||||
x * this._scaledCellWidth + this._scaledCharLeft,
|
|
||||||
y * this._scaledCellHeight + this._scaledCharTop
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!atlasDidDraw) {
|
|
||||||
this._drawUncachedChars(terminal, cell, x, y);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Draws one or more characters at one or more cells. The character(s) will be
|
|
||||||
* clipped to ensure that they fit with the cell(s), including the cell to the
|
|
||||||
* right if the last character is a wide character.
|
|
||||||
* @param terminal The terminal.
|
|
||||||
* @param chars The character.
|
|
||||||
* @param width The width of the character.
|
|
||||||
* @param fg The foreground color, in the format stored within the attributes.
|
|
||||||
* @param x The column to draw at.
|
|
||||||
* @param y The row to draw at.
|
|
||||||
*/
|
|
||||||
private _drawUncachedChars(terminal: Terminal, cell: ICellData, x: number, y: number): void {
|
|
||||||
this._ctx.save();
|
|
||||||
this._ctx.font = this._getFont(terminal, !!cell.isBold(), !!cell.isItalic());
|
|
||||||
this._ctx.textBaseline = 'middle';
|
|
||||||
|
|
||||||
if (cell.isInverse()) {
|
|
||||||
if (cell.isBgDefault()) {
|
|
||||||
this._ctx.fillStyle = this._colors.background.css;
|
|
||||||
} else if (cell.isBgRGB()) {
|
|
||||||
this._ctx.fillStyle = `rgb(${AttributeData.toColorRGB(cell.getBgColor()).join(',')})`;
|
|
||||||
} else {
|
|
||||||
this._ctx.fillStyle = this._colors.ansi[cell.getBgColor()].css;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (cell.isFgDefault()) {
|
|
||||||
this._ctx.fillStyle = this._colors.foreground.css;
|
|
||||||
} else if (cell.isFgRGB()) {
|
|
||||||
this._ctx.fillStyle = `rgb(${AttributeData.toColorRGB(cell.getFgColor()).join(',')})`;
|
|
||||||
} else {
|
|
||||||
let fg = cell.getFgColor();
|
|
||||||
if (terminal.getOption('drawBoldTextInBrightColors') && cell.isBold() && fg < 8) {
|
|
||||||
fg += 8;
|
|
||||||
}
|
|
||||||
this._ctx.fillStyle = this._colors.ansi[fg].css;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this._clipRow(terminal, y);
|
|
||||||
|
|
||||||
// Apply alpha to dim the character
|
|
||||||
if (cell.isDim()) {
|
|
||||||
this._ctx.globalAlpha = DIM_OPACITY;
|
|
||||||
}
|
|
||||||
// Draw the character
|
|
||||||
this._ctx.fillText(
|
|
||||||
cell.getChars(),
|
|
||||||
x * this._scaledCellWidth + this._scaledCharLeft,
|
|
||||||
y * this._scaledCellHeight + this._scaledCharTop + this._scaledCharHeight / 2);
|
|
||||||
this._ctx.restore();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clips a row to ensure no pixels will be drawn outside the cells in the row.
|
* Clips a row to ensure no pixels will be drawn outside the cells in the row.
|
||||||
* @param terminal The terminal.
|
* @param terminal The terminal.
|
||||||
|
|||||||
@@ -26,17 +26,17 @@ const BLINK_INTERVAL = 600;
|
|||||||
export class CursorRenderLayer extends BaseRenderLayer {
|
export class CursorRenderLayer extends BaseRenderLayer {
|
||||||
private _state: ICursorState;
|
private _state: ICursorState;
|
||||||
private _cursorRenderers: {[key: string]: (terminal: Terminal, x: number, y: number, cell: ICellData) => void};
|
private _cursorRenderers: {[key: string]: (terminal: Terminal, x: number, y: number, cell: ICellData) => void};
|
||||||
private _cursorBlinkStateManager: CursorBlinkStateManager;
|
private _cursorBlinkStateManager: CursorBlinkStateManager | undefined;
|
||||||
private _cell: ICellData = new CellData();
|
private _cell: ICellData = new CellData();
|
||||||
|
|
||||||
constructor(container: HTMLElement, zIndex: number, colors: IColorSet) {
|
constructor(container: HTMLElement, zIndex: number, colors: IColorSet) {
|
||||||
super(container, 'cursor', zIndex, true, colors);
|
super(container, 'cursor', zIndex, true, colors);
|
||||||
this._state = {
|
this._state = {
|
||||||
x: null,
|
x: 0,
|
||||||
y: null,
|
y: 0,
|
||||||
isFocused: null,
|
isFocused: false,
|
||||||
style: null,
|
style: '',
|
||||||
width: null
|
width: 0
|
||||||
};
|
};
|
||||||
this._cursorRenderers = {
|
this._cursorRenderers = {
|
||||||
'bar': this._renderBarCursor.bind(this),
|
'bar': this._renderBarCursor.bind(this),
|
||||||
@@ -50,11 +50,11 @@ export class CursorRenderLayer extends BaseRenderLayer {
|
|||||||
super.resize(terminal, dim);
|
super.resize(terminal, dim);
|
||||||
// Resizing the canvas discards the contents of the canvas so clear state
|
// Resizing the canvas discards the contents of the canvas so clear state
|
||||||
this._state = {
|
this._state = {
|
||||||
x: null,
|
x: 0,
|
||||||
y: null,
|
y: 0,
|
||||||
isFocused: null,
|
isFocused: false,
|
||||||
style: null,
|
style: '',
|
||||||
width: null
|
width: 0
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,7 +62,6 @@ export class CursorRenderLayer extends BaseRenderLayer {
|
|||||||
this._clearCursor();
|
this._clearCursor();
|
||||||
if (this._cursorBlinkStateManager) {
|
if (this._cursorBlinkStateManager) {
|
||||||
this._cursorBlinkStateManager.dispose();
|
this._cursorBlinkStateManager.dispose();
|
||||||
this._cursorBlinkStateManager = null;
|
|
||||||
this.onOptionsChanged(terminal);
|
this.onOptionsChanged(terminal);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -92,7 +91,6 @@ export class CursorRenderLayer extends BaseRenderLayer {
|
|||||||
} else {
|
} else {
|
||||||
if (this._cursorBlinkStateManager) {
|
if (this._cursorBlinkStateManager) {
|
||||||
this._cursorBlinkStateManager.dispose();
|
this._cursorBlinkStateManager.dispose();
|
||||||
this._cursorBlinkStateManager = null;
|
|
||||||
}
|
}
|
||||||
// Request a refresh from the terminal as management of rendering is being
|
// Request a refresh from the terminal as management of rendering is being
|
||||||
// moved back to the terminal
|
// moved back to the terminal
|
||||||
@@ -184,11 +182,11 @@ export class CursorRenderLayer extends BaseRenderLayer {
|
|||||||
if (this._state) {
|
if (this._state) {
|
||||||
this._clearCells(this._state.x, this._state.y, this._state.width, 1);
|
this._clearCells(this._state.x, this._state.y, this._state.width, 1);
|
||||||
this._state = {
|
this._state = {
|
||||||
x: null,
|
x: 0,
|
||||||
y: null,
|
y: 0,
|
||||||
isFocused: null,
|
isFocused: false,
|
||||||
style: null,
|
style: '',
|
||||||
width: null
|
width: 0
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -227,16 +225,16 @@ export class CursorRenderLayer extends BaseRenderLayer {
|
|||||||
class CursorBlinkStateManager {
|
class CursorBlinkStateManager {
|
||||||
public isCursorVisible: boolean;
|
public isCursorVisible: boolean;
|
||||||
|
|
||||||
private _animationFrame: number;
|
private _animationFrame: number | undefined;
|
||||||
private _blinkStartTimeout: number;
|
private _blinkStartTimeout: number | undefined;
|
||||||
private _blinkInterval: number;
|
private _blinkInterval: number | undefined;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The time at which the animation frame was restarted, this is used on the
|
* The time at which the animation frame was restarted, this is used on the
|
||||||
* next render to restart the timers so they don't need to restart the timers
|
* next render to restart the timers so they don't need to restart the timers
|
||||||
* multiple times over a short period.
|
* multiple times over a short period.
|
||||||
*/
|
*/
|
||||||
private _animationTimeRestarted: number;
|
private _animationTimeRestarted: number | undefined;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
terminal: Terminal,
|
terminal: Terminal,
|
||||||
@@ -253,15 +251,15 @@ class CursorBlinkStateManager {
|
|||||||
public dispose(): void {
|
public dispose(): void {
|
||||||
if (this._blinkInterval) {
|
if (this._blinkInterval) {
|
||||||
window.clearInterval(this._blinkInterval);
|
window.clearInterval(this._blinkInterval);
|
||||||
this._blinkInterval = null;
|
this._blinkInterval = undefined;
|
||||||
}
|
}
|
||||||
if (this._blinkStartTimeout) {
|
if (this._blinkStartTimeout) {
|
||||||
window.clearTimeout(this._blinkStartTimeout);
|
window.clearTimeout(this._blinkStartTimeout);
|
||||||
this._blinkStartTimeout = null;
|
this._blinkStartTimeout = undefined;
|
||||||
}
|
}
|
||||||
if (this._animationFrame) {
|
if (this._animationFrame) {
|
||||||
window.cancelAnimationFrame(this._animationFrame);
|
window.cancelAnimationFrame(this._animationFrame);
|
||||||
this._animationFrame = null;
|
this._animationFrame = undefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -276,7 +274,7 @@ class CursorBlinkStateManager {
|
|||||||
if (!this._animationFrame) {
|
if (!this._animationFrame) {
|
||||||
this._animationFrame = window.requestAnimationFrame(() => {
|
this._animationFrame = window.requestAnimationFrame(() => {
|
||||||
this._renderCallback();
|
this._renderCallback();
|
||||||
this._animationFrame = null;
|
this._animationFrame = undefined;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -296,7 +294,7 @@ class CursorBlinkStateManager {
|
|||||||
// started
|
// started
|
||||||
if (this._animationTimeRestarted) {
|
if (this._animationTimeRestarted) {
|
||||||
const time = BLINK_INTERVAL - (Date.now() - this._animationTimeRestarted);
|
const time = BLINK_INTERVAL - (Date.now() - this._animationTimeRestarted);
|
||||||
this._animationTimeRestarted = null;
|
this._animationTimeRestarted = undefined;
|
||||||
if (time > 0) {
|
if (time > 0) {
|
||||||
this._restartInterval(time);
|
this._restartInterval(time);
|
||||||
return;
|
return;
|
||||||
@@ -307,7 +305,7 @@ class CursorBlinkStateManager {
|
|||||||
this.isCursorVisible = false;
|
this.isCursorVisible = false;
|
||||||
this._animationFrame = window.requestAnimationFrame(() => {
|
this._animationFrame = window.requestAnimationFrame(() => {
|
||||||
this._renderCallback();
|
this._renderCallback();
|
||||||
this._animationFrame = null;
|
this._animationFrame = undefined;
|
||||||
});
|
});
|
||||||
|
|
||||||
// Setup the blink interval
|
// Setup the blink interval
|
||||||
@@ -317,7 +315,7 @@ class CursorBlinkStateManager {
|
|||||||
// calc time diff
|
// calc time diff
|
||||||
// Make restart interval do a setTimeout initially?
|
// Make restart interval do a setTimeout initially?
|
||||||
const time = BLINK_INTERVAL - (Date.now() - this._animationTimeRestarted);
|
const time = BLINK_INTERVAL - (Date.now() - this._animationTimeRestarted);
|
||||||
this._animationTimeRestarted = null;
|
this._animationTimeRestarted = undefined;
|
||||||
this._restartInterval(time);
|
this._restartInterval(time);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -326,7 +324,7 @@ class CursorBlinkStateManager {
|
|||||||
this.isCursorVisible = !this.isCursorVisible;
|
this.isCursorVisible = !this.isCursorVisible;
|
||||||
this._animationFrame = window.requestAnimationFrame(() => {
|
this._animationFrame = window.requestAnimationFrame(() => {
|
||||||
this._renderCallback();
|
this._renderCallback();
|
||||||
this._animationFrame = null;
|
this._animationFrame = undefined;
|
||||||
});
|
});
|
||||||
}, BLINK_INTERVAL);
|
}, BLINK_INTERVAL);
|
||||||
}, timeToStart);
|
}, timeToStart);
|
||||||
@@ -336,20 +334,20 @@ class CursorBlinkStateManager {
|
|||||||
this.isCursorVisible = true;
|
this.isCursorVisible = true;
|
||||||
if (this._blinkInterval) {
|
if (this._blinkInterval) {
|
||||||
window.clearInterval(this._blinkInterval);
|
window.clearInterval(this._blinkInterval);
|
||||||
this._blinkInterval = null;
|
this._blinkInterval = undefined;
|
||||||
}
|
}
|
||||||
if (this._blinkStartTimeout) {
|
if (this._blinkStartTimeout) {
|
||||||
window.clearTimeout(this._blinkStartTimeout);
|
window.clearTimeout(this._blinkStartTimeout);
|
||||||
this._blinkStartTimeout = null;
|
this._blinkStartTimeout = undefined;
|
||||||
}
|
}
|
||||||
if (this._animationFrame) {
|
if (this._animationFrame) {
|
||||||
window.cancelAnimationFrame(this._animationFrame);
|
window.cancelAnimationFrame(this._animationFrame);
|
||||||
this._animationFrame = null;
|
this._animationFrame = undefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public resume(terminal: Terminal): void {
|
public resume(terminal: Terminal): void {
|
||||||
this._animationTimeRestarted = null;
|
this._animationTimeRestarted = undefined;
|
||||||
this._restartInterval();
|
this._restartInterval();
|
||||||
this.restartBlinkAnimation(terminal);
|
this.restartBlinkAnimation(terminal);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import { IColorSet } from 'browser/Types';
|
|||||||
import { IRenderDimensions } from 'browser/renderer/Types';
|
import { IRenderDimensions } from 'browser/renderer/Types';
|
||||||
|
|
||||||
export class LinkRenderLayer extends BaseRenderLayer {
|
export class LinkRenderLayer extends BaseRenderLayer {
|
||||||
private _state: ILinkifierEvent = null;
|
private _state: ILinkifierEvent | undefined;
|
||||||
|
|
||||||
constructor(container: HTMLElement, zIndex: number, colors: IColorSet, terminal: ILinkifierAccessor) {
|
constructor(container: HTMLElement, zIndex: number, colors: IColorSet, terminal: ILinkifierAccessor) {
|
||||||
super(container, 'link', zIndex, true, colors);
|
super(container, 'link', zIndex, true, colors);
|
||||||
@@ -23,7 +23,7 @@ export class LinkRenderLayer extends BaseRenderLayer {
|
|||||||
public resize(terminal: Terminal, dim: IRenderDimensions): void {
|
public resize(terminal: Terminal, dim: IRenderDimensions): void {
|
||||||
super.resize(terminal, dim);
|
super.resize(terminal, dim);
|
||||||
// Resizing the canvas discards the contents of the canvas so clear state
|
// Resizing the canvas discards the contents of the canvas so clear state
|
||||||
this._state = null;
|
this._state = undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
public reset(terminal: Terminal): void {
|
public reset(terminal: Terminal): void {
|
||||||
@@ -38,7 +38,7 @@ export class LinkRenderLayer extends BaseRenderLayer {
|
|||||||
this._clearCells(0, this._state.y1 + 1, this._state.cols, middleRowCount);
|
this._clearCells(0, this._state.y1 + 1, this._state.cols, middleRowCount);
|
||||||
}
|
}
|
||||||
this._clearCells(0, this._state.y2, this._state.x2, 1);
|
this._clearCells(0, this._state.y2, this._state.x2, 1);
|
||||||
this._state = null;
|
this._state = undefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,8 @@
|
|||||||
"paths": {
|
"paths": {
|
||||||
"common/*": [ "../../../src/common/*" ],
|
"common/*": [ "../../../src/common/*" ],
|
||||||
"browser/*": [ "../../../src/browser/*" ]
|
"browser/*": [ "../../../src/browser/*" ]
|
||||||
}
|
},
|
||||||
|
"strict": true
|
||||||
},
|
},
|
||||||
"include": [
|
"include": [
|
||||||
"./**/*",
|
"./**/*",
|
||||||
|
|||||||
+5
-5
@@ -34,7 +34,7 @@ import { SelectionService } from './browser/services/SelectionService';
|
|||||||
import * as Browser from 'common/Platform';
|
import * as Browser from 'common/Platform';
|
||||||
import { addDisposableDomListener } from 'browser/Lifecycle';
|
import { addDisposableDomListener } from 'browser/Lifecycle';
|
||||||
import * as Strings from './browser/LocalizableStrings';
|
import * as Strings from './browser/LocalizableStrings';
|
||||||
import { SoundManager } from './SoundManager';
|
import { SoundService } from 'browser/services/SoundService';
|
||||||
import { MouseZoneManager } from './MouseZoneManager';
|
import { MouseZoneManager } from './MouseZoneManager';
|
||||||
import { AccessibilityManager } from './AccessibilityManager';
|
import { AccessibilityManager } from './AccessibilityManager';
|
||||||
import { ITheme, IMarker, IDisposable, ISelectionPosition } from 'xterm';
|
import { ITheme, IMarker, IDisposable, ISelectionPosition } from 'xterm';
|
||||||
@@ -49,7 +49,7 @@ import { ColorManager } from 'browser/ColorManager';
|
|||||||
import { RenderService } from 'browser/services/RenderService';
|
import { RenderService } from 'browser/services/RenderService';
|
||||||
import { IOptionsService, IBufferService, ICoreService } from 'common/services/Services';
|
import { IOptionsService, IBufferService, ICoreService } from 'common/services/Services';
|
||||||
import { OptionsService } from 'common/services/OptionsService';
|
import { OptionsService } from 'common/services/OptionsService';
|
||||||
import { ICharSizeService, IRenderService, IMouseService, ISelectionService } from 'browser/services/Services';
|
import { ICharSizeService, IRenderService, IMouseService, ISelectionService, ISoundService } from 'browser/services/Services';
|
||||||
import { CharSizeService } from 'browser/services/CharSizeService';
|
import { CharSizeService } from 'browser/services/CharSizeService';
|
||||||
import { BufferService, MINIMUM_COLS, MINIMUM_ROWS } from 'common/services/BufferService';
|
import { BufferService, MINIMUM_COLS, MINIMUM_ROWS } from 'common/services/BufferService';
|
||||||
import { Disposable } from 'common/Lifecycle';
|
import { Disposable } from 'common/Lifecycle';
|
||||||
@@ -117,6 +117,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
private _mouseService: IMouseService;
|
private _mouseService: IMouseService;
|
||||||
private _renderService: IRenderService;
|
private _renderService: IRenderService;
|
||||||
private _selectionService: ISelectionService;
|
private _selectionService: ISelectionService;
|
||||||
|
private _soundService: ISoundService;
|
||||||
|
|
||||||
// modes
|
// modes
|
||||||
public applicationKeypad: boolean;
|
public applicationKeypad: boolean;
|
||||||
@@ -175,7 +176,6 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
private _userScrolling: boolean;
|
private _userScrolling: boolean;
|
||||||
|
|
||||||
private _inputHandler: InputHandler;
|
private _inputHandler: InputHandler;
|
||||||
public soundManager: SoundManager;
|
|
||||||
public linkifier: ILinkifier;
|
public linkifier: ILinkifier;
|
||||||
public viewport: IViewport;
|
public viewport: IViewport;
|
||||||
private _compositionHelper: ICompositionHelper;
|
private _compositionHelper: ICompositionHelper;
|
||||||
@@ -305,7 +305,6 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
this._selectionService = this._selectionService || null;
|
this._selectionService = this._selectionService || null;
|
||||||
this.linkifier = this.linkifier || new Linkifier(this);
|
this.linkifier = this.linkifier || new Linkifier(this);
|
||||||
this._mouseZoneManager = this._mouseZoneManager || null;
|
this._mouseZoneManager = this._mouseZoneManager || null;
|
||||||
this.soundManager = this.soundManager || new SoundManager(this);
|
|
||||||
|
|
||||||
if (this.options.windowsMode) {
|
if (this.options.windowsMode) {
|
||||||
this._windowsMode = applyWindowsMode(this);
|
this._windowsMode = applyWindowsMode(this);
|
||||||
@@ -620,6 +619,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
this._renderService.onRender(e => this._onRender.fire(e));
|
this._renderService.onRender(e => this._onRender.fire(e));
|
||||||
this.onResize(e => this._renderService.resize(e.cols, e.rows));
|
this.onResize(e => this._renderService.resize(e.cols, e.rows));
|
||||||
|
|
||||||
|
this._soundService = new SoundService(this.optionsService);
|
||||||
this._mouseService = new MouseService(this._renderService, this._charSizeService);
|
this._mouseService = new MouseService(this._renderService, this._charSizeService);
|
||||||
|
|
||||||
this._mouseZoneManager = new MouseZoneManager(this, this._mouseService);
|
this._mouseZoneManager = new MouseZoneManager(this, this._mouseService);
|
||||||
@@ -1677,7 +1677,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
*/
|
*/
|
||||||
public bell(): void {
|
public bell(): void {
|
||||||
if (this._soundBell()) {
|
if (this._soundBell()) {
|
||||||
this.soundManager.playBellSound();
|
this._soundService.playBellSound();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this._visualBell()) {
|
if (this._visualBell()) {
|
||||||
|
|||||||
Vendored
-4
@@ -347,10 +347,6 @@ export interface IBrowser {
|
|||||||
isWindows: boolean;
|
isWindows: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ISoundManager {
|
|
||||||
playBellSound(): void;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IMouseZoneManager extends IDisposable {
|
export interface IMouseZoneManager extends IDisposable {
|
||||||
add(zone: IMouseZone): void;
|
add(zone: IMouseZone): void;
|
||||||
clearAll(start?: number, end?: number): void;
|
clearAll(start?: number, end?: number): void;
|
||||||
|
|||||||
Vendored
+4
@@ -72,3 +72,7 @@ export interface ISelectionService {
|
|||||||
refresh(isLinuxMouseSelection?: boolean): void;
|
refresh(isLinuxMouseSelection?: boolean): void;
|
||||||
onMouseDown(event: MouseEvent): void;
|
onMouseDown(event: MouseEvent): void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ISoundService {
|
||||||
|
playBellSound(): void;
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,35 +3,36 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { ITerminal, ISoundManager } from './Types';
|
import { IOptionsService } from 'common/services/Services';
|
||||||
|
import { ISoundService } from 'browser/services/Services';
|
||||||
|
|
||||||
export class SoundManager implements ISoundManager {
|
export class SoundService implements ISoundService {
|
||||||
private static _audioContext: AudioContext;
|
private static _audioContext: AudioContext;
|
||||||
|
|
||||||
static get audioContext(): AudioContext | null {
|
static get audioContext(): AudioContext | null {
|
||||||
if (!SoundManager._audioContext) {
|
if (!SoundService._audioContext) {
|
||||||
const audioContextCtor: typeof AudioContext = (<any>window).AudioContext || (<any>window).webkitAudioContext;
|
const audioContextCtor: typeof AudioContext = (<any>window).AudioContext || (<any>window).webkitAudioContext;
|
||||||
if (!audioContextCtor) {
|
if (!audioContextCtor) {
|
||||||
console.warn('Web Audio API is not supported by this browser. Consider upgrading to the latest version');
|
console.warn('Web Audio API is not supported by this browser. Consider upgrading to the latest version');
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
SoundManager._audioContext = new audioContextCtor();
|
SoundService._audioContext = new audioContextCtor();
|
||||||
}
|
}
|
||||||
return SoundManager._audioContext;
|
return SoundService._audioContext;
|
||||||
}
|
}
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private _terminal: ITerminal
|
private _optionsService: IOptionsService
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
public playBellSound(): void {
|
public playBellSound(): void {
|
||||||
const ctx = SoundManager.audioContext;
|
const ctx = SoundService.audioContext;
|
||||||
if (!ctx) {
|
if (!ctx) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const bellAudioSource = ctx.createBufferSource();
|
const bellAudioSource = ctx.createBufferSource();
|
||||||
ctx.decodeAudioData(this._base64ToArrayBuffer(this._removeMimeType(this._terminal.options.bellSound)), (buffer) => {
|
ctx.decodeAudioData(this._base64ToArrayBuffer(this._removeMimeType(this._optionsService.options.bellSound)), (buffer) => {
|
||||||
bellAudioSource.buffer = buffer;
|
bellAudioSource.buffer = buffer;
|
||||||
bellAudioSource.connect(ctx.destination);
|
bellAudioSource.connect(ctx.destination);
|
||||||
bellAudioSource.start(0);
|
bellAudioSource.start(0);
|
||||||
Reference in New Issue
Block a user