@xterm/addon-webgl 0.19.0-beta.79 → 0.19.0-beta.80
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/addon-webgl.js +1 -1
- package/lib/addon-webgl.js.map +1 -1
- package/lib/addon-webgl.mjs +8 -8
- package/lib/addon-webgl.mjs.map +3 -3
- package/package.json +3 -3
- package/src/WebglRenderer.ts +4 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xterm/addon-webgl",
|
|
3
|
-
"version": "0.19.0-beta.
|
|
3
|
+
"version": "0.19.0-beta.80",
|
|
4
4
|
"author": {
|
|
5
5
|
"name": "The xterm.js authors",
|
|
6
6
|
"url": "https://xtermjs.org/"
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"start": "node ../../demo/start"
|
|
25
25
|
},
|
|
26
26
|
"peerDependencies": {
|
|
27
|
-
"@xterm/xterm": "^5.6.0-beta.
|
|
27
|
+
"@xterm/xterm": "^5.6.0-beta.80"
|
|
28
28
|
},
|
|
29
|
-
"commit": "
|
|
29
|
+
"commit": "33a5457407949a4aab9e4662015436c427cefe5a"
|
|
30
30
|
}
|
package/src/WebglRenderer.ts
CHANGED
|
@@ -381,6 +381,7 @@ export class WebglRenderer extends Disposable implements IRenderer {
|
|
|
381
381
|
let isValidJoinRange: boolean = true;
|
|
382
382
|
let lastCharX: number;
|
|
383
383
|
let range: [number, number];
|
|
384
|
+
let isCursorRow: boolean;
|
|
384
385
|
let chars: string;
|
|
385
386
|
let code: number;
|
|
386
387
|
let width: number;
|
|
@@ -407,6 +408,7 @@ export class WebglRenderer extends Disposable implements IRenderer {
|
|
|
407
408
|
row = y + terminal.buffer.ydisp;
|
|
408
409
|
line = terminal.buffer.lines.get(row)!;
|
|
409
410
|
this._model.lineLengths[y] = 0;
|
|
411
|
+
isCursorRow = cursorY === row;
|
|
410
412
|
skipJoinedCheckUntilX = 0;
|
|
411
413
|
joinedRanges = this._characterJoinerService.getJoinedCharacters(row);
|
|
412
414
|
for (x = 0; x < terminal.cols; x++) {
|
|
@@ -438,6 +440,8 @@ export class WebglRenderer extends Disposable implements IRenderer {
|
|
|
438
440
|
for (i = range[0] + 1; i < range[1]; i++) {
|
|
439
441
|
isValidJoinRange &&= (firstSelectionState === this._model.selection.isCellSelected(this._terminal, i, row));
|
|
440
442
|
}
|
|
443
|
+
// Similarly, if the cursor is in the ligature, don't join it.
|
|
444
|
+
isValidJoinRange &&= !isCursorRow || cursorX < range[0] || cursorX >= range[1];
|
|
441
445
|
if (!isValidJoinRange) {
|
|
442
446
|
skipJoinedCheckUntilX = range[1];
|
|
443
447
|
} else {
|