@xterm/xterm 6.1.0-beta.18 → 6.1.0-beta.181
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 +60 -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 +25 -14
- package/src/browser/AccessibilityManager.ts +6 -3
- package/src/browser/Clipboard.ts +6 -3
- package/src/browser/CoreBrowserTerminal.ts +142 -62
- package/src/browser/Dom.ts +178 -0
- package/src/browser/Linkifier.ts +3 -3
- 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 +40 -17
- package/src/browser/decorations/BufferDecorationRenderer.ts +1 -1
- package/src/browser/decorations/OverviewRulerRenderer.ts +15 -16
- package/src/browser/input/CompositionHelper.ts +16 -1
- package/src/browser/public/Terminal.ts +24 -27
- package/src/browser/renderer/dom/DomRenderer.ts +128 -8
- 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 +481 -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/MouseService.ts +2 -1
- package/src/browser/services/RenderService.ts +22 -15
- package/src/browser/services/SelectionService.ts +12 -4
- package/src/browser/services/Services.ts +24 -15
- 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 +21 -11
- package/src/common/Event.ts +118 -0
- package/src/common/InputHandler.ts +244 -24
- 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 +9 -3
- package/src/common/Types.ts +29 -9
- 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 +496 -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 +75 -22
- package/src/common/parser/OscParser.ts +5 -5
- package/src/common/parser/Types.ts +34 -1
- 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/CoreMouseService.ts +2 -2
- 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/OptionsService.ts +13 -4
- package/src/common/services/Services.ts +39 -16
- package/src/common/services/UnicodeService.ts +1 -1
- package/typings/xterm.d.ts +319 -35
- 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,300 @@
|
|
|
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 { GlobalPointerMoveMonitor } from './globalPointerMoveMonitor';
|
|
9
|
+
import { StandardWheelEvent } from './mouseEvent';
|
|
10
|
+
import { ScrollbarArrow, IScrollbarArrowOptions } from './scrollbarArrow';
|
|
11
|
+
import { ScrollbarState } from './scrollbarState';
|
|
12
|
+
import { ScrollbarVisibilityController } from './scrollbarVisibilityController';
|
|
13
|
+
import { Widget } from './widget';
|
|
14
|
+
import * as platform from 'common/Platform';
|
|
15
|
+
import { INewScrollPosition, Scrollable, ScrollbarVisibility } from './scrollable';
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* The orthogonal distance to the slider at which dragging "resets". This implements "snapping"
|
|
19
|
+
*/
|
|
20
|
+
const POINTER_DRAG_RESET_DISTANCE = 140;
|
|
21
|
+
|
|
22
|
+
export interface ISimplifiedPointerEvent {
|
|
23
|
+
buttons: number;
|
|
24
|
+
pageX: number;
|
|
25
|
+
pageY: number;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
export interface IScrollbarHost {
|
|
29
|
+
handleMouseWheel(mouseWheelEvent: StandardWheelEvent): void;
|
|
30
|
+
handleDragStart(): void;
|
|
31
|
+
handleDragEnd(): void;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
interface IAbstractScrollbarOptions {
|
|
35
|
+
lazyRender: boolean;
|
|
36
|
+
host: IScrollbarHost;
|
|
37
|
+
scrollbarState: ScrollbarState;
|
|
38
|
+
visibility: ScrollbarVisibility;
|
|
39
|
+
extraScrollbarClassName: string;
|
|
40
|
+
scrollable: Scrollable;
|
|
41
|
+
scrollByPage: boolean;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
export abstract class AbstractScrollbar extends Widget {
|
|
45
|
+
|
|
46
|
+
protected _host: IScrollbarHost;
|
|
47
|
+
protected _scrollable: Scrollable;
|
|
48
|
+
protected _scrollByPage: boolean;
|
|
49
|
+
private _lazyRender: boolean;
|
|
50
|
+
protected _scrollbarState: ScrollbarState;
|
|
51
|
+
protected _visibilityController: ScrollbarVisibilityController;
|
|
52
|
+
private _pointerMoveMonitor: GlobalPointerMoveMonitor;
|
|
53
|
+
|
|
54
|
+
public domNode: FastDomNode<HTMLElement>;
|
|
55
|
+
public slider!: FastDomNode<HTMLElement>;
|
|
56
|
+
|
|
57
|
+
protected _shouldRender: boolean;
|
|
58
|
+
|
|
59
|
+
constructor(opts: IAbstractScrollbarOptions) {
|
|
60
|
+
super();
|
|
61
|
+
this._lazyRender = opts.lazyRender;
|
|
62
|
+
this._host = opts.host;
|
|
63
|
+
this._scrollable = opts.scrollable;
|
|
64
|
+
this._scrollByPage = opts.scrollByPage;
|
|
65
|
+
this._scrollbarState = opts.scrollbarState;
|
|
66
|
+
this._visibilityController = this._register(new ScrollbarVisibilityController(opts.visibility, 'xterm-visible xterm-scrollbar ' + opts.extraScrollbarClassName, 'xterm-invisible xterm-scrollbar ' + opts.extraScrollbarClassName));
|
|
67
|
+
this._visibilityController.setIsNeeded(this._scrollbarState.isNeeded());
|
|
68
|
+
this._pointerMoveMonitor = this._register(new GlobalPointerMoveMonitor());
|
|
69
|
+
this._shouldRender = true;
|
|
70
|
+
this.domNode = new FastDomNode(document.createElement('div'));
|
|
71
|
+
this.domNode.setAttribute('role', 'presentation');
|
|
72
|
+
this.domNode.setAttribute('aria-hidden', 'true');
|
|
73
|
+
|
|
74
|
+
this._visibilityController.setDomNode(this.domNode);
|
|
75
|
+
this.domNode.setPosition('absolute');
|
|
76
|
+
|
|
77
|
+
this._register(dom.addDisposableListener(this.domNode.domNode, dom.eventType.POINTER_DOWN, (e: PointerEvent) => this._domNodePointerDown(e)));
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
// ----------------- creation
|
|
81
|
+
|
|
82
|
+
/**
|
|
83
|
+
* Creates the dom node for an arrow & adds it to the container
|
|
84
|
+
*/
|
|
85
|
+
protected _createArrow(opts: IScrollbarArrowOptions): ScrollbarArrow {
|
|
86
|
+
const arrow = this._register(new ScrollbarArrow(opts));
|
|
87
|
+
this.domNode.domNode.appendChild(arrow.bgDomNode);
|
|
88
|
+
this.domNode.domNode.appendChild(arrow.domNode);
|
|
89
|
+
return arrow;
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/**
|
|
93
|
+
* Creates the slider dom node, adds it to the container & hooks up the events
|
|
94
|
+
*/
|
|
95
|
+
protected _createSlider(top: number, left: number, width: number | undefined, height: number | undefined): void {
|
|
96
|
+
this.slider = new FastDomNode(document.createElement('div'));
|
|
97
|
+
this.slider.setClassName('xterm-slider');
|
|
98
|
+
this.slider.setPosition('absolute');
|
|
99
|
+
this.slider.setTop(top);
|
|
100
|
+
this.slider.setLeft(left);
|
|
101
|
+
if (typeof width === 'number') {
|
|
102
|
+
this.slider.setWidth(width);
|
|
103
|
+
}
|
|
104
|
+
if (typeof height === 'number') {
|
|
105
|
+
this.slider.setHeight(height);
|
|
106
|
+
}
|
|
107
|
+
this.slider.setLayerHinting(true);
|
|
108
|
+
this.slider.setContain('strict');
|
|
109
|
+
|
|
110
|
+
this.domNode.domNode.appendChild(this.slider.domNode);
|
|
111
|
+
|
|
112
|
+
this._register(dom.addDisposableListener(
|
|
113
|
+
this.slider.domNode,
|
|
114
|
+
dom.eventType.POINTER_DOWN,
|
|
115
|
+
(e: PointerEvent) => {
|
|
116
|
+
if (e.button === 0) {
|
|
117
|
+
e.preventDefault();
|
|
118
|
+
this._sliderPointerDown(e);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
));
|
|
122
|
+
|
|
123
|
+
this._onclick(this.slider.domNode, e => {
|
|
124
|
+
if (e.leftButton) {
|
|
125
|
+
e.stopPropagation();
|
|
126
|
+
}
|
|
127
|
+
});
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
// ----------------- Update state
|
|
131
|
+
|
|
132
|
+
protected _handleElementSize(visibleSize: number): boolean {
|
|
133
|
+
if (this._scrollbarState.setVisibleSize(visibleSize)) {
|
|
134
|
+
this._visibilityController.setIsNeeded(this._scrollbarState.isNeeded());
|
|
135
|
+
this._shouldRender = true;
|
|
136
|
+
if (!this._lazyRender) {
|
|
137
|
+
this.render();
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
return this._shouldRender;
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
protected _handleElementScrollSize(elementScrollSize: number): boolean {
|
|
144
|
+
if (this._scrollbarState.setScrollSize(elementScrollSize)) {
|
|
145
|
+
this._visibilityController.setIsNeeded(this._scrollbarState.isNeeded());
|
|
146
|
+
this._shouldRender = true;
|
|
147
|
+
if (!this._lazyRender) {
|
|
148
|
+
this.render();
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
return this._shouldRender;
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
protected _handleElementScrollPosition(elementScrollPosition: number): boolean {
|
|
155
|
+
if (this._scrollbarState.setScrollPosition(elementScrollPosition)) {
|
|
156
|
+
this._visibilityController.setIsNeeded(this._scrollbarState.isNeeded());
|
|
157
|
+
this._shouldRender = true;
|
|
158
|
+
if (!this._lazyRender) {
|
|
159
|
+
this.render();
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
return this._shouldRender;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
// ----------------- rendering
|
|
166
|
+
|
|
167
|
+
public beginReveal(): void {
|
|
168
|
+
this._visibilityController.setShouldBeVisible(true);
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
public beginHide(): void {
|
|
172
|
+
this._visibilityController.setShouldBeVisible(false);
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
public render(): void {
|
|
176
|
+
if (!this._shouldRender) {
|
|
177
|
+
return;
|
|
178
|
+
}
|
|
179
|
+
this._shouldRender = false;
|
|
180
|
+
|
|
181
|
+
this._renderDomNode(this._scrollbarState.getRectangleLargeSize(), this._scrollbarState.getRectangleSmallSize());
|
|
182
|
+
this._updateSlider(this._scrollbarState.getSliderSize(), this._scrollbarState.getArrowSize() + this._scrollbarState.getSliderPosition());
|
|
183
|
+
}
|
|
184
|
+
// ----------------- DOM events
|
|
185
|
+
|
|
186
|
+
private _domNodePointerDown(e: PointerEvent): void {
|
|
187
|
+
if (e.target !== this.domNode.domNode) {
|
|
188
|
+
return;
|
|
189
|
+
}
|
|
190
|
+
this._handlePointerDown(e);
|
|
191
|
+
}
|
|
192
|
+
|
|
193
|
+
public delegatePointerDown(e: PointerEvent): void {
|
|
194
|
+
const domTop = this.domNode.domNode.getClientRects()[0].top;
|
|
195
|
+
const sliderStart = domTop + this._scrollbarState.getSliderPosition();
|
|
196
|
+
const sliderStop = domTop + this._scrollbarState.getSliderPosition() + this._scrollbarState.getSliderSize();
|
|
197
|
+
const pointerPos = this._sliderPointerPosition(e);
|
|
198
|
+
if (sliderStart <= pointerPos && pointerPos <= sliderStop) {
|
|
199
|
+
if (e.button === 0) {
|
|
200
|
+
e.preventDefault();
|
|
201
|
+
this._sliderPointerDown(e);
|
|
202
|
+
}
|
|
203
|
+
} else {
|
|
204
|
+
this._handlePointerDown(e);
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
private _handlePointerDown(e: PointerEvent): void {
|
|
209
|
+
let offsetX: number;
|
|
210
|
+
let offsetY: number;
|
|
211
|
+
if (e.target === this.domNode.domNode && typeof e.offsetX === 'number' && typeof e.offsetY === 'number') {
|
|
212
|
+
offsetX = e.offsetX;
|
|
213
|
+
offsetY = e.offsetY;
|
|
214
|
+
} else {
|
|
215
|
+
const domNodePosition = dom.getDomNodePagePosition(this.domNode.domNode);
|
|
216
|
+
offsetX = e.pageX - domNodePosition.left;
|
|
217
|
+
offsetY = e.pageY - domNodePosition.top;
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
const offset = this._pointerDownRelativePosition(offsetX, offsetY);
|
|
221
|
+
this._setDesiredScrollPositionNow(
|
|
222
|
+
this._scrollByPage
|
|
223
|
+
? this._scrollbarState.getDesiredScrollPositionFromOffsetPaged(offset)
|
|
224
|
+
: this._scrollbarState.getDesiredScrollPositionFromOffset(offset)
|
|
225
|
+
);
|
|
226
|
+
|
|
227
|
+
if (e.button === 0) {
|
|
228
|
+
e.preventDefault();
|
|
229
|
+
this._sliderPointerDown(e);
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
private _sliderPointerDown(e: PointerEvent): void {
|
|
234
|
+
if (!e.target || !(e.target instanceof Element)) {
|
|
235
|
+
return;
|
|
236
|
+
}
|
|
237
|
+
const initialPointerPosition = this._sliderPointerPosition(e);
|
|
238
|
+
const initialPointerOrthogonalPosition = this._sliderOrthogonalPointerPosition(e);
|
|
239
|
+
const initialScrollbarState = this._scrollbarState.clone();
|
|
240
|
+
this.slider.toggleClassName('xterm-active', true);
|
|
241
|
+
|
|
242
|
+
this._pointerMoveMonitor.startMonitoring(
|
|
243
|
+
e.target,
|
|
244
|
+
e.pointerId,
|
|
245
|
+
e.buttons,
|
|
246
|
+
(pointerMoveData: PointerEvent) => {
|
|
247
|
+
const pointerOrthogonalPosition = this._sliderOrthogonalPointerPosition(pointerMoveData);
|
|
248
|
+
const pointerOrthogonalDelta = Math.abs(pointerOrthogonalPosition - initialPointerOrthogonalPosition);
|
|
249
|
+
|
|
250
|
+
if (platform.isWindows && pointerOrthogonalDelta > POINTER_DRAG_RESET_DISTANCE) {
|
|
251
|
+
this._setDesiredScrollPositionNow(initialScrollbarState.getScrollPosition());
|
|
252
|
+
return;
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
const pointerPosition = this._sliderPointerPosition(pointerMoveData);
|
|
256
|
+
const pointerDelta = pointerPosition - initialPointerPosition;
|
|
257
|
+
this._setDesiredScrollPositionNow(initialScrollbarState.getDesiredScrollPositionFromDelta(pointerDelta));
|
|
258
|
+
},
|
|
259
|
+
() => {
|
|
260
|
+
this.slider.toggleClassName('xterm-active', false);
|
|
261
|
+
this._host.handleDragEnd();
|
|
262
|
+
}
|
|
263
|
+
);
|
|
264
|
+
|
|
265
|
+
this._host.handleDragStart();
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
private _setDesiredScrollPositionNow(_desiredScrollPosition: number): void {
|
|
269
|
+
|
|
270
|
+
const desiredScrollPosition: INewScrollPosition = {};
|
|
271
|
+
this.writeScrollPosition(desiredScrollPosition, _desiredScrollPosition);
|
|
272
|
+
|
|
273
|
+
this._scrollable.setScrollPositionNow(desiredScrollPosition);
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
public updateScrollbarSize(scrollbarSize: number): void {
|
|
277
|
+
this._updateScrollbarSize(scrollbarSize);
|
|
278
|
+
this._scrollbarState.setScrollbarSize(scrollbarSize);
|
|
279
|
+
this._shouldRender = true;
|
|
280
|
+
if (!this._lazyRender) {
|
|
281
|
+
this.render();
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
|
|
285
|
+
public isNeeded(): boolean {
|
|
286
|
+
return this._scrollbarState.isNeeded();
|
|
287
|
+
}
|
|
288
|
+
|
|
289
|
+
// ----------------- Overwrite these
|
|
290
|
+
|
|
291
|
+
protected abstract _renderDomNode(largeSize: number, smallSize: number): void;
|
|
292
|
+
protected abstract _updateSlider(sliderSize: number, sliderPosition: number): void;
|
|
293
|
+
|
|
294
|
+
protected abstract _pointerDownRelativePosition(offsetX: number, offsetY: number): number;
|
|
295
|
+
protected abstract _sliderPointerPosition(e: ISimplifiedPointerEvent): number;
|
|
296
|
+
protected abstract _sliderOrthogonalPointerPosition(e: ISimplifiedPointerEvent): number;
|
|
297
|
+
protected abstract _updateScrollbarSize(size: number): void;
|
|
298
|
+
|
|
299
|
+
public abstract writeScrollPosition(target: INewScrollPosition, scrollPosition: number): void;
|
|
300
|
+
}
|
|
@@ -0,0 +1,126 @@
|
|
|
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
|
+
export class FastDomNode<T extends HTMLElement> {
|
|
7
|
+
|
|
8
|
+
private _width: string = '';
|
|
9
|
+
private _height: string = '';
|
|
10
|
+
private _top: string = '';
|
|
11
|
+
private _left: string = '';
|
|
12
|
+
private _bottom: string = '';
|
|
13
|
+
private _right: string = '';
|
|
14
|
+
private _className: string = '';
|
|
15
|
+
private _position: string = '';
|
|
16
|
+
private _layerHint: boolean = false;
|
|
17
|
+
private _contain: 'none' | 'strict' | 'content' | 'size' | 'layout' | 'style' | 'paint' = 'none';
|
|
18
|
+
|
|
19
|
+
constructor(
|
|
20
|
+
public readonly domNode: T
|
|
21
|
+
) { }
|
|
22
|
+
|
|
23
|
+
public setWidth(_width: number | string): void {
|
|
24
|
+
const width = numberAsPixels(_width);
|
|
25
|
+
if (this._width === width) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
this._width = width;
|
|
29
|
+
this.domNode.style.width = this._width;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
public setHeight(_height: number | string): void {
|
|
33
|
+
const height = numberAsPixels(_height);
|
|
34
|
+
if (this._height === height) {
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
this._height = height;
|
|
38
|
+
this.domNode.style.height = this._height;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
public setTop(_top: number | string): void {
|
|
42
|
+
const top = numberAsPixels(_top);
|
|
43
|
+
if (this._top === top) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
this._top = top;
|
|
47
|
+
this.domNode.style.top = this._top;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
public setLeft(_left: number | string): void {
|
|
51
|
+
const left = numberAsPixels(_left);
|
|
52
|
+
if (this._left === left) {
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
this._left = left;
|
|
56
|
+
this.domNode.style.left = this._left;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
public setBottom(_bottom: number | string): void {
|
|
60
|
+
const bottom = numberAsPixels(_bottom);
|
|
61
|
+
if (this._bottom === bottom) {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
this._bottom = bottom;
|
|
65
|
+
this.domNode.style.bottom = this._bottom;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
public setRight(_right: number | string): void {
|
|
69
|
+
const right = numberAsPixels(_right);
|
|
70
|
+
if (this._right === right) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
this._right = right;
|
|
74
|
+
this.domNode.style.right = this._right;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
public setClassName(className: string): void {
|
|
78
|
+
if (this._className === className) {
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
this._className = className;
|
|
82
|
+
this.domNode.className = this._className;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
public toggleClassName(className: string, shouldHaveIt?: boolean): void {
|
|
86
|
+
this.domNode.classList.toggle(className, shouldHaveIt);
|
|
87
|
+
this._className = this.domNode.className;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
public setPosition(position: string): void {
|
|
91
|
+
if (this._position === position) {
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
this._position = position;
|
|
95
|
+
this.domNode.style.position = this._position;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
public setLayerHinting(layerHint: boolean): void {
|
|
99
|
+
if (this._layerHint === layerHint) {
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
this._layerHint = layerHint;
|
|
103
|
+
if (layerHint) {
|
|
104
|
+
this.domNode.style.transform = 'translate3d(0px, 0px, 0px)';
|
|
105
|
+
} else {
|
|
106
|
+
this.domNode.style.transform = '';
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
public setContain(contain: 'none' | 'strict' | 'content' | 'size' | 'layout' | 'style' | 'paint'): void {
|
|
111
|
+
if (this._contain === contain) {
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
this._contain = contain;
|
|
115
|
+
this.domNode.style.contain = this._contain;
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
public setAttribute(name: string, value: string): void {
|
|
119
|
+
this.domNode.setAttribute(name, value);
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
function numberAsPixels(value: number | string): string {
|
|
125
|
+
return (typeof value === 'number' ? `${value}px` : value);
|
|
126
|
+
}
|
|
@@ -0,0 +1,90 @@
|
|
|
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 { DisposableStore, IDisposable, toDisposable } from 'common/Lifecycle';
|
|
8
|
+
|
|
9
|
+
type PointerMoveCallback = (event: PointerEvent) => void;
|
|
10
|
+
type OnStopCallback = () => void;
|
|
11
|
+
|
|
12
|
+
export class GlobalPointerMoveMonitor implements IDisposable {
|
|
13
|
+
|
|
14
|
+
private readonly _hooks = new DisposableStore();
|
|
15
|
+
private _pointerMoveCallback: PointerMoveCallback | null = null;
|
|
16
|
+
private _onStopCallback: OnStopCallback | null = null;
|
|
17
|
+
|
|
18
|
+
public dispose(): void {
|
|
19
|
+
this.stopMonitoring(false);
|
|
20
|
+
this._hooks.dispose();
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
public stopMonitoring(invokeStopCallback: boolean): void {
|
|
24
|
+
if (!this.isMonitoring()) {
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
this._hooks.clear();
|
|
29
|
+
this._pointerMoveCallback = null;
|
|
30
|
+
const onStopCallback = this._onStopCallback;
|
|
31
|
+
this._onStopCallback = null;
|
|
32
|
+
|
|
33
|
+
if (invokeStopCallback && onStopCallback) {
|
|
34
|
+
onStopCallback();
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
public isMonitoring(): boolean {
|
|
39
|
+
return !!this._pointerMoveCallback;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
public startMonitoring(
|
|
43
|
+
initialElement: Element,
|
|
44
|
+
pointerId: number,
|
|
45
|
+
initialButtons: number,
|
|
46
|
+
pointerMoveCallback: PointerMoveCallback,
|
|
47
|
+
onStopCallback: OnStopCallback
|
|
48
|
+
): void {
|
|
49
|
+
if (this.isMonitoring()) {
|
|
50
|
+
this.stopMonitoring(false);
|
|
51
|
+
}
|
|
52
|
+
this._pointerMoveCallback = pointerMoveCallback;
|
|
53
|
+
this._onStopCallback = onStopCallback;
|
|
54
|
+
|
|
55
|
+
let eventSource: Element | Window = initialElement;
|
|
56
|
+
|
|
57
|
+
try {
|
|
58
|
+
initialElement.setPointerCapture(pointerId);
|
|
59
|
+
this._hooks.add(toDisposable(() => {
|
|
60
|
+
try {
|
|
61
|
+
initialElement.releasePointerCapture(pointerId);
|
|
62
|
+
} catch {
|
|
63
|
+
// ignore
|
|
64
|
+
}
|
|
65
|
+
}));
|
|
66
|
+
} catch {
|
|
67
|
+
eventSource = dom.getWindow(initialElement);
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
this._hooks.add(dom.addDisposableListener(
|
|
71
|
+
eventSource,
|
|
72
|
+
dom.eventType.POINTER_MOVE,
|
|
73
|
+
(e) => {
|
|
74
|
+
if (e.buttons !== initialButtons) {
|
|
75
|
+
this.stopMonitoring(true);
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
e.preventDefault();
|
|
80
|
+
this._pointerMoveCallback!(e);
|
|
81
|
+
}
|
|
82
|
+
));
|
|
83
|
+
|
|
84
|
+
this._hooks.add(dom.addDisposableListener(
|
|
85
|
+
eventSource,
|
|
86
|
+
dom.eventType.POINTER_UP,
|
|
87
|
+
(e: PointerEvent) => this.stopMonitoring(true)
|
|
88
|
+
));
|
|
89
|
+
}
|
|
90
|
+
}
|
|
@@ -0,0 +1,85 @@
|
|
|
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 { AbstractScrollbar, ISimplifiedPointerEvent, IScrollbarHost } from './abstractScrollbar';
|
|
7
|
+
import { IScrollableElementResolvedOptions } from './scrollableElementOptions';
|
|
8
|
+
import { ScrollbarState } from './scrollbarState';
|
|
9
|
+
import { INewScrollPosition, Scrollable, ScrollbarVisibility, IScrollEvent } from './scrollable';
|
|
10
|
+
|
|
11
|
+
export class HorizontalScrollbar extends AbstractScrollbar {
|
|
12
|
+
|
|
13
|
+
constructor(scrollable: Scrollable, options: IScrollableElementResolvedOptions, host: IScrollbarHost) {
|
|
14
|
+
const scrollDimensions = scrollable.getScrollDimensions();
|
|
15
|
+
const scrollPosition = scrollable.getCurrentScrollPosition();
|
|
16
|
+
super({
|
|
17
|
+
lazyRender: options.lazyRender,
|
|
18
|
+
host: host,
|
|
19
|
+
scrollbarState: new ScrollbarState(
|
|
20
|
+
(options.horizontalHasArrows ? options.horizontalScrollbarSize : 0),
|
|
21
|
+
(options.horizontal === ScrollbarVisibility.HIDDEN ? 0 : options.horizontalScrollbarSize),
|
|
22
|
+
(options.vertical === ScrollbarVisibility.HIDDEN ? 0 : options.verticalScrollbarSize),
|
|
23
|
+
scrollDimensions.width,
|
|
24
|
+
scrollDimensions.scrollWidth,
|
|
25
|
+
scrollPosition.scrollLeft
|
|
26
|
+
),
|
|
27
|
+
visibility: options.horizontal,
|
|
28
|
+
extraScrollbarClassName: 'xterm-horizontal',
|
|
29
|
+
scrollable: scrollable,
|
|
30
|
+
scrollByPage: options.scrollByPage
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
if (options.horizontalHasArrows) {
|
|
34
|
+
throw new Error('horizontalHasArrows is not supported in xterm.js');
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
this._createSlider(Math.floor((options.horizontalScrollbarSize - options.horizontalSliderSize) / 2), 0, undefined, options.horizontalSliderSize);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
protected _updateSlider(sliderSize: number, sliderPosition: number): void {
|
|
41
|
+
this.slider.setWidth(sliderSize);
|
|
42
|
+
this.slider.setLeft(sliderPosition);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
protected _renderDomNode(largeSize: number, smallSize: number): void {
|
|
46
|
+
this.domNode.setWidth(largeSize);
|
|
47
|
+
this.domNode.setHeight(smallSize);
|
|
48
|
+
this.domNode.setLeft(0);
|
|
49
|
+
this.domNode.setBottom(0);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
public handleScroll(e: IScrollEvent): boolean {
|
|
53
|
+
this._shouldRender = this._handleElementScrollSize(e.scrollWidth) || this._shouldRender;
|
|
54
|
+
this._shouldRender = this._handleElementScrollPosition(e.scrollLeft) || this._shouldRender;
|
|
55
|
+
this._shouldRender = this._handleElementSize(e.width) || this._shouldRender;
|
|
56
|
+
return this._shouldRender;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
protected _pointerDownRelativePosition(offsetX: number, offsetY: number): number {
|
|
60
|
+
return offsetX;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
protected _sliderPointerPosition(e: ISimplifiedPointerEvent): number {
|
|
64
|
+
return e.pageX;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
protected _sliderOrthogonalPointerPosition(e: ISimplifiedPointerEvent): number {
|
|
68
|
+
return e.pageY;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
protected _updateScrollbarSize(size: number): void {
|
|
72
|
+
this.slider.setHeight(size);
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
public writeScrollPosition(target: INewScrollPosition, scrollPosition: number): void {
|
|
76
|
+
target.scrollLeft = scrollPosition;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
public updateOptions(options: IScrollableElementResolvedOptions): void {
|
|
80
|
+
this.updateScrollbarSize(options.horizontal === ScrollbarVisibility.HIDDEN ? 0 : options.horizontalScrollbarSize);
|
|
81
|
+
this._scrollbarState.setOppositeScrollbarSize(options.vertical === ScrollbarVisibility.HIDDEN ? 0 : options.verticalScrollbarSize);
|
|
82
|
+
this._visibilityController.setVisibility(options.horizontal);
|
|
83
|
+
this._scrollByPage = options.scrollByPage;
|
|
84
|
+
}
|
|
85
|
+
}
|