eiac/xterm.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

New method _linkHandler used by both addCsiHandler and addOscHandler.

Browse Source
This commit is contained in:
Per Bothner
2018-12-15 09:42:19 -08:00
parent 5af4626ec7
commit 8a5a03238f
1 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/EscapeSequenceParser.ts
+27 -33
View File
@@ -7,6 +7,10 @@ import { ParserState, ParserAction, IParsingState, IDcsHandler, IEscapeSequenceP
import { IDisposable } from 'xterm'; import { IDisposable } from 'xterm';
import { Disposable } from './common/Lifecycle'; import { Disposable } from './common/Lifecycle';
interface IHandlerLink extends IDisposable {
nextHandler: IHandlerLink | null;
}
/** /**
* Returns an array filled with numbers between the low and high parameters (right exclusive). * Returns an array filled with numbers between the low and high parameters (right exclusive).
* @param low The low number. * @param low The low number.
@@ -304,33 +308,38 @@ export class EscapeSequenceParser extends Disposable implements IEscapeSequenceP
this._executeHandlerFb = callback; this._executeHandlerFb = callback;
} }
addCsiHandler(flag: string, callback: (params: number[], collect: string) => boolean): IDisposable { private _linkHandler(handlers: object[], index: number, newCallback: object): IDisposable {
const index = flag.charCodeAt(0); const newHead: any = newCallback;
const oldHead = this._csiHandlers[index]; newHead.nextHandler = handlers[index] as IHandlerLink;
const parser = this;
const newHead =
(params: number[], collect: string): void => {
if (! callback(params, collect)) {
if (newHead.nextHandler) { newHead.nextHandler(params, collect); }
else { this._csiHandlerFb(collect, params, index); }
}
};
newHead.nextHandler = oldHead;
newHead.dispose = function (): void { newHead.dispose = function (): void {
let previous = null; let cur = parser._csiHandlers[index]; let previous = null;
let cur = handlers[index] as IHandlerLink;
for (; cur && cur.nextHandler; for (; cur && cur.nextHandler;
previous = cur, cur = cur.nextHandler) { previous = cur, cur = cur.nextHandler) {
if (cur === newHead) { if (cur === newHead) {
if (previous) { previous.nextHandler = cur.nextHandler; } if (previous) { previous.nextHandler = cur.nextHandler; }
else { parser._csiHandlers[index] = cur.nextHandler; } else { handlers[index] = cur.nextHandler; }
break; break;
} }
} }
}; };
this._csiHandlers[index] = newHead; handlers[index] = newHead;
return newHead; return newHead;
} }
addCsiHandler(flag: string, callback: (params: number[], collect: string) => boolean): IDisposable {
const index = flag.charCodeAt(0);
const newHead =
(params: number[], collect: string): void => {
if (! callback(params, collect)) {
const next = (newHead as unknown as IHandlerLink).nextHandler;
if (next) { (next as any)(params, collect); }
else { this._csiHandlerFb(collect, params, index); }
}
};
return this._linkHandler(this._csiHandlers, index, newHead);
}
setCsiHandler(flag: string, callback: (params: number[], collect: string) => void): void { setCsiHandler(flag: string, callback: (params: number[], collect: string) => void): void {
this._csiHandlers[flag.charCodeAt(0)] = callback; this._csiHandlers[flag.charCodeAt(0)] = callback;
} }
@@ -352,30 +361,15 @@ export class EscapeSequenceParser extends Disposable implements IEscapeSequenceP
} }
addOscHandler(ident: number, callback: (data: string) => boolean): IDisposable { addOscHandler(ident: number, callback: (data: string) => boolean): IDisposable {
const oldHead = this._oscHandlers[ident];
const parser = this;
const newHead = const newHead =
(data: string): void => { (data: string): void => {
if (! callback(data)) { if (! callback(data)) {
if (newHead.nextHandler) { newHead.nextHandler(data); } const next = (newHead as unknown as IHandlerLink).nextHandler;
if (next) { (next as any)(data); }
else { this._oscHandlerFb(ident, data); } else { this._oscHandlerFb(ident, data); }
} }
}; };
newHead.nextHandler = oldHead; return this._linkHandler(this._oscHandlers, ident, newHead);
newHead.dispose =
function (): void {
let previous = null; let cur = parser._oscHandlers[ident];
for (; cur && cur.nextHandler;
previous = cur, cur = cur.nextHandler) {
if (cur === newHead) {
if (previous) { previous.nextHandler = cur.nextHandler; }
else { parser._oscHandlers[ident] = cur.nextHandler; }
break;
}
}
};
this._oscHandlers[ident] = newHead;
return newHead;
} }
setOscHandler(ident: number, callback: (data: string) => void): void { setOscHandler(ident: number, callback: (data: string) => void): void {
this._oscHandlers[ident] = callback; this._oscHandlers[ident] = callback;