Fix the ligature support

sedwards2009 · Jan 7, 2025 · f0b5f69 · f0b5f69
1 parent 75e91c7
commit f0b5f69
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/main/src/terminal/TerminalBlock.ts b/main/src/terminal/TerminalBlock.ts
@@ -579,6 +579,8 @@ export class TerminalBlock implements Block {
     if (ligatureMarker != null) {
       const text = line.getString(0);
       ligatureMarker.markLigaturesCharCellLine(line, text);
+    } else {
+      line.clearAllLigatures();
     }
 
     let hoverLinkID = 0;

diff --git a/packages/extraterm-char-cell-line/src/CharCellLine.ts b/packages/extraterm-char-cell-line/src/CharCellLine.ts
@@ -612,6 +612,19 @@ export class CharCellLine {
     this.#dirtyFlag = true;
   }
 
+  clearAllLigatures(): void {
+    const width = this.width;
+    for (let i=0; i<width; i++) {
+      const offset = i * CELL_SIZE_BYTES;
+      const flags = this.#dataView.getUint8(offset + OFFSET_FLAGS);
+      if (flags & FLAG_MASK_LIGATURE) {
+        // Clear ligature flag and set width to 1 (normal)
+        this.#dataView.setUint8(offset + OFFSET_FLAGS, flags & ~(FLAG_MASK_LIGATURE|FLAG_MASK_WIDTH));
+      }
+    }
+    this.#dirtyFlag = true;
+  }
+
   getLigature(x: number): number {
     const offset = x * CELL_SIZE_BYTES;
     const flags = this.#dataView.getUint8(offset + OFFSET_FLAGS);

diff --git a/packages/extraterm-char-render-canvas/src/CellPainter.ts b/packages/extraterm-char-render-canvas/src/CellPainter.ts
@@ -140,13 +140,12 @@ export class CellPainter {
       let isExtra = false;
       for (const fontSlice of fontSlices) {
         if (fontSlice.containsCodePoint(codePoint)) {
-          line.setExtraFontsFlag(i, true);
+          line.setLigature(i, 0);
           isExtra = true;
           break;
         }
       }
       line.setExtraFontsFlag(i, isExtra);
-      line.setLigature(i, 0);
     }
   }
 }