waveterm/xterm.js
0
0
Fork 0
mirror of https://github.com/wavetermdev/xterm.js.git synced 2026-08-05 13:43:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

borrow emitter ctor from xterm

Browse Source
This commit is contained in:
Jörg Breitbart
2025-01-07 21:22:40 +01:00
parent f516346e09
commit 6a232765f4
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/addon-progress/src/ProgressAddon.ts
+17 -9
View File
@@ -3,10 +3,9 @@
* @license MIT
*/
import type { Terminal, ITerminalAddon } from '@xterm/xterm';
import type { Terminal, ITerminalAddon, IDisposable } from '@xterm/xterm';
import type { ProgressAddon as IProgressApi, IProgress } from '@xterm/addon-progress';
import { Emitter } from 'vs/base/common/event';
import { Disposable } from 'vs/base/common/lifecycle';
import type { Emitter, Event } from 'vs/base/common/event';
export const enum ProgressState {
@@ -34,14 +33,20 @@ function toInt(s: string): number {
}
export class ProgressAddon extends Disposable implements ITerminalAddon, IProgressApi {
export class ProgressAddon implements ITerminalAddon, IProgressApi {
private _seqHandler: IDisposable | undefined;
private _st: ProgressState = ProgressState.REMOVE;
private _pr = 0;
private readonly _onChange = this._register(new Emitter<IProgress>());
public readonly onChange = this._onChange.event;
private _onChange: Emitter<IProgress> | undefined;
public onChange: Event<IProgress> | undefined;
public dispose(): void {
this._seqHandler?.dispose();
this._onChange?.dispose();
}
public activate(terminal: Terminal): void {
this._register(terminal.parser.registerOscHandler(9, data => {
this._seqHandler = terminal.parser.registerOscHandler(9, data => {
if (!data.startsWith('4;')) {
return false;
}
@@ -74,7 +79,10 @@ export class ProgressAddon extends Disposable implements ITerminalAddon, IProgre
break;
}
return true;
}));
});
// FIXME: borrow emitter ctor from xterm, to be changed once #5283 is resolved
this._onChange = new (terminal as any)._core._onData.constructor();
this.onChange = this._onChange!.event;
}
public get progress(): IProgress {
@@ -88,6 +96,6 @@ export class ProgressAddon extends Disposable implements ITerminalAddon, IProgre
}
this._st = progress.state;
this._pr = Math.min(Math.max(progress.value, 0), 100);
this._onChange.fire({ state: this._st, value: this._pr });
this._onChange?.fire({ state: this._st, value: this._pr });
}
}
addons/addon-progress/typings/addon-progress.d.ts
Vendored
+4 -3
View File
@@ -3,17 +3,18 @@
* @license MIT
*/
import { Terminal, ITerminalAddon, IDisposable, IEvent } from '@xterm/xterm';
import { Terminal, ITerminalAddon, IDisposable } from '@xterm/xterm';
import type { Event } from 'vs/base/common/event';
import type { ProgressState } from '../src/ProgressAddon';
declare module '@xterm/addon-progress' {
/** xterm.js addon providing an interface for ConEmu's progress sequence */
export class ProgressAddon implements ITerminalAddon {
export class ProgressAddon implements ITerminalAddon, IDisposable {
constructor();
public activate(terminal: Terminal): void;
public dispose(): void;
public readonly onChange: IEvent<IProgress>;
public readonly onChange: Event<IProgress> | undefined;
/** getter / setter for current progress */
public progress: IProgress;