*/
private _refreshAnimationFrame: number;
- private _bufferTrimListener: any;
+ /**
+ * Whether selection is enabled.
+ */
+ private _enabled = true;
+
private _mouseMoveListener: EventListener;
- private _mouseDownListener: EventListener;
private _mouseUpListener: EventListener;
constructor(
* Initializes listener variables.
*/
private _initListeners() {
- this._bufferTrimListener = (amount: number) => this._onTrim(amount);
this._mouseMoveListener = event => this._onMouseMove(<MouseEvent>event);
- this._mouseDownListener = event => this._onMouseDown(<MouseEvent>event);
this._mouseUpListener = event => this._onMouseUp(<MouseEvent>event);
+
+ this._rowContainer.addEventListener('mousedown', event => this._onMouseDown(<MouseEvent>event));
+
+ // Only adjust the selection on trim, shiftElements is rarely used (only in
+ // reverseIndex) and delete in a splice is only ever used when the same
+ // number of elements was just added. Given this is could actually be
+ // beneficial to leave the selection as is for these cases.
+ this._buffer.on('trim', (amount: number) => this._onTrim(amount));
}
/**
*/
public disable() {
this.clearSelection();
- this._buffer.off('trim', this._bufferTrimListener);
- this._rowContainer.removeEventListener('mousedown', this._mouseDownListener);
+ this._enabled = false;
}
/**
* Enable the selection manager.
*/
public enable() {
- // Only adjust the selection on trim, shiftElements is rarely used (only in
- // reverseIndex) and delete in a splice is only ever used when the same
- // number of elements was just added. Given this is could actually be
- // beneficial to leave the selection as is for these cases.
- this._buffer.on('trim', this._bufferTrimListener);
- this._rowContainer.addEventListener('mousedown', this._mouseDownListener);
+ this._enabled = true;
}
/**
*/
private _getMouseBufferCoords(event: MouseEvent): [number, number] {
const coords = Mouse.getCoords(event, this._rowContainer, this._charMeasure, this._terminal.cols, this._terminal.rows, true);
+ if (!coords) {
+ return null;
+ }
+
// Convert to 0-based
coords[0]--;
coords[1]--;
* @param event The mousedown event.
*/
private _onMouseDown(event: MouseEvent) {
+ // If we have selection, we want the context menu on right click even if the
+ // terminal is in mouse mode.
+ if (event.button === 2 && this.hasSelection) {
+ event.stopPropagation();
+ return;
+ }
+
// Only action the primary button
if (event.button !== 0) {
return;
}
+ // Allow selection when using a specific modifier key, even when disabled
+ if (!this._enabled) {
+ const shouldForceSelection = Browser.isMac && event.altKey;
+
+ if (!shouldForceSelection) {
+ return;
+ }
+
+ // Don't send the mouse down event to the current process, we want to select
+ event.stopPropagation();
+ }
+
// Tell the browser not to start a regular selection
event.preventDefault();
// Reset drag scroll state
this._dragScrollAmount = 0;
- if (event.shiftKey) {
- this._onShiftClick(event);
+ if (this._enabled && event.shiftKey) {
+ this._onIncrementalClick(event);
} else {
if (event.detail === 1) {
- this._onSingleClick(event);
+ this._onSingleClick(event);
} else if (event.detail === 2) {
- this._onDoubleClick(event);
+ this._onDoubleClick(event);
} else if (event.detail === 3) {
- this._onTripleClick(event);
+ this._onTripleClick(event);
}
}
}
/**
- * Performs a shift click, setting the selection end position to the mouse
+ * Performs an incremental click, setting the selection end position to the mouse
* position.
* @param event The mouse event.
*/
- private _onShiftClick(event: MouseEvent): void {
+ private _onIncrementalClick(event: MouseEvent): void {
if (this._model.selectionStart) {
this._model.selectionEnd = this._getMouseBufferCoords(event);
}
this._model.selectionStartLength = 0;
this._model.isSelectAllActive = false;
this._activeSelectionMode = SelectionMode.NORMAL;
+
+ // Initialize the new selection
this._model.selectionStart = this._getMouseBufferCoords(event);
- if (this._model.selectionStart) {
- this._model.selectionEnd = null;
- // If the mouse is over the second half of a wide character, adjust the
- // selection to cover the whole character
- const char = this._buffer.get(this._model.selectionStart[1])[this._model.selectionStart[0]];
- if (char[LINE_DATA_WIDTH_INDEX] === 0) {
- this._model.selectionStart[0]++;
- }
+ if (!this._model.selectionStart) {
+ return;
+ }
+ this._model.selectionEnd = null;
+
+ // Ensure the line exists
+ const line = this._buffer.get(this._model.selectionStart[1]);
+ if (!line) {
+ return;
+ }
+
+ // If the mouse is over the second half of a wide character, adjust the
+ // selection to cover the whole character
+ const char = line[this._model.selectionStart[0]];
+ if (char[LINE_DATA_WIDTH_INDEX] === 0) {
+ this._model.selectionStart[0]++;
}
}
// Set the initial selection end based on the mouse coordinates
this._model.selectionEnd = this._getMouseBufferCoords(event);
+ if (!this._model.selectionEnd) {
+ this.refresh(true);
+ return;
+ }
// Select the entire line if line select mode is active.
if (this._activeSelectionMode === SelectionMode.LINE) {
// Only draw here if the selection changes.
if (!previousSelectionEnd ||
- previousSelectionEnd[0] !== this._model.selectionEnd[0] ||
- previousSelectionEnd[1] !== this._model.selectionEnd[1]) {
+ previousSelectionEnd[0] !== this._model.selectionEnd[0] ||
+ previousSelectionEnd[1] !== this._model.selectionEnd[1]) {
this.refresh(true);
}
}
const start = startIndex + charOffset - leftWideCharCount;
const length = Math.min(endIndex - startIndex + leftWideCharCount + rightWideCharCount + 1/*include endIndex char*/, this._terminal.cols);
- return {start, length};
+ return { start, length };
}
/**