eiac/xterm.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into remove_ee

Browse Source
This commit is contained in:
Daniel Imms
2019-06-08 21:45:30 -07:00
parent 80ce33f9ef 58ec3f9973
commit 5aeb70bea4
7 changed files with 42 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Terminal.ts
+10 -12
View File
@@ -23,8 +23,6 @@
import { IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminalOptions, ITerminal, IBrowser, ILinkifier, ILinkMatcherOptions, CustomKeyEventHandler, LinkMatcherHandler, IMouseZoneManager } from './Types';
import { IRenderer, CharacterJoinerHandler } from 'browser/renderer/Types';
import { BufferSet } from 'common/buffer/BufferSet';
import { Buffer } from 'common/buffer/Buffer';
import { CompositionHelper } from './CompositionHelper';
import { Viewport } from './Viewport';
import { rightClickHandler, moveTextAreaUnderMouseCursor, pasteHandler, copyHandler } from './Clipboard';
@@ -36,7 +34,7 @@ import { SelectionManager } from './SelectionManager';
import * as Browser from 'common/Platform';
import { addDisposableDomListener } from 'browser/Lifecycle';
import * as Strings from './Strings';
import { MouseHelper } from './browser/input/MouseHelper';
import { MouseHelper } from 'browser/input/MouseHelper';
import { SoundManager } from './SoundManager';
import { MouseZoneManager } from './MouseZoneManager';
import { AccessibilityManager } from './AccessibilityManager';
@@ -56,6 +54,7 @@ import { ICharSizeService } from 'browser/services/Services';
import { CharSizeService } from 'browser/services/CharSizeService';
import { BufferService, MINIMUM_COLS, MINIMUM_ROWS } from 'common/services/BufferService';
import { Disposable } from 'common/Lifecycle';
import { IBufferSet, IBuffer } from 'common/buffer/Types';
// Let it work inside Node.js for automated testing purposes.
const document = (typeof window !== 'undefined') ? window.document : null;
@@ -174,7 +173,6 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
public soundManager: SoundManager;
public selectionManager: SelectionManager;
public linkifier: ILinkifier;
public buffers: BufferSet;
public viewport: IViewport;
private _compositionHelper: ICompositionHelper;
private _mouseZoneManager: IMouseZoneManager;
@@ -235,14 +233,11 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
) {
super();
// Initialize common services
// Setup and initialize common services
this.optionsService = new OptionsService(options);
this._bufferService = new BufferService(this.optionsService);
this._setupOptionsListeners();
// this.options = clone(options);
this._setup();
this._bufferService = new BufferService(this.optionsService);
}
public dispose(): void {
@@ -309,8 +304,6 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
this._mouseZoneManager = this._mouseZoneManager || null;
this.soundManager = this.soundManager || new SoundManager(this);
// Create the terminal's buffers and set the current buffer
this.buffers = new BufferSet(this.optionsService, this._bufferService);
if (this.selectionManager) {
this.selectionManager.clearSelection();
this.selectionManager.initBuffersListeners();
@@ -324,10 +317,14 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
/**
* Convenience property to active buffer.
*/
public get buffer(): Buffer {
public get buffer(): IBuffer {
return this.buffers.active;
}
public get buffers(): IBufferSet {
return this._bufferService.buffers;
}
/**
* back_color_erase feature for xterm.
*/
@@ -1884,6 +1881,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
const userScrolling = this._userScrolling;
this._setup();
this._bufferService.reset();
// reattach
this._customKeyEventHandler = customKeyEventHandler;