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

Handle remaining CSI_PARAM cases and introduce the state

Browse Source
This commit is contained in:
Daniel Imms
2017-01-09 16:07:27 -08:00
parent 7572dd5fa6
commit c7fa2d55b4
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Parser.ts
+18 -17
View File
@@ -32,7 +32,7 @@ csiParamStateHandler['$'] = (parser) => parser.setPostfix('$');
csiParamStateHandler['"'] = (parser) => parser.setPostfix('"');
csiParamStateHandler[' '] = (parser) => parser.setPostfix(' ');
csiParamStateHandler['\''] = (parser) => parser.setPostfix('\'');
// TODO: Handle ';' and default (move on to ParserState.CSI (from CSI_PARAM)
csiParamStateHandler[';'] = (parser) => parser.finalizeParam();
const csiStateHandler: {[key: string]: (handler: IInputHandler, params: number[]) => void} = {};
csiStateHandler['A'] = (handler, params) => handler.cursorUp(params);
@@ -43,11 +43,12 @@ csiStateHandler['D'] = (handler, params) => handler.cursorBackward(params);
enum ParserState {
NORMAL = 0,
ESCAPED = 1,
CSI = 2,
OSC = 3,
CHARSET = 4,
DCS = 5,
IGNORE = 6
CSI_PARAM = 2,
CSI = 3,
OSC = 4,
CHARSET = 5,
DCS = 6,
IGNORE = 7
}
export class Parser {
@@ -194,7 +195,7 @@ export class Parser {
case '[':
this._terminal.params = [];
this._terminal.currentParam = 0;
this.state = ParserState.CSI;
this.state = ParserState.CSI_PARAM;
break;
// ESC ] Operating System Command ( OSC is 0x9d).
@@ -513,21 +514,16 @@ export class Parser {
}
break;
case ParserState.CSI:
case ParserState.CSI_PARAM:
if (ch in csiParamStateHandler) {
csiParamStateHandler[ch](this);
// Skip below switch as this has handled these codes (eventually everything will be handled here
break;
}
this.finalizeParam();
// Fall through the CSI as this character should be the CSI code.
this.state = ParserState.CSI;
// TODO: a new state should be introduced? to differentiate checking for params and the codes
this._terminal.params.push(this._terminal.currentParam);
this._terminal.currentParam = 0;
// ';'
if (ch === ';') break;
case ParserState.CSI:
this.state = ParserState.NORMAL;
if (ch in csiStateHandler) {
@@ -1048,6 +1044,11 @@ export class Parser {
return this._terminal.currentParam;
}
public finalizeParam(): void {
this._terminal.params.push(this._terminal.currentParam);
this._terminal.currentParam = 0;
}
public setPostfix(postfix: string): void {
this._terminal.postfix = postfix;
}