Merge branch 'master' into webgl2

src/InputHandler.test.ts

@@ -18,6 +18,7 @@ describe('InputHandler', () => {
     const terminal = new MockInputHandlingTerminal();
     terminal.buffer.x = 1;
     terminal.buffer.y = 2;
+    terminal.buffer.ybase = 0;
     terminal.curAttrData.fg = 3;
     const inputHandler = new InputHandler(terminal);
     // Save cursor position

src/MouseZoneManager.ts

@@ -6,6 +6,7 @@
 import { ITerminal, IMouseZoneManager, IMouseZone } from './Types';
 import { Disposable } from 'common/Lifecycle';
 import { addDisposableDomListener } from 'browser/Lifecycle';
+import { IMouseService } from 'browser/services/Services';
 
 const HOVER_DURATION = 500;
 
@@ -31,7 +32,8 @@ export class MouseZoneManager extends Disposable implements IMouseZoneManager {
   private _initialSelectionLength: number;
 
   constructor(
-    private _terminal: ITerminal
+    private _terminal: ITerminal,
+    private _mouseService: IMouseService
   ) {
     super();
 
@@ -203,7 +205,7 @@ export class MouseZoneManager extends Disposable implements IMouseZoneManager {
   }
 
   private _findZoneEventAt(e: MouseEvent): IMouseZone {
-    const coords = this._terminal.mouseHelper.getCoords(e, this._terminal.screenElement, this._terminal.cols, this._terminal.rows);
+    const coords = this._mouseService.getCoords(e, this._terminal.screenElement, this._terminal.cols, this._terminal.rows);
     if (!coords) {
       return null;
     }

src/SelectionManager.test.ts

@@ -5,16 +5,15 @@
 
 import { assert } from 'chai';
 import { SelectionManager, SelectionMode } from './SelectionManager';
-import { SelectionModel } from './SelectionModel';
-import { BufferSet } from 'common/buffer/BufferSet';
+import { SelectionModel } from 'browser/selection/SelectionModel';
 import { ITerminal } from './Types';
 import { IBuffer } from 'common/buffer/Types';
 import { IBufferLine } from 'common/Types';
 import { MockTerminal } from './TestUtils.test';
-import { MockOptionsService, MockBufferService } from 'common/TestUtils.test';
+import { MockBufferService } from 'common/TestUtils.test';
 import { BufferLine } from 'common/buffer/BufferLine';
 import { IBufferService } from 'common/services/Services';
-import { MockCharSizeService } from 'browser/TestUtils.test';
+import { MockCharSizeService, MockMouseService } from 'browser/TestUtils.test';
 import { CellData } from 'common/buffer/CellData';
 
 class TestMockTerminal extends MockTerminal {
@@ -26,7 +25,7 @@ class TestSelectionManager extends SelectionManager {
     terminal: ITerminal,
     bufferService: IBufferService
   ) {
-    super(terminal, new MockCharSizeService(10, 10), bufferService);
+    super(terminal, new MockCharSizeService(10, 10), bufferService, new MockMouseService());
   }
 
   public get model(): SelectionModel { return this._model; }
@@ -52,10 +51,7 @@ describe('SelectionManager', () => {
   beforeEach(() => {
     terminal = new TestMockTerminal();
     bufferService = new MockBufferService(20, 20);
-    terminal.buffers = new BufferSet(
-      new MockOptionsService({ scrollback: 100 }),
-      bufferService
-    );
+    terminal.buffers = bufferService.buffers;
     terminal.cols = 20;
     terminal.rows = 20;
     terminal.buffer = terminal.buffers.active;
@@ -366,14 +362,13 @@ describe('SelectionManager', () => {
 
   describe('selectAll', () => {
     it('should select the entire buffer, beyond the viewport', () => {
-      buffer.lines.length = 5;
+      bufferService.resize(20, 5);
       buffer.lines.set(0, stringToRow('1'));
       buffer.lines.set(1, stringToRow('2'));
       buffer.lines.set(2, stringToRow('3'));
       buffer.lines.set(3, stringToRow('4'));
       buffer.lines.set(4, stringToRow('5'));
       selectionManager.selectAll();
-      terminal.buffer.ybase = buffer.lines.length - bufferService.rows;
       assert.equal(selectionManager.selectionText, '1\n2\n3\n4\n5');
     });
   });

src/SelectionManager.ts

@@ -6,15 +6,15 @@
 import { ITerminal, ISelectionManager, ISelectionRedrawRequestEvent } from './Types';
 import { IBuffer } from 'common/buffer/Types';
 import { IBufferLine } from 'common/Types';
-import { MouseHelper } from 'browser/input/MouseHelper';
 import * as Browser from 'common/Platform';
-import { SelectionModel } from './SelectionModel';
+import { SelectionModel } from 'browser/selection/SelectionModel';
 import { AltClickHandler } from './handlers/AltClickHandler';
 import { CellData } from 'common/buffer/CellData';
 import { IDisposable } from 'xterm';
 import { EventEmitter, IEvent } from 'common/EventEmitter';
-import { ICharSizeService } from 'browser/services/Services';
+import { ICharSizeService, IMouseService } from 'browser/services/Services';
 import { IBufferService } from 'common/services/Services';
+import { getCoordsRelativeToElement } from 'browser/input/Mouse';
 
 /**
  * The number of pixels the mouse needs to be above or below the viewport in
@@ -118,14 +118,15 @@ export class SelectionManager implements ISelectionManager {
   public get onSelectionChange(): IEvent<void> { return this._onSelectionChange.event; }
 
   constructor(
-    private _terminal: ITerminal,
-    private _charSizeService: ICharSizeService,
-    bufferService: IBufferService
+    private readonly _terminal: ITerminal,
+    private readonly _charSizeService: ICharSizeService,
+    readonly bufferService: IBufferService,
+    private readonly _mouseService: IMouseService
   ) {
     this._initListeners();
     this.enable();
 
-    this._model = new SelectionModel(_terminal, bufferService);
+    this._model = new SelectionModel(bufferService);
     this._activeSelectionMode = SelectionMode.NORMAL;
   }
 
@@ -357,7 +358,7 @@ export class SelectionManager implements ISelectionManager {
    * @param event The mouse event.
    */
   private _getMouseBufferCoords(event: MouseEvent): [number, number] {
-    const coords = this._terminal.mouseHelper.getCoords(event, this._terminal.screenElement, this._terminal.cols, this._terminal.rows, true);
+    const coords = this._mouseService.getCoords(event, this._terminal.screenElement, this._terminal.cols, this._terminal.rows, true);
     if (!coords) {
       return null;
     }
@@ -377,7 +378,7 @@ export class SelectionManager implements ISelectionManager {
    * @param event The mouse event.
    */
   private _getMouseEventScrollAmount(event: MouseEvent): number {
-    let offset = MouseHelper.getCoordsRelativeToElement(event, this._terminal.screenElement)[1];
+    let offset = getCoordsRelativeToElement(event, this._terminal.screenElement)[1];
     const terminalHeight = this._terminal.rows * Math.ceil(this._charSizeService.height * this._terminal.options.lineHeight);
     if (offset >= 0 && offset <= terminalHeight) {
       return 0;
@@ -654,7 +655,7 @@ export class SelectionManager implements ISelectionManager {
     this._removeMouseDownListeners();
 
     if (this.selectionText.length <= 1 && timeElapsed < ALT_CLICK_MOVE_CURSOR_TIME) {
-      (new AltClickHandler(event, this._terminal)).move();
+      (new AltClickHandler(event, this._terminal, this._mouseService)).move();
     } else if (this.hasSelection) {
       this._onSelectionChange.fire();
     }

src/Terminal.ts

@@ -34,7 +34,6 @@ import { SelectionManager } from './SelectionManager';
 import * as Browser from 'common/Platform';
 import { addDisposableDomListener } from 'browser/Lifecycle';
 import * as Strings from './browser/LocalizableStrings';
-import { MouseHelper } from 'browser/input/MouseHelper';
 import { SoundManager } from './SoundManager';
 import { MouseZoneManager } from './MouseZoneManager';
 import { AccessibilityManager } from './AccessibilityManager';
@@ -50,12 +49,13 @@ import { ColorManager } from 'browser/ColorManager';
 import { RenderService } from 'browser/services/RenderService';
 import { IOptionsService, IBufferService } from 'common/services/Services';
 import { OptionsService } from 'common/services/OptionsService';
-import { ICharSizeService } from 'browser/services/Services';
+import { ICharSizeService, IRenderService, IMouseService } 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';
 import { Attributes } from 'common/buffer/Constants';
+import { MouseService } from 'browser/services/MouseService';
 
 // Let it work inside Node.js for automated testing purposes.
 const document = (typeof window !== 'undefined') ? window.document : null;
@@ -111,7 +111,8 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
 
   // browser services
   private _charSizeService: ICharSizeService;
-  private _renderService: RenderService;
+  private _renderService: IRenderService;
+  private _mouseService: IMouseService;
 
   // modes
   public applicationKeypad: boolean;
@@ -177,7 +178,6 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
   public viewport: IViewport;
   private _compositionHelper: ICompositionHelper;
   private _mouseZoneManager: IMouseZoneManager;
-  public mouseHelper: MouseHelper;
   private _accessibilityManager: AccessibilityManager;
   private _colorManager: ColorManager;
   private _theme: ITheme;
@@ -591,11 +591,6 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
     this.screenElement.appendChild(this._helperContainer);
     fragment.appendChild(this.screenElement);
 
-    this._mouseZoneManager = new MouseZoneManager(this);
-    this.register(this._mouseZoneManager);
-    this.register(this.onScroll(() => this._mouseZoneManager.clearAll()));
-    this.linkifier.attachToDom(this._mouseZoneManager);
-
     this.textarea = document.createElement('textarea');
     this.textarea.classList.add('xterm-helper-textarea');
     this.textarea.setAttribute('aria-label', Strings.promptLabel);
@@ -628,6 +623,13 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
     this._renderService.onRender(e => this._onRender.fire(e));
     this.onResize(e => this._renderService.resize(e.cols, e.rows));
 
+    this._mouseService = new MouseService(this._renderService, this._charSizeService);
+
+    this._mouseZoneManager = new MouseZoneManager(this, this._mouseService);
+    this.register(this._mouseZoneManager);
+    this.register(this.onScroll(() => this._mouseZoneManager.clearAll()));
+    this.linkifier.attachToDom(this._mouseZoneManager);
+
     this.viewport = new Viewport(this, this._viewportElement, this._viewportScrollArea, this._renderService.dimensions, this._charSizeService);
     this.viewport.onThemeChange(this._colorManager.colors);
     this.register(this.viewport);
@@ -638,7 +640,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
     this.register(this.onFocus(() => this._renderService.onFocus()));
     this.register(this._renderService.onDimensionsChange(() => this.viewport.syncScrollArea()));
 
-    this.selectionManager = new SelectionManager(this, this._charSizeService, this._bufferService);
+    this.selectionManager = new SelectionManager(this, this._charSizeService, this._bufferService, this._mouseService);
     this.register(this.selectionManager.onSelectionChange(() => this._onSelectionChange.fire()));
     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)));
@@ -656,7 +658,6 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
     }));
     this.register(addDisposableDomListener(this._viewportElement, 'scroll', () => this.selectionManager.refresh()));
 
-    this.mouseHelper = new MouseHelper(this._renderService, this._charSizeService);
     // apply mouse event classes set by escape codes before terminal was attached
     this.element.classList.toggle('enable-mouse-events', this.mouseEvents);
     if (this.mouseEvents) {
@@ -690,7 +691,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
   private _createRenderer(): IRenderer {
     switch (this.options.rendererType) {
       case 'canvas': return new Renderer(this, this._colorManager.colors, this._charSizeService); break;
-      case 'dom': return new DomRenderer(this, this._colorManager.colors, this._charSizeService); break;
+      case 'dom': return new DomRenderer(this, this._colorManager.colors, this._charSizeService, this.optionsService); break;
       default: throw new Error(`Unrecognized rendererType "${this.options.rendererType}"`);
     }
   }
@@ -738,7 +739,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
       button = getButton(ev);
 
       // get mouse coordinates
-      pos = self.mouseHelper.getRawByteCoords(ev, self.screenElement, self.cols, self.rows);
+      pos = self._mouseService.getRawByteCoords(ev, self.screenElement, self.cols, self.rows);
       if (!pos) return;
 
       sendEvent(button, pos);
@@ -764,7 +765,7 @@ export class Terminal extends Disposable implements ITerminal, IDisposable, IInp
     // ^[[M 3<^[[M@4<^[[M@5<^[[M@6<^[[M@7<^[[M#7<
     function sendMove(ev: MouseEvent): void {
       let button = pressed;
-      const pos = self.mouseHelper.getRawByteCoords(ev, self.screenElement, self.cols, self.rows);
+      const pos = self._mouseService.getRawByteCoords(ev, self.screenElement, self.cols, self.rows);
       if (!pos) return;
 
       // buttons marked as motions

src/TestUtils.test.ts

@@ -12,7 +12,7 @@ import * as Browser from 'common/Platform';
 import { IDisposable, IMarker, IEvent, ISelectionPosition } from 'xterm';
 import { Terminal } from './Terminal';
 import { AttributeData } from 'common/buffer/AttributeData';
-import { IColorManager, IColorSet, IMouseHelper } from 'browser/Types';
+import { IColorManager, IColorSet } from 'browser/Types';
 import { IOptionsService } from 'common/services/Services';
 import { EventEmitter } from 'common/EventEmitter';
 
@@ -122,7 +122,6 @@ export class MockTerminal implements ITerminal {
     throw new Error('Method not implemented.');
   }
   bracketedPasteMode: boolean;
-  mouseHelper: IMouseHelper;
   renderer: IRenderer;
   linkifier: ILinkifier;
   isFocused: boolean;

src/Types.d.ts

@@ -6,7 +6,7 @@
 import { ITerminalOptions as IPublicTerminalOptions, IDisposable, IMarker, ISelectionPosition } from 'xterm';
 import { ICharset, IAttributeData, CharData } from 'common/Types';
 import { IEvent, IEventEmitter } from 'common/EventEmitter';
-import { IColorSet, IMouseHelper } from 'browser/Types';
+import { IColorSet } from 'browser/Types';
 import { IOptionsService } from 'common/services/Services';
 import { IBuffer, IBufferSet } from 'common/buffer/Types';
 
@@ -204,7 +204,6 @@ export interface ITerminal extends IPublicTerminal, IElementAccessor, IBufferAcc
   buffer: IBuffer;
   buffers: IBufferSet;
   isFocused: boolean;
-  mouseHelper: IMouseHelper;
   viewport: IViewport;
   bracketedPasteMode: boolean;
   applicationCursor: boolean;

src/browser/TestUtils.test.ts

@@ -4,7 +4,7 @@
  */
 
 import { IEvent, EventEmitter } from 'common/EventEmitter';
-import { ICharSizeService } from 'browser/services/Services';
+import { ICharSizeService, IMouseService } from 'browser/services/Services';
 
 export class MockCharSizeService implements ICharSizeService {
   get hasValidSize(): boolean { return this.width > 0 && this.height > 0; }
@@ -12,3 +12,13 @@ export class MockCharSizeService implements ICharSizeService {
   constructor(public width: number, public height: number) {}
   measure(): void {}
 }
+
+export class MockMouseService implements IMouseService {
+  public getCoords(event: {clientX: number, clientY: number}, element: HTMLElement, colCount: number, rowCount: number, isSelection?: boolean): [number, number] | undefined {
+    throw new Error('Not implemented');
+  }
+
+  public getRawByteCoords(event: MouseEvent, element: HTMLElement, colCount: number, rowCount: number): { x: number, y: number } | undefined {
+    throw new Error('Not implemented');
+  }
+}

src/browser/Types.d.ts

@@ -20,8 +20,3 @@ export interface IColorSet {
   selection: IColor;
   ansi: IColor[];
 }
-
-export interface IMouseHelper {
-  getCoords(event: { clientX: number, clientY: number }, element: HTMLElement, colCount: number, rowCount: number, isSelection?: boolean): [number, number] | undefined;
-  getRawByteCoords(event: MouseEvent, element: HTMLElement, colCount: number, rowCount: number): { x: number | undefined, y: number | undefined };
-}

src/browser/input/Mouse.test.ts

@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
+import jsdom = require('jsdom');
+import { assert } from 'chai';
+import { getCoords } from 'browser/input/Mouse';
+
+const CHAR_WIDTH = 10;
+const CHAR_HEIGHT = 20;
+
+describe('Mouse getCoords', () => {
+  let document: Document;
+
+  beforeEach(() => {
+    document = new jsdom.JSDOM('').window.document;
+  });
+
+  it('should return the cell that was clicked', () => {
+    let coords: [number, number] | undefined;
+    coords = getCoords({ clientX: CHAR_WIDTH / 2, clientY: CHAR_HEIGHT / 2 }, document.createElement('div'), 10, 10, true, CHAR_WIDTH, CHAR_HEIGHT);
+    assert.deepEqual(coords, [1, 1]);
+    coords = getCoords({ clientX: CHAR_WIDTH, clientY: CHAR_HEIGHT }, document.createElement('div'), 10, 10, true, CHAR_WIDTH, CHAR_HEIGHT);
+    assert.deepEqual(coords, [1, 1]);
+    coords = getCoords({ clientX: CHAR_WIDTH, clientY: CHAR_HEIGHT + 1 }, document.createElement('div'), 10, 10, true, CHAR_WIDTH, CHAR_HEIGHT);
+    assert.deepEqual(coords, [1, 2]);
+    coords = getCoords({ clientX: CHAR_WIDTH + 1, clientY: CHAR_HEIGHT }, document.createElement('div'), 10, 10, true, CHAR_WIDTH, CHAR_HEIGHT);
+    assert.deepEqual(coords, [2, 1]);
+  });
+
+  it('should ensure the coordinates are returned within the terminal bounds', () => {
+    let coords: [number, number] | undefined;
+    coords = getCoords({ clientX: -1, clientY: -1 }, document.createElement('div'), 10, 10, true, CHAR_WIDTH, CHAR_HEIGHT);
+    assert.deepEqual(coords, [1, 1]);
+    // Event are double the cols/rows
+    coords = getCoords({ clientX: CHAR_WIDTH * 20, clientY: CHAR_HEIGHT * 20 }, document.createElement('div'), 10, 10, true, CHAR_WIDTH, CHAR_HEIGHT);
+    assert.deepEqual(coords, [10, 10], 'coordinates should never come back as larger than the terminal');
+  });
+});

src/browser/input/Mouse.ts

@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2017 The xterm.js authors. All rights reserved.
+ * @license MIT
+ */
+
+export function getCoordsRelativeToElement(event: {clientX: number, clientY: number}, element: HTMLElement): [number, number] {
+  const rect = element.getBoundingClientRect();
+  return [event.clientX - rect.left, event.clientY - rect.top];
+}
+
+/**
+ * Gets coordinates within the terminal for a particular mouse event. The result
+ * is returned as an array in the form [x, y] instead of an object as it's a
+ * little faster and this function is used in some low level code.
+ * @param event The mouse event.
+ * @param element The terminal's container element.
+ * @param colCount The number of columns in the terminal.
+ * @param rowCount The number of rows n the terminal.
+ * @param isSelection Whether the request is for the selection or not. This will
+ * apply an offset to the x value such that the left half of the cell will
+ * select that cell and the right half will select the next cell.
+ */
+export function getCoords(event: {clientX: number, clientY: number}, element: HTMLElement, colCount: number, rowCount: number, hasValidCharSize: boolean, actualCellWidth: number, actualCellHeight: number, isSelection?: boolean): [number, number] | undefined {
+  // Coordinates cannot be measured if there are no valid
+  if (!hasValidCharSize) {
+    return undefined;
+  }
+
+  const coords = getCoordsRelativeToElement(event, element);
+  if (!coords) {
+    return undefined;
+  }
+
+  coords[0] = Math.ceil((coords[0] + (isSelection ? actualCellWidth / 2 : 0)) / actualCellWidth);
+  coords[1] = Math.ceil(coords[1] / actualCellHeight);
+
+  // Ensure coordinates are within the terminal viewport. Note that selections
+  // need an addition point of precision to cover the end point (as characters
+  // cover half of one char and half of the next).
+  coords[0] = Math.min(Math.max(coords[0], 1), colCount + (isSelection ? 1 : 0));
+  coords[1] = Math.min(Math.max(coords[1], 1), rowCount);
+
+  return coords;
+}
+
+/**
+ * Gets coordinates within the terminal for a particular mouse event, wrapping
+ * them to the bounds of the terminal and adding 32 to both the x and y values
+ * as expected by xterm.
+ */
+export function getRawByteCoords(coords: [number, number] | undefined): { x: number, y: number } | undefined {
+  if (!coords) {
+    return undefined;
+  }
+
+  // xterm sends raw bytes and starts at 32 (SP) for each.
+  return { x: coords[0] + 32, y: coords[1] + 32 };
+}

src/browser/input/MouseHelper.test.ts

@@ -1,49 +0,0 @@
-/**
- * Copyright (c) 2017 The xterm.js authors. All rights reserved.
- * @license MIT
- */
-
-import jsdom = require('jsdom');
-import { assert } from 'chai';
-import { MouseHelper } from 'browser/input/MouseHelper';
-import { MockCharSizeService } from 'browser/TestUtils.test';
-
-const CHAR_WIDTH = 10;
-const CHAR_HEIGHT = 20;
-
-describe('MouseHelper.getCoords', () => {
-  let document: Document;
-  let mouseHelper: MouseHelper;
-
-  beforeEach(() => {
-    document = new jsdom.JSDOM('').window.document;
-    const mockRenderService = {
-      dimensions: {
-        actualCellWidth: CHAR_WIDTH,
-        actualCellHeight: CHAR_HEIGHT
-      }
-    };
-    mouseHelper = new MouseHelper(mockRenderService as any, new MockCharSizeService(CHAR_WIDTH, CHAR_HEIGHT));
-  });
-
-  it('should return the cell that was clicked', () => {
-    let coords: [number, number] | undefined;
-    coords = mouseHelper.getCoords({ clientX: CHAR_WIDTH / 2, clientY: CHAR_HEIGHT / 2 }, document.createElement('div'), 10, 10);
-    assert.deepEqual(coords, [1, 1]);
-    coords = mouseHelper.getCoords({ clientX: CHAR_WIDTH, clientY: CHAR_HEIGHT }, document.createElement('div'), 10, 10);
-    assert.deepEqual(coords, [1, 1]);
-    coords = mouseHelper.getCoords({ clientX: CHAR_WIDTH, clientY: CHAR_HEIGHT + 1 }, document.createElement('div'), 10, 10);
-    assert.deepEqual(coords, [1, 2]);
-    coords = mouseHelper.getCoords({ clientX: CHAR_WIDTH + 1, clientY: CHAR_HEIGHT }, document.createElement('div'), 10, 10);
-    assert.deepEqual(coords, [2, 1]);
-  });
-
-  it('should ensure the coordinates are returned within the terminal bounds', () => {
-    let coords: [number, number] | undefined;
-    coords = mouseHelper.getCoords({ clientX: -1, clientY: -1 }, document.createElement('div'), 10, 10);
-    assert.deepEqual(coords, [1, 1]);
-    // Event are double the cols/rows
-    coords = mouseHelper.getCoords({ clientX: CHAR_WIDTH * 20, clientY: CHAR_HEIGHT * 20 }, document.createElement('div'), 10, 10);
-    assert.deepEqual(coords, [10, 10], 'coordinates should never come back as larger than the terminal');
-  });
-});

src/browser/input/MouseHelper.ts

@@ -1,75 +0,0 @@
-/**
- * Copyright (c) 2017 The xterm.js authors. All rights reserved.
- * @license MIT
- */
-
-import { IMouseHelper } from 'browser/Types';
-import { RenderService } from 'browser/services/RenderService';
-import { ICharSizeService } from 'browser/services/Services';
-
-export class MouseHelper implements IMouseHelper {
-  constructor(
-    private _renderService: RenderService,
-    private _charSizeService: ICharSizeService
-  ) {
-  }
-
-  public static getCoordsRelativeToElement(event: {clientX: number, clientY: number}, element: HTMLElement): [number, number] {
-    const rect = element.getBoundingClientRect();
-    return [event.clientX - rect.left, event.clientY - rect.top];
-  }
-
-  /**
-   * Gets coordinates within the terminal for a particular mouse event. The result
-   * is returned as an array in the form [x, y] instead of an object as it's a
-   * little faster and this function is used in some low level code.
-   * @param event The mouse event.
-   * @param element The terminal's container element.
-   * @param colCount The number of columns in the terminal.
-   * @param rowCount The number of rows n the terminal.
-   * @param isSelection Whether the request is for the selection or not. This will
-   * apply an offset to the x value such that the left half of the cell will
-   * select that cell and the right half will select the next cell.
-   */
-  public getCoords(event: {clientX: number, clientY: number}, element: HTMLElement, colCount: number, rowCount: number, isSelection?: boolean): [number, number] | undefined {
-    // Coordinates cannot be measured if there are no valid
-    if (!this._charSizeService.hasValidSize) {
-      return undefined;
-    }
-
-    const coords = MouseHelper.getCoordsRelativeToElement(event, element);
-    if (!coords) {
-      return undefined;
-    }
-
-    coords[0] = Math.ceil((coords[0] + (isSelection ? this._renderService.dimensions.actualCellWidth / 2 : 0)) / this._renderService.dimensions.actualCellWidth);
-    coords[1] = Math.ceil(coords[1] / this._renderService.dimensions.actualCellHeight);
-
-    // Ensure coordinates are within the terminal viewport. Note that selections
-    // need an addition point of precision to cover the end point (as characters
-    // cover half of one char and half of the next).
-    coords[0] = Math.min(Math.max(coords[0], 1), colCount + (isSelection ? 1 : 0));
-    coords[1] = Math.min(Math.max(coords[1], 1), rowCount);
-
-    return coords;
-  }
-
-  /**
-   * Gets coordinates within the terminal for a particular mouse event, wrapping
-   * them to the bounds of the terminal and adding 32 to both the x and y values
-   * as expected by xterm.
-   * @param event The mouse event.
-   * @param element The terminal's container element.
-   * @param colCount The number of columns in the terminal.
-   * @param rowCount The number of rows in the terminal.
-   */
-  public getRawByteCoords(event: MouseEvent, element: HTMLElement, colCount: number, rowCount: number): { x: number | undefined, y: number | undefined } {
-    const coords = this.getCoords(event, element, colCount, rowCount);
-
-    // xterm sends raw bytes and starts at 32 (SP) for each.
-    const x = coords ? coords[0] + 32 : undefined;
-    const y = coords ? coords[1] + 32 : undefined;
-
-    return { x, y };
-  }
-}

src/browser/renderer/CharacterJoinerRegistry.test.ts

@@ -4,24 +4,19 @@
  */
 
 import { assert } from 'chai';
-
-import { MockTerminal, MockBuffer } from '../TestUtils.test';
-import { CircularList } from 'common/CircularList';
-
-import { ICharacterJoinerRegistry } from './Types';
-import { CharacterJoinerRegistry } from './CharacterJoinerRegistry';
+import { ICharacterJoinerRegistry } from 'browser/renderer/Types';
+import { CharacterJoinerRegistry } from 'browser/renderer/CharacterJoinerRegistry';
 import { BufferLine } from 'common/buffer/BufferLine';
 import { IBufferLine } from 'common/Types';
 import { CellData } from 'common/buffer/CellData';
+import { MockBufferService } from 'common/TestUtils.test';
 
 describe('CharacterJoinerRegistry', () => {
   let registry: ICharacterJoinerRegistry;
 
   beforeEach(() => {
-    const terminal = new MockTerminal();
-    terminal.cols = 16;
-    terminal.buffer = new MockBuffer();
-    const lines = new CircularList<IBufferLine>(7);
+    const bufferService = new MockBufferService(16, 10);
+    const lines = bufferService.buffer.lines;
     lines.set(0, lineData([['a -> b -> c -> d']]));
     lines.set(1, lineData([['a -> b => c -> d']]));
     lines.set(2, lineData([['a -> b -', 0xFFFFFFFF], ['> c -> d', 0]]));
@@ -31,7 +26,7 @@ describe('CharacterJoinerRegistry', () => {
     lines.set(5, lineData([['a', 0x11111111], [' -> b -> c -> '], ['d', 0x22222222]]));
     const line6 = lineData([['wi']]);
     line6.resize(line6.length + 1, CellData.fromCharData([0, '￥', 2, '￥'.charCodeAt(0)]));
-    line6.resize(line6.length + 1, CellData.fromCharData([0, '', 0, null]));
+    line6.resize(line6.length + 1, CellData.fromCharData([0, '', 0, 0]));
     let sub = lineData([['deemo']]);
     let oldSize = line6.length;
     line6.resize(oldSize + sub.length, CellData.fromCharData([0, '', 0, 0]));
@@ -44,9 +39,7 @@ describe('CharacterJoinerRegistry', () => {
     for (let i = 0; i < sub.length; ++i) line6.setCell(i + oldSize, sub.loadCell(i, new CellData()));
     lines.set(6, line6);
 
-    (<MockBuffer>terminal.buffer).setLines(lines);
-    terminal.buffer.ydisp = 0;
-    registry = new CharacterJoinerRegistry(terminal);
+    registry = new CharacterJoinerRegistry(bufferService);
   });
 
   it('has no joiners upon creation', () => {

src/browser/renderer/CharacterJoinerRegistry.ts

@@ -3,12 +3,12 @@
  * @license MIT
  */
 
-import { ITerminal } from '../Types';
 import { IBufferLine, ICellData, CharData } from 'common/Types';
-import { ICharacterJoinerRegistry, ICharacterJoiner } from './Types';
+import { ICharacterJoinerRegistry, ICharacterJoiner } from 'browser/renderer/Types';
 import { AttributeData } from 'common/buffer/AttributeData';
 import { WHITESPACE_CELL_CHAR, Content } from 'common/buffer/Constants';
 import { CellData } from 'common/buffer/CellData';
+import { IBufferService } from 'common/services/Services';
 
 export class JoinedCellData extends AttributeData implements ICellData {
   private _width: number;
@@ -61,8 +61,7 @@ export class CharacterJoinerRegistry implements ICharacterJoinerRegistry {
   private _nextCharacterJoinerId: number = 0;
   private _workCell: CellData = new CellData();
 
-  constructor(private _terminal: ITerminal) {
-  }
+  constructor(private _bufferService: IBufferService) { }
 
   public registerCharacterJoiner(handler: (text: string) => [number, number][]): number {
     const joiner: ICharacterJoiner = {
@@ -90,8 +89,8 @@ export class CharacterJoinerRegistry implements ICharacterJoinerRegistry {
       return [];
     }
 
-    const line = this._terminal.buffer.lines.get(row);
-    if (line.length === 0) {
+    const line = this._bufferService.buffer.lines.get(row);
+    if (!line || line.length === 0) {
       return [];
     }
 
@@ -144,7 +143,7 @@ export class CharacterJoinerRegistry implements ICharacterJoinerRegistry {
     }
 
     // Process any trailing ranges.
-    if (this._terminal.cols - rangeStartColumn > 1) {
+    if (this._bufferService.cols - rangeStartColumn > 1) {
       const joinedRanges = this._getJoinedRanges(
         lineStr,
         rangeStartStringIndex,
@@ -204,7 +203,7 @@ export class CharacterJoinerRegistry implements ICharacterJoinerRegistry {
       return;
     }
 
-    for (let x = startCol; x < this._terminal.cols; x++) {
+    for (let x = startCol; x < this._bufferService.cols; x++) {
       const width = line.getWidth(x);
       const length = line.getString(x).length || WHITESPACE_CELL_CHAR.length;
 
@@ -252,7 +251,7 @@ export class CharacterJoinerRegistry implements ICharacterJoinerRegistry {
     // If there is still a range left at the end, it must extend all the way to
     // the end of the line.
     if (currentRange) {
-      currentRange[1] = this._terminal.cols;
+      currentRange[1] = this._bufferService.cols;
     }
   }
 

src/browser/renderer/GridCache.test.ts

@@ -4,7 +4,7 @@
  */
 
 import { assert } from 'chai';
-import { GridCache } from './GridCache';
+import { GridCache } from 'browser/renderer/GridCache';
 
 describe('GridCache', () => {
   let grid: GridCache<number>;

src/browser/renderer/GridCache.ts

@@ -4,7 +4,7 @@
  */
 
 export class GridCache<T> {
-  public cache: T[][];
+  public cache: (T | undefined)[][];
 
   public constructor() {
     this.cache = [];
@@ -16,7 +16,7 @@ export class GridCache<T> {
         this.cache.push([]);
       }
       for (let y = this.cache[x].length; y < height; y++) {
-        this.cache[x].push(null);
+        this.cache[x].push(undefined);
       }
       this.cache[x].length = height;
     }
@@ -26,7 +26,7 @@ export class GridCache<T> {
   public clear(): void {
     for (let x = 0; x < this.cache.length; x++) {
       for (let y = 0; y < this.cache[x].length; y++) {
-        this.cache[x][y] = null;
+        this.cache[x][y] = undefined;
       }
     }
   }

src/browser/renderer/Types.d.ts

@@ -45,3 +45,14 @@ export interface IRenderer extends IDisposable {
   registerCharacterJoiner(handler: CharacterJoinerHandler): number;
   deregisterCharacterJoiner(joinerId: number): boolean;
 }
+
+export interface ICharacterJoiner {
+  id: number;
+  handler: CharacterJoinerHandler;
+}
+
+export interface ICharacterJoinerRegistry {
+  registerCharacterJoiner(handler: (text: string) => [number, number][]): number;
+  deregisterCharacterJoiner(joinerId: number): boolean;
+  getJoinedCharacters(row: number): [number, number][];
+}

src/browser/renderer/atlas/LRUMap.test.ts

@@ -4,7 +4,7 @@
  */
 
 import { assert } from 'chai';
-import { LRUMap } from './LRUMap';
+import { LRUMap } from 'browser/renderer/atlas/LRUMap';
 
 describe('LRUMap', () => {
   it('can be used to store and retrieve values', () => {