char = this._terminal.charset[char];
}
- let row = this._terminal.y + this._terminal.ybase;
+ let row = this._terminal.buffer.y + this._terminal.buffer.ybase;
// insert combining char in last cell
// FIXME: needs handling after cursor jumps
- if (!ch_width && this._terminal.x) {
+ if (!ch_width && this._terminal.buffer.x) {
// dont overflow left
- if (this._terminal.lines.get(row)[this._terminal.x - 1]) {
- if (!this._terminal.lines.get(row)[this._terminal.x - 1][2]) {
+ if (this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 1]) {
+ if (!this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 1][2]) {
// found empty cell after fullwidth, need to go 2 cells back
- if (this._terminal.lines.get(row)[this._terminal.x - 2])
- this._terminal.lines.get(row)[this._terminal.x - 2][1] += char;
+ if (this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 2])
+ this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 2][1] += char;
} else {
- this._terminal.lines.get(row)[this._terminal.x - 1][1] += char;
+ this._terminal.buffer.lines.get(row)[this._terminal.buffer.x - 1][1] += char;
}
- this._terminal.updateRange(this._terminal.y);
+ this._terminal.updateRange(this._terminal.buffer.y);
}
return;
}
// goto next line if ch would overflow
// TODO: needs a global min terminal width of 2
- if (this._terminal.x + ch_width - 1 >= this._terminal.cols) {
+ if (this._terminal.buffer.x + ch_width - 1 >= this._terminal.cols) {
// autowrap - DECAWM
if (this._terminal.wraparoundMode) {
- this._terminal.x = 0;
- this._terminal.y++;
- if (this._terminal.y > this._terminal.scrollBottom) {
- this._terminal.y--;
- this._terminal.scroll();
+ this._terminal.buffer.x = 0;
+ this._terminal.buffer.y++;
+ if (this._terminal.buffer.y > this._terminal.buffer.scrollBottom) {
+ this._terminal.buffer.y--;
+ this._terminal.scroll(true);
+ } else {
+ // The line already exists (eg. the initial viewport), mark it as a
+ // wrapped line
+ this._terminal.buffer.lines.get(this._terminal.buffer.y).isWrapped = true;
}
} else {
if (ch_width === 2) // FIXME: check for xterm behavior
return;
}
}
- row = this._terminal.y + this._terminal.ybase;
+ row = this._terminal.buffer.y + this._terminal.buffer.ybase;
// insert mode: move characters to right
if (this._terminal.insertMode) {
for (let moves = 0; moves < ch_width; ++moves) {
// remove last cell, if it's width is 0
// we have to adjust the second last cell as well
- const removed = this._terminal.lines.get(this._terminal.y + this._terminal.ybase).pop();
+ const removed = this._terminal.buffer.lines.get(this._terminal.buffer.y + this._terminal.buffer.ybase).pop();
if (removed[2] === 0
- && this._terminal.lines.get(row)[this._terminal.cols - 2]
- && this._terminal.lines.get(row)[this._terminal.cols - 2][2] === 2) {
- this._terminal.lines.get(row)[this._terminal.cols - 2] = [this._terminal.curAttr, ' ', 1];
+ && this._terminal.buffer.lines.get(row)[this._terminal.cols - 2]
+ && this._terminal.buffer.lines.get(row)[this._terminal.cols - 2][2] === 2) {
+ this._terminal.buffer.lines.get(row)[this._terminal.cols - 2] = [this._terminal.curAttr, ' ', 1];
}
// insert empty cell at cursor
- this._terminal.lines.get(row).splice(this._terminal.x, 0, [this._terminal.curAttr, ' ', 1]);
+ this._terminal.buffer.lines.get(row).splice(this._terminal.buffer.x, 0, [this._terminal.curAttr, ' ', 1]);
}
}
- this._terminal.lines.get(row)[this._terminal.x] = [this._terminal.curAttr, char, ch_width];
- this._terminal.x++;
- this._terminal.updateRange(this._terminal.y);
+ this._terminal.buffer.lines.get(row)[this._terminal.buffer.x] = [this._terminal.curAttr, char, ch_width];
+ this._terminal.buffer.x++;
+ this._terminal.updateRange(this._terminal.buffer.y);
// fullwidth char - set next cell width to zero and advance cursor
if (ch_width === 2) {
- this._terminal.lines.get(row)[this._terminal.x] = [this._terminal.curAttr, '', 0];
- this._terminal.x++;
+ this._terminal.buffer.lines.get(row)[this._terminal.buffer.x] = [this._terminal.curAttr, '', 0];
+ this._terminal.buffer.x++;
}
}
}
*/
public lineFeed(): void {
if (this._terminal.convertEol) {
- this._terminal.x = 0;
+ this._terminal.buffer.x = 0;
}
- this._terminal.y++;
- if (this._terminal.y > this._terminal.scrollBottom) {
- this._terminal.y--;
+ this._terminal.buffer.y++;
+ if (this._terminal.buffer.y > this._terminal.buffer.scrollBottom) {
+ this._terminal.buffer.y--;
this._terminal.scroll();
}
// If the end of the line is hit, prevent this action from wrapping around to the next line.
- if (this._terminal.x >= this._terminal.cols) {
- this._terminal.x--;
- }
+ if (this._terminal.buffer.x >= this._terminal.cols) {
+ this._terminal.buffer.x--;
+ }
+ /**
+ * This event is emitted whenever the terminal outputs a LF or NL.
+ *
+ * @event lineFeed
+ */
+ this._terminal.emit('lineFeed');
}
/**
* Carriage Return (Ctrl-M).
*/
public carriageReturn(): void {
- this._terminal.x = 0;
+ this._terminal.buffer.x = 0;
}
/**
* Backspace (Ctrl-H).
*/
public backspace(): void {
- if (this._terminal.x > 0) {
- this._terminal.x--;
+ if (this._terminal.buffer.x > 0) {
+ this._terminal.buffer.x--;
}
}
* Horizontal Tab (HT) (Ctrl-I).
*/
public tab(): void {
- this._terminal.x = this._terminal.nextStop();
+ this._terminal.buffer.x = this._terminal.nextStop();
}
/**
param = params[0];
if (param < 1) param = 1;
- row = this._terminal.y + this._terminal.ybase;
- j = this._terminal.x;
+ row = this._terminal.buffer.y + this._terminal.buffer.ybase;
+ j = this._terminal.buffer.x;
ch = [this._terminal.eraseAttr(), ' ', 1]; // xterm
while (param-- && j < this._terminal.cols) {
- this._terminal.lines.get(row).splice(j++, 0, ch);
- this._terminal.lines.get(row).pop();
+ this._terminal.buffer.lines.get(row).splice(j++, 0, ch);
+ this._terminal.buffer.lines.get(row).pop();
}
}
if (param < 1) {
param = 1;
}
- this._terminal.y -= param;
- if (this._terminal.y < 0) {
- this._terminal.y = 0;
+ this._terminal.buffer.y -= param;
+ if (this._terminal.buffer.y < 0) {
+ this._terminal.buffer.y = 0;
}
}
if (param < 1) {
param = 1;
}
- this._terminal.y += param;
- if (this._terminal.y >= this._terminal.rows) {
- this._terminal.y = this._terminal.rows - 1;
+ this._terminal.buffer.y += param;
+ if (this._terminal.buffer.y >= this._terminal.rows) {
+ this._terminal.buffer.y = this._terminal.rows - 1;
}
// If the end of the line is hit, prevent this action from wrapping around to the next line.
- if (this._terminal.x >= this._terminal.cols) {
- this._terminal.x--;
+ if (this._terminal.buffer.x >= this._terminal.cols) {
+ this._terminal.buffer.x--;
}
}
if (param < 1) {
param = 1;
}
- this._terminal.x += param;
- if (this._terminal.x >= this._terminal.cols) {
- this._terminal.x = this._terminal.cols - 1;
+ this._terminal.buffer.x += param;
+ if (this._terminal.buffer.x >= this._terminal.cols) {
+ this._terminal.buffer.x = this._terminal.cols - 1;
}
}
param = 1;
}
// If the end of the line is hit, prevent this action from wrapping around to the next line.
- if (this._terminal.x >= this._terminal.cols) {
- this._terminal.x--;
+ if (this._terminal.buffer.x >= this._terminal.cols) {
+ this._terminal.buffer.x--;
}
- this._terminal.x -= param;
- if (this._terminal.x < 0) {
- this._terminal.x = 0;
+ this._terminal.buffer.x -= param;
+ if (this._terminal.buffer.x < 0) {
+ this._terminal.buffer.x = 0;
}
}
if (param < 1) {
param = 1;
}
- this._terminal.y += param;
- if (this._terminal.y >= this._terminal.rows) {
- this._terminal.y = this._terminal.rows - 1;
+ this._terminal.buffer.y += param;
+ if (this._terminal.buffer.y >= this._terminal.rows) {
+ this._terminal.buffer.y = this._terminal.rows - 1;
}
- this._terminal.x = 0;
- };
+ this._terminal.buffer.x = 0;
+ }
/**
if (param < 1) {
param = 1;
}
- this._terminal.y -= param;
- if (this._terminal.y < 0) {
- this._terminal.y = 0;
+ this._terminal.buffer.y -= param;
+ if (this._terminal.buffer.y < 0) {
+ this._terminal.buffer.y = 0;
}
- this._terminal.x = 0;
- };
+ this._terminal.buffer.x = 0;
+ }
/**
if (param < 1) {
param = 1;
}
- this._terminal.x = param - 1;
+ this._terminal.buffer.x = param - 1;
}
/**
col = this._terminal.cols - 1;
}
- this._terminal.x = col;
- this._terminal.y = row;
+ this._terminal.buffer.x = col;
+ this._terminal.buffer.y = row;
}
/**
public cursorForwardTab(params: number[]): void {
let param = params[0] || 1;
while (param--) {
- this._terminal.x = this._terminal.nextStop();
+ this._terminal.buffer.x = this._terminal.nextStop();
}
}
let j;
switch (params[0]) {
case 0:
- this._terminal.eraseRight(this._terminal.x, this._terminal.y);
- j = this._terminal.y + 1;
+ this._terminal.eraseRight(this._terminal.buffer.x, this._terminal.buffer.y);
+ j = this._terminal.buffer.y + 1;
for (; j < this._terminal.rows; j++) {
this._terminal.eraseLine(j);
}
break;
case 1:
- this._terminal.eraseLeft(this._terminal.x, this._terminal.y);
- j = this._terminal.y;
+ this._terminal.eraseLeft(this._terminal.buffer.x, this._terminal.buffer.y);
+ j = this._terminal.buffer.y;
while (j--) {
this._terminal.eraseLine(j);
}
break;
case 3:
// Clear scrollback (everything not in viewport)
- const scrollBackSize = this._terminal.lines.length - this._terminal.rows;
+ const scrollBackSize = this._terminal.buffer.lines.length - this._terminal.rows;
if (scrollBackSize > 0) {
- this._terminal.lines.trimStart(scrollBackSize);
- this._terminal.ybase = Math.max(this._terminal.ybase - scrollBackSize, 0);
- this._terminal.ydisp = Math.max(this._terminal.ydisp - scrollBackSize, 0);
+ this._terminal.buffer.lines.trimStart(scrollBackSize);
+ this._terminal.buffer.ybase = Math.max(this._terminal.buffer.ybase - scrollBackSize, 0);
+ this._terminal.buffer.ydisp = Math.max(this._terminal.buffer.ydisp - scrollBackSize, 0);
+ // Force a scroll event to refresh viewport
+ this._terminal.emit('scroll', 0);
}
break;
}
public eraseInLine(params: number[]): void {
switch (params[0]) {
case 0:
- this._terminal.eraseRight(this._terminal.x, this._terminal.y);
+ this._terminal.eraseRight(this._terminal.buffer.x, this._terminal.buffer.y);
break;
case 1:
- this._terminal.eraseLeft(this._terminal.x, this._terminal.y);
+ this._terminal.eraseLeft(this._terminal.buffer.x, this._terminal.buffer.y);
break;
case 2:
- this._terminal.eraseLine(this._terminal.y);
+ this._terminal.eraseLine(this._terminal.buffer.y);
break;
}
}
if (param < 1) {
param = 1;
}
- row = this._terminal.y + this._terminal.ybase;
+ row = this._terminal.buffer.y + this._terminal.buffer.ybase;
- j = this._terminal.rows - 1 - this._terminal.scrollBottom;
- j = this._terminal.rows - 1 + this._terminal.ybase - j + 1;
+ j = this._terminal.rows - 1 - this._terminal.buffer.scrollBottom;
+ j = this._terminal.rows - 1 + this._terminal.buffer.ybase - j + 1;
while (param--) {
- if (this._terminal.lines.length === this._terminal.lines.maxLength) {
+ if (this._terminal.buffer.lines.length === this._terminal.buffer.lines.maxLength) {
// Trim the start of lines to make room for the new line
- this._terminal.lines.trimStart(1);
- this._terminal.ybase--;
- this._terminal.ydisp--;
+ this._terminal.buffer.lines.trimStart(1);
+ this._terminal.buffer.ybase--;
+ this._terminal.buffer.ydisp--;
row--;
j--;
}
// test: echo -e '\e[44m\e[1L\e[0m'
// blankLine(true) - xterm/linux behavior
- this._terminal.lines.splice(row, 0, this._terminal.blankLine(true));
- this._terminal.lines.splice(j, 1);
+ this._terminal.buffer.lines.splice(row, 0, this._terminal.blankLine(true));
+ this._terminal.buffer.lines.splice(j, 1);
}
// this.maxRange();
- this._terminal.updateRange(this._terminal.y);
- this._terminal.updateRange(this._terminal.scrollBottom);
+ this._terminal.updateRange(this._terminal.buffer.y);
+ this._terminal.updateRange(this._terminal.buffer.scrollBottom);
}
/**
if (param < 1) {
param = 1;
}
- row = this._terminal.y + this._terminal.ybase;
+ row = this._terminal.buffer.y + this._terminal.buffer.ybase;
- j = this._terminal.rows - 1 - this._terminal.scrollBottom;
- j = this._terminal.rows - 1 + this._terminal.ybase - j;
+ j = this._terminal.rows - 1 - this._terminal.buffer.scrollBottom;
+ j = this._terminal.rows - 1 + this._terminal.buffer.ybase - j;
while (param--) {
- if (this._terminal.lines.length === this._terminal.lines.maxLength) {
+ if (this._terminal.buffer.lines.length === this._terminal.buffer.lines.maxLength) {
// Trim the start of lines to make room for the new line
- this._terminal.lines.trimStart(1);
- this._terminal.ybase -= 1;
- this._terminal.ydisp -= 1;
+ this._terminal.buffer.lines.trimStart(1);
+ this._terminal.buffer.ybase -= 1;
+ this._terminal.buffer.ydisp -= 1;
}
// test: echo -e '\e[44m\e[1M\e[0m'
// blankLine(true) - xterm/linux behavior
- this._terminal.lines.splice(j + 1, 0, this._terminal.blankLine(true));
- this._terminal.lines.splice(row, 1);
+ this._terminal.buffer.lines.splice(j + 1, 0, this._terminal.blankLine(true));
+ this._terminal.buffer.lines.splice(row, 1);
}
// this.maxRange();
- this._terminal.updateRange(this._terminal.y);
- this._terminal.updateRange(this._terminal.scrollBottom);
+ this._terminal.updateRange(this._terminal.buffer.y);
+ this._terminal.updateRange(this._terminal.buffer.scrollBottom);
}
/**
param = 1;
}
- row = this._terminal.y + this._terminal.ybase;
+ row = this._terminal.buffer.y + this._terminal.buffer.ybase;
ch = [this._terminal.eraseAttr(), ' ', 1]; // xterm
while (param--) {
- this._terminal.lines.get(row).splice(this._terminal.x, 1);
- this._terminal.lines.get(row).push(ch);
+ this._terminal.buffer.lines.get(row).splice(this._terminal.buffer.x, 1);
+ this._terminal.buffer.lines.get(row).push(ch);
}
}
public scrollUp(params: number[]): void {
let param = params[0] || 1;
while (param--) {
- this._terminal.lines.splice(this._terminal.ybase + this._terminal.scrollTop, 1);
- this._terminal.lines.splice(this._terminal.ybase + this._terminal.scrollBottom, 0, this._terminal.blankLine());
+ this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.buffer.scrollTop, 1);
+ this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.buffer.scrollBottom, 0, this._terminal.blankLine());
}
// this.maxRange();
- this._terminal.updateRange(this._terminal.scrollTop);
- this._terminal.updateRange(this._terminal.scrollBottom);
+ this._terminal.updateRange(this._terminal.buffer.scrollTop);
+ this._terminal.updateRange(this._terminal.buffer.scrollBottom);
}
/**
public scrollDown(params: number[]): void {
let param = params[0] || 1;
while (param--) {
- this._terminal.lines.splice(this._terminal.ybase + this._terminal.scrollBottom, 1);
- this._terminal.lines.splice(this._terminal.ybase + this._terminal.scrollTop, 0, this._terminal.blankLine());
+ this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.buffer.scrollBottom, 1);
+ this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.buffer.scrollTop, 0, this._terminal.blankLine());
}
// this.maxRange();
- this._terminal.updateRange(this._terminal.scrollTop);
- this._terminal.updateRange(this._terminal.scrollBottom);
+ this._terminal.updateRange(this._terminal.buffer.scrollTop);
+ this._terminal.updateRange(this._terminal.buffer.scrollBottom);
}
/**
param = 1;
}
- row = this._terminal.y + this._terminal.ybase;
- j = this._terminal.x;
+ row = this._terminal.buffer.y + this._terminal.buffer.ybase;
+ j = this._terminal.buffer.x;
ch = [this._terminal.eraseAttr(), ' ', 1]; // xterm
while (param-- && j < this._terminal.cols) {
- this._terminal.lines.get(row)[j++] = ch;
+ this._terminal.buffer.lines.get(row)[j++] = ch;
}
}
public cursorBackwardTab(params: number[]): void {
let param = params[0] || 1;
while (param--) {
- this._terminal.x = this._terminal.prevStop();
+ this._terminal.buffer.x = this._terminal.prevStop();
}
}
if (param < 1) {
param = 1;
}
- this._terminal.x = param - 1;
- if (this._terminal.x >= this._terminal.cols) {
- this._terminal.x = this._terminal.cols - 1;
+ this._terminal.buffer.x = param - 1;
+ if (this._terminal.buffer.x >= this._terminal.cols) {
+ this._terminal.buffer.x = this._terminal.cols - 1;
}
}
if (param < 1) {
param = 1;
}
- this._terminal.x += param;
- if (this._terminal.x >= this._terminal.cols) {
- this._terminal.x = this._terminal.cols - 1;
+ this._terminal.buffer.x += param;
+ if (this._terminal.buffer.x >= this._terminal.cols) {
+ this._terminal.buffer.x = this._terminal.cols - 1;
}
}
*/
public repeatPrecedingCharacter(params: number[]): void {
let param = params[0] || 1
- , line = this._terminal.lines.get(this._terminal.ybase + this._terminal.y)
- , ch = line[this._terminal.x - 1] || [this._terminal.defAttr, ' ', 1];
+ , line = this._terminal.buffer.lines.get(this._terminal.buffer.ybase + this._terminal.buffer.y)
+ , ch = line[this._terminal.buffer.x - 1] || [this._terminal.defAttr, ' ', 1];
while (param--) {
- line[this._terminal.x++] = ch;
+ line[this._terminal.buffer.x++] = ch;
}
}
if (param < 1) {
param = 1;
}
- this._terminal.y = param - 1;
- if (this._terminal.y >= this._terminal.rows) {
- this._terminal.y = this._terminal.rows - 1;
+ this._terminal.buffer.y = param - 1;
+ if (this._terminal.buffer.y >= this._terminal.rows) {
+ this._terminal.buffer.y = this._terminal.rows - 1;
}
}
if (param < 1) {
param = 1;
}
- this._terminal.y += param;
- if (this._terminal.y >= this._terminal.rows) {
- this._terminal.y = this._terminal.rows - 1;
+ this._terminal.buffer.y += param;
+ if (this._terminal.buffer.y >= this._terminal.rows) {
+ this._terminal.buffer.y = this._terminal.rows - 1;
}
// If the end of the line is hit, prevent this action from wrapping around to the next line.
- if (this._terminal.x >= this._terminal.cols) {
- this._terminal.x--;
+ if (this._terminal.buffer.x >= this._terminal.cols) {
+ this._terminal.buffer.x--;
}
}
if (params[0] < 1) params[0] = 1;
if (params[1] < 1) params[1] = 1;
- this._terminal.y = params[0] - 1;
- if (this._terminal.y >= this._terminal.rows) {
- this._terminal.y = this._terminal.rows - 1;
+ this._terminal.buffer.y = params[0] - 1;
+ if (this._terminal.buffer.y >= this._terminal.rows) {
+ this._terminal.buffer.y = this._terminal.rows - 1;
}
- this._terminal.x = params[1] - 1;
- if (this._terminal.x >= this._terminal.cols) {
- this._terminal.x = this._terminal.cols - 1;
+ this._terminal.buffer.x = params[1] - 1;
+ if (this._terminal.buffer.x >= this._terminal.cols) {
+ this._terminal.buffer.x = this._terminal.cols - 1;
}
}
public tabClear(params: number[]): void {
let param = params[0];
if (param <= 0) {
- delete this._terminal.tabs[this._terminal.x];
+ delete this._terminal.buffer.tabs[this._terminal.buffer.x];
} else if (param === 3) {
- this._terminal.tabs = {};
+ this._terminal.buffer.tabs = {};
}
}
this._terminal.cursorHidden = false;
break;
case 1049: // alt screen buffer cursor
- // this._terminal.saveCursor();
- ; // FALL-THROUGH
+ // TODO: Not sure if we need to save/restore after switching the buffer
+ // this.saveCursor(params);
+ // FALL-THROUGH
case 47: // alt screen buffer
case 1047: // alt screen buffer
- if (!this._terminal.normal) {
- let normal = {
- lines: this._terminal.lines,
- ybase: this._terminal.ybase,
- ydisp: this._terminal.ydisp,
- x: this._terminal.x,
- y: this._terminal.y,
- scrollTop: this._terminal.scrollTop,
- scrollBottom: this._terminal.scrollBottom,
- tabs: this._terminal.tabs
- // XXX save charset(s) here?
- // charset: this._terminal.charset,
- // glevel: this._terminal.glevel,
- // charsets: this._terminal.charsets
- };
- this._terminal.reset();
- this._terminal.viewport.syncScrollArea();
- this._terminal.normal = normal;
- this._terminal.showCursor();
- }
+ this._terminal.buffers.activateAltBuffer();
+ this._terminal.viewport.syncScrollArea();
+ this._terminal.showCursor();
break;
}
}
this._terminal.cursorHidden = true;
break;
case 1049: // alt screen buffer cursor
- ; // FALL-THROUGH
+ // FALL-THROUGH
case 47: // normal screen buffer
case 1047: // normal screen buffer - clearing it first
- if (this._terminal.normal) {
- this._terminal.lines = this._terminal.normal.lines;
- this._terminal.ybase = this._terminal.normal.ybase;
- this._terminal.ydisp = this._terminal.normal.ydisp;
- this._terminal.x = this._terminal.normal.x;
- this._terminal.y = this._terminal.normal.y;
- this._terminal.scrollTop = this._terminal.normal.scrollTop;
- this._terminal.scrollBottom = this._terminal.normal.scrollBottom;
- this._terminal.tabs = this._terminal.normal.tabs;
- this._terminal.normal = null;
- // Ensure the selection manager has the correct buffer
- this._terminal.selectionManager.setBuffer(this._terminal.lines);
- // if (params === 1049) {
- // this.x = this.savedX;
- // this.y = this.savedY;
- // }
- this._terminal.refresh(0, this._terminal.rows - 1);
- this._terminal.viewport.syncScrollArea();
- this._terminal.showCursor();
- }
+ // Ensure the selection manager has the correct buffer
+ this._terminal.buffers.activateNormalBuffer();
+ // TODO: Not sure if we need to save/restore after switching the buffer
+ // if (params[0] === 1049) {
+ // this.restoreCursor(params);
+ // }
+ this._terminal.selectionManager.setBuffer(this._terminal.buffer.lines);
+ this._terminal.refresh(0, this._terminal.rows - 1);
+ this._terminal.viewport.syncScrollArea();
+ this._terminal.showCursor();
break;
}
}
case 6:
// cursor position
this._terminal.send(C0.ESC + '['
- + (this._terminal.y + 1)
+ + (this._terminal.buffer.y + 1)
+ ';'
- + (this._terminal.x + 1)
+ + (this._terminal.buffer.x + 1)
+ 'R');
break;
}
case 6:
// cursor position
this._terminal.send(C0.ESC + '[?'
- + (this._terminal.y + 1)
+ + (this._terminal.buffer.y + 1)
+ ';'
- + (this._terminal.x + 1)
+ + (this._terminal.buffer.x + 1)
+ 'R');
break;
case 15:
this._terminal.applicationKeypad = false; // ?
this._terminal.viewport.syncScrollArea();
this._terminal.applicationCursor = false;
- this._terminal.scrollTop = 0;
- this._terminal.scrollBottom = this._terminal.rows - 1;
+ this._terminal.buffer.scrollTop = 0;
+ this._terminal.buffer.scrollBottom = this._terminal.rows - 1;
this._terminal.curAttr = this._terminal.defAttr;
- this._terminal.x = this._terminal.y = 0; // ?
+ this._terminal.buffer.x = this._terminal.buffer.y = 0; // ?
this._terminal.charset = null;
this._terminal.glevel = 0; // ??
this._terminal.charsets = [null]; // ??
*/
public setScrollRegion(params: number[]): void {
if (this._terminal.prefix) return;
- this._terminal.scrollTop = (params[0] || 1) - 1;
- this._terminal.scrollBottom = (params[1] && params[1] <= this._terminal.rows ? params[1] : this._terminal.rows) - 1;
- this._terminal.x = 0;
- this._terminal.y = 0;
+ this._terminal.buffer.scrollTop = (params[0] || 1) - 1;
+ this._terminal.buffer.scrollBottom = (params[1] && params[1] <= this._terminal.rows ? params[1] : this._terminal.rows) - 1;
+ this._terminal.buffer.x = 0;
+ this._terminal.buffer.y = 0;
}
* Save cursor (ANSI.SYS).
*/
public saveCursor(params: number[]): void {
- this._terminal.savedX = this._terminal.x;
- this._terminal.savedY = this._terminal.y;
+ this._terminal.buffer.savedX = this._terminal.buffer.x;
+ this._terminal.buffer.savedY = this._terminal.buffer.y;
}
* Restore cursor (ANSI.SYS).
*/
public restoreCursor(params: number[]): void {
- this._terminal.x = this._terminal.savedX || 0;
- this._terminal.y = this._terminal.savedY || 0;
+ this._terminal.buffer.x = this._terminal.buffer.savedX || 0;
+ this._terminal.buffer.y = this._terminal.buffer.savedY || 0;
}
}
-const wcwidth = (function(opts) {
- // extracted from https://www.cl.cam.ac.uk/%7Emgk25/ucs/wcwidth.c
- // combining characters
- const COMBINING = [
- [0x0300, 0x036F], [0x0483, 0x0486], [0x0488, 0x0489],
- [0x0591, 0x05BD], [0x05BF, 0x05BF], [0x05C1, 0x05C2],
- [0x05C4, 0x05C5], [0x05C7, 0x05C7], [0x0600, 0x0603],
- [0x0610, 0x0615], [0x064B, 0x065E], [0x0670, 0x0670],
- [0x06D6, 0x06E4], [0x06E7, 0x06E8], [0x06EA, 0x06ED],
- [0x070F, 0x070F], [0x0711, 0x0711], [0x0730, 0x074A],
- [0x07A6, 0x07B0], [0x07EB, 0x07F3], [0x0901, 0x0902],
- [0x093C, 0x093C], [0x0941, 0x0948], [0x094D, 0x094D],
- [0x0951, 0x0954], [0x0962, 0x0963], [0x0981, 0x0981],
- [0x09BC, 0x09BC], [0x09C1, 0x09C4], [0x09CD, 0x09CD],
- [0x09E2, 0x09E3], [0x0A01, 0x0A02], [0x0A3C, 0x0A3C],
- [0x0A41, 0x0A42], [0x0A47, 0x0A48], [0x0A4B, 0x0A4D],
- [0x0A70, 0x0A71], [0x0A81, 0x0A82], [0x0ABC, 0x0ABC],
- [0x0AC1, 0x0AC5], [0x0AC7, 0x0AC8], [0x0ACD, 0x0ACD],
- [0x0AE2, 0x0AE3], [0x0B01, 0x0B01], [0x0B3C, 0x0B3C],
- [0x0B3F, 0x0B3F], [0x0B41, 0x0B43], [0x0B4D, 0x0B4D],
- [0x0B56, 0x0B56], [0x0B82, 0x0B82], [0x0BC0, 0x0BC0],
- [0x0BCD, 0x0BCD], [0x0C3E, 0x0C40], [0x0C46, 0x0C48],
- [0x0C4A, 0x0C4D], [0x0C55, 0x0C56], [0x0CBC, 0x0CBC],
- [0x0CBF, 0x0CBF], [0x0CC6, 0x0CC6], [0x0CCC, 0x0CCD],
- [0x0CE2, 0x0CE3], [0x0D41, 0x0D43], [0x0D4D, 0x0D4D],
- [0x0DCA, 0x0DCA], [0x0DD2, 0x0DD4], [0x0DD6, 0x0DD6],
- [0x0E31, 0x0E31], [0x0E34, 0x0E3A], [0x0E47, 0x0E4E],
- [0x0EB1, 0x0EB1], [0x0EB4, 0x0EB9], [0x0EBB, 0x0EBC],
- [0x0EC8, 0x0ECD], [0x0F18, 0x0F19], [0x0F35, 0x0F35],
- [0x0F37, 0x0F37], [0x0F39, 0x0F39], [0x0F71, 0x0F7E],
- [0x0F80, 0x0F84], [0x0F86, 0x0F87], [0x0F90, 0x0F97],
- [0x0F99, 0x0FBC], [0x0FC6, 0x0FC6], [0x102D, 0x1030],
- [0x1032, 0x1032], [0x1036, 0x1037], [0x1039, 0x1039],
- [0x1058, 0x1059], [0x1160, 0x11FF], [0x135F, 0x135F],
- [0x1712, 0x1714], [0x1732, 0x1734], [0x1752, 0x1753],
- [0x1772, 0x1773], [0x17B4, 0x17B5], [0x17B7, 0x17BD],
- [0x17C6, 0x17C6], [0x17C9, 0x17D3], [0x17DD, 0x17DD],
- [0x180B, 0x180D], [0x18A9, 0x18A9], [0x1920, 0x1922],
- [0x1927, 0x1928], [0x1932, 0x1932], [0x1939, 0x193B],
- [0x1A17, 0x1A18], [0x1B00, 0x1B03], [0x1B34, 0x1B34],
- [0x1B36, 0x1B3A], [0x1B3C, 0x1B3C], [0x1B42, 0x1B42],
- [0x1B6B, 0x1B73], [0x1DC0, 0x1DCA], [0x1DFE, 0x1DFF],
- [0x200B, 0x200F], [0x202A, 0x202E], [0x2060, 0x2063],
- [0x206A, 0x206F], [0x20D0, 0x20EF], [0x302A, 0x302F],
- [0x3099, 0x309A], [0xA806, 0xA806], [0xA80B, 0xA80B],
- [0xA825, 0xA826], [0xFB1E, 0xFB1E], [0xFE00, 0xFE0F],
- [0xFE20, 0xFE23], [0xFEFF, 0xFEFF], [0xFFF9, 0xFFFB],
- [0x10A01, 0x10A03], [0x10A05, 0x10A06], [0x10A0C, 0x10A0F],
- [0x10A38, 0x10A3A], [0x10A3F, 0x10A3F], [0x1D167, 0x1D169],
- [0x1D173, 0x1D182], [0x1D185, 0x1D18B], [0x1D1AA, 0x1D1AD],
- [0x1D242, 0x1D244], [0xE0001, 0xE0001], [0xE0020, 0xE007F],
- [0xE0100, 0xE01EF]
- ];
- // binary search
- function bisearch(ucs) {
- let min = 0;
- let max = COMBINING.length - 1;
- let mid;
- if (ucs < COMBINING[0][0] || ucs > COMBINING[max][1])
+export const wcwidth = (function(opts) {
+ // extracted from https://www.cl.cam.ac.uk/%7Emgk25/ucs/wcwidth.c
+ // combining characters
+ const COMBINING_BMP = [
+ [0x0300, 0x036F], [0x0483, 0x0486], [0x0488, 0x0489],
+ [0x0591, 0x05BD], [0x05BF, 0x05BF], [0x05C1, 0x05C2],
+ [0x05C4, 0x05C5], [0x05C7, 0x05C7], [0x0600, 0x0603],
+ [0x0610, 0x0615], [0x064B, 0x065E], [0x0670, 0x0670],
+ [0x06D6, 0x06E4], [0x06E7, 0x06E8], [0x06EA, 0x06ED],
+ [0x070F, 0x070F], [0x0711, 0x0711], [0x0730, 0x074A],
+ [0x07A6, 0x07B0], [0x07EB, 0x07F3], [0x0901, 0x0902],
+ [0x093C, 0x093C], [0x0941, 0x0948], [0x094D, 0x094D],
+ [0x0951, 0x0954], [0x0962, 0x0963], [0x0981, 0x0981],
+ [0x09BC, 0x09BC], [0x09C1, 0x09C4], [0x09CD, 0x09CD],
+ [0x09E2, 0x09E3], [0x0A01, 0x0A02], [0x0A3C, 0x0A3C],
+ [0x0A41, 0x0A42], [0x0A47, 0x0A48], [0x0A4B, 0x0A4D],
+ [0x0A70, 0x0A71], [0x0A81, 0x0A82], [0x0ABC, 0x0ABC],
+ [0x0AC1, 0x0AC5], [0x0AC7, 0x0AC8], [0x0ACD, 0x0ACD],
+ [0x0AE2, 0x0AE3], [0x0B01, 0x0B01], [0x0B3C, 0x0B3C],
+ [0x0B3F, 0x0B3F], [0x0B41, 0x0B43], [0x0B4D, 0x0B4D],
+ [0x0B56, 0x0B56], [0x0B82, 0x0B82], [0x0BC0, 0x0BC0],
+ [0x0BCD, 0x0BCD], [0x0C3E, 0x0C40], [0x0C46, 0x0C48],
+ [0x0C4A, 0x0C4D], [0x0C55, 0x0C56], [0x0CBC, 0x0CBC],
+ [0x0CBF, 0x0CBF], [0x0CC6, 0x0CC6], [0x0CCC, 0x0CCD],
+ [0x0CE2, 0x0CE3], [0x0D41, 0x0D43], [0x0D4D, 0x0D4D],
+ [0x0DCA, 0x0DCA], [0x0DD2, 0x0DD4], [0x0DD6, 0x0DD6],
+ [0x0E31, 0x0E31], [0x0E34, 0x0E3A], [0x0E47, 0x0E4E],
+ [0x0EB1, 0x0EB1], [0x0EB4, 0x0EB9], [0x0EBB, 0x0EBC],
+ [0x0EC8, 0x0ECD], [0x0F18, 0x0F19], [0x0F35, 0x0F35],
+ [0x0F37, 0x0F37], [0x0F39, 0x0F39], [0x0F71, 0x0F7E],
+ [0x0F80, 0x0F84], [0x0F86, 0x0F87], [0x0F90, 0x0F97],
+ [0x0F99, 0x0FBC], [0x0FC6, 0x0FC6], [0x102D, 0x1030],
+ [0x1032, 0x1032], [0x1036, 0x1037], [0x1039, 0x1039],
+ [0x1058, 0x1059], [0x1160, 0x11FF], [0x135F, 0x135F],
+ [0x1712, 0x1714], [0x1732, 0x1734], [0x1752, 0x1753],
+ [0x1772, 0x1773], [0x17B4, 0x17B5], [0x17B7, 0x17BD],
+ [0x17C6, 0x17C6], [0x17C9, 0x17D3], [0x17DD, 0x17DD],
+ [0x180B, 0x180D], [0x18A9, 0x18A9], [0x1920, 0x1922],
+ [0x1927, 0x1928], [0x1932, 0x1932], [0x1939, 0x193B],
+ [0x1A17, 0x1A18], [0x1B00, 0x1B03], [0x1B34, 0x1B34],
+ [0x1B36, 0x1B3A], [0x1B3C, 0x1B3C], [0x1B42, 0x1B42],
+ [0x1B6B, 0x1B73], [0x1DC0, 0x1DCA], [0x1DFE, 0x1DFF],
+ [0x200B, 0x200F], [0x202A, 0x202E], [0x2060, 0x2063],
+ [0x206A, 0x206F], [0x20D0, 0x20EF], [0x302A, 0x302F],
+ [0x3099, 0x309A], [0xA806, 0xA806], [0xA80B, 0xA80B],
+ [0xA825, 0xA826], [0xFB1E, 0xFB1E], [0xFE00, 0xFE0F],
+ [0xFE20, 0xFE23], [0xFEFF, 0xFEFF], [0xFFF9, 0xFFFB],
+ ];
+ const COMBINING_HIGH = [
+ [0x10A01, 0x10A03], [0x10A05, 0x10A06], [0x10A0C, 0x10A0F],
+ [0x10A38, 0x10A3A], [0x10A3F, 0x10A3F], [0x1D167, 0x1D169],
+ [0x1D173, 0x1D182], [0x1D185, 0x1D18B], [0x1D1AA, 0x1D1AD],
+ [0x1D242, 0x1D244], [0xE0001, 0xE0001], [0xE0020, 0xE007F],
+ [0xE0100, 0xE01EF]
+ ];
+ // binary search
+ function bisearch(ucs, data) {
+ let min = 0;
+ let max = data.length - 1;
+ let mid;
+ if (ucs < data[0][0] || ucs > data[max][1])
+ return false;
+ while (max >= min) {
+ mid = (min + max) >> 1;
+ if (ucs > data[mid][1])
+ min = mid + 1;
+ else if (ucs < data[mid][0])
+ max = mid - 1;
+ else
+ return true;
+ }
return false;
- while (max >= min) {
- mid = Math.floor((min + max) / 2);
- if (ucs > COMBINING[mid][1])
- min = mid + 1;
- else if (ucs < COMBINING[mid][0])
- max = mid - 1;
- else
- return true;
- }
- return false;
- }
- function wcwidth(ucs) {
- // test for 8-bit control characters
- if (ucs === 0)
- return opts.nul;
- if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
- return opts.control;
- // binary search in table of non-spacing characters
- if (bisearch(ucs))
- return 0;
- // if we arrive here, ucs is not a combining or C0/C1 control character
- if (isWide(ucs)) {
- return 2;
- }
- return 1;
- }
- function isWide(ucs) {
- return (
- ucs >= 0x1100 && (
+ }
+ function wcwidthBMP(ucs) {
+ // test for 8-bit control characters
+ if (ucs === 0)
+ return opts.nul;
+ if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
+ return opts.control;
+ // binary search in table of non-spacing characters
+ if (bisearch(ucs, COMBINING_BMP))
+ return 0;
+ // if we arrive here, ucs is not a combining or C0/C1 control character
+ if (isWideBMP(ucs)) {
+ return 2;
+ }
+ return 1;
+ }
+ function isWideBMP(ucs) {
+ return (
+ ucs >= 0x1100 && (
ucs <= 0x115f || // Hangul Jamo init. consonants
ucs === 0x2329 ||
ucs === 0x232a ||
(ucs >= 0xfe10 && ucs <= 0xfe19) || // Vertical forms
(ucs >= 0xfe30 && ucs <= 0xfe6f) || // CJK Compat Forms
(ucs >= 0xff00 && ucs <= 0xff60) || // Fullwidth Forms
- (ucs >= 0xffe0 && ucs <= 0xffe6) ||
- (ucs >= 0x20000 && ucs <= 0x2fffd) ||
- (ucs >= 0x30000 && ucs <= 0x3fffd)));
- }
- return wcwidth;
+ (ucs >= 0xffe0 && ucs <= 0xffe6)));
+ }
+ function wcwidthHigh(ucs) {
+ if (bisearch(ucs, COMBINING_HIGH))
+ return 0;
+ if ((ucs >= 0x20000 && ucs <= 0x2fffd) || (ucs >= 0x30000 && ucs <= 0x3fffd)) {
+ return 2;
+ }
+ return 1;
+ }
+ const control = opts.control | 0;
+ let table = null;
+ function init_table() {
+ // lookup table for BMP
+ const CODEPOINTS = 65536; // BMP holds 65536 codepoints
+ const BITWIDTH = 2; // a codepoint can have a width of 0, 1 or 2
+ const ITEMSIZE = 32; // using uint32_t
+ const CONTAINERSIZE = CODEPOINTS * BITWIDTH / ITEMSIZE;
+ const CODEPOINTS_PER_ITEM = ITEMSIZE / BITWIDTH;
+ table = (typeof Uint32Array === 'undefined')
+ ? new Array(CONTAINERSIZE)
+ : new Uint32Array(CONTAINERSIZE);
+ for (let i = 0; i < CONTAINERSIZE; ++i) {
+ let num = 0;
+ let pos = CODEPOINTS_PER_ITEM;
+ while (pos--)
+ num = (num << 2) | wcwidthBMP(CODEPOINTS_PER_ITEM * i + pos);
+ table[i] = num;
+ }
+ return table;
+ }
+ // get width from lookup table
+ // position in container : num / CODEPOINTS_PER_ITEM
+ // ==> n = table[Math.floor(num / 16)]
+ // ==> n = table[num >> 4]
+ // 16 codepoints per number: FFEEDDCCBBAA99887766554433221100
+ // position in number : (num % CODEPOINTS_PER_ITEM) * BITWIDTH
+ // ==> m = (n % 16) * 2
+ // ==> m = (num & 15) << 1
+ // right shift to position m
+ // ==> n = n >> m e.g. m=12 000000000000FFEEDDCCBBAA99887766
+ // we are only interested in 2 LSBs, cut off higher bits
+ // ==> n = n & 3 e.g. 000000000000000000000000000000XX
+ return function (num) {
+ num = num | 0; // get asm.js like optimization under V8
+ if (num < 32)
+ return control | 0;
+ if (num < 127)
+ return 1;
+ let t = table || init_table();
+ if (num < 65536)
+ return t[num >> 4] >> ((num & 15) << 1) & 3;
+ // do a full search for high codepoints
+ return wcwidthHigh(num);
+ };
})({nul: 0, control: 0}); // configurable options
projects / mirror_xterm.js.git / blobdiff