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

prefetch row in addChar

Browse Source
This commit is contained in:
Jörg Breitbart
2018-04-23 18:26:06 +02:00
parent dd096c2e8b
commit 0d7ecd9129
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/InputHandler.ts
+16 -15
View File
@@ -39,22 +39,23 @@ export class InputHandler implements IInputHandler {
this._terminal.emit('a11y.char', char);
}
let row = buffer.y + buffer.ybase;
//let row = buffer.y + buffer.ybase;
let row = buffer.lines.get(buffer.y + buffer.ybase);
// insert combining char in last cell
// FIXME: needs handling after cursor jumps
if (!chWidth && buffer.x) {
// dont overflow left
if (buffer.lines.get(row)[buffer.x - 1]) {
if (!buffer.lines.get(row)[buffer.x - 1][CHAR_DATA_WIDTH_INDEX]) {
if (row[buffer.x - 1]) {
if (!row[buffer.x - 1][CHAR_DATA_WIDTH_INDEX]) {
// found empty cell after fullwidth, need to go 2 cells back
if (buffer.lines.get(row)[buffer.x - 2]) {
buffer.lines.get(row)[buffer.x - 2][CHAR_DATA_CHAR_INDEX] += char;
buffer.lines.get(row)[buffer.x - 2][3] = char.charCodeAt(0);
if (row[buffer.x - 2]) {
row[buffer.x - 2][CHAR_DATA_CHAR_INDEX] += char;
row[buffer.x - 2][3] = char.charCodeAt(0);
}
} else {
buffer.lines.get(row)[buffer.x - 1][CHAR_DATA_CHAR_INDEX] += char;
buffer.lines.get(row)[buffer.x - 1][3] = char.charCodeAt(0);
row[buffer.x - 1][CHAR_DATA_CHAR_INDEX] += char;
row[buffer.x - 1][3] = char.charCodeAt(0);
}
this._terminal.updateRange(buffer.y);
}
@@ -82,7 +83,7 @@ export class InputHandler implements IInputHandler {
}
}
}
row = buffer.y + buffer.ybase;
row = buffer.lines.get(buffer.y + buffer.ybase);
// insert mode: move characters to right
if (this._terminal.insertMode) {
@@ -92,23 +93,23 @@ export class InputHandler implements IInputHandler {
// we have to adjust the second last cell as well
const removed = buffer.lines.get(buffer.y + buffer.ybase).pop();
if (removed[CHAR_DATA_WIDTH_INDEX] === 0
&& buffer.lines.get(row)[this._terminal.cols - 2]
&& buffer.lines.get(row)[this._terminal.cols - 2][CHAR_DATA_WIDTH_INDEX] === 2) {
buffer.lines.get(row)[this._terminal.cols - 2] = [this._terminal.curAttr, ' ', 1, ' '.charCodeAt(0)];
&& row[this._terminal.cols - 2]
&& row[this._terminal.cols - 2][CHAR_DATA_WIDTH_INDEX] === 2) {
row[this._terminal.cols - 2] = [this._terminal.curAttr, ' ', 1, ' '.charCodeAt(0)];
}
// insert empty cell at cursor
buffer.lines.get(row).splice(buffer.x, 0, [this._terminal.curAttr, ' ', 1, ' '.charCodeAt(0)]);
row.splice(buffer.x, 0, [this._terminal.curAttr, ' ', 1, ' '.charCodeAt(0)]);
}
}
buffer.lines.get(row)[buffer.x] = [this._terminal.curAttr, char, chWidth, char.charCodeAt(0)];
row[buffer.x] = [this._terminal.curAttr, char, chWidth, char.charCodeAt(0)];
buffer.x++;
this._terminal.updateRange(buffer.y);
// fullwidth char - set next cell width to zero and advance cursor
if (chWidth === 2) {
buffer.lines.get(row)[buffer.x] = [this._terminal.curAttr, '', 0, undefined];
row[buffer.x] = [this._terminal.curAttr, '', 0, undefined];
buffer.x++;
}
}