Merge branch 'master' into 1981_prevent_scroll_on_focus
This commit is contained in:
Vendored
+5
-1
@@ -38,7 +38,11 @@
|
|||||||
"run",
|
"run",
|
||||||
"start-debug"
|
"start-debug"
|
||||||
],
|
],
|
||||||
"port": 9229
|
"port": 9229,
|
||||||
|
"serverReadyAction": {
|
||||||
|
"action": "openExternally",
|
||||||
|
"pattern": "App listening to (http://.*?:[0-9]+)"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { ITheme } from 'xterm';
|
|||||||
import { EventEmitter } from '../../common/EventEmitter';
|
import { EventEmitter } from '../../common/EventEmitter';
|
||||||
import { ColorManager } from '../ColorManager';
|
import { ColorManager } from '../ColorManager';
|
||||||
import { RenderDebouncer } from '../../ui/RenderDebouncer';
|
import { RenderDebouncer } from '../../ui/RenderDebouncer';
|
||||||
import { BOLD_CLASS, ITALIC_CLASS, CURSOR_CLASS, CURSOR_STYLE_BLOCK_CLASS, CURSOR_STYLE_BAR_CLASS, CURSOR_STYLE_UNDERLINE_CLASS, DomRendererRowFactory } from './DomRendererRowFactory';
|
import { BOLD_CLASS, ITALIC_CLASS, CURSOR_CLASS, CURSOR_STYLE_BLOCK_CLASS, CURSOR_BLINK_CLASS, CURSOR_STYLE_BAR_CLASS, CURSOR_STYLE_UNDERLINE_CLASS, DomRendererRowFactory } from './DomRendererRowFactory';
|
||||||
import { INVERTED_DEFAULT_COLOR } from '../atlas/Types';
|
import { INVERTED_DEFAULT_COLOR } from '../atlas/Types';
|
||||||
|
|
||||||
const TERMINAL_CLASS_PREFIX = 'xterm-dom-renderer-owner-';
|
const TERMINAL_CLASS_PREFIX = 'xterm-dom-renderer-owner-';
|
||||||
@@ -75,7 +75,7 @@ export class DomRenderer extends EventEmitter implements IRenderer {
|
|||||||
this._updateDimensions();
|
this._updateDimensions();
|
||||||
|
|
||||||
this._renderDebouncer = new RenderDebouncer(this._terminal, this._renderRows.bind(this));
|
this._renderDebouncer = new RenderDebouncer(this._terminal, this._renderRows.bind(this));
|
||||||
this._rowFactory = new DomRendererRowFactory(document);
|
this._rowFactory = new DomRendererRowFactory(_terminal.options, document);
|
||||||
|
|
||||||
this._terminal.element.classList.add(TERMINAL_CLASS_PREFIX + this._terminalClass);
|
this._terminal.element.classList.add(TERMINAL_CLASS_PREFIX + this._terminalClass);
|
||||||
this._terminal.screenElement.appendChild(this._rowContainer);
|
this._terminal.screenElement.appendChild(this._rowContainer);
|
||||||
@@ -165,12 +165,22 @@ export class DomRenderer extends EventEmitter implements IRenderer {
|
|||||||
`${this._terminalSelector} span.${ITALIC_CLASS} {` +
|
`${this._terminalSelector} span.${ITALIC_CLASS} {` +
|
||||||
` font-style: italic;` +
|
` font-style: italic;` +
|
||||||
`}`;
|
`}`;
|
||||||
|
// Blink animation
|
||||||
|
styles +=
|
||||||
|
`@keyframes blink {` +
|
||||||
|
` 0 % { opacity: 1.0; }` +
|
||||||
|
` 50% { opacity: 0.0; }` +
|
||||||
|
` 100 % { opacity: 1.0; }` +
|
||||||
|
`}`;
|
||||||
// Cursor
|
// Cursor
|
||||||
styles +=
|
styles +=
|
||||||
`${this._terminalSelector} .${ROW_CONTAINER_CLASS}:not(.${FOCUS_CLASS}) .${CURSOR_CLASS} {` +
|
`${this._terminalSelector} .${ROW_CONTAINER_CLASS}:not(.${FOCUS_CLASS}) .${CURSOR_CLASS} {` +
|
||||||
` outline: 1px solid ${this.colorManager.colors.cursor.css};` +
|
` outline: 1px solid ${this.colorManager.colors.cursor.css};` +
|
||||||
` outline-offset: -1px;` +
|
` outline-offset: -1px;` +
|
||||||
`}` +
|
`}` +
|
||||||
|
`${this._terminalSelector} .${ROW_CONTAINER_CLASS}.${FOCUS_CLASS} .${CURSOR_CLASS}.${CURSOR_BLINK_CLASS} {` +
|
||||||
|
` animation: blink 1s step-end infinite;` +
|
||||||
|
`}` +
|
||||||
`${this._terminalSelector} .${ROW_CONTAINER_CLASS}.${FOCUS_CLASS} .${CURSOR_CLASS}.${CURSOR_STYLE_BLOCK_CLASS} {` +
|
`${this._terminalSelector} .${ROW_CONTAINER_CLASS}.${FOCUS_CLASS} .${CURSOR_CLASS}.${CURSOR_STYLE_BLOCK_CLASS} {` +
|
||||||
` background-color: ${this.colorManager.colors.cursor.css};` +
|
` background-color: ${this.colorManager.colors.cursor.css};` +
|
||||||
` color: ${this.colorManager.colors.cursorAccent.css};` +
|
` color: ${this.colorManager.colors.cursorAccent.css};` +
|
||||||
@@ -328,6 +338,7 @@ export class DomRenderer extends EventEmitter implements IRenderer {
|
|||||||
|
|
||||||
const cursorAbsoluteY = terminal.buffer.ybase + terminal.buffer.y;
|
const cursorAbsoluteY = terminal.buffer.ybase + terminal.buffer.y;
|
||||||
const cursorX = this._terminal.buffer.x;
|
const cursorX = this._terminal.buffer.x;
|
||||||
|
const cursorBlink = this._terminal.options.cursorBlink;
|
||||||
|
|
||||||
for (let y = start; y <= end; y++) {
|
for (let y = start; y <= end; y++) {
|
||||||
const rowElement = this._rowElements[y];
|
const rowElement = this._rowElements[y];
|
||||||
@@ -336,7 +347,7 @@ export class DomRenderer extends EventEmitter implements IRenderer {
|
|||||||
const row = y + terminal.buffer.ydisp;
|
const row = y + terminal.buffer.ydisp;
|
||||||
const lineData = terminal.buffer.lines.get(row);
|
const lineData = terminal.buffer.lines.get(row);
|
||||||
const cursorStyle = terminal.options.cursorStyle;
|
const cursorStyle = terminal.options.cursorStyle;
|
||||||
rowElement.appendChild(this._rowFactory.createRow(lineData, row === cursorAbsoluteY, cursorStyle, cursorX, this.dimensions.actualCellWidth, terminal.cols));
|
rowElement.appendChild(this._rowFactory.createRow(lineData, row === cursorAbsoluteY, cursorStyle, cursorX, cursorBlink, this.dimensions.actualCellWidth, terminal.cols));
|
||||||
}
|
}
|
||||||
|
|
||||||
this._terminal.emit('refresh', {start, end});
|
this._terminal.emit('refresh', {start, end});
|
||||||
|
|||||||
@@ -9,23 +9,28 @@ import { DomRendererRowFactory } from './DomRendererRowFactory';
|
|||||||
import { DEFAULT_ATTR, NULL_CELL_CODE, NULL_CELL_WIDTH, NULL_CELL_CHAR } from '../../Buffer';
|
import { DEFAULT_ATTR, NULL_CELL_CODE, NULL_CELL_WIDTH, NULL_CELL_CHAR } from '../../Buffer';
|
||||||
import { FLAGS } from '../Types';
|
import { FLAGS } from '../Types';
|
||||||
import { BufferLine } from '../../BufferLine';
|
import { BufferLine } from '../../BufferLine';
|
||||||
import { IBufferLine } from '../../Types';
|
import { IBufferLine, ITerminalOptions } from '../../Types';
|
||||||
import { DEFAULT_COLOR } from '../atlas/Types';
|
import { DEFAULT_COLOR } from '../atlas/Types';
|
||||||
|
|
||||||
describe('DomRendererRowFactory', () => {
|
describe('DomRendererRowFactory', () => {
|
||||||
let dom: jsdom.JSDOM;
|
let dom: jsdom.JSDOM;
|
||||||
|
const options: ITerminalOptions = {};
|
||||||
let rowFactory: DomRendererRowFactory;
|
let rowFactory: DomRendererRowFactory;
|
||||||
let lineData: IBufferLine;
|
let lineData: IBufferLine;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
dom = new jsdom.JSDOM('');
|
dom = new jsdom.JSDOM('');
|
||||||
rowFactory = new DomRendererRowFactory(dom.window.document);
|
|
||||||
|
options.enableBold = true;
|
||||||
|
options.drawBoldTextInBrightColors = true;
|
||||||
|
|
||||||
|
rowFactory = new DomRendererRowFactory(options, dom.window.document);
|
||||||
lineData = createEmptyLineData(2);
|
lineData = createEmptyLineData(2);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('createRow', () => {
|
describe('createRow', () => {
|
||||||
it('should not create anything for an empty row', () => {
|
it('should not create anything for an empty row', () => {
|
||||||
const fragment = rowFactory.createRow(lineData, false, undefined, 0, 5, 20);
|
const fragment = rowFactory.createRow(lineData, false, undefined, 0, false, 5, 20);
|
||||||
assert.equal(getFragmentHtml(fragment),
|
assert.equal(getFragmentHtml(fragment),
|
||||||
''
|
''
|
||||||
);
|
);
|
||||||
@@ -35,7 +40,7 @@ describe('DomRendererRowFactory', () => {
|
|||||||
lineData.set(0, [DEFAULT_ATTR, '語', 2, '語'.charCodeAt(0)]);
|
lineData.set(0, [DEFAULT_ATTR, '語', 2, '語'.charCodeAt(0)]);
|
||||||
// There should be no element for the following "empty" cell
|
// There should be no element for the following "empty" cell
|
||||||
lineData.set(1, [DEFAULT_ATTR, '', 0, undefined]);
|
lineData.set(1, [DEFAULT_ATTR, '', 0, undefined]);
|
||||||
const fragment = rowFactory.createRow(lineData, false, undefined, 0, 5, 20);
|
const fragment = rowFactory.createRow(lineData, false, undefined, 0, false, 5, 20);
|
||||||
assert.equal(getFragmentHtml(fragment),
|
assert.equal(getFragmentHtml(fragment),
|
||||||
'<span style="width: 10px;">語</span>'
|
'<span style="width: 10px;">語</span>'
|
||||||
);
|
);
|
||||||
@@ -43,17 +48,24 @@ describe('DomRendererRowFactory', () => {
|
|||||||
|
|
||||||
it('should add class for cursor and cursor style', () => {
|
it('should add class for cursor and cursor style', () => {
|
||||||
for (const style of ['block', 'bar', 'underline']) {
|
for (const style of ['block', 'bar', 'underline']) {
|
||||||
const fragment = rowFactory.createRow(lineData, true, style, 0, 5, 20);
|
const fragment = rowFactory.createRow(lineData, true, style, 0, false, 5, 20);
|
||||||
assert.equal(getFragmentHtml(fragment),
|
assert.equal(getFragmentHtml(fragment),
|
||||||
`<span class="xterm-cursor xterm-cursor-${style}"> </span>`
|
`<span class="xterm-cursor xterm-cursor-${style}"> </span>`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should add class for cursor blink', () => {
|
||||||
|
const fragment = rowFactory.createRow(lineData, true, 'block', 0, true, 5, 20);
|
||||||
|
assert.equal(getFragmentHtml(fragment),
|
||||||
|
`<span class="xterm-cursor xterm-cursor-blink xterm-cursor-block"> </span>`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
it('should not render cells that go beyond the terminal\'s columns', () => {
|
it('should not render cells that go beyond the terminal\'s columns', () => {
|
||||||
lineData.set(0, [DEFAULT_ATTR, 'a', 1, 'a'.charCodeAt(0)]);
|
lineData.set(0, [DEFAULT_ATTR, 'a', 1, 'a'.charCodeAt(0)]);
|
||||||
lineData.set(1, [DEFAULT_ATTR, 'b', 1, 'b'.charCodeAt(0)]);
|
lineData.set(1, [DEFAULT_ATTR, 'b', 1, 'b'.charCodeAt(0)]);
|
||||||
const fragment = rowFactory.createRow(lineData, false, undefined, 0, 5, 1);
|
const fragment = rowFactory.createRow(lineData, false, undefined, 0, false, 5, 1);
|
||||||
assert.equal(getFragmentHtml(fragment),
|
assert.equal(getFragmentHtml(fragment),
|
||||||
'<span>a</span>'
|
'<span>a</span>'
|
||||||
);
|
);
|
||||||
@@ -62,7 +74,7 @@ describe('DomRendererRowFactory', () => {
|
|||||||
describe('attributes', () => {
|
describe('attributes', () => {
|
||||||
it('should add class for bold', () => {
|
it('should add class for bold', () => {
|
||||||
lineData.set(0, [DEFAULT_ATTR | (FLAGS.BOLD << 18), 'a', 1, 'a'.charCodeAt(0)]);
|
lineData.set(0, [DEFAULT_ATTR | (FLAGS.BOLD << 18), 'a', 1, 'a'.charCodeAt(0)]);
|
||||||
const fragment = rowFactory.createRow(lineData, false, undefined, 0, 5, 20);
|
const fragment = rowFactory.createRow(lineData, false, undefined, 0, false, 5, 20);
|
||||||
assert.equal(getFragmentHtml(fragment),
|
assert.equal(getFragmentHtml(fragment),
|
||||||
'<span class="xterm-bold">a</span>'
|
'<span class="xterm-bold">a</span>'
|
||||||
);
|
);
|
||||||
@@ -70,7 +82,7 @@ describe('DomRendererRowFactory', () => {
|
|||||||
|
|
||||||
it('should add class for italic', () => {
|
it('should add class for italic', () => {
|
||||||
lineData.set(0, [DEFAULT_ATTR | (FLAGS.ITALIC << 18), 'a', 1, 'a'.charCodeAt(0)]);
|
lineData.set(0, [DEFAULT_ATTR | (FLAGS.ITALIC << 18), 'a', 1, 'a'.charCodeAt(0)]);
|
||||||
const fragment = rowFactory.createRow(lineData, false, undefined, 0, 5, 20);
|
const fragment = rowFactory.createRow(lineData, false, undefined, 0, false, 5, 20);
|
||||||
assert.equal(getFragmentHtml(fragment),
|
assert.equal(getFragmentHtml(fragment),
|
||||||
'<span class="xterm-italic">a</span>'
|
'<span class="xterm-italic">a</span>'
|
||||||
);
|
);
|
||||||
@@ -80,7 +92,7 @@ describe('DomRendererRowFactory', () => {
|
|||||||
const defaultAttrNoFgColor = (0 << 9) | (DEFAULT_COLOR << 0);
|
const defaultAttrNoFgColor = (0 << 9) | (DEFAULT_COLOR << 0);
|
||||||
for (let i = 0; i < 256; i++) {
|
for (let i = 0; i < 256; i++) {
|
||||||
lineData.set(0, [defaultAttrNoFgColor | (i << 9), 'a', 1, 'a'.charCodeAt(0)]);
|
lineData.set(0, [defaultAttrNoFgColor | (i << 9), 'a', 1, 'a'.charCodeAt(0)]);
|
||||||
const fragment = rowFactory.createRow(lineData, false, undefined, 0, 5, 20);
|
const fragment = rowFactory.createRow(lineData, false, undefined, 0, false, 5, 20);
|
||||||
assert.equal(getFragmentHtml(fragment),
|
assert.equal(getFragmentHtml(fragment),
|
||||||
`<span class="xterm-fg-${i}">a</span>`
|
`<span class="xterm-fg-${i}">a</span>`
|
||||||
);
|
);
|
||||||
@@ -91,7 +103,7 @@ describe('DomRendererRowFactory', () => {
|
|||||||
const defaultAttrNoBgColor = (DEFAULT_ATTR << 9) | (0 << 0);
|
const defaultAttrNoBgColor = (DEFAULT_ATTR << 9) | (0 << 0);
|
||||||
for (let i = 0; i < 256; i++) {
|
for (let i = 0; i < 256; i++) {
|
||||||
lineData.set(0, [defaultAttrNoBgColor | (i << 0), 'a', 1, 'a'.charCodeAt(0)]);
|
lineData.set(0, [defaultAttrNoBgColor | (i << 0), 'a', 1, 'a'.charCodeAt(0)]);
|
||||||
const fragment = rowFactory.createRow(lineData, false, undefined, 0, 5, 20);
|
const fragment = rowFactory.createRow(lineData, false, undefined, 0, false, 5, 20);
|
||||||
assert.equal(getFragmentHtml(fragment),
|
assert.equal(getFragmentHtml(fragment),
|
||||||
`<span class="xterm-bg-${i}">a</span>`
|
`<span class="xterm-bg-${i}">a</span>`
|
||||||
);
|
);
|
||||||
@@ -100,7 +112,7 @@ describe('DomRendererRowFactory', () => {
|
|||||||
|
|
||||||
it('should correctly invert colors', () => {
|
it('should correctly invert colors', () => {
|
||||||
lineData.set(0, [(FLAGS.INVERSE << 18) | (2 << 9) | (1 << 0), 'a', 1, 'a'.charCodeAt(0)]);
|
lineData.set(0, [(FLAGS.INVERSE << 18) | (2 << 9) | (1 << 0), 'a', 1, 'a'.charCodeAt(0)]);
|
||||||
const fragment = rowFactory.createRow(lineData, false, undefined, 0, 5, 20);
|
const fragment = rowFactory.createRow(lineData, false, undefined, 0, false, 5, 20);
|
||||||
assert.equal(getFragmentHtml(fragment),
|
assert.equal(getFragmentHtml(fragment),
|
||||||
'<span class="xterm-fg-1 xterm-bg-2">a</span>'
|
'<span class="xterm-fg-1 xterm-bg-2">a</span>'
|
||||||
);
|
);
|
||||||
@@ -108,7 +120,7 @@ describe('DomRendererRowFactory', () => {
|
|||||||
|
|
||||||
it('should correctly invert default fg color', () => {
|
it('should correctly invert default fg color', () => {
|
||||||
lineData.set(0, [(FLAGS.INVERSE << 18) | (DEFAULT_ATTR << 9) | (1 << 0), 'a', 1, 'a'.charCodeAt(0)]);
|
lineData.set(0, [(FLAGS.INVERSE << 18) | (DEFAULT_ATTR << 9) | (1 << 0), 'a', 1, 'a'.charCodeAt(0)]);
|
||||||
const fragment = rowFactory.createRow(lineData, false, undefined, 0, 5, 20);
|
const fragment = rowFactory.createRow(lineData, false, undefined, 0, false, 5, 20);
|
||||||
assert.equal(getFragmentHtml(fragment),
|
assert.equal(getFragmentHtml(fragment),
|
||||||
'<span class="xterm-fg-1 xterm-bg-257">a</span>'
|
'<span class="xterm-fg-1 xterm-bg-257">a</span>'
|
||||||
);
|
);
|
||||||
@@ -116,7 +128,7 @@ describe('DomRendererRowFactory', () => {
|
|||||||
|
|
||||||
it('should correctly invert default bg color', () => {
|
it('should correctly invert default bg color', () => {
|
||||||
lineData.set(0, [(FLAGS.INVERSE << 18) | (1 << 9) | (DEFAULT_COLOR << 0), 'a', 1, 'a'.charCodeAt(0)]);
|
lineData.set(0, [(FLAGS.INVERSE << 18) | (1 << 9) | (DEFAULT_COLOR << 0), 'a', 1, 'a'.charCodeAt(0)]);
|
||||||
const fragment = rowFactory.createRow(lineData, false, undefined, 0, 5, 20);
|
const fragment = rowFactory.createRow(lineData, false, undefined, 0, false, 5, 20);
|
||||||
assert.equal(getFragmentHtml(fragment),
|
assert.equal(getFragmentHtml(fragment),
|
||||||
'<span class="xterm-fg-257 xterm-bg-1">a</span>'
|
'<span class="xterm-fg-257 xterm-bg-1">a</span>'
|
||||||
);
|
);
|
||||||
@@ -125,7 +137,7 @@ describe('DomRendererRowFactory', () => {
|
|||||||
it('should turn bold fg text bright', () => {
|
it('should turn bold fg text bright', () => {
|
||||||
for (let i = 0; i < 8; i++) {
|
for (let i = 0; i < 8; i++) {
|
||||||
lineData.set(0, [(FLAGS.BOLD << 18) | (i << 9) | (DEFAULT_COLOR << 0), 'a', 1, 'a'.charCodeAt(0)]);
|
lineData.set(0, [(FLAGS.BOLD << 18) | (i << 9) | (DEFAULT_COLOR << 0), 'a', 1, 'a'.charCodeAt(0)]);
|
||||||
const fragment = rowFactory.createRow(lineData, false, undefined, 0, 5, 20);
|
const fragment = rowFactory.createRow(lineData, false, undefined, 0, false, 5, 20);
|
||||||
assert.equal(getFragmentHtml(fragment),
|
assert.equal(getFragmentHtml(fragment),
|
||||||
`<span class="xterm-bold xterm-fg-${i + 8}">a</span>`
|
`<span class="xterm-bold xterm-fg-${i + 8}">a</span>`
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -5,23 +5,25 @@
|
|||||||
|
|
||||||
import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_ATTR_INDEX, CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CODE_INDEX, NULL_CELL_CODE, WHITESPACE_CELL_CHAR } from '../../Buffer';
|
import { CHAR_DATA_CHAR_INDEX, CHAR_DATA_ATTR_INDEX, CHAR_DATA_WIDTH_INDEX, CHAR_DATA_CODE_INDEX, NULL_CELL_CODE, WHITESPACE_CELL_CHAR } from '../../Buffer';
|
||||||
import { FLAGS } from '../Types';
|
import { FLAGS } from '../Types';
|
||||||
import { IBufferLine } from '../../Types';
|
import { IBufferLine, ITerminalOptions } from '../../Types';
|
||||||
import { DEFAULT_COLOR, INVERTED_DEFAULT_COLOR } from '../atlas/Types';
|
import { DEFAULT_COLOR, INVERTED_DEFAULT_COLOR } from '../atlas/Types';
|
||||||
|
|
||||||
export const BOLD_CLASS = 'xterm-bold';
|
export const BOLD_CLASS = 'xterm-bold';
|
||||||
export const ITALIC_CLASS = 'xterm-italic';
|
export const ITALIC_CLASS = 'xterm-italic';
|
||||||
export const CURSOR_CLASS = 'xterm-cursor';
|
export const CURSOR_CLASS = 'xterm-cursor';
|
||||||
|
export const CURSOR_BLINK_CLASS = 'xterm-cursor-blink';
|
||||||
export const CURSOR_STYLE_BLOCK_CLASS = 'xterm-cursor-block';
|
export const CURSOR_STYLE_BLOCK_CLASS = 'xterm-cursor-block';
|
||||||
export const CURSOR_STYLE_BAR_CLASS = 'xterm-cursor-bar';
|
export const CURSOR_STYLE_BAR_CLASS = 'xterm-cursor-bar';
|
||||||
export const CURSOR_STYLE_UNDERLINE_CLASS = 'xterm-cursor-underline';
|
export const CURSOR_STYLE_UNDERLINE_CLASS = 'xterm-cursor-underline';
|
||||||
|
|
||||||
export class DomRendererRowFactory {
|
export class DomRendererRowFactory {
|
||||||
constructor(
|
constructor(
|
||||||
|
private _terminalOptions: ITerminalOptions,
|
||||||
private _document: Document
|
private _document: Document
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
public createRow(lineData: IBufferLine, isCursorRow: boolean, cursorStyle: string | undefined, cursorX: number, cellWidth: number, cols: number): DocumentFragment {
|
public createRow(lineData: IBufferLine, isCursorRow: boolean, cursorStyle: string | undefined, cursorX: number, cursorBlink: boolean, cellWidth: number, cols: number): DocumentFragment {
|
||||||
const fragment = this._document.createDocumentFragment();
|
const fragment = this._document.createDocumentFragment();
|
||||||
|
|
||||||
// Find the line length first, this prevents the need to output a bunch of
|
// Find the line length first, this prevents the need to output a bunch of
|
||||||
@@ -62,6 +64,10 @@ export class DomRendererRowFactory {
|
|||||||
if (isCursorRow && x === cursorX) {
|
if (isCursorRow && x === cursorX) {
|
||||||
charElement.classList.add(CURSOR_CLASS);
|
charElement.classList.add(CURSOR_CLASS);
|
||||||
|
|
||||||
|
if (cursorBlink) {
|
||||||
|
charElement.classList.add(CURSOR_BLINK_CLASS);
|
||||||
|
}
|
||||||
|
|
||||||
switch (cursorStyle) {
|
switch (cursorStyle) {
|
||||||
case 'bar':
|
case 'bar':
|
||||||
charElement.classList.add(CURSOR_STYLE_BAR_CLASS);
|
charElement.classList.add(CURSOR_STYLE_BAR_CLASS);
|
||||||
@@ -88,10 +94,10 @@ export class DomRendererRowFactory {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flags & FLAGS.BOLD) {
|
if (flags & FLAGS.BOLD && this._terminalOptions.enableBold) {
|
||||||
// Convert the FG color to the bold variant. This should not happen when
|
// Convert the FG color to the bold variant. This should not happen when
|
||||||
// the fg is the inverse default color as there is no bold variant.
|
// the fg is the inverse default color as there is no bold variant.
|
||||||
if (fg < 8) {
|
if (fg < 8 && this._terminalOptions.drawBoldTextInBrightColors) {
|
||||||
fg += 8;
|
fg += 8;
|
||||||
}
|
}
|
||||||
charElement.classList.add(BOLD_CLASS);
|
charElement.classList.add(BOLD_CLASS);
|
||||||
|
|||||||
Reference in New Issue
Block a user