atlas: draw selection colors as background/foreground instead of alpha overlay #17725
Conversation
This lets us get rid of SelectionFrom/SelectionTo and the selection quad.
This required some changes to the WPF Control API surface
microsoft-github-policy-service
bot
added
Issue-Task
| // Return early if we couldn't paint the whole region (either this was not the last row, or | ||
| // it was the last row but the highlight ends outside of our x range.) | ||
| // We will resume from here in the next call. | ||
| if (!isFinalRow || hiEnd.x /*inclusive*/ >= x2 /*exclusive*/) |
There was a problem hiding this comment.
This is the thing it took hours to fix lol
There was a problem hiding this comment.
Wait, Ahh, hmm. Thanks for fixing this 🥲😃
| @@ -16,7 +16,7 @@ | |||
| #define SHADING_TYPE_CURLY_LINE 7 | |||
| #define SHADING_TYPE_SOLID_LINE 8 | |||
| #define SHADING_TYPE_CURSOR 9 | |||
| #define SHADING_TYPE_SELECTION 10 | |||
| #define SHADING_TYPE_FILLED_RECT 10 | |||
There was a problem hiding this comment.
better name would be A-OK with me
|
Here's a quick demo video of selection colors, and how they change while I change color schemes. WindowsTerminal_20240803T175408_562.mp4 |
| _api.s.write()->misc.write()->selectionColor = selectionColor; | ||
| auto misc = _api.s.write()->misc.write(); | ||
| misc->selectionColor = selectionColor; | ||
| misc->selectionForeground = 0xff000000 | ColorFix::GetPerceivableColor(color, color, 0.5f * 0.5f); |
There was a problem hiding this comment.
Hold up, this has color twice. (1st param is fg, 2nd param is bg.)
There was a problem hiding this comment.
Oh, I see: I misread the code in BackendD3D for cursor colors. I thought it did pass the background twice, but it passes background and bg (lol)
There was a problem hiding this comment.
Oh, no, I didn't misread. I pulled this from BackendD3D _drawCursorForegroundSlowPath
auto color = c.foreground == 0xffffffff ? it.color ^ 0xffffff : c.foreground;
color = ColorFix::GetPerceivableColor(color, c.background, 0.5f * 0.5f);
It uses a foreground and a background, whereas we don't have a foreground color to speak of yet.
|
@tusharsnx let me tell you, I spent five hours with a whiteboard and rewrote the whole thing, and it was a seriously humbling experience. I fixed the issue I was seeing, and then I decided to just keep everything that was already there. I couldn't--and still can't!--wrap my head around how to simplify it given that it detects overlaps of a coordinate span with a coordinate span. In my rewrite, I ended up linearizing every coordinate (y*w+x) instead. I'm still mad at myself for it. 😁 |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
With the merge of #17638, selections are now accumulated early in the
rendering process. This allows Atlas, which currently makes decisions
about cell foreground/background at the time of text rendering,
awareness of the selection ranges before text rendering begins.
As a result, we can now paint the selection into the background and
foreground bitmaps. We no longer need to overlay a rectangle, or series
of rectangles, on top of the rendering surface and alpha blend the
selection color onto the final image.
As a reminder, "alpha selection" was always a stopgap because we didn't
have durable per-cell foreground and background customization in the
original DxEngine.
Selection foregrounds are not customizable, and will be chosen using the
same color distancing algorithm as the cursor. We can make them
customizable "easily" (once we figure out the schema for it) for #3580.
ATLAS_DEBUG_SHOW_DIRTYwas using theSelectionshading type to drawcolored regions. I didn't want to break that, so I elected to rename the
Selectionshading type toFilledRectand keep its value. It helpsthat the shader didn't have any special treatment for
SHADING_TYPE_SELECTION.This fixes the entire category of issues created by selection being an
80%-opacity white rectangle. However, given that it changes the imputed
colors of the text it will reveal
SGR 8concealed/hidden characters.Refs #17355
Refs #14859
Refs #11181
Refs #8716
Refs #4971
Closes #3561