Move handler into CoreService and adopt
This also fine tunes some of the data events to not clear selection and scroll to the bottom of the viewport anymore. Part of #1507 Fixes #2112
This commit is contained in:
@@ -7,6 +7,7 @@ import { assert } from 'chai';
|
|||||||
import { CompositionHelper } from './CompositionHelper';
|
import { CompositionHelper } from './CompositionHelper';
|
||||||
import { ITerminal } from './Types';
|
import { ITerminal } from './Types';
|
||||||
import { MockCharSizeService } from 'browser/TestUtils.test';
|
import { MockCharSizeService } from 'browser/TestUtils.test';
|
||||||
|
import { MockCoreService } from '../out/common/TestUtils.test';
|
||||||
|
|
||||||
describe('CompositionHelper', () => {
|
describe('CompositionHelper', () => {
|
||||||
let terminal: ITerminal;
|
let terminal: ITerminal;
|
||||||
@@ -54,7 +55,7 @@ describe('CompositionHelper', () => {
|
|||||||
}
|
}
|
||||||
} as any;
|
} as any;
|
||||||
handledText = '';
|
handledText = '';
|
||||||
compositionHelper = new CompositionHelper(textarea, compositionView, terminal, new MockCharSizeService(10, 10));
|
compositionHelper = new CompositionHelper(textarea, compositionView, terminal, new MockCharSizeService(10, 10), new MockCoreService());
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Input', () => {
|
describe('Input', () => {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
import { ITerminal } from './Types';
|
import { ITerminal } from './Types';
|
||||||
import { ICharSizeService } from 'browser/services/Services';
|
import { ICharSizeService } from 'browser/services/Services';
|
||||||
|
import { ICoreService } from 'common/services/Services';
|
||||||
|
|
||||||
interface IPosition {
|
interface IPosition {
|
||||||
start: number;
|
start: number;
|
||||||
@@ -41,10 +42,11 @@ export class CompositionHelper {
|
|||||||
* @param _terminal The Terminal to forward the finished composition to.
|
* @param _terminal The Terminal to forward the finished composition to.
|
||||||
*/
|
*/
|
||||||
constructor(
|
constructor(
|
||||||
private _textarea: HTMLTextAreaElement,
|
private readonly _textarea: HTMLTextAreaElement,
|
||||||
private _compositionView: HTMLElement,
|
private readonly _compositionView: HTMLElement,
|
||||||
private _terminal: ITerminal,
|
private readonly _terminal: ITerminal,
|
||||||
private _charSizeService: ICharSizeService
|
private readonly _charSizeService: ICharSizeService,
|
||||||
|
private readonly _coreService: ICoreService
|
||||||
) {
|
) {
|
||||||
this._isComposing = false;
|
this._isComposing = false;
|
||||||
this._isSendingComposition = false;
|
this._isSendingComposition = false;
|
||||||
@@ -127,7 +129,7 @@ export class CompositionHelper {
|
|||||||
// Cancel any delayed composition send requests and send the input immediately.
|
// Cancel any delayed composition send requests and send the input immediately.
|
||||||
this._isSendingComposition = false;
|
this._isSendingComposition = false;
|
||||||
const input = this._textarea.value.substring(this._compositionPosition.start, this._compositionPosition.end);
|
const input = this._textarea.value.substring(this._compositionPosition.start, this._compositionPosition.end);
|
||||||
this._terminal.handler(input);
|
this._coreService.triggerDataEvent(input, true);
|
||||||
} else {
|
} else {
|
||||||
// Make a deep copy of the composition position here as a new compositionstart event may
|
// Make a deep copy of the composition position here as a new compositionstart event may
|
||||||
// fire before the setTimeout executes.
|
// fire before the setTimeout executes.
|
||||||
@@ -159,7 +161,7 @@ export class CompositionHelper {
|
|||||||
// (eg. 2) after a composition character.
|
// (eg. 2) after a composition character.
|
||||||
input = this._textarea.value.substring(currentCompositionPosition.start);
|
input = this._textarea.value.substring(currentCompositionPosition.start);
|
||||||
}
|
}
|
||||||
this._terminal.handler(input);
|
this._coreService.triggerDataEvent(input, true);
|
||||||
}
|
}
|
||||||
}, 0);
|
}, 0);
|
||||||
}
|
}
|
||||||
@@ -179,7 +181,7 @@ export class CompositionHelper {
|
|||||||
const newValue = this._textarea.value;
|
const newValue = this._textarea.value;
|
||||||
const diff = newValue.replace(oldValue, '');
|
const diff = newValue.replace(oldValue, '');
|
||||||
if (diff.length > 0) {
|
if (diff.length > 0) {
|
||||||
this._terminal.handler(diff);
|
this._coreService.triggerDataEvent(diff, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, 0);
|
}, 0);
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import { DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine';
|
|||||||
import { CellData } from 'common/buffer/CellData';
|
import { CellData } from 'common/buffer/CellData';
|
||||||
import { Attributes } from 'common/buffer/Constants';
|
import { Attributes } from 'common/buffer/Constants';
|
||||||
import { AttributeData } from 'common/buffer/AttributeData';
|
import { AttributeData } from 'common/buffer/AttributeData';
|
||||||
|
import { MockCoreService } from 'common/TestUtils.test';
|
||||||
|
|
||||||
describe('InputHandler', () => {
|
describe('InputHandler', () => {
|
||||||
describe('save and restore cursor', () => {
|
describe('save and restore cursor', () => {
|
||||||
@@ -20,7 +21,7 @@ describe('InputHandler', () => {
|
|||||||
terminal.buffer.y = 2;
|
terminal.buffer.y = 2;
|
||||||
terminal.buffer.ybase = 0;
|
terminal.buffer.ybase = 0;
|
||||||
terminal.curAttrData.fg = 3;
|
terminal.curAttrData.fg = 3;
|
||||||
const inputHandler = new InputHandler(terminal);
|
const inputHandler = new InputHandler(terminal, new MockCoreService());
|
||||||
// Save cursor position
|
// Save cursor position
|
||||||
inputHandler.saveCursor([]);
|
inputHandler.saveCursor([]);
|
||||||
assert.equal(terminal.buffer.x, 1);
|
assert.equal(terminal.buffer.x, 1);
|
||||||
@@ -39,7 +40,7 @@ describe('InputHandler', () => {
|
|||||||
describe('setCursorStyle', () => {
|
describe('setCursorStyle', () => {
|
||||||
it('should call Terminal.setOption with correct params', () => {
|
it('should call Terminal.setOption with correct params', () => {
|
||||||
const terminal = new MockInputHandlingTerminal();
|
const terminal = new MockInputHandlingTerminal();
|
||||||
const inputHandler = new InputHandler(terminal);
|
const inputHandler = new InputHandler(terminal, new MockCoreService());
|
||||||
const collect = ' ';
|
const collect = ' ';
|
||||||
|
|
||||||
inputHandler.setCursorStyle([0], collect);
|
inputHandler.setCursorStyle([0], collect);
|
||||||
@@ -82,7 +83,7 @@ describe('InputHandler', () => {
|
|||||||
const terminal = new MockInputHandlingTerminal();
|
const terminal = new MockInputHandlingTerminal();
|
||||||
const collect = '?';
|
const collect = '?';
|
||||||
terminal.bracketedPasteMode = false;
|
terminal.bracketedPasteMode = false;
|
||||||
const inputHandler = new InputHandler(terminal);
|
const inputHandler = new InputHandler(terminal, new MockCoreService());
|
||||||
// Set bracketed paste mode
|
// Set bracketed paste mode
|
||||||
inputHandler.setMode([2004], collect);
|
inputHandler.setMode([2004], collect);
|
||||||
assert.equal(terminal.bracketedPasteMode, true);
|
assert.equal(terminal.bracketedPasteMode, true);
|
||||||
@@ -100,7 +101,7 @@ describe('InputHandler', () => {
|
|||||||
|
|
||||||
it('insertChars', function(): void {
|
it('insertChars', function(): void {
|
||||||
const term = new Terminal();
|
const term = new Terminal();
|
||||||
const inputHandler = new InputHandler(term);
|
const inputHandler = new InputHandler(term, new MockCoreService());
|
||||||
|
|
||||||
// insert some data in first and second line
|
// insert some data in first and second line
|
||||||
inputHandler.parse(Array(term.cols - 9).join('a'));
|
inputHandler.parse(Array(term.cols - 9).join('a'));
|
||||||
@@ -137,7 +138,7 @@ describe('InputHandler', () => {
|
|||||||
});
|
});
|
||||||
it('deleteChars', function(): void {
|
it('deleteChars', function(): void {
|
||||||
const term = new Terminal();
|
const term = new Terminal();
|
||||||
const inputHandler = new InputHandler(term);
|
const inputHandler = new InputHandler(term, new MockCoreService());
|
||||||
|
|
||||||
// insert some data in first and second line
|
// insert some data in first and second line
|
||||||
inputHandler.parse(Array(term.cols - 9).join('a'));
|
inputHandler.parse(Array(term.cols - 9).join('a'));
|
||||||
@@ -177,7 +178,7 @@ describe('InputHandler', () => {
|
|||||||
});
|
});
|
||||||
it('eraseInLine', function(): void {
|
it('eraseInLine', function(): void {
|
||||||
const term = new Terminal();
|
const term = new Terminal();
|
||||||
const inputHandler = new InputHandler(term);
|
const inputHandler = new InputHandler(term, new MockCoreService());
|
||||||
|
|
||||||
// fill 6 lines to test 3 different states
|
// fill 6 lines to test 3 different states
|
||||||
inputHandler.parse(Array(term.cols + 1).join('a'));
|
inputHandler.parse(Array(term.cols + 1).join('a'));
|
||||||
@@ -205,7 +206,7 @@ describe('InputHandler', () => {
|
|||||||
});
|
});
|
||||||
it('eraseInDisplay', function(): void {
|
it('eraseInDisplay', function(): void {
|
||||||
const term = new Terminal({cols: 80, rows: 7});
|
const term = new Terminal({cols: 80, rows: 7});
|
||||||
const inputHandler = new InputHandler(term);
|
const inputHandler = new InputHandler(term, new MockCoreService());
|
||||||
|
|
||||||
// fill display with a's
|
// fill display with a's
|
||||||
for (let i = 0; i < term.rows; ++i) inputHandler.parse(Array(term.cols + 1).join('a'));
|
for (let i = 0; i < term.rows; ++i) inputHandler.parse(Array(term.cols + 1).join('a'));
|
||||||
@@ -340,7 +341,7 @@ describe('InputHandler', () => {
|
|||||||
describe('print', () => {
|
describe('print', () => {
|
||||||
it('should not cause an infinite loop (regression test)', () => {
|
it('should not cause an infinite loop (regression test)', () => {
|
||||||
const term = new Terminal();
|
const term = new Terminal();
|
||||||
const inputHandler = new InputHandler(term);
|
const inputHandler = new InputHandler(term, new MockCoreService());
|
||||||
const container = new Uint32Array(10);
|
const container = new Uint32Array(10);
|
||||||
container[0] = 0x200B;
|
container[0] = 0x200B;
|
||||||
inputHandler.print(container, 0, 1);
|
inputHandler.print(container, 0, 1);
|
||||||
@@ -353,7 +354,7 @@ describe('InputHandler', () => {
|
|||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
term = new Terminal();
|
term = new Terminal();
|
||||||
handler = new InputHandler(term);
|
handler = new InputHandler(term, new MockCoreService());
|
||||||
});
|
});
|
||||||
it('should handle DECSET/DECRST 47 (alt screen buffer)', () => {
|
it('should handle DECSET/DECRST 47 (alt screen buffer)', () => {
|
||||||
handler.parse('\x1b[?47h\r\n\x1b[31mJUNK\x1b[?47lTEST');
|
handler.parse('\x1b[?47h\r\n\x1b[31mJUNK\x1b[?47lTEST');
|
||||||
|
|||||||
+11
-11
@@ -19,6 +19,7 @@ import { IParsingState, IDcsHandler, IEscapeSequenceParser } from 'common/parser
|
|||||||
import { NULL_CELL_CODE, NULL_CELL_WIDTH, Attributes, FgFlags, BgFlags } from 'common/buffer/Constants';
|
import { NULL_CELL_CODE, NULL_CELL_WIDTH, Attributes, FgFlags, BgFlags } from 'common/buffer/Constants';
|
||||||
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 { ICoreService } from 'common/services/Services';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Map collect to glevel. Used in `selectCharset`.
|
* Map collect to glevel. Used in `selectCharset`.
|
||||||
@@ -113,8 +114,6 @@ export class InputHandler extends Disposable implements IInputHandler {
|
|||||||
|
|
||||||
private _onCursorMove = new EventEmitter<void>();
|
private _onCursorMove = new EventEmitter<void>();
|
||||||
public get onCursorMove(): IEvent<void> { return this._onCursorMove.event; }
|
public get onCursorMove(): IEvent<void> { return this._onCursorMove.event; }
|
||||||
private _onData = new EventEmitter<string>();
|
|
||||||
public get onData(): IEvent<string> { return this._onData.event; }
|
|
||||||
private _onLineFeed = new EventEmitter<void>();
|
private _onLineFeed = new EventEmitter<void>();
|
||||||
public get onLineFeed(): IEvent<void> { return this._onLineFeed.event; }
|
public get onLineFeed(): IEvent<void> { return this._onLineFeed.event; }
|
||||||
private _onScroll = new EventEmitter<number>();
|
private _onScroll = new EventEmitter<number>();
|
||||||
@@ -122,6 +121,7 @@ export class InputHandler extends Disposable implements IInputHandler {
|
|||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
protected _terminal: IInputHandlingTerminal,
|
protected _terminal: IInputHandlingTerminal,
|
||||||
|
private _coreService: ICoreService,
|
||||||
private _parser: IEscapeSequenceParser = new EscapeSequenceParser())
|
private _parser: IEscapeSequenceParser = new EscapeSequenceParser())
|
||||||
{
|
{
|
||||||
super();
|
super();
|
||||||
@@ -1098,24 +1098,24 @@ export class InputHandler extends Disposable implements IInputHandler {
|
|||||||
|
|
||||||
if (!collect) {
|
if (!collect) {
|
||||||
if (this._terminal.is('xterm') || this._terminal.is('rxvt-unicode') || this._terminal.is('screen')) {
|
if (this._terminal.is('xterm') || this._terminal.is('rxvt-unicode') || this._terminal.is('screen')) {
|
||||||
this._terminal.handler(C0.ESC + '[?1;2c');
|
this._coreService.triggerDataEvent(C0.ESC + '[?1;2c');
|
||||||
} else if (this._terminal.is('linux')) {
|
} else if (this._terminal.is('linux')) {
|
||||||
this._terminal.handler(C0.ESC + '[?6c');
|
this._coreService.triggerDataEvent(C0.ESC + '[?6c');
|
||||||
}
|
}
|
||||||
} else if (collect === '>') {
|
} else if (collect === '>') {
|
||||||
// xterm and urxvt
|
// xterm and urxvt
|
||||||
// seem to spit this
|
// seem to spit this
|
||||||
// out around ~370 times (?).
|
// out around ~370 times (?).
|
||||||
if (this._terminal.is('xterm')) {
|
if (this._terminal.is('xterm')) {
|
||||||
this._terminal.handler(C0.ESC + '[>0;276;0c');
|
this._coreService.triggerDataEvent(C0.ESC + '[>0;276;0c');
|
||||||
} else if (this._terminal.is('rxvt-unicode')) {
|
} else if (this._terminal.is('rxvt-unicode')) {
|
||||||
this._terminal.handler(C0.ESC + '[>85;95;0c');
|
this._coreService.triggerDataEvent(C0.ESC + '[>85;95;0c');
|
||||||
} else if (this._terminal.is('linux')) {
|
} else if (this._terminal.is('linux')) {
|
||||||
// not supported by linux console.
|
// not supported by linux console.
|
||||||
// linux console echoes parameters.
|
// linux console echoes parameters.
|
||||||
this._terminal.handler(params[0] + 'c');
|
this._coreService.triggerDataEvent(params[0] + 'c');
|
||||||
} else if (this._terminal.is('screen')) {
|
} else if (this._terminal.is('screen')) {
|
||||||
this._terminal.handler(C0.ESC + '[>83;40003;0c');
|
this._coreService.triggerDataEvent(C0.ESC + '[>83;40003;0c');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1799,13 +1799,13 @@ export class InputHandler extends Disposable implements IInputHandler {
|
|||||||
switch (params[0]) {
|
switch (params[0]) {
|
||||||
case 5:
|
case 5:
|
||||||
// status report
|
// status report
|
||||||
this._onData.fire(`${C0.ESC}[0n`);
|
this._coreService.triggerDataEvent(`${C0.ESC}[0n`);
|
||||||
break;
|
break;
|
||||||
case 6:
|
case 6:
|
||||||
// cursor position
|
// cursor position
|
||||||
const y = this._terminal.buffer.y + 1;
|
const y = this._terminal.buffer.y + 1;
|
||||||
const x = this._terminal.buffer.x + 1;
|
const x = this._terminal.buffer.x + 1;
|
||||||
this._onData.fire(`${C0.ESC}[${y};${x}R`);
|
this._coreService.triggerDataEvent(`${C0.ESC}[${y};${x}R`);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} else if (collect === '?') {
|
} else if (collect === '?') {
|
||||||
@@ -1816,7 +1816,7 @@ export class InputHandler extends Disposable implements IInputHandler {
|
|||||||
// cursor position
|
// cursor position
|
||||||
const y = this._terminal.buffer.y + 1;
|
const y = this._terminal.buffer.y + 1;
|
||||||
const x = this._terminal.buffer.x + 1;
|
const x = this._terminal.buffer.x + 1;
|
||||||
this._onData.fire(`${C0.ESC}[?${y};${x}R`);
|
this._coreService.triggerDataEvent(`${C0.ESC}[?${y};${x}R`);
|
||||||
break;
|
break;
|
||||||
case 15:
|
case 15:
|
||||||
// no printer
|
// no printer
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import { ITerminal } from './Types';
|
|||||||
import { IBuffer } from 'common/buffer/Types';
|
import { IBuffer } from 'common/buffer/Types';
|
||||||
import { IBufferLine } from 'common/Types';
|
import { IBufferLine } from 'common/Types';
|
||||||
import { MockTerminal } from './TestUtils.test';
|
import { MockTerminal } from './TestUtils.test';
|
||||||
import { MockBufferService, MockOptionsService } from 'common/TestUtils.test';
|
import { MockBufferService, MockOptionsService, MockCoreService } from 'common/TestUtils.test';
|
||||||
import { BufferLine } from 'common/buffer/BufferLine';
|
import { BufferLine } from 'common/buffer/BufferLine';
|
||||||
import { IBufferService, IOptionsService } from 'common/services/Services';
|
import { IBufferService, IOptionsService } from 'common/services/Services';
|
||||||
import { MockCharSizeService, MockMouseService } from 'browser/TestUtils.test';
|
import { MockCharSizeService, MockMouseService } from 'browser/TestUtils.test';
|
||||||
@@ -26,7 +26,7 @@ class TestSelectionManager extends SelectionManager {
|
|||||||
bufferService: IBufferService,
|
bufferService: IBufferService,
|
||||||
optionsService: IOptionsService
|
optionsService: IOptionsService
|
||||||
) {
|
) {
|
||||||
super(terminal, null, new MockCharSizeService(10, 10), bufferService, new MockMouseService(), optionsService);
|
super(terminal, null, new MockCharSizeService(10, 10), bufferService, new MockCoreService(), new MockMouseService(), optionsService);
|
||||||
}
|
}
|
||||||
|
|
||||||
public get model(): SelectionModel { return this._model; }
|
public get model(): SelectionModel { return this._model; }
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import { CellData } from 'common/buffer/CellData';
|
|||||||
import { IDisposable } from 'xterm';
|
import { IDisposable } from 'xterm';
|
||||||
import { EventEmitter, IEvent } from 'common/EventEmitter';
|
import { EventEmitter, IEvent } from 'common/EventEmitter';
|
||||||
import { ICharSizeService, IMouseService } from 'browser/services/Services';
|
import { ICharSizeService, IMouseService } from 'browser/services/Services';
|
||||||
import { IBufferService, IOptionsService } from 'common/services/Services';
|
import { IBufferService, IOptionsService, ICoreService } from 'common/services/Services';
|
||||||
import { getCoordsRelativeToElement } from 'browser/input/Mouse';
|
import { getCoordsRelativeToElement } from 'browser/input/Mouse';
|
||||||
import { moveToCellSequence } from 'browser/input/MoveToCell';
|
import { moveToCellSequence } from 'browser/input/MoveToCell';
|
||||||
|
|
||||||
@@ -117,6 +117,7 @@ export class SelectionManager implements ISelectionManager {
|
|||||||
private readonly _screenElement: HTMLElement,
|
private readonly _screenElement: HTMLElement,
|
||||||
private readonly _charSizeService: ICharSizeService,
|
private readonly _charSizeService: ICharSizeService,
|
||||||
private readonly _bufferService: IBufferService,
|
private readonly _bufferService: IBufferService,
|
||||||
|
private readonly _coreService: ICoreService,
|
||||||
private readonly _mouseService: IMouseService,
|
private readonly _mouseService: IMouseService,
|
||||||
private readonly _optionsService: IOptionsService
|
private readonly _optionsService: IOptionsService
|
||||||
) {
|
) {
|
||||||
@@ -137,7 +138,11 @@ export class SelectionManager implements ISelectionManager {
|
|||||||
private _initListeners(): void {
|
private _initListeners(): void {
|
||||||
this._mouseMoveListener = event => this._onMouseMove(<MouseEvent>event);
|
this._mouseMoveListener = event => this._onMouseMove(<MouseEvent>event);
|
||||||
this._mouseUpListener = event => this._onMouseUp(<MouseEvent>event);
|
this._mouseUpListener = event => this._onMouseUp(<MouseEvent>event);
|
||||||
|
this._coreService.onUserInput(() => {
|
||||||
|
if (this.hasSelection) {
|
||||||
|
this.clearSelection();
|
||||||
|
}
|
||||||
|
});
|
||||||
this.initBuffersListeners();
|
this.initBuffersListeners();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -661,7 +666,7 @@ export class SelectionManager implements ISelectionManager {
|
|||||||
);
|
);
|
||||||
if (coordinates && coordinates[0] !== undefined && coordinates[1] !== undefined) {
|
if (coordinates && coordinates[0] !== undefined && coordinates[1] !== undefined) {
|
||||||
const sequence = moveToCellSequence(coordinates[0] - 1, coordinates[1] - 1, this._bufferService, this._terminal.applicationCursor);
|
const sequence = moveToCellSequence(coordinates[0] - 1, coordinates[1] - 1, this._bufferService, this._terminal.applicationCursor);
|
||||||
this._terminal.handler(sequence);
|
this._coreService.triggerDataEvent(sequence, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (this.hasSelection) {
|
} else if (this.hasSelection) {
|
||||||
|
|||||||
@@ -53,10 +53,11 @@ describe('Terminal', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
describe('events', () => {
|
describe('events', () => {
|
||||||
it('should fire the onData evnet', (done) => {
|
// TODO: Add an onData test back
|
||||||
term.onData(() => done());
|
// it('should fire the onData evnet', (done) => {
|
||||||
term.handler('fake');
|
// term.onData(() => done());
|
||||||
});
|
// term.handler('fake');
|
||||||
|
// });
|
||||||
it('should fire the onCursorMove event', (done) => {
|
it('should fire the onCursorMove event', (done) => {
|
||||||
term.onCursorMove(() => done());
|
term.onCursorMove(() => done());
|
||||||
term.write('foo');
|
term.write('foo');
|
||||||
@@ -142,7 +143,6 @@ describe('Terminal', () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
term.handler = () => { };
|
|
||||||
term.showCursor = () => { };
|
term.showCursor = () => { };
|
||||||
term.clearSelection = () => { };
|
term.clearSelection = () => { };
|
||||||
});
|
});
|
||||||
@@ -520,7 +520,6 @@ describe('Terminal', () => {
|
|||||||
let evKeyPress: any;
|
let evKeyPress: any;
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
term.handler = () => { };
|
|
||||||
term.showCursor = () => { };
|
term.showCursor = () => { };
|
||||||
term.clearSelection = () => { };
|
term.clearSelection = () => { };
|
||||||
// term.compositionHelper = {
|
// term.compositionHelper = {
|
||||||
|
|||||||
+41
-38
@@ -47,7 +47,7 @@ import { DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine';
|
|||||||
import { applyWindowsMode } from './WindowsMode';
|
import { applyWindowsMode } from './WindowsMode';
|
||||||
import { ColorManager } from 'browser/ColorManager';
|
import { ColorManager } from 'browser/ColorManager';
|
||||||
import { RenderService } from 'browser/services/RenderService';
|
import { RenderService } from 'browser/services/RenderService';
|
||||||
import { IOptionsService, IBufferService } 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 } from 'browser/services/Services';
|
import { ICharSizeService, IRenderService, IMouseService } from 'browser/services/Services';
|
||||||
import { CharSizeService } from 'browser/services/CharSizeService';
|
import { CharSizeService } from 'browser/services/CharSizeService';
|
||||||
@@ -56,6 +56,7 @@ import { Disposable } from 'common/Lifecycle';
|
|||||||
import { IBufferSet, IBuffer } from 'common/buffer/Types';
|
import { IBufferSet, IBuffer } from 'common/buffer/Types';
|
||||||
import { Attributes } from 'common/buffer/Constants';
|
import { Attributes } from 'common/buffer/Constants';
|
||||||
import { MouseService } from 'browser/services/MouseService';
|
import { MouseService } from 'browser/services/MouseService';
|
||||||
|
import { CoreService } from 'common/services/CoreService';
|
||||||
|
|
||||||
// Let it work inside Node.js for automated testing purposes.
|
// Let it work inside Node.js for automated testing purposes.
|
||||||
const document = (typeof window !== 'undefined') ? window.document : null;
|
const document = (typeof window !== 'undefined') ? window.document : null;
|
||||||
@@ -107,6 +108,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
|
|
||||||
// common services
|
// common services
|
||||||
private _bufferService: IBufferService;
|
private _bufferService: IBufferService;
|
||||||
|
private _coreService: ICoreService;
|
||||||
public optionsService: IOptionsService;
|
public optionsService: IOptionsService;
|
||||||
|
|
||||||
// browser services
|
// browser services
|
||||||
@@ -237,6 +239,9 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
// Setup and initialize common services
|
// Setup and initialize common services
|
||||||
this.optionsService = new OptionsService(options);
|
this.optionsService = new OptionsService(options);
|
||||||
this._bufferService = new BufferService(this.optionsService);
|
this._bufferService = new BufferService(this.optionsService);
|
||||||
|
this._coreService = new CoreService(() => this.scrollToBottom(), this._bufferService, this.optionsService);
|
||||||
|
this._coreService.onData(e => this._onData.fire(e));
|
||||||
|
|
||||||
this._setupOptionsListeners();
|
this._setupOptionsListeners();
|
||||||
this._setup();
|
this._setup();
|
||||||
}
|
}
|
||||||
@@ -249,7 +254,6 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
}
|
}
|
||||||
this._customKeyEventHandler = null;
|
this._customKeyEventHandler = null;
|
||||||
removeTerminalFromCache(this);
|
removeTerminalFromCache(this);
|
||||||
this.handler = () => {};
|
|
||||||
this.write = () => {};
|
this.write = () => {};
|
||||||
if (this.element && this.element.parentNode) {
|
if (this.element && this.element.parentNode) {
|
||||||
this.element.parentNode.removeChild(this.element);
|
this.element.parentNode.removeChild(this.element);
|
||||||
@@ -294,10 +298,9 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
this._userScrolling = false;
|
this._userScrolling = false;
|
||||||
|
|
||||||
// Register input handler and refire/handle events
|
// Register input handler and refire/handle events
|
||||||
this._inputHandler = new InputHandler(this);
|
this._inputHandler = new InputHandler(this, this._coreService);
|
||||||
this._inputHandler.onCursorMove(() => this._onCursorMove.fire());
|
this._inputHandler.onCursorMove(() => this._onCursorMove.fire());
|
||||||
this._inputHandler.onLineFeed(() => this._onLineFeed.fire());
|
this._inputHandler.onLineFeed(() => this._onLineFeed.fire());
|
||||||
this._inputHandler.onData(e => this._onData.fire(e));
|
|
||||||
this.register(this._inputHandler);
|
this.register(this._inputHandler);
|
||||||
|
|
||||||
this.selectionManager = this.selectionManager || null;
|
this.selectionManager = this.selectionManager || null;
|
||||||
@@ -434,7 +437,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
*/
|
*/
|
||||||
private _onTextAreaFocus(ev: KeyboardEvent): void {
|
private _onTextAreaFocus(ev: KeyboardEvent): void {
|
||||||
if (this.sendFocus) {
|
if (this.sendFocus) {
|
||||||
this.handler(C0.ESC + '[I');
|
this._coreService.triggerDataEvent(C0.ESC + '[I');
|
||||||
}
|
}
|
||||||
this.updateCursorStyle(ev);
|
this.updateCursorStyle(ev);
|
||||||
this.element.classList.add('focus');
|
this.element.classList.add('focus');
|
||||||
@@ -459,7 +462,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
this.textarea.value = '';
|
this.textarea.value = '';
|
||||||
this.refresh(this.buffer.y, this.buffer.y);
|
this.refresh(this.buffer.y, this.buffer.y);
|
||||||
if (this.sendFocus) {
|
if (this.sendFocus) {
|
||||||
this.handler(C0.ESC + '[O');
|
this._coreService.triggerDataEvent(C0.ESC + '[O');
|
||||||
}
|
}
|
||||||
this.element.classList.remove('focus');
|
this.element.classList.remove('focus');
|
||||||
this._onBlur.fire();
|
this._onBlur.fire();
|
||||||
@@ -480,7 +483,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
}
|
}
|
||||||
copyHandler(event, this.selectionManager);
|
copyHandler(event, this.selectionManager);
|
||||||
}));
|
}));
|
||||||
const pasteHandlerWrapper = (event: ClipboardEvent) => pasteHandler(event, this.textarea, this.bracketedPasteMode, e => this.handler(e));
|
const pasteHandlerWrapper = (event: ClipboardEvent) => pasteHandler(event, this.textarea, this.bracketedPasteMode, e => this._coreService.triggerDataEvent(e, true));
|
||||||
this.register(addDisposableDomListener(this.textarea, 'paste', pasteHandlerWrapper));
|
this.register(addDisposableDomListener(this.textarea, 'paste', pasteHandlerWrapper));
|
||||||
this.register(addDisposableDomListener(this.element, 'paste', pasteHandlerWrapper));
|
this.register(addDisposableDomListener(this.element, 'paste', pasteHandlerWrapper));
|
||||||
|
|
||||||
@@ -607,7 +610,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
|
|
||||||
this._compositionView = document.createElement('div');
|
this._compositionView = document.createElement('div');
|
||||||
this._compositionView.classList.add('composition-view');
|
this._compositionView.classList.add('composition-view');
|
||||||
this._compositionHelper = new CompositionHelper(this.textarea, this._compositionView, this, this._charSizeService);
|
this._compositionHelper = new CompositionHelper(this.textarea, this._compositionView, this, this._charSizeService, this._coreService);
|
||||||
this._helperContainer.appendChild(this._compositionView);
|
this._helperContainer.appendChild(this._compositionView);
|
||||||
|
|
||||||
// Performance: Add viewport and helper elements from the fragment
|
// Performance: Add viewport and helper elements from the fragment
|
||||||
@@ -640,7 +643,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
this.register(this.onFocus(() => this._renderService.onFocus()));
|
this.register(this.onFocus(() => this._renderService.onFocus()));
|
||||||
this.register(this._renderService.onDimensionsChange(() => this.viewport.syncScrollArea()));
|
this.register(this._renderService.onDimensionsChange(() => this.viewport.syncScrollArea()));
|
||||||
|
|
||||||
this.selectionManager = new SelectionManager(this, this.screenElement, this._charSizeService, this._bufferService, this._mouseService, this.optionsService);
|
this.selectionManager = new SelectionManager(this, this.screenElement, this._charSizeService, this._bufferService, this._coreService, this._mouseService, this.optionsService);
|
||||||
this.register(this.selectionManager.onSelectionChange(() => this._onSelectionChange.fire()));
|
this.register(this.selectionManager.onSelectionChange(() => this._onSelectionChange.fire()));
|
||||||
this.register(addDisposableDomListener(this.element, 'mousedown', (e: MouseEvent) => this.selectionManager.onMouseDown(e)));
|
this.register(addDisposableDomListener(this.element, 'mousedown', (e: MouseEvent) => this.selectionManager.onMouseDown(e)));
|
||||||
this.register(this.selectionManager.onRedrawRequest(e => this._renderService.onSelectionChanged(e.start, e.end, e.columnSelectMode)));
|
this.register(this.selectionManager.onRedrawRequest(e => this._renderService.onSelectionChanged(e.start, e.end, e.columnSelectMode)));
|
||||||
@@ -814,7 +817,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
else if (button === 3) return;
|
else if (button === 3) return;
|
||||||
else data += '0';
|
else data += '0';
|
||||||
data += '~[' + pos.x + ',' + pos.y + ']\r';
|
data += '~[' + pos.x + ',' + pos.y + ']\r';
|
||||||
self.handler(data);
|
self._coreService.triggerDataEvent(data, true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -827,7 +830,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
else if (button === 1) button = 4;
|
else if (button === 1) button = 4;
|
||||||
else if (button === 2) button = 6;
|
else if (button === 2) button = 6;
|
||||||
else if (button === 3) button = 3;
|
else if (button === 3) button = 3;
|
||||||
self.handler(C0.ESC + '['
|
self._coreService.triggerDataEvent(C0.ESC + '['
|
||||||
+ button
|
+ button
|
||||||
+ ';'
|
+ ';'
|
||||||
+ (button === 3 ? 4 : 0)
|
+ (button === 3 ? 4 : 0)
|
||||||
@@ -838,7 +841,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
+ ';'
|
+ ';'
|
||||||
// Not sure what page is meant to be
|
// Not sure what page is meant to be
|
||||||
+ (<any>pos).page || 0
|
+ (<any>pos).page || 0
|
||||||
+ '&w');
|
+ '&w', true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -847,20 +850,20 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
pos.y -= 32;
|
pos.y -= 32;
|
||||||
pos.x++;
|
pos.x++;
|
||||||
pos.y++;
|
pos.y++;
|
||||||
self.handler(C0.ESC + '[' + button + ';' + pos.x + ';' + pos.y + 'M');
|
self._coreService.triggerDataEvent(C0.ESC + '[' + button + ';' + pos.x + ';' + pos.y + 'M', true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (self.sgrMouse) {
|
if (self.sgrMouse) {
|
||||||
pos.x -= 32;
|
pos.x -= 32;
|
||||||
pos.y -= 32;
|
pos.y -= 32;
|
||||||
self.handler(C0.ESC + '[<'
|
self._coreService.triggerDataEvent(C0.ESC + '[<'
|
||||||
+ (((button & 3) === 3 ? button & ~3 : button) - 32)
|
+ (((button & 3) === 3 ? button & ~3 : button) - 32)
|
||||||
+ ';'
|
+ ';'
|
||||||
+ pos.x
|
+ pos.x
|
||||||
+ ';'
|
+ ';'
|
||||||
+ pos.y
|
+ pos.y
|
||||||
+ ((button & 3) === 3 ? 'm' : 'M'));
|
+ ((button & 3) === 3 ? 'm' : 'M'), true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -870,7 +873,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
encode(data, pos.x);
|
encode(data, pos.x);
|
||||||
encode(data, pos.y);
|
encode(data, pos.y);
|
||||||
|
|
||||||
self.handler(C0.ESC + '[M' + String.fromCharCode.apply(String, data));
|
self._coreService.triggerDataEvent(C0.ESC + '[M' + String.fromCharCode.apply(String, data), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
function getButton(ev: MouseEvent): number {
|
function getButton(ev: MouseEvent): number {
|
||||||
@@ -1015,7 +1018,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
for (let i = 0; i < Math.abs(amount); i++) {
|
for (let i = 0; i < Math.abs(amount); i++) {
|
||||||
data += sequence;
|
data += sequence;
|
||||||
}
|
}
|
||||||
this.handler(data);
|
this._coreService.triggerDataEvent(data, true);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1240,7 +1243,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
if (this.options.useFlowControl && !this._xoffSentToCatchUp && this.writeBufferUtf8.length >= WRITE_BUFFER_PAUSE_THRESHOLD) {
|
if (this.options.useFlowControl && !this._xoffSentToCatchUp && this.writeBufferUtf8.length >= WRITE_BUFFER_PAUSE_THRESHOLD) {
|
||||||
// XOFF - stop pty pipe
|
// XOFF - stop pty pipe
|
||||||
// XON will be triggered by emulator before processing data chunk
|
// XON will be triggered by emulator before processing data chunk
|
||||||
this.handler(C0.DC3);
|
this._coreService.triggerDataEvent(C0.DC3);
|
||||||
this._xoffSentToCatchUp = true;
|
this._xoffSentToCatchUp = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1268,7 +1271,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
// If XOFF was sent in order to catch up with the pty process, resume it if
|
// If XOFF was sent in order to catch up with the pty process, resume it if
|
||||||
// we reached the end of the writeBuffer to allow more data to come in.
|
// we reached the end of the writeBuffer to allow more data to come in.
|
||||||
if (this._xoffSentToCatchUp && this.writeBufferUtf8.length === bufferOffset) {
|
if (this._xoffSentToCatchUp && this.writeBufferUtf8.length === bufferOffset) {
|
||||||
this.handler(C0.DC1);
|
this._coreService.triggerDataEvent(C0.DC1);
|
||||||
this._xoffSentToCatchUp = false;
|
this._xoffSentToCatchUp = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1327,7 +1330,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
if (this.options.useFlowControl && !this._xoffSentToCatchUp && this.writeBuffer.length >= WRITE_BUFFER_PAUSE_THRESHOLD) {
|
if (this.options.useFlowControl && !this._xoffSentToCatchUp && this.writeBuffer.length >= WRITE_BUFFER_PAUSE_THRESHOLD) {
|
||||||
// XOFF - stop pty pipe
|
// XOFF - stop pty pipe
|
||||||
// XON will be triggered by emulator before processing data chunk
|
// XON will be triggered by emulator before processing data chunk
|
||||||
this.handler(C0.DC3);
|
this._coreService.triggerDataEvent(C0.DC3);
|
||||||
this._xoffSentToCatchUp = true;
|
this._xoffSentToCatchUp = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1355,7 +1358,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
// If XOFF was sent in order to catch up with the pty process, resume it if
|
// If XOFF was sent in order to catch up with the pty process, resume it if
|
||||||
// we reached the end of the writeBuffer to allow more data to come in.
|
// we reached the end of the writeBuffer to allow more data to come in.
|
||||||
if (this._xoffSentToCatchUp && this.writeBuffer.length === bufferOffset) {
|
if (this._xoffSentToCatchUp && this.writeBuffer.length === bufferOffset) {
|
||||||
this.handler(C0.DC1);
|
this._coreService.triggerDataEvent(C0.DC1);
|
||||||
this._xoffSentToCatchUp = false;
|
this._xoffSentToCatchUp = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1587,7 +1590,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
|
|
||||||
this._onKey.fire({ key: result.key, domEvent: event });
|
this._onKey.fire({ key: result.key, domEvent: event });
|
||||||
this.showCursor();
|
this.showCursor();
|
||||||
this.handler(result.key);
|
this._coreService.triggerDataEvent(result.key, true);
|
||||||
|
|
||||||
return this.cancel(event, true);
|
return this.cancel(event, true);
|
||||||
}
|
}
|
||||||
@@ -1665,7 +1668,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
|
|
||||||
this._onKey.fire({ key, domEvent: ev });
|
this._onKey.fire({ key, domEvent: ev });
|
||||||
this.showCursor();
|
this.showCursor();
|
||||||
this.handler(key);
|
this._coreService.triggerDataEvent(key, true);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -1796,23 +1799,23 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
|
|||||||
* Emit the data event and populate the given data.
|
* Emit the data event and populate the given data.
|
||||||
* @param data The data to populate in the event.
|
* @param data The data to populate in the event.
|
||||||
*/
|
*/
|
||||||
public handler(data: string): void {
|
// public handler(data: string): void {
|
||||||
// Prevents all events to pty process if stdin is disabled
|
// // Prevents all events to pty process if stdin is disabled
|
||||||
if (this.options.disableStdin) {
|
// if (this.options.disableStdin) {
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
|
|
||||||
// Clear the selection if the selection manager is available and has an active selection
|
// // Clear the selection if the selection manager is available and has an active selection
|
||||||
if (this.selectionManager && this.selectionManager.hasSelection) {
|
// if (this.selectionManager && this.selectionManager.hasSelection) {
|
||||||
this.selectionManager.clearSelection();
|
// this.selectionManager.clearSelection();
|
||||||
}
|
// }
|
||||||
|
|
||||||
// Input is being sent to the terminal, the terminal should focus the prompt.
|
// // Input is being sent to the terminal, the terminal should focus the prompt.
|
||||||
if (this.buffer.ybase !== this.buffer.ydisp) {
|
// if (this.buffer.ybase !== this.buffer.ydisp) {
|
||||||
this.scrollToBottom();
|
// this.scrollToBottom();
|
||||||
}
|
// }
|
||||||
this._onData.fire(data);
|
// this._onData.fire(data);
|
||||||
}
|
// }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emit the 'title' event and populate the given title.
|
* Emit the 'title' event and populate the given title.
|
||||||
|
|||||||
Vendored
-2
@@ -73,7 +73,6 @@ export interface IInputHandlingTerminal {
|
|||||||
refresh(start: number, end: number): void;
|
refresh(start: number, end: number): void;
|
||||||
error(text: string, data?: any): void;
|
error(text: string, data?: any): void;
|
||||||
tabSet(): void;
|
tabSet(): void;
|
||||||
handler(data: string): void;
|
|
||||||
handleTitle(title: string): void;
|
handleTitle(title: string): void;
|
||||||
index(): void;
|
index(): void;
|
||||||
reverseIndex(): void;
|
reverseIndex(): void;
|
||||||
@@ -217,7 +216,6 @@ export interface ITerminal extends IPublicTerminal, IElementAccessor, IBufferAcc
|
|||||||
onA11yChar: IEvent<string>;
|
onA11yChar: IEvent<string>;
|
||||||
onA11yTab: IEvent<number>;
|
onA11yTab: IEvent<number>;
|
||||||
|
|
||||||
handler(data: string): void;
|
|
||||||
scrollLines(disp: number, suppressScrollEvent?: boolean): void;
|
scrollLines(disp: number, suppressScrollEvent?: boolean): void;
|
||||||
cancel(ev: Event, force?: boolean): boolean | void;
|
cancel(ev: Event, force?: boolean): boolean | void;
|
||||||
log(text: string): void;
|
log(text: string): void;
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { IBufferService, IOptionsService, ITerminalOptions, IPartialTerminalOptions } from 'common/services/Services';
|
import { IBufferService, ICoreService, IOptionsService, ITerminalOptions, IPartialTerminalOptions } from 'common/services/Services';
|
||||||
import { IEvent, EventEmitter } from 'common/EventEmitter';
|
import { IEvent, EventEmitter } from 'common/EventEmitter';
|
||||||
import { clone } from 'common/Clone';
|
import { clone } from 'common/Clone';
|
||||||
import { DEFAULT_OPTIONS } from 'common/services/OptionsService';
|
import { DEFAULT_OPTIONS } from 'common/services/OptionsService';
|
||||||
@@ -27,6 +27,12 @@ export class MockBufferService implements IBufferService {
|
|||||||
reset(): void {}
|
reset(): void {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class MockCoreService implements ICoreService {
|
||||||
|
onData: IEvent<string> = new EventEmitter<string>().event;
|
||||||
|
onUserInput: IEvent<void> = new EventEmitter<void>().event;
|
||||||
|
triggerDataEvent(data: string, wasUserInput?: boolean): void {}
|
||||||
|
}
|
||||||
|
|
||||||
export class MockOptionsService implements IOptionsService {
|
export class MockOptionsService implements IOptionsService {
|
||||||
options: ITerminalOptions = clone(DEFAULT_OPTIONS);
|
options: ITerminalOptions = clone(DEFAULT_OPTIONS);
|
||||||
onOptionChange: IEvent<string> = new EventEmitter<string>().event;
|
onOptionChange: IEvent<string> = new EventEmitter<string>().event;
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2019 The xterm.js authors. All rights reserved.
|
||||||
|
* @license MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { ICoreService, IOptionsService, IBufferService } from 'common/services/Services';
|
||||||
|
import { EventEmitter, IEvent } from 'common/EventEmitter';
|
||||||
|
|
||||||
|
export class CoreService implements ICoreService {
|
||||||
|
private _onData = new EventEmitter<string>();
|
||||||
|
public get onData(): IEvent<string> { return this._onData.event; }
|
||||||
|
private _onUserInput = new EventEmitter<void>();
|
||||||
|
public get onUserInput(): IEvent<void> { return this._onUserInput.event; }
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
// TODO: Move this into a service
|
||||||
|
private readonly _scrollToBottom: () => void,
|
||||||
|
private readonly _bufferService: IBufferService,
|
||||||
|
private readonly _optionsService: IOptionsService
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
|
public triggerDataEvent(data: string, wasUserInput: boolean = false): void {
|
||||||
|
// Prevents all events to pty process if stdin is disabled
|
||||||
|
if (this._optionsService.options.disableStdin) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Input is being sent to the terminal, the terminal should focus the prompt.
|
||||||
|
const buffer = this._bufferService.buffer;
|
||||||
|
if (buffer.ybase !== buffer.ydisp) {
|
||||||
|
this._scrollToBottom();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fire onUserInput so listeners can react as well (eg. clear selection)
|
||||||
|
if (wasUserInput) {
|
||||||
|
this._onUserInput.fire();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fire onData API
|
||||||
|
this._onData.fire(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
Vendored
+15
@@ -18,6 +18,21 @@ export interface IBufferService {
|
|||||||
reset(): void;
|
reset(): void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ICoreService {
|
||||||
|
readonly onData: IEvent<string>;
|
||||||
|
readonly onUserInput: IEvent<void>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Triggers the onData event in the public API.
|
||||||
|
* @param data The data that is being emitted.
|
||||||
|
* @param wasFromUser Whether the data originated from the user (as opposed to
|
||||||
|
* resulting from parsing incoming data). When true this will also:
|
||||||
|
* - Scroll to the bottom of the buffer.s
|
||||||
|
* - Fire the `onUserInput` event (so selection can be cleared).
|
||||||
|
*/
|
||||||
|
triggerDataEvent(data: string, wasUserInput?: boolean): void;
|
||||||
|
}
|
||||||
|
|
||||||
export interface IOptionsService {
|
export interface IOptionsService {
|
||||||
readonly options: ITerminalOptions;
|
readonly options: ITerminalOptions;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user