xterm - npm Package Compare versions

Comparing version 3.13.0-beta2 to 3.13.0-beta3

lib/renderer/BaseRenderLayer.js

@@ -173,11 +173,16 @@ "use strict";
         }
-        else if (cell.isFgRGB()) {
-            this._ctx.fillStyle = "rgb(" + BufferLine_1.AttributeData.toColorRGB(cell.getFgColor()).join(',') + ")";
-        }
-        else if (cell.isFgPalette()) {
-            var fg = cell.getFgColor();
-            if (terminal.options.drawBoldTextInBrightColors && cell.isBold() && fg < 8) {
-                fg += 8;
+        else {
+            if (cell.isFgDefault()) {
+                this._ctx.fillStyle = this._colors.foreground.css;
             }
-            this._ctx.fillStyle = this._colors.ansi[fg].css;
+            else if (cell.isFgRGB()) {
+                this._ctx.fillStyle = "rgb(" + BufferLine_1.AttributeData.toColorRGB(cell.getFgColor()).join(',') + ")";
+            }
+            else {
+                var fg = cell.getFgColor();
+                if (terminal.options.drawBoldTextInBrightColors && cell.isBold() && fg < 8) {
+                    fg += 8;
+                }
+                this._ctx.fillStyle = this._colors.ansi[fg].css;
+            }
         }
@@ -184,0 +189,0 @@ this._clipRow(terminal, y);

lib/renderer/TextRenderLayer.js

@@ -152,8 +152,17 @@ "use strict";
                 }
-                else if (cell.isFgRGB()) {
-                    _this._ctx.fillStyle = "rgb(" + BufferLine_1.AttributeData.toColorRGB(cell.getFgColor()).join(',') + ")";
+                else {
+                    if (cell.isFgDefault()) {
+                        _this._ctx.fillStyle = _this._colors.foreground.css;
+                    }
+                    else if (cell.isFgRGB()) {
+                        _this._ctx.fillStyle = "rgb(" + BufferLine_1.AttributeData.toColorRGB(cell.getFgColor()).join(',') + ")";
+                    }
+                    else {
+                        var fg = cell.getFgColor();
+                        if (terminal.options.drawBoldTextInBrightColors && cell.isBold() && fg < 8) {
+                            fg += 8;
+                        }
+                        _this._ctx.fillStyle = _this._colors.ansi[fg].css;
+                    }
                 }
-                else if (cell.isFgPalette()) {
-                    _this._ctx.fillStyle = _this._colors.ansi[cell.getFgColor()].css;
-                }
                 _this.fillBottomLineAtCells(x, y, cell.getWidth());
@@ -160,0 +169,0 @@ _this._ctx.restore();

package.json

 {
   "name": "xterm",
   "description": "Full xterm terminal, in your browser",
-  "version": "3.13.0-beta2",
+  "version": "3.13.0-beta3",
   "main": "lib/public/Terminal.js",
@@ -6,0 +6,0 @@ "types": "typings/xterm.d.ts",

src/renderer/BaseRenderLayer.ts

@@ -325,10 +325,14 @@ /**
       }
-    } 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;
     }
@@ -335,0 +339,0 @@

src/renderer/TextRenderLayer.ts

@@ -220,6 +220,14 @@ /**
           }
-        } 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;
+          }
         }
@@ -226,0 +234,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

2555793

increased by0.09%

Lines of code

38544

increased by0.1%

No dependency changes