Support basic cursor
This commit is contained in:
@@ -0,0 +1,75 @@
|
|||||||
|
import { IDataRenderLayer } from './Interfaces';
|
||||||
|
import { IBuffer, ICharMeasure, ITerminal } from '../Interfaces';
|
||||||
|
import { CHAR_DATA_ATTR_INDEX } from '../Buffer';
|
||||||
|
import { COLORS } from './Color';
|
||||||
|
import { GridCache } from './GridCache';
|
||||||
|
import { FLAGS } from './Types';
|
||||||
|
|
||||||
|
export class CursorRenderLayer implements IDataRenderLayer {
|
||||||
|
private _canvas: HTMLCanvasElement;
|
||||||
|
private _ctx: CanvasRenderingContext2D;
|
||||||
|
private _state: [number, number];
|
||||||
|
|
||||||
|
constructor(container: HTMLElement) {
|
||||||
|
this._canvas = document.createElement('canvas');
|
||||||
|
this._canvas.classList.add('xterm-cursor-layer');
|
||||||
|
this._ctx = this._canvas.getContext('2d');
|
||||||
|
this._ctx.scale(window.devicePixelRatio, window.devicePixelRatio);
|
||||||
|
container.appendChild(this._canvas);
|
||||||
|
this._state = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public resize(terminal: ITerminal, canvasWidth: number, canvasHeight: number, charSizeChanged: boolean): void {
|
||||||
|
this._canvas.width = canvasWidth * window.devicePixelRatio;
|
||||||
|
this._canvas.height = canvasHeight * window.devicePixelRatio;
|
||||||
|
this._canvas.style.width = `${canvasWidth}px`;
|
||||||
|
this._canvas.style.height = `${canvasHeight}px`;
|
||||||
|
}
|
||||||
|
|
||||||
|
public render(terminal: ITerminal, startRow: number, endRow: number): void {
|
||||||
|
// TODO: Track blur/focus somehow, support unfocused cursor
|
||||||
|
|
||||||
|
const scaledCharWidth = Math.ceil(terminal.charMeasure.width) * window.devicePixelRatio;
|
||||||
|
const scaledCharHeight = Math.ceil(terminal.charMeasure.height) * window.devicePixelRatio;
|
||||||
|
|
||||||
|
// Don't draw the cursor if it's hidden
|
||||||
|
if (!terminal.cursorState || terminal.cursorHidden) {
|
||||||
|
this._clearCursor(scaledCharWidth, scaledCharHeight);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const cursorY = terminal.buffer.ybase + terminal.buffer.y;
|
||||||
|
const viewportRelativeCursorY = cursorY - terminal.buffer.ydisp;
|
||||||
|
|
||||||
|
// Don't draw the cursor if it's off-screen
|
||||||
|
if (viewportRelativeCursorY < 0 || viewportRelativeCursorY >= terminal.rows) {
|
||||||
|
this._clearCursor(scaledCharWidth, scaledCharHeight);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this._state) {
|
||||||
|
// The cursor is already in the correct spot, don't redraw
|
||||||
|
if (this._state[0] === terminal.buffer.x && this._state[1] === viewportRelativeCursorY) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this._clearCursor(scaledCharWidth, scaledCharHeight);
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Draw text in COLORS[0], using the char atlas if possible
|
||||||
|
// const charData = terminal.buffer.lines.get(viewportRelativeCursorY)[terminal.buffer.x];
|
||||||
|
|
||||||
|
this._ctx.save();
|
||||||
|
this._ctx.fillStyle = COLORS[7];
|
||||||
|
this._ctx.fillRect(terminal.buffer.x * scaledCharWidth, viewportRelativeCursorY * scaledCharHeight, scaledCharWidth, scaledCharHeight);
|
||||||
|
this._ctx.restore();
|
||||||
|
|
||||||
|
this._state = [terminal.buffer.x, viewportRelativeCursorY];
|
||||||
|
}
|
||||||
|
|
||||||
|
private _clearCursor(scaledCharWidth: number, scaledCharHeight: number): void {
|
||||||
|
if (this._state) {
|
||||||
|
this._ctx.clearRect(this._state[0] * scaledCharWidth, this._state[1] * scaledCharHeight, scaledCharWidth, scaledCharHeight);
|
||||||
|
this._state = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -53,8 +53,8 @@ export class ForegroundRenderLayer implements IDataRenderLayer {
|
|||||||
this._ctx.font = `${16 * window.devicePixelRatio}px courier`;
|
this._ctx.font = `${16 * window.devicePixelRatio}px courier`;
|
||||||
|
|
||||||
for (let y = startRow; y <= endRow; y++) {
|
for (let y = startRow; y <= endRow; y++) {
|
||||||
let row = y + terminal.buffer.ydisp;
|
const row = y + terminal.buffer.ydisp;
|
||||||
let line = terminal.buffer.lines.get(row);
|
const line = terminal.buffer.lines.get(row);
|
||||||
|
|
||||||
for (let x = 0; x < terminal.cols; x++) {
|
for (let x = 0; x < terminal.cols; x++) {
|
||||||
const charData = line[x];
|
const charData = line[x];
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import { IDataRenderLayer, ISelectionRenderLayer } from './Interfaces';
|
|||||||
import { BackgroundRenderLayer } from './BackgroundRenderLayer';
|
import { BackgroundRenderLayer } from './BackgroundRenderLayer';
|
||||||
import { ForegroundRenderLayer } from './ForegroundRenderLayer';
|
import { ForegroundRenderLayer } from './ForegroundRenderLayer';
|
||||||
import { SelectionRenderLayer } from './SelectionRenderLayer';
|
import { SelectionRenderLayer } from './SelectionRenderLayer';
|
||||||
|
import { CursorRenderLayer } from './CursorRenderLayer';
|
||||||
|
|
||||||
export class Renderer {
|
export class Renderer {
|
||||||
/** A queue of the rows to be refreshed */
|
/** A queue of the rows to be refreshed */
|
||||||
@@ -22,7 +23,8 @@ export class Renderer {
|
|||||||
constructor(private _terminal: ITerminal) {
|
constructor(private _terminal: ITerminal) {
|
||||||
this._dataRenderLayers = [
|
this._dataRenderLayers = [
|
||||||
new BackgroundRenderLayer(this._terminal.element),
|
new BackgroundRenderLayer(this._terminal.element),
|
||||||
new ForegroundRenderLayer(this._terminal.element)
|
new ForegroundRenderLayer(this._terminal.element),
|
||||||
|
new CursorRenderLayer(this._terminal.element)
|
||||||
];
|
];
|
||||||
this._selectionRenderLayers = [
|
this._selectionRenderLayers = [
|
||||||
new SelectionRenderLayer(this._terminal.element)
|
new SelectionRenderLayer(this._terminal.element)
|
||||||
|
|||||||
@@ -167,6 +167,7 @@
|
|||||||
.terminal .xterm-bg-layer { z-index: 0; }
|
.terminal .xterm-bg-layer { z-index: 0; }
|
||||||
.terminal .xterm-selection-layer { z-index: 1; }
|
.terminal .xterm-selection-layer { z-index: 1; }
|
||||||
.terminal .xterm-fg-layer { z-index: 2; }
|
.terminal .xterm-fg-layer { z-index: 2; }
|
||||||
|
.terminal .xterm-cursor-layer { z-index: 3; }
|
||||||
|
|
||||||
.terminal .xterm-rows {
|
.terminal .xterm-rows {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|||||||
Reference in New Issue
Block a user