Allow inverse colors to be stored in glyph keys, fix inverted colors in DOM renderer #1739
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This uses the actual fg for bg and bg to fg, rather than the black/white theme colors Fixes xtermjs#1738
bgw
approved these changes
Nov 23, 2018
src/renderer/BaseRenderLayer.ts
Outdated
| @@ -298,7 +298,7 @@ export abstract class BaseRenderLayer implements IRenderLayer { | |||
|
|
|||
| if (fg === INVERTED_DEFAULT_COLOR) { | |||
| this._ctx.fillStyle = this._colors.background.css; | |||
| } else if (fg < 256) { | |||
| } else if (fg < DEFAULT_COLOR) { | |||
There was a problem hiding this comment.
Doing a range check against what is essentially an enum value is a little confusing. Since we're doing this in a few places, maybe we should have a isNormalColor helper function?
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1737
This issue was happening as we were assuming fg was a number >= 0 for the glyph key but it could also be
-1to indicate an inverse default color. See the first commit for this fix.The second commit cleans up the usage of 256/257 as the fg color by introducing constants. It also removes 257 as the "No BG color key" and instead uses 256 as that is the default color for the background, I don't think there's a reason to differentiate them.
The third commit fixes #1738 (not a regression).
Before
DOM Renderer
Canvas/static
Canvas/dynamic
After
DOM Renderer
Canvas/static
Canvas/dynamic