@xterm/xterm 6.1.0-beta.21 → 6.1.0-beta.211
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +61 -38
- package/css/xterm.css +29 -22
- package/lib/xterm.js +1 -1
- package/lib/xterm.js.map +1 -1
- package/lib/xterm.mjs +8 -34
- package/lib/xterm.mjs.map +4 -4
- package/package.json +24 -13
- package/src/browser/AccessibilityManager.ts +6 -3
- package/src/browser/Clipboard.ts +6 -3
- package/src/browser/CoreBrowserTerminal.ts +147 -318
- package/src/browser/Dom.ts +178 -0
- package/src/browser/Linkifier.ts +11 -11
- package/src/browser/OscLinkProvider.ts +3 -1
- package/src/browser/RenderDebouncer.ts +2 -2
- package/src/browser/TimeBasedDebouncer.ts +2 -2
- package/src/browser/Types.ts +12 -11
- package/src/browser/Viewport.ts +55 -20
- package/src/browser/decorations/BufferDecorationRenderer.ts +1 -1
- package/src/browser/decorations/OverviewRulerRenderer.ts +33 -17
- package/src/browser/input/CompositionHelper.ts +44 -8
- package/src/browser/public/Terminal.ts +25 -28
- package/src/browser/renderer/dom/DomRenderer.ts +205 -41
- package/src/browser/renderer/dom/DomRendererRowFactory.ts +19 -13
- package/src/browser/renderer/dom/WidthCache.ts +54 -52
- package/src/browser/renderer/shared/Constants.ts +7 -0
- package/src/browser/renderer/shared/TextBlinkStateManager.ts +97 -0
- package/src/browser/renderer/shared/Types.ts +8 -2
- package/src/browser/scrollable/abstractScrollbar.ts +300 -0
- package/src/browser/scrollable/fastDomNode.ts +126 -0
- package/src/browser/scrollable/globalPointerMoveMonitor.ts +90 -0
- package/src/browser/scrollable/horizontalScrollbar.ts +85 -0
- package/src/browser/scrollable/mouseEvent.ts +292 -0
- package/src/browser/scrollable/scrollable.ts +486 -0
- package/src/browser/scrollable/scrollableElement.ts +579 -0
- package/src/browser/scrollable/scrollableElementOptions.ts +161 -0
- package/src/browser/scrollable/scrollbarArrow.ts +110 -0
- package/src/browser/scrollable/scrollbarState.ts +246 -0
- package/src/browser/scrollable/scrollbarVisibilityController.ts +113 -0
- package/src/browser/scrollable/touch.ts +485 -0
- package/src/browser/scrollable/verticalScrollbar.ts +143 -0
- package/src/browser/scrollable/widget.ts +23 -0
- package/src/browser/services/CharSizeService.ts +2 -2
- package/src/browser/services/CoreBrowserService.ts +7 -5
- package/src/browser/services/KeyboardService.ts +67 -0
- package/src/browser/services/LinkProviderService.ts +1 -1
- package/src/browser/services/MouseCoordsService.ts +47 -0
- package/src/browser/services/MouseService.ts +518 -25
- package/src/browser/services/RenderService.ts +22 -15
- package/src/browser/services/SelectionService.ts +16 -8
- package/src/browser/services/Services.ts +40 -17
- package/src/browser/services/ThemeService.ts +2 -2
- package/src/common/Async.ts +105 -0
- package/src/common/CircularList.ts +2 -2
- package/src/common/Color.ts +8 -0
- package/src/common/CoreTerminal.ts +28 -18
- package/src/common/Event.ts +118 -0
- package/src/common/InputHandler.ts +263 -43
- package/src/common/Lifecycle.ts +113 -0
- package/src/common/Platform.ts +13 -3
- package/src/common/SortedList.ts +7 -3
- package/src/common/TaskQueue.ts +14 -5
- package/src/common/Types.ts +35 -15
- package/src/common/Version.ts +9 -0
- package/src/common/buffer/Buffer.ts +20 -14
- package/src/common/buffer/BufferLine.ts +4 -5
- package/src/common/buffer/BufferSet.ts +7 -6
- package/src/common/buffer/CellData.ts +57 -0
- package/src/common/buffer/Marker.ts +2 -2
- package/src/common/buffer/Types.ts +6 -2
- package/src/common/data/EscapeSequences.ts +71 -70
- package/src/common/input/Keyboard.ts +14 -7
- package/src/common/input/KittyKeyboard.ts +519 -0
- package/src/common/input/Win32InputMode.ts +297 -0
- package/src/common/input/WriteBuffer.ts +34 -2
- package/src/common/input/XParseColor.ts +2 -2
- package/src/common/parser/ApcParser.ts +245 -0
- package/src/common/parser/Constants.ts +22 -4
- package/src/common/parser/DcsParser.ts +5 -5
- package/src/common/parser/EscapeSequenceParser.ts +167 -57
- package/src/common/parser/OscParser.ts +5 -5
- package/src/common/parser/Params.ts +13 -0
- package/src/common/parser/Types.ts +36 -2
- package/src/common/public/BufferLineApiView.ts +2 -2
- package/src/common/public/BufferNamespaceApi.ts +2 -2
- package/src/common/public/ParserApi.ts +3 -0
- package/src/common/services/BufferService.ts +8 -5
- package/src/common/services/CharsetService.ts +4 -0
- package/src/common/services/CoreService.ts +18 -4
- package/src/common/services/DecorationService.ts +24 -8
- package/src/common/services/LogService.ts +1 -31
- package/src/common/services/{CoreMouseService.ts → MouseStateService.ts} +21 -132
- package/src/common/services/OptionsService.ts +13 -4
- package/src/common/services/Services.ts +47 -40
- package/src/common/services/UnicodeService.ts +1 -1
- package/typings/xterm.d.ts +316 -32
- package/src/common/TypedArrayUtils.ts +0 -17
- package/src/vs/base/browser/browser.ts +0 -141
- package/src/vs/base/browser/canIUse.ts +0 -49
- package/src/vs/base/browser/dom.ts +0 -2369
- package/src/vs/base/browser/fastDomNode.ts +0 -316
- package/src/vs/base/browser/globalPointerMoveMonitor.ts +0 -112
- package/src/vs/base/browser/iframe.ts +0 -135
- package/src/vs/base/browser/keyboardEvent.ts +0 -213
- package/src/vs/base/browser/mouseEvent.ts +0 -229
- package/src/vs/base/browser/touch.ts +0 -372
- package/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts +0 -303
- package/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts +0 -114
- package/src/vs/base/browser/ui/scrollbar/scrollableElement.ts +0 -720
- package/src/vs/base/browser/ui/scrollbar/scrollableElementOptions.ts +0 -165
- package/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts +0 -114
- package/src/vs/base/browser/ui/scrollbar/scrollbarState.ts +0 -243
- package/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts +0 -118
- package/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts +0 -116
- package/src/vs/base/browser/ui/widget.ts +0 -57
- package/src/vs/base/browser/window.ts +0 -14
- package/src/vs/base/common/arrays.ts +0 -887
- package/src/vs/base/common/arraysFind.ts +0 -202
- package/src/vs/base/common/assert.ts +0 -71
- package/src/vs/base/common/async.ts +0 -1992
- package/src/vs/base/common/cancellation.ts +0 -148
- package/src/vs/base/common/charCode.ts +0 -450
- package/src/vs/base/common/collections.ts +0 -140
- package/src/vs/base/common/decorators.ts +0 -130
- package/src/vs/base/common/equals.ts +0 -146
- package/src/vs/base/common/errors.ts +0 -303
- package/src/vs/base/common/event.ts +0 -1778
- package/src/vs/base/common/functional.ts +0 -32
- package/src/vs/base/common/hash.ts +0 -316
- package/src/vs/base/common/iterator.ts +0 -159
- package/src/vs/base/common/keyCodes.ts +0 -526
- package/src/vs/base/common/keybindings.ts +0 -284
- package/src/vs/base/common/lazy.ts +0 -47
- package/src/vs/base/common/lifecycle.ts +0 -801
- package/src/vs/base/common/linkedList.ts +0 -142
- package/src/vs/base/common/map.ts +0 -202
- package/src/vs/base/common/numbers.ts +0 -98
- package/src/vs/base/common/observable.ts +0 -76
- package/src/vs/base/common/observableInternal/api.ts +0 -31
- package/src/vs/base/common/observableInternal/autorun.ts +0 -281
- package/src/vs/base/common/observableInternal/base.ts +0 -489
- package/src/vs/base/common/observableInternal/debugName.ts +0 -145
- package/src/vs/base/common/observableInternal/derived.ts +0 -428
- package/src/vs/base/common/observableInternal/lazyObservableValue.ts +0 -146
- package/src/vs/base/common/observableInternal/logging.ts +0 -328
- package/src/vs/base/common/observableInternal/promise.ts +0 -209
- package/src/vs/base/common/observableInternal/utils.ts +0 -610
- package/src/vs/base/common/platform.ts +0 -281
- package/src/vs/base/common/scrollable.ts +0 -522
- package/src/vs/base/common/sequence.ts +0 -34
- package/src/vs/base/common/stopwatch.ts +0 -43
- package/src/vs/base/common/strings.ts +0 -557
- package/src/vs/base/common/symbols.ts +0 -9
- package/src/vs/base/common/uint.ts +0 -59
- package/src/vs/patches/nls.ts +0 -90
- package/src/vs/typings/base-common.d.ts +0 -20
- package/src/vs/typings/require.d.ts +0 -42
- package/src/vs/typings/vscode-globals-nls.d.ts +0 -36
- package/src/vs/typings/vscode-globals-product.d.ts +0 -33
|
@@ -0,0 +1,579 @@
|
|
|
1
|
+
/*---------------------------------------------------------------------------------------------
|
|
2
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
|
+
*--------------------------------------------------------------------------------------------*/
|
|
5
|
+
|
|
6
|
+
import * as dom from '../Dom';
|
|
7
|
+
import { FastDomNode } from './fastDomNode';
|
|
8
|
+
import { IMouseEvent, IMouseWheelEvent, StandardWheelEvent } from './mouseEvent';
|
|
9
|
+
import { IScrollbarHost } from './abstractScrollbar';
|
|
10
|
+
import { HorizontalScrollbar } from './horizontalScrollbar';
|
|
11
|
+
import { IScrollableElementChangeOptions, IScrollableElementCreationOptions, IScrollableElementResolvedOptions } from './scrollableElementOptions';
|
|
12
|
+
import { VerticalScrollbar } from './verticalScrollbar';
|
|
13
|
+
import { Widget } from './widget';
|
|
14
|
+
import { TimeoutTimer } from 'common/Async';
|
|
15
|
+
import { Emitter, IEvent } from 'common/Event';
|
|
16
|
+
import { IDisposable, dispose } from 'common/Lifecycle';
|
|
17
|
+
import * as platform from 'common/Platform';
|
|
18
|
+
import { INewScrollDimensions, INewScrollPosition, IScrollDimensions, IScrollPosition, IScrollEvent, Scrollable, ScrollbarVisibility } from './scrollable';
|
|
19
|
+
// import 'vs/css!./media/scrollbars';
|
|
20
|
+
|
|
21
|
+
const HIDE_TIMEOUT = 500;
|
|
22
|
+
const SCROLL_WHEEL_SENSITIVITY = 50;
|
|
23
|
+
|
|
24
|
+
class MouseWheelClassifierItem {
|
|
25
|
+
public timestamp: number;
|
|
26
|
+
public deltaX: number;
|
|
27
|
+
public deltaY: number;
|
|
28
|
+
public score: number;
|
|
29
|
+
|
|
30
|
+
constructor(timestamp: number, deltaX: number, deltaY: number) {
|
|
31
|
+
this.timestamp = timestamp;
|
|
32
|
+
this.deltaX = deltaX;
|
|
33
|
+
this.deltaY = deltaY;
|
|
34
|
+
this.score = 0;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
class MouseWheelClassifier {
|
|
39
|
+
|
|
40
|
+
public static readonly INSTANCE = new MouseWheelClassifier();
|
|
41
|
+
|
|
42
|
+
private readonly _capacity: number;
|
|
43
|
+
private _memory: MouseWheelClassifierItem[];
|
|
44
|
+
private _front: number;
|
|
45
|
+
private _rear: number;
|
|
46
|
+
|
|
47
|
+
constructor() {
|
|
48
|
+
this._capacity = 5;
|
|
49
|
+
this._memory = [];
|
|
50
|
+
this._front = -1;
|
|
51
|
+
this._rear = -1;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
public isPhysicalMouseWheel(): boolean {
|
|
55
|
+
if (this._front === -1 && this._rear === -1) {
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
let remainingInfluence = 1;
|
|
60
|
+
let score = 0;
|
|
61
|
+
let iteration = 1;
|
|
62
|
+
|
|
63
|
+
let index = this._rear;
|
|
64
|
+
while (index !== -1) {
|
|
65
|
+
const influence = (index === this._front ? remainingInfluence : Math.pow(2, -iteration));
|
|
66
|
+
remainingInfluence -= influence;
|
|
67
|
+
score += this._memory[index].score * influence;
|
|
68
|
+
|
|
69
|
+
if (index === this._front) {
|
|
70
|
+
break;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
index = (this._capacity + index - 1) % this._capacity;
|
|
74
|
+
iteration++;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
return (score <= 0.5);
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
public acceptStandardWheelEvent(e: StandardWheelEvent): void {
|
|
81
|
+
if (platform.isChrome) {
|
|
82
|
+
const targetWindow = dom.getWindow(e.browserEvent);
|
|
83
|
+
const pageZoomFactor = platform.getZoomFactor(targetWindow);
|
|
84
|
+
this.accept(Date.now(), e.deltaX * pageZoomFactor, e.deltaY * pageZoomFactor);
|
|
85
|
+
} else {
|
|
86
|
+
this.accept(Date.now(), e.deltaX, e.deltaY);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
public accept(timestamp: number, deltaX: number, deltaY: number): void {
|
|
91
|
+
let previousItem = null;
|
|
92
|
+
const item = new MouseWheelClassifierItem(timestamp, deltaX, deltaY);
|
|
93
|
+
|
|
94
|
+
if (this._front === -1 && this._rear === -1) {
|
|
95
|
+
this._memory[0] = item;
|
|
96
|
+
this._front = 0;
|
|
97
|
+
this._rear = 0;
|
|
98
|
+
} else {
|
|
99
|
+
previousItem = this._memory[this._rear];
|
|
100
|
+
|
|
101
|
+
this._rear = (this._rear + 1) % this._capacity;
|
|
102
|
+
if (this._rear === this._front) {
|
|
103
|
+
this._front = (this._front + 1) % this._capacity;
|
|
104
|
+
}
|
|
105
|
+
this._memory[this._rear] = item;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
item.score = this._computeScore(item, previousItem);
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
private _computeScore(item: MouseWheelClassifierItem, previousItem: MouseWheelClassifierItem | null): number {
|
|
112
|
+
|
|
113
|
+
if (Math.abs(item.deltaX) > 0 && Math.abs(item.deltaY) > 0) {
|
|
114
|
+
return 1;
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
let score: number = 0.5;
|
|
118
|
+
|
|
119
|
+
if (!this._isAlmostInt(item.deltaX) || !this._isAlmostInt(item.deltaY)) {
|
|
120
|
+
score += 0.25;
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
if (previousItem) {
|
|
124
|
+
const absDeltaX = Math.abs(item.deltaX);
|
|
125
|
+
const absDeltaY = Math.abs(item.deltaY);
|
|
126
|
+
|
|
127
|
+
const absPreviousDeltaX = Math.abs(previousItem.deltaX);
|
|
128
|
+
const absPreviousDeltaY = Math.abs(previousItem.deltaY);
|
|
129
|
+
|
|
130
|
+
const minDeltaX = Math.max(Math.min(absDeltaX, absPreviousDeltaX), 1);
|
|
131
|
+
const minDeltaY = Math.max(Math.min(absDeltaY, absPreviousDeltaY), 1);
|
|
132
|
+
|
|
133
|
+
const maxDeltaX = Math.max(absDeltaX, absPreviousDeltaX);
|
|
134
|
+
const maxDeltaY = Math.max(absDeltaY, absPreviousDeltaY);
|
|
135
|
+
|
|
136
|
+
const isSameModulo = (maxDeltaX % minDeltaX === 0 && maxDeltaY % minDeltaY === 0);
|
|
137
|
+
if (isSameModulo) {
|
|
138
|
+
score -= 0.5;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
return Math.min(Math.max(score, 0), 1);
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
private _isAlmostInt(value: number): boolean {
|
|
146
|
+
const delta = Math.abs(Math.round(value) - value);
|
|
147
|
+
return (delta < 0.01);
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
export class SmoothScrollableElement extends Widget {
|
|
152
|
+
|
|
153
|
+
private readonly _options: IScrollableElementResolvedOptions;
|
|
154
|
+
protected readonly _scrollable: Scrollable;
|
|
155
|
+
private readonly _verticalScrollbar: VerticalScrollbar;
|
|
156
|
+
private readonly _horizontalScrollbar: HorizontalScrollbar;
|
|
157
|
+
private readonly _domNode: HTMLElement;
|
|
158
|
+
|
|
159
|
+
private readonly _leftShadowDomNode: FastDomNode<HTMLElement> | null;
|
|
160
|
+
private readonly _topShadowDomNode: FastDomNode<HTMLElement> | null;
|
|
161
|
+
private readonly _topLeftShadowDomNode: FastDomNode<HTMLElement> | null;
|
|
162
|
+
|
|
163
|
+
private readonly _listenOnDomNode: HTMLElement;
|
|
164
|
+
|
|
165
|
+
private _mouseWheelToDispose: IDisposable[];
|
|
166
|
+
|
|
167
|
+
private _isDragging: boolean;
|
|
168
|
+
private _mouseIsOver: boolean;
|
|
169
|
+
|
|
170
|
+
private readonly _hideTimeout: TimeoutTimer;
|
|
171
|
+
private _shouldRender: boolean;
|
|
172
|
+
|
|
173
|
+
private _revealOnScroll: boolean;
|
|
174
|
+
|
|
175
|
+
private readonly _onScroll = this._register(new Emitter<IScrollEvent>());
|
|
176
|
+
public readonly onScroll: IEvent<IScrollEvent> = this._onScroll.event;
|
|
177
|
+
|
|
178
|
+
public get options(): Readonly<IScrollableElementResolvedOptions> {
|
|
179
|
+
return this._options;
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
public constructor(element: HTMLElement, options: IScrollableElementCreationOptions, scrollable?: Scrollable) {
|
|
183
|
+
super();
|
|
184
|
+
options = options ?? {};
|
|
185
|
+
let resolvedScrollable: Scrollable;
|
|
186
|
+
const ownsScrollable = !scrollable;
|
|
187
|
+
if (scrollable) {
|
|
188
|
+
resolvedScrollable = scrollable;
|
|
189
|
+
} else {
|
|
190
|
+
options.mouseWheelSmoothScroll = false;
|
|
191
|
+
resolvedScrollable = new Scrollable({
|
|
192
|
+
forceIntegerValues: true,
|
|
193
|
+
smoothScrollDuration: 0,
|
|
194
|
+
scheduleAtNextAnimationFrame: (callback) => dom.scheduleAtNextAnimationFrame(dom.getWindow(element), callback)
|
|
195
|
+
});
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
this._options = resolveOptions(options);
|
|
199
|
+
this._scrollable = resolvedScrollable;
|
|
200
|
+
|
|
201
|
+
this._register(this._scrollable.onScroll((e) => {
|
|
202
|
+
this._handleScroll(e);
|
|
203
|
+
this._onScroll.fire(e);
|
|
204
|
+
}));
|
|
205
|
+
if (ownsScrollable) {
|
|
206
|
+
this._register(this._scrollable);
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
const scrollbarHost: IScrollbarHost = {
|
|
210
|
+
handleMouseWheel: (mouseWheelEvent: StandardWheelEvent) => this._handleMouseWheel(mouseWheelEvent),
|
|
211
|
+
handleDragStart: () => this._handleDragStart(),
|
|
212
|
+
handleDragEnd: () => this._handleDragEnd(),
|
|
213
|
+
};
|
|
214
|
+
this._verticalScrollbar = this._register(new VerticalScrollbar(this._scrollable, this._options, scrollbarHost));
|
|
215
|
+
this._horizontalScrollbar = this._register(new HorizontalScrollbar(this._scrollable, this._options, scrollbarHost));
|
|
216
|
+
|
|
217
|
+
this._domNode = document.createElement('div');
|
|
218
|
+
this._domNode.className = 'xterm-scrollable-element ' + this._options.className;
|
|
219
|
+
this._domNode.setAttribute('role', 'presentation');
|
|
220
|
+
this._domNode.style.position = 'relative';
|
|
221
|
+
this._domNode.appendChild(element);
|
|
222
|
+
this._domNode.appendChild(this._horizontalScrollbar.domNode.domNode);
|
|
223
|
+
this._domNode.appendChild(this._verticalScrollbar.domNode.domNode);
|
|
224
|
+
|
|
225
|
+
if (this._options.useShadows) {
|
|
226
|
+
this._leftShadowDomNode = new FastDomNode(document.createElement('div'));
|
|
227
|
+
this._leftShadowDomNode.setClassName('xterm-shadow');
|
|
228
|
+
this._domNode.appendChild(this._leftShadowDomNode.domNode);
|
|
229
|
+
|
|
230
|
+
this._topShadowDomNode = new FastDomNode(document.createElement('div'));
|
|
231
|
+
this._topShadowDomNode.setClassName('xterm-shadow');
|
|
232
|
+
this._domNode.appendChild(this._topShadowDomNode.domNode);
|
|
233
|
+
|
|
234
|
+
this._topLeftShadowDomNode = new FastDomNode(document.createElement('div'));
|
|
235
|
+
this._topLeftShadowDomNode.setClassName('xterm-shadow');
|
|
236
|
+
this._domNode.appendChild(this._topLeftShadowDomNode.domNode);
|
|
237
|
+
} else {
|
|
238
|
+
this._leftShadowDomNode = null;
|
|
239
|
+
this._topShadowDomNode = null;
|
|
240
|
+
this._topLeftShadowDomNode = null;
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
this._listenOnDomNode = this._options.listenOnDomNode ?? this._domNode;
|
|
244
|
+
|
|
245
|
+
this._mouseWheelToDispose = [];
|
|
246
|
+
this._setListeningToMouseWheel(this._options.handleMouseWheel);
|
|
247
|
+
|
|
248
|
+
this._onmouseover(this._listenOnDomNode, (e) => this._handleMouseOver(e));
|
|
249
|
+
this._onmouseleave(this._listenOnDomNode, (e) => this._handleMouseLeave(e));
|
|
250
|
+
|
|
251
|
+
this._hideTimeout = this._register(new TimeoutTimer());
|
|
252
|
+
this._isDragging = false;
|
|
253
|
+
this._mouseIsOver = false;
|
|
254
|
+
|
|
255
|
+
this._shouldRender = true;
|
|
256
|
+
|
|
257
|
+
this._revealOnScroll = true;
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
public override dispose(): void {
|
|
261
|
+
this._mouseWheelToDispose = dispose(this._mouseWheelToDispose);
|
|
262
|
+
super.dispose();
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
public getDomNode(): HTMLElement {
|
|
266
|
+
return this._domNode;
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
public getScrollDimensions(): IScrollDimensions {
|
|
270
|
+
return this._scrollable.getScrollDimensions();
|
|
271
|
+
}
|
|
272
|
+
|
|
273
|
+
public setScrollDimensions(dimensions: INewScrollDimensions): void {
|
|
274
|
+
this._scrollable.setScrollDimensions(dimensions, false);
|
|
275
|
+
}
|
|
276
|
+
|
|
277
|
+
public setScrollPosition(update: INewScrollPosition & { reuseAnimation?: boolean }): void {
|
|
278
|
+
if (update.reuseAnimation) {
|
|
279
|
+
this._scrollable.setScrollPositionSmooth(update, update.reuseAnimation);
|
|
280
|
+
} else {
|
|
281
|
+
this._scrollable.setScrollPositionNow(update);
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
|
|
285
|
+
public getScrollPosition(): IScrollPosition {
|
|
286
|
+
return this._scrollable.getCurrentScrollPosition();
|
|
287
|
+
}
|
|
288
|
+
|
|
289
|
+
public updateClassName(newClassName: string): void {
|
|
290
|
+
this._options.className = newClassName;
|
|
291
|
+
if (platform.isMac) {
|
|
292
|
+
this._options.className += ' xterm-mac';
|
|
293
|
+
}
|
|
294
|
+
this._domNode.className = 'xterm-scrollable-element ' + this._options.className;
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
public updateOptions(newOptions: IScrollableElementChangeOptions): void {
|
|
298
|
+
if (typeof newOptions.handleMouseWheel !== 'undefined') {
|
|
299
|
+
this._options.handleMouseWheel = newOptions.handleMouseWheel;
|
|
300
|
+
this._setListeningToMouseWheel(this._options.handleMouseWheel);
|
|
301
|
+
}
|
|
302
|
+
if (typeof newOptions.mouseWheelScrollSensitivity !== 'undefined') {
|
|
303
|
+
this._options.mouseWheelScrollSensitivity = newOptions.mouseWheelScrollSensitivity;
|
|
304
|
+
}
|
|
305
|
+
if (typeof newOptions.fastScrollSensitivity !== 'undefined') {
|
|
306
|
+
this._options.fastScrollSensitivity = newOptions.fastScrollSensitivity;
|
|
307
|
+
}
|
|
308
|
+
if (typeof newOptions.scrollPredominantAxis !== 'undefined') {
|
|
309
|
+
this._options.scrollPredominantAxis = newOptions.scrollPredominantAxis;
|
|
310
|
+
}
|
|
311
|
+
if (typeof newOptions.horizontal !== 'undefined') {
|
|
312
|
+
this._options.horizontal = newOptions.horizontal;
|
|
313
|
+
}
|
|
314
|
+
if (typeof newOptions.vertical !== 'undefined') {
|
|
315
|
+
this._options.vertical = newOptions.vertical;
|
|
316
|
+
}
|
|
317
|
+
if (typeof newOptions.horizontalHasArrows !== 'undefined') {
|
|
318
|
+
this._options.horizontalHasArrows = newOptions.horizontalHasArrows;
|
|
319
|
+
}
|
|
320
|
+
if (typeof newOptions.verticalHasArrows !== 'undefined') {
|
|
321
|
+
this._options.verticalHasArrows = newOptions.verticalHasArrows;
|
|
322
|
+
}
|
|
323
|
+
if (typeof newOptions.horizontalScrollbarSize !== 'undefined') {
|
|
324
|
+
this._options.horizontalScrollbarSize = newOptions.horizontalScrollbarSize;
|
|
325
|
+
}
|
|
326
|
+
if (typeof newOptions.verticalScrollbarSize !== 'undefined') {
|
|
327
|
+
this._options.verticalScrollbarSize = newOptions.verticalScrollbarSize;
|
|
328
|
+
}
|
|
329
|
+
if (typeof newOptions.scrollByPage !== 'undefined') {
|
|
330
|
+
this._options.scrollByPage = newOptions.scrollByPage;
|
|
331
|
+
}
|
|
332
|
+
this._horizontalScrollbar.updateOptions(this._options);
|
|
333
|
+
this._verticalScrollbar.updateOptions(this._options);
|
|
334
|
+
|
|
335
|
+
if (!this._options.lazyRender) {
|
|
336
|
+
this._render();
|
|
337
|
+
}
|
|
338
|
+
}
|
|
339
|
+
|
|
340
|
+
public delegateScrollFromMouseWheelEvent(browserEvent: IMouseWheelEvent): void {
|
|
341
|
+
this._handleMouseWheel(new StandardWheelEvent(browserEvent));
|
|
342
|
+
}
|
|
343
|
+
|
|
344
|
+
// -------------------- mouse wheel scrolling --------------------
|
|
345
|
+
|
|
346
|
+
private _setListeningToMouseWheel(shouldListen: boolean): void {
|
|
347
|
+
const isListening = (this._mouseWheelToDispose.length > 0);
|
|
348
|
+
|
|
349
|
+
if (isListening === shouldListen) {
|
|
350
|
+
return;
|
|
351
|
+
}
|
|
352
|
+
|
|
353
|
+
this._mouseWheelToDispose = dispose(this._mouseWheelToDispose);
|
|
354
|
+
|
|
355
|
+
if (shouldListen) {
|
|
356
|
+
const onMouseWheel = (browserEvent: IMouseWheelEvent): void => {
|
|
357
|
+
this._handleMouseWheel(new StandardWheelEvent(browserEvent));
|
|
358
|
+
};
|
|
359
|
+
|
|
360
|
+
this._mouseWheelToDispose.push(dom.addDisposableListener(this._listenOnDomNode, dom.eventType.MOUSE_WHEEL, onMouseWheel, { passive: false }));
|
|
361
|
+
}
|
|
362
|
+
}
|
|
363
|
+
|
|
364
|
+
private _handleMouseWheel(e: StandardWheelEvent): void {
|
|
365
|
+
if (e.browserEvent?.defaultPrevented) {
|
|
366
|
+
return;
|
|
367
|
+
}
|
|
368
|
+
|
|
369
|
+
const classifier = MouseWheelClassifier.INSTANCE;
|
|
370
|
+
classifier.acceptStandardWheelEvent(e);
|
|
371
|
+
|
|
372
|
+
let didScroll = false;
|
|
373
|
+
|
|
374
|
+
if (e.deltaY || e.deltaX) {
|
|
375
|
+
let deltaY = e.deltaY * this._options.mouseWheelScrollSensitivity;
|
|
376
|
+
let deltaX = e.deltaX * this._options.mouseWheelScrollSensitivity;
|
|
377
|
+
|
|
378
|
+
if (this._options.scrollPredominantAxis) {
|
|
379
|
+
if (this._options.scrollYToX && deltaX + deltaY === 0) {
|
|
380
|
+
deltaX = deltaY = 0;
|
|
381
|
+
} else if (Math.abs(deltaY) >= Math.abs(deltaX)) {
|
|
382
|
+
deltaX = 0;
|
|
383
|
+
} else {
|
|
384
|
+
deltaY = 0;
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
|
|
388
|
+
if (this._options.flipAxes) {
|
|
389
|
+
[deltaY, deltaX] = [deltaX, deltaY];
|
|
390
|
+
}
|
|
391
|
+
|
|
392
|
+
const shiftConvert = !platform.isMac && e.browserEvent && e.browserEvent.shiftKey;
|
|
393
|
+
if ((this._options.scrollYToX || shiftConvert) && !deltaX) {
|
|
394
|
+
deltaX = deltaY;
|
|
395
|
+
deltaY = 0;
|
|
396
|
+
}
|
|
397
|
+
|
|
398
|
+
if (e.browserEvent && e.browserEvent.altKey) {
|
|
399
|
+
deltaX = deltaX * this._options.fastScrollSensitivity;
|
|
400
|
+
deltaY = deltaY * this._options.fastScrollSensitivity;
|
|
401
|
+
}
|
|
402
|
+
|
|
403
|
+
const futureScrollPosition = this._scrollable.getFutureScrollPosition();
|
|
404
|
+
|
|
405
|
+
let desiredScrollPosition: INewScrollPosition = {};
|
|
406
|
+
if (deltaY) {
|
|
407
|
+
const deltaScrollTop = SCROLL_WHEEL_SENSITIVITY * deltaY;
|
|
408
|
+
const desiredScrollTop = futureScrollPosition.scrollTop - (deltaScrollTop < 0 ? Math.floor(deltaScrollTop) : Math.ceil(deltaScrollTop));
|
|
409
|
+
this._verticalScrollbar.writeScrollPosition(desiredScrollPosition, desiredScrollTop);
|
|
410
|
+
}
|
|
411
|
+
if (deltaX) {
|
|
412
|
+
const deltaScrollLeft = SCROLL_WHEEL_SENSITIVITY * deltaX;
|
|
413
|
+
const desiredScrollLeft = futureScrollPosition.scrollLeft - (deltaScrollLeft < 0 ? Math.floor(deltaScrollLeft) : Math.ceil(deltaScrollLeft));
|
|
414
|
+
this._horizontalScrollbar.writeScrollPosition(desiredScrollPosition, desiredScrollLeft);
|
|
415
|
+
}
|
|
416
|
+
|
|
417
|
+
desiredScrollPosition = this._scrollable.validateScrollPosition(desiredScrollPosition);
|
|
418
|
+
|
|
419
|
+
if (futureScrollPosition.scrollLeft !== desiredScrollPosition.scrollLeft || futureScrollPosition.scrollTop !== desiredScrollPosition.scrollTop) {
|
|
420
|
+
|
|
421
|
+
const canPerformSmoothScroll = (
|
|
422
|
+
this._options.mouseWheelSmoothScroll
|
|
423
|
+
&& classifier.isPhysicalMouseWheel()
|
|
424
|
+
);
|
|
425
|
+
|
|
426
|
+
if (canPerformSmoothScroll) {
|
|
427
|
+
this._scrollable.setScrollPositionSmooth(desiredScrollPosition);
|
|
428
|
+
} else {
|
|
429
|
+
this._scrollable.setScrollPositionNow(desiredScrollPosition);
|
|
430
|
+
}
|
|
431
|
+
|
|
432
|
+
didScroll = true;
|
|
433
|
+
}
|
|
434
|
+
}
|
|
435
|
+
|
|
436
|
+
let consumeMouseWheel = didScroll;
|
|
437
|
+
if (!consumeMouseWheel && this._options.alwaysConsumeMouseWheel) {
|
|
438
|
+
consumeMouseWheel = true;
|
|
439
|
+
}
|
|
440
|
+
if (!consumeMouseWheel && this._options.consumeMouseWheelIfScrollbarIsNeeded && (this._verticalScrollbar.isNeeded() || this._horizontalScrollbar.isNeeded())) {
|
|
441
|
+
consumeMouseWheel = true;
|
|
442
|
+
}
|
|
443
|
+
|
|
444
|
+
if (consumeMouseWheel) {
|
|
445
|
+
e.preventDefault();
|
|
446
|
+
e.stopPropagation();
|
|
447
|
+
}
|
|
448
|
+
}
|
|
449
|
+
|
|
450
|
+
private _handleScroll(e: IScrollEvent): void {
|
|
451
|
+
this._shouldRender = this._horizontalScrollbar.handleScroll(e) || this._shouldRender;
|
|
452
|
+
this._shouldRender = this._verticalScrollbar.handleScroll(e) || this._shouldRender;
|
|
453
|
+
|
|
454
|
+
if (this._options.useShadows) {
|
|
455
|
+
this._shouldRender = true;
|
|
456
|
+
}
|
|
457
|
+
|
|
458
|
+
if (this._revealOnScroll) {
|
|
459
|
+
this._reveal();
|
|
460
|
+
}
|
|
461
|
+
|
|
462
|
+
if (!this._options.lazyRender) {
|
|
463
|
+
this._render();
|
|
464
|
+
}
|
|
465
|
+
}
|
|
466
|
+
|
|
467
|
+
public renderNow(): void {
|
|
468
|
+
if (!this._options.lazyRender) {
|
|
469
|
+
throw new Error('Please use `lazyRender` together with `renderNow`!');
|
|
470
|
+
}
|
|
471
|
+
|
|
472
|
+
this._render();
|
|
473
|
+
}
|
|
474
|
+
|
|
475
|
+
private _render(): void {
|
|
476
|
+
if (!this._shouldRender) {
|
|
477
|
+
return;
|
|
478
|
+
}
|
|
479
|
+
|
|
480
|
+
this._shouldRender = false;
|
|
481
|
+
|
|
482
|
+
this._horizontalScrollbar.render();
|
|
483
|
+
this._verticalScrollbar.render();
|
|
484
|
+
|
|
485
|
+
if (this._options.useShadows) {
|
|
486
|
+
const scrollState = this._scrollable.getCurrentScrollPosition();
|
|
487
|
+
const enableTop = scrollState.scrollTop > 0;
|
|
488
|
+
const enableLeft = scrollState.scrollLeft > 0;
|
|
489
|
+
|
|
490
|
+
const leftClassName = (enableLeft ? ' xterm-shadow-left' : '');
|
|
491
|
+
const topClassName = (enableTop ? ' xterm-shadow-top' : '');
|
|
492
|
+
const topLeftClassName = (enableLeft || enableTop ? ' xterm-shadow-top-left-corner' : '');
|
|
493
|
+
this._leftShadowDomNode!.setClassName(`xterm-shadow${leftClassName}`);
|
|
494
|
+
this._topShadowDomNode!.setClassName(`xterm-shadow${topClassName}`);
|
|
495
|
+
this._topLeftShadowDomNode!.setClassName(`xterm-shadow${topLeftClassName}${topClassName}${leftClassName}`);
|
|
496
|
+
}
|
|
497
|
+
}
|
|
498
|
+
|
|
499
|
+
// -------------------- fade in / fade out --------------------
|
|
500
|
+
|
|
501
|
+
private _handleDragStart(): void {
|
|
502
|
+
this._isDragging = true;
|
|
503
|
+
this._reveal();
|
|
504
|
+
}
|
|
505
|
+
|
|
506
|
+
private _handleDragEnd(): void {
|
|
507
|
+
this._isDragging = false;
|
|
508
|
+
this._hide();
|
|
509
|
+
}
|
|
510
|
+
|
|
511
|
+
private _handleMouseLeave(e: IMouseEvent): void {
|
|
512
|
+
this._mouseIsOver = false;
|
|
513
|
+
this._hide();
|
|
514
|
+
}
|
|
515
|
+
|
|
516
|
+
private _handleMouseOver(e: IMouseEvent): void {
|
|
517
|
+
this._mouseIsOver = true;
|
|
518
|
+
this._reveal();
|
|
519
|
+
}
|
|
520
|
+
|
|
521
|
+
private _reveal(): void {
|
|
522
|
+
this._verticalScrollbar.beginReveal();
|
|
523
|
+
this._horizontalScrollbar.beginReveal();
|
|
524
|
+
this._scheduleHide();
|
|
525
|
+
}
|
|
526
|
+
|
|
527
|
+
private _hide(): void {
|
|
528
|
+
if (!this._mouseIsOver && !this._isDragging) {
|
|
529
|
+
this._verticalScrollbar.beginHide();
|
|
530
|
+
this._horizontalScrollbar.beginHide();
|
|
531
|
+
}
|
|
532
|
+
}
|
|
533
|
+
|
|
534
|
+
private _scheduleHide(): void {
|
|
535
|
+
if (!this._mouseIsOver && !this._isDragging) {
|
|
536
|
+
this._hideTimeout.cancelAndSet(() => this._hide(), HIDE_TIMEOUT);
|
|
537
|
+
}
|
|
538
|
+
}
|
|
539
|
+
}
|
|
540
|
+
|
|
541
|
+
function resolveOptions(opts: IScrollableElementCreationOptions): IScrollableElementResolvedOptions {
|
|
542
|
+
const result: IScrollableElementResolvedOptions = {
|
|
543
|
+
lazyRender: (typeof opts.lazyRender !== 'undefined' ? opts.lazyRender : false),
|
|
544
|
+
className: (typeof opts.className !== 'undefined' ? opts.className : ''),
|
|
545
|
+
useShadows: (typeof opts.useShadows !== 'undefined' ? opts.useShadows : true),
|
|
546
|
+
handleMouseWheel: (typeof opts.handleMouseWheel !== 'undefined' ? opts.handleMouseWheel : true),
|
|
547
|
+
flipAxes: (typeof opts.flipAxes !== 'undefined' ? opts.flipAxes : false),
|
|
548
|
+
consumeMouseWheelIfScrollbarIsNeeded: (typeof opts.consumeMouseWheelIfScrollbarIsNeeded !== 'undefined' ? opts.consumeMouseWheelIfScrollbarIsNeeded : false),
|
|
549
|
+
alwaysConsumeMouseWheel: (typeof opts.alwaysConsumeMouseWheel !== 'undefined' ? opts.alwaysConsumeMouseWheel : false),
|
|
550
|
+
scrollYToX: (typeof opts.scrollYToX !== 'undefined' ? opts.scrollYToX : false),
|
|
551
|
+
mouseWheelScrollSensitivity: (typeof opts.mouseWheelScrollSensitivity !== 'undefined' ? opts.mouseWheelScrollSensitivity : 1),
|
|
552
|
+
fastScrollSensitivity: (typeof opts.fastScrollSensitivity !== 'undefined' ? opts.fastScrollSensitivity : 5),
|
|
553
|
+
scrollPredominantAxis: (typeof opts.scrollPredominantAxis !== 'undefined' ? opts.scrollPredominantAxis : true),
|
|
554
|
+
mouseWheelSmoothScroll: (typeof opts.mouseWheelSmoothScroll !== 'undefined' ? opts.mouseWheelSmoothScroll : true),
|
|
555
|
+
|
|
556
|
+
listenOnDomNode: (typeof opts.listenOnDomNode !== 'undefined' ? opts.listenOnDomNode : null),
|
|
557
|
+
|
|
558
|
+
horizontal: (typeof opts.horizontal !== 'undefined' ? opts.horizontal : ScrollbarVisibility.AUTO),
|
|
559
|
+
horizontalScrollbarSize: (typeof opts.horizontalScrollbarSize !== 'undefined' ? opts.horizontalScrollbarSize : 10),
|
|
560
|
+
horizontalSliderSize: (typeof opts.horizontalSliderSize !== 'undefined' ? opts.horizontalSliderSize : 0),
|
|
561
|
+
horizontalHasArrows: (typeof opts.horizontalHasArrows !== 'undefined' ? opts.horizontalHasArrows : false),
|
|
562
|
+
|
|
563
|
+
vertical: (typeof opts.vertical !== 'undefined' ? opts.vertical : ScrollbarVisibility.AUTO),
|
|
564
|
+
verticalScrollbarSize: (typeof opts.verticalScrollbarSize !== 'undefined' ? opts.verticalScrollbarSize : 10),
|
|
565
|
+
verticalHasArrows: (typeof opts.verticalHasArrows !== 'undefined' ? opts.verticalHasArrows : false),
|
|
566
|
+
verticalSliderSize: (typeof opts.verticalSliderSize !== 'undefined' ? opts.verticalSliderSize : 0),
|
|
567
|
+
|
|
568
|
+
scrollByPage: (typeof opts.scrollByPage !== 'undefined' ? opts.scrollByPage : false)
|
|
569
|
+
};
|
|
570
|
+
|
|
571
|
+
result.horizontalSliderSize = (typeof opts.horizontalSliderSize !== 'undefined' ? opts.horizontalSliderSize : result.horizontalScrollbarSize);
|
|
572
|
+
result.verticalSliderSize = (typeof opts.verticalSliderSize !== 'undefined' ? opts.verticalSliderSize : result.verticalScrollbarSize);
|
|
573
|
+
|
|
574
|
+
if (platform.isMac) {
|
|
575
|
+
result.className += ' xterm-mac';
|
|
576
|
+
}
|
|
577
|
+
|
|
578
|
+
return result;
|
|
579
|
+
}
|