Merge pull request #2034 from jerch/2031_defaultcolor_handling

apply default fg color for uncached chars and underline in canvas renderer
xtermjs · Apr 29, 2019 · 3f145b8 · 3f145b8
2 parents f4bbfc3 + 1f42e7c
commit 3f145b8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/src/renderer/BaseRenderLayer.ts b/src/renderer/BaseRenderLayer.ts
@@ -322,14 +322,18 @@ export abstract class BaseRenderLayer implements IRenderLayer {
       } else {
         this._ctx.fillStyle = this._colors.ansi[cell.getBgColor()].css;
       }
-    } else if (cell.isFgRGB()) {
-      this._ctx.fillStyle = `rgb(${AttributeData.toColorRGB(cell.getFgColor()).join(',')})`;
-    } else if (cell.isFgPalette()) {
-      let fg = cell.getFgColor();
-      if (terminal.options.drawBoldTextInBrightColors && cell.isBold() && fg < 8) {
-        fg += 8;
+    } else {
+      if (cell.isFgDefault()) {
+        this._ctx.fillStyle = this._colors.foreground.css;
+      } else if (cell.isFgRGB()) {
+        this._ctx.fillStyle = `rgb(${AttributeData.toColorRGB(cell.getFgColor()).join(',')})`;
+      } else {
+        let fg = cell.getFgColor();
+        if (terminal.options.drawBoldTextInBrightColors && cell.isBold() && fg < 8) {
+          fg += 8;
+        }
+        this._ctx.fillStyle = this._colors.ansi[fg].css;
       }
-      this._ctx.fillStyle = this._colors.ansi[fg].css;
     }
 
     this._clipRow(terminal, y);

diff --git a/src/renderer/TextRenderLayer.ts b/src/renderer/TextRenderLayer.ts
@@ -217,10 +217,18 @@ export class TextRenderLayer extends BaseRenderLayer {
           } else {
             this._ctx.fillStyle = this._colors.ansi[cell.getBgColor()].css;
           }
-        } else if (cell.isFgRGB()) {
-          this._ctx.fillStyle = `rgb(${AttributeData.toColorRGB(cell.getFgColor()).join(',')})`;
-        } else if (cell.isFgPalette()) {
-          this._ctx.fillStyle = this._colors.ansi[cell.getFgColor()].css;
+        } else {
+          if (cell.isFgDefault()) {
+            this._ctx.fillStyle = this._colors.foreground.css;
+          } else if (cell.isFgRGB()) {
+            this._ctx.fillStyle = `rgb(${AttributeData.toColorRGB(cell.getFgColor()).join(',')})`;
+          } else {
+            let fg = cell.getFgColor();
+            if (terminal.options.drawBoldTextInBrightColors && cell.isBold() && fg < 8) {
+              fg += 8;
+            }
+            this._ctx.fillStyle = this._colors.ansi[fg].css;
+          }
         }
 
         this.fillBottomLineAtCells(x, y, cell.getWidth());