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.buffer.lines.get(row)[this._terminal.x - 1]) {
- if (!this._terminal.buffer.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.buffer.lines.get(row)[this._terminal.x - 2])
- this._terminal.buffer.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.buffer.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) {
- // Insert a new line, scroll and mark as a wrapped line
- this._terminal.y--;
+ this._terminal.buffer.x = 0;
+ this._terminal.buffer.y++;
+ if (this._terminal.buffer.y > this._terminal.scrollBottom) {
+ this._terminal.buffer.y--;
this._terminal.scroll(true);
} else {
// The line already exists (eg. the initial viewport), mark it as a
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.buffer.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.buffer.lines.get(row)[this._terminal.cols - 2]
&& this._terminal.buffer.lines.get(row)[this._terminal.cols - 2][2] === 2) {
}
// insert empty cell at cursor
- this._terminal.buffer.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.buffer.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.buffer.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.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--;
}
}
* 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) {
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);
}
const scrollBackSize = this._terminal.buffer.lines.length - this._terminal.rows;
if (scrollBackSize > 0) {
this._terminal.buffer.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.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);
}
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.ybase - j + 1;
while (param--) {
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.buffer.lines.trimStart(1);
- this._terminal.ybase--;
- this._terminal.ydisp--;
+ this._terminal.buffer.ybase--;
+ this._terminal.buffer.ydisp--;
row--;
j--;
}
}
// this.maxRange();
- this._terminal.updateRange(this._terminal.y);
+ this._terminal.updateRange(this._terminal.buffer.y);
this._terminal.updateRange(this._terminal.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.ybase - j;
while (param--) {
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.buffer.lines.trimStart(1);
- this._terminal.ybase -= 1;
- this._terminal.ydisp -= 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.maxRange();
- this._terminal.updateRange(this._terminal.y);
+ this._terminal.updateRange(this._terminal.buffer.y);
this._terminal.updateRange(this._terminal.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.buffer.lines.get(row).splice(this._terminal.x, 1);
+ 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.buffer.lines.splice(this._terminal.ybase + this._terminal.scrollTop, 1);
- this._terminal.buffer.lines.splice(this._terminal.ybase + this._terminal.scrollBottom, 0, this._terminal.blankLine());
+ this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.scrollTop, 1);
+ this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.scrollBottom, 0, this._terminal.blankLine());
}
// this.maxRange();
this._terminal.updateRange(this._terminal.scrollTop);
public scrollDown(params: number[]): void {
let param = params[0] || 1;
while (param--) {
- this._terminal.buffer.lines.splice(this._terminal.ybase + this._terminal.scrollBottom, 1);
- this._terminal.buffer.lines.splice(this._terminal.ybase + this._terminal.scrollTop, 0, this._terminal.blankLine());
+ this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.scrollBottom, 1);
+ this._terminal.buffer.lines.splice(this._terminal.buffer.ybase + this._terminal.scrollTop, 0, this._terminal.blankLine());
}
// this.maxRange();
this._terminal.updateRange(this._terminal.scrollTop);
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) {
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.buffer.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.tabs[this._terminal.buffer.x];
} else if (param === 3) {
this._terminal.tabs = {};
}
// TODO: Why are params[0] compares nested within a switch for params[0]?
- this._terminal.x10Mouse = params[0] === 9;
+ this._terminal.buffer.x10Mouse = params[0] === 9;
this._terminal.vt200Mouse = params[0] === 1000;
this._terminal.normalMouse = params[0] > 1000;
this._terminal.mouseEvents = true;
case 1047: // alt screen buffer
if (!this._terminal.normal) {
let normal = {
- lines: this._terminal.buffers.normal.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
// 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();
}
break;
}
case 1000: // vt200 mouse
case 1002: // button event mouse
case 1003: // any event mouse
- this._terminal.x10Mouse = false;
+ this._terminal.buffer.x10Mouse = false;
this._terminal.vt200Mouse = false;
this._terminal.normalMouse = false;
this._terminal.mouseEvents = false;
case 47: // normal screen buffer
case 1047: // normal screen buffer - clearing it first
if (this._terminal.normal) {
- this._terminal.buffers.activateNormalBuffer();
- 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.x = this.savedX;
// this.y = this.savedY;
// }
+ this._terminal.buffers.activateNormalBuffer();
this._terminal.refresh(0, this._terminal.rows - 1);
this._terminal.viewport.syncScrollArea();
this._terminal.showCursor();
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.scrollTop = 0;
this._terminal.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]; // ??
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.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.savedX = this._terminal.buffer.x;
+ this._terminal.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.savedX || 0;
+ this._terminal.buffer.y = this._terminal.savedY || 0;
}
}
this.on('data', options.handler);
}
- /**
- * The scroll position of the y cursor, ie. ybase + y = the y position within the entire
- * buffer
- */
- this.ybase = 0;
-
- /**
- * The scroll position of the viewport
- */
- this.ydisp = 0;
-
- /**
- * The cursor's x position after ybase
- */
- this.x = 0;
-
- /**
- * The cursor's y position after ybase
- */
- this.y = 0;
-
this.cursorState = 0;
this.cursorHidden = false;
this.convertEol;
if (this.options[key] !== value) {
if (this.buffer.length > value) {
const amountToTrim = this.buffer.lines.length - value;
- const needsRefresh = (this.ydisp - amountToTrim < 0);
+ const needsRefresh = (this.buffer.ydisp - amountToTrim < 0);
this.buffer.lines.trimStart(amountToTrim);
- this.ybase = Math.max(this.ybase - amountToTrim, 0);
- this.ydisp = Math.max(this.ydisp - amountToTrim, 0);
+ this.buffer.ybase = Math.max(this.buffer.ybase - amountToTrim, 0);
+ this.buffer.ydisp = Math.max(this.buffer.ydisp - amountToTrim, 0);
if (needsRefresh) {
this.refresh(0, this.rows - 1);
}
this.viewport = new Viewport(this, this.viewportElement, this.viewportScrollArea, this.charMeasure);
this.renderer = new Renderer(this);
-<<<<<<< HEAD
- this.selectionManager = new SelectionManager(this, this.lines, this.rowContainer, this.charMeasure);
+ this.selectionManager = new SelectionManager(this, this.buffer.lines, this.rowContainer, this.charMeasure);
this.selectionManager.on('refresh', data => {
this.renderer.refreshSelection(data.start, data.end);
});
this.textarea.focus();
this.textarea.select();
});
-=======
- this.selectionManager = new SelectionManager(this, this.buffer.lines, this.rowContainer, this.charMeasure);
- this.selectionManager.on('refresh', data => this.renderer.refreshSelection(data.start, data.end));
->>>>>>> Create `terminal.buffer` convenience attribute
this.on('scroll', () => this.selectionManager.refresh());
this.viewportElement.addEventListener('scroll', () => this.selectionManager.refresh());
Terminal.prototype.showCursor = function() {
if (!this.cursorState) {
this.cursorState = 1;
- this.refresh(this.y, this.y);
+ this.refresh(this.buffer.y, this.buffer.y);
}
};
// Make room for the new row in lines
if (this.buffer.lines.length === this.buffer.lines.maxLength) {
this.buffer.lines.trimStart(1);
- this.ybase--;
- if (this.ydisp !== 0) {
- this.ydisp--;
+ this.buffer.ybase--;
+ if (this.buffer.ydisp !== 0) {
+ this.buffer.ydisp--;
}
}
- this.ybase++;
+ this.buffer.ybase++;
// TODO: Why is this done twice?
if (!this.userScrolling) {
- this.ydisp = this.ybase;
+ this.buffer.ydisp = this.buffer.ybase;
}
// last line
- row = this.ybase + this.rows - 1;
+ row = this.buffer.ybase + this.rows - 1;
// subtract the bottom scroll region
row -= this.rows - 1 - this.scrollBottom;
}
if (this.scrollTop !== 0) {
- if (this.ybase !== 0) {
- this.ybase--;
+ if (this.buffer.ybase !== 0) {
+ this.buffer.ybase--;
if (!this.userScrolling) {
- this.ydisp = this.ybase;
+ this.buffer.ydisp = this.buffer.ybase;
}
}
- this.buffer.lines.splice(this.ybase + this.scrollTop, 1);
+ this.buffer.lines.splice(this.buffer.ybase + this.scrollTop, 1);
}
// this.maxRange();
*
* @event scroll
*/
- this.emit('scroll', this.ydisp);
+ this.emit('scroll', this.buffer.ydisp);
};
/**
*/
Terminal.prototype.scrollDisp = function(disp, suppressScrollEvent) {
if (disp < 0) {
- if (this.ydisp === 0) {
+ if (this.buffer.ydisp === 0) {
return;
}
this.userScrolling = true;
- } else if (disp + this.ydisp >= this.ybase) {
+ } else if (disp + this.buffer.ydisp >= this.buffer.ybase) {
this.userScrolling = false;
}
- const oldYdisp = this.ydisp;
- this.ydisp = Math.max(Math.min(this.ydisp + disp, this.ybase), 0);
+ const oldYdisp = this.buffer.ydisp;
+ this.buffer.ydisp = Math.max(Math.min(this.buffer.ydisp + disp, this.buffer.ybase), 0);
// No change occurred, don't trigger scroll/refresh
- if (oldYdisp === this.ydisp) {
+ if (oldYdisp === this.buffer.ydisp) {
return;
}
if (!suppressScrollEvent) {
- this.emit('scroll', this.ydisp);
+ this.emit('scroll', this.buffer.ydisp);
}
this.refresh(0, this.rows - 1);
* Scrolls the display of the terminal to the top.
*/
Terminal.prototype.scrollToTop = function() {
- this.scrollDisp(-this.ydisp);
+ this.scrollDisp(-this.buffer.ydisp);
};
/**
* Scrolls the display of the terminal to the bottom.
*/
Terminal.prototype.scrollToBottom = function() {
- this.scrollDisp(this.ybase - this.ydisp);
+ this.scrollDisp(this.buffer.ybase - this.buffer.ydisp);
};
/**
this.xoffSentToCatchUp = false;
}
- this.refreshStart = this.y;
- this.refreshEnd = this.y;
+ this.refreshStart = this.buffer.y;
+ this.refreshEnd = this.buffer.y;
// HACK: Set the parser state based on it's state at the time of return.
// This works around the bug #662 which saw the parser state reset in the
var state = this.parser.parse(data);
this.parser.setState(state);
- this.updateRange(this.y);
+ this.updateRange(this.buffer.y);
this.refresh(this.refreshStart, this.refreshEnd);
}
if (this.writeBuffer.length > 0) {
this.restartCursorBlinking();
if (!this.compositionHelper.keydown.bind(this.compositionHelper)(ev)) {
- if (this.ybase !== this.ydisp) {
+ if (this.buffer.ybase !== this.buffer.ydisp) {
this.scrollToBottom();
}
return false;
if (j < y) {
el = this.element;
while (j++ < y) {
- // y is rows, not this.y
- if (this.buffer.lines.length < y + this.ybase) {
- if (this.ybase > 0 && this.buffer.lines.length <= this.ybase + this.y + addToY + 1) {
+ // y is rows, not this.buffer.y
+ if (this.buffer.lines.length < y + this.buffer.ybase) {
+ if (this.buffer.ybase > 0 && this.buffer.lines.length <= this.buffer.ybase + this.buffer.y + addToY + 1) {
// There is room above the buffer and there are no empty elements below the line,
// scroll up
- this.ybase--;
+ this.buffer.ybase--;
addToY++;
- if (this.ydisp > 0) {
+ if (this.buffer.ydisp > 0) {
// Viewport is at the top of the buffer, must increase downwards
- this.ydisp--;
+ this.buffer.ydisp--;
}
} else {
// Add a blank line if there is no buffer left at the top to scroll to, or if there
}
} else { // (j > y)
while (j-- > y) {
- if (this.buffer.lines.length > y + this.ybase) {
- if (this.buffer.lines.length > this.ybase + this.y + 1) {
+ if (this.buffer.lines.length > y + this.buffer.ybase) {
+ if (this.buffer.lines.length > this.buffer.ybase + this.buffer.y + 1) {
// The line is a blank line below the cursor, remove it
this.buffer.lines.pop();
} else {
// The line is the cursor, scroll down
- this.ybase++;
- this.ydisp++;
+ this.buffer.ybase++;
+ this.buffer.ydisp++;
}
}
if (this.children.length > y) {
this.rows = y;
// Make sure that the cursor stays on screen
- if (this.y >= y) {
- this.y = y - 1;
+ if (this.buffer.y >= y) {
+ this.buffer.y = y - 1;
}
if (addToY) {
- this.y += addToY;
+ this.buffer.y += addToY;
}
- if (this.x >= x) {
- this.x = x - 1;
+ if (this.buffer.x >= x) {
+ this.buffer.x = x - 1;
}
this.scrollTop = 0;
* @param {number} y The line in which to operate.
*/
Terminal.prototype.eraseRight = function(x, y) {
- var line = this.buffer.lines.get(this.ybase + y);
+ var line = this.buffer.lines.get(this.buffer.ybase + y);
if (!line) {
return;
}
* @param {number} y The line in which to operate.
*/
Terminal.prototype.eraseLeft = function(x, y) {
- var line = this.buffer.lines.get(this.ybase + y);
+ var line = this.buffer.lines.get(this.buffer.ybase + y);
if (!line) {
return;
}
* Clears the entire buffer, making the prompt line the new first line.
*/
Terminal.prototype.clear = function() {
- if (this.ybase === 0 && this.y === 0) {
+ if (this.buffer.ybase === 0 && this.buffer.y === 0) {
// Don't clear if it's already clear
return;
}
- this.buffer.lines.set(0, this.buffer.lines.get(this.ybase + this.y));
+ this.buffer.lines.set(0, this.buffer.lines.get(this.buffer.ybase + this.buffer.y));
this.buffer.lines.length = 1;
- this.ydisp = 0;
- this.ybase = 0;
- this.y = 0;
+ this.buffer.ydisp = 0;
+ this.buffer.ybase = 0;
+ this.buffer.y = 0;
for (var i = 1; i < this.rows; i++) {
this.buffer.lines.push(this.blankLine());
}
this.refresh(0, this.rows - 1);
- this.emit('scroll', this.ydisp);
+ this.emit('scroll', this.buffer.ydisp);
};
/**
}
// Input is being sent to the terminal, the terminal should focus the prompt.
- if (this.ybase !== this.ydisp) {
+ if (this.buffer.ybase !== this.buffer.ydisp) {
this.scrollToBottom();
}
this.emit('data', data);
* ESC D Index (IND is 0x84).
*/
Terminal.prototype.index = function() {
- this.y++;
- if (this.y > this.scrollBottom) {
- this.y--;
+ this.buffer.y++;
+ if (this.buffer.y > this.scrollBottom) {
+ this.buffer.y--;
this.scroll();
}
// If the end of the line is hit, prevent this action from wrapping around to the next line.
- if (this.x >= this.cols) {
+ if (this.buffer.x >= this.cols) {
this.x--;
}
};
*/
Terminal.prototype.reverseIndex = function() {
var j;
- if (this.y === this.scrollTop) {
+ if (this.buffer.y === this.scrollTop) {
// possibly move the code below to term.reverseScroll();
// test: echo -ne '\e[1;1H\e[44m\eM\e[0m'
// blankLine(true) is xterm/linux behavior
- this.buffer.lines.shiftElements(this.y + this.ybase, this.rows - 1, 1);
- this.buffer.lines.set(this.y + this.ybase, this.blankLine(true));
+ this.buffer.lines.shiftElements(this.buffer.y + this.buffer.ybase, this.rows - 1, 1);
+ this.buffer.lines.set(this.buffer.y + this.buffer.ybase, this.blankLine(true));
this.updateRange(this.scrollTop);
this.updateRange(this.scrollBottom);
} else {
- this.y--;
+ this.buffer.y--;
}
};