⭐ Football Update: microsoft/terminal/pull/

Leonard Hecker (lhecker) · 2025-09-08T19:39:36Z

This PR moves the cursor blinker and VT blink rendition timer into
Renderer. To do so, this PR introduces a generic timer system with
which you can schedule arbitrary timer jobs. Thanks to this, this PR
removes a crapton of code, particularly throughout conhost.

Validation Steps Performed

Focus/unfocus starts/stops blinking ✅
OS-wide blink settings apply on focus ✅

Goal: Remove `CursorBlinker`. Problem: Spooky action at a distance via `Cursor::HasMoved`. Solution: Moved all the a11y event raising into `_stream.cpp` and pray for the best. Goal: Prevent node.js from tanking conhost performance via MSAA (WHY). Problem: `ServiceLocator`. Solution: Unserviced the locator. Debounced event raising. Performance increased by >10x. Problem 2: Lots of files changed. This PR is a prerequisite for #19330 ## Validation Steps Performed Ran NVDA with and without UIA enabled and with different delays. ✅

Dustin L. Howett (DHowett)

50/56

Dustin L. Howett (DHowett) · 2025-09-26T20:45:26Z

 // - <none>
 // Return Value:
 // - <none>
 void Window::_UpdateSystemMetrics() const


📝 Make sure nobody else called this who cares about the cursor metrics (probably not)

Dustin L. Howett (DHowett) · 2025-09-26T20:46:32Z

    cursor.SetSize(_d->ulSavedCursorSize);
    cursor.SetIsVisible(_d->fSavedCursorVisible);
    cursor.SetType(_d->savedCursorType);
-    cursor.SetIsOn(true);


📝 make sure selection has the same cursor behavior

…inker

Carlos Zamora (carlos-zamora) · 2025-11-04T21:28:34Z

+
    void TermControl::CursorVisibility(Control::CursorDisplayState cursorVisibility)
    {
        _cursorVisibility = cursorVisibility;


It looks like cursor visibility is stored across 3 variables:

TermControl::_cursorVisibility

ControlCore::_forceCursorVisible

Renderer::_cursorVisibilityInhibitors

Could we remove the one in TermControl and just query the one in ControlCore? Or, even better, just pipe the value from Renderer all the way up, rather than having a separate boolean member on each layer?

I actually tried this, but that doesn't work unless we refactor how focus is handled in ControlInteractivity. This is because we make a distinction in TermControl between cursor-visible-because-of-xaml-focus and cursor-visible-because-of-cursor-display-state. ControlCore then ties these together into a single boolean again, with some extra logic on top. If you ask me, it's a mistake to handle XAML/UI-logic in the ControlCore layer like that. It should just be "do I have focus? yes/no" and TermControl decides that.

I would not expose _forceCursorVisible from ControlCore just to remove the _cursorVisibility in TermControl. The variables are duplicated now, but they serve a different purpose. It'd be better to remove the need for forcing the cursor visibility in the first place IMO.

Carlos Zamora (carlos-zamora) · 2025-11-04T22:38:19Z

+        static DWORD _timerToMillis(TimerRepr t) noexcept;
+
+        // Actual rendering
+        [[nodiscard]] HRESULT PaintFrame();


It's a bit weird that this one is marked private, but doesn't have the _ prefix. Plus there's also _PaintFrame() just below it.

IIRC I did this to help git with reducing the diff size.

Carlos Zamora (carlos-zamora) · 2025-11-04T23:41:04Z

Fully reviewed. I want to get some resolution on my comments before approving.

Regarding accessibility (#19374), I plan on taking a look at a reported memory leak in WT when UIA is enabled soon-ish. I'll lump looking into #19374 too and Leonard and I can tag team work on a11y then.

Carlos Zamora (carlos-zamora) · 2025-11-04T23:42:04Z

Oh, and you probably want to update the PR body too.

Carlos Zamora (carlos-zamora)

LGTM. Thanks for doing this 🙂

Leonard Hecker (lhecker) · 2025-11-11T14:30:06Z

I've merged this now Dustin L. Howett (@DHowett) so we can move on and fix it in post if needed.

Dustin L. Howett (DHowett) · 2025-11-11T21:12:56Z

+        }
+    }
+
+why_does_cpp_not_have_labeled_loops:


Dustin L. Howett (DHowett)

approved 63/63 after merge. Well done. One nit: StarTimer ⭐

With the rendering thread changes in GH-18632 and GH-19330, we strengthened a requirement that render shutdown be done outside of the console lock. This works on all platforms except OneCore, where ConIoSrv manages the focus of multiple console windows and we need to explicitly order the handling of tearing down and relinquishing device resources. The old code (before GH-18632) used to wait for a whole second before giving up. Instead, let's just unlock the console to let the final frame drain out. I created a synthetic repro: start two cmd sessions with a lot of rendering load (`cmdd start cmd /c dir /s c:\`), and then run `cmdd date /t` in a tight loop while tabbing between the console windows. Before this fix, it hangs within a couple tens of date invocations. With this fix, it does not hang at all. Fixes #61354695

…evt (#19967) With the rendering thread changes in #18632 and #19330, we strengthened a requirement that render shutdown be done outside of the console lock. This works on all platforms except OneCore, where ConIoSrv manages the focus of multiple console windows and we need to explicitly order the handling of tearing down and relinquishing device resources. The old code (before #18632) used to wait for a whole second before giving up. Instead, let's just unlock the console to let the final frame drain out. I created a synthetic repro: start two cmd sessions with a lot of rendering load (`cmdd start cmd /c dir /s c:\`), and then run `cmdd date /t` in a tight loop while tabbing between the console windows. Before this fix, it hangs within a couple tens of date invocations. With this fix, it does not hang at all. Fixes MSFT-61354695

This pull request builds on the render timer infrastructure in #19330 and the pointer ID work in #20017 to move automatic scrolling down into the Interactivity layer. Leonard tells me that this is an acceptable use of the render timer infrastructure because it directly results in a new frame or new content being rendered (therefore, it does not spin the renderer for no reason.) Much of the code is the same. I recommend reviewing with: ``` git diff --color-moved=dimmed-zebra --color-moved-ws=ignore-all-space (git merge-base origin/main origin/dev/duhowett/wpf-1-autoscroll-to-interactivity) origin/dev/duhowett/wpf-1-autoscroll-to-interactivity ```

github-advanced-security AI found potential problems Sep 8, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

Leonard Hecker (lhecker) force-pushed the dev/lhecker/cursor-blinker branch from 4de989d to 8d17e85 Compare September 8, 2025 19:44

Leonard Hecker (lhecker) mentioned this pull request Sep 12, 2025

Rewrite the MSAA/UIA integration into conhost #19344

Merged

Leonard Hecker (lhecker) changed the base branch from main to dev/lhecker/BEGONE-FOUL-SPIRIT September 14, 2025 11:16

Leonard Hecker (lhecker) force-pushed the dev/lhecker/cursor-blinker branch from 8d17e85 to 8390d60 Compare September 14, 2025 11:26

Leonard Hecker (lhecker) force-pushed the dev/lhecker/cursor-blinker branch from 8390d60 to 5742c64 Compare September 22, 2025 22:59

Leonard Hecker (lhecker) changed the base branch from dev/lhecker/BEGONE-FOUL-SPIRIT to main September 22, 2025 22:59

Leonard Hecker (lhecker) marked this pull request as ready for review September 22, 2025 22:59

Move all blink handling into Renderer

1c23430

Leonard Hecker (lhecker) force-pushed the dev/lhecker/cursor-blinker branch from 5742c64 to 1c23430 Compare September 23, 2025 13:55

Leonard Hecker (lhecker) mentioned this pull request Sep 23, 2025

WPF terminal control in a tabbed interface deadlocks when rapidly opening new tabs #19373

Open

Fix tests?

1b712b2

Carlos Zamora (carlos-zamora) reviewed Sep 23, 2025

View reviewed changes

Fix tests

1c07227

Dustin L. Howett (DHowett) reviewed Sep 26, 2025

View reviewed changes

Leonard Hecker (lhecker) added 6 commits October 14, 2025 18:37

Merge remote-tracking branch 'origin/main' into dev/lhecker/cursor-bl…

0ff1f1f

…inker

Fix off-by-one bugs

7083bc0

Add support for EVENT_CONSOLE_UPDATE_SIMPLE

8214051

Fix build

55e3efe

Address feedback, Fix broadcast input

dfad2d9

Fix assert

99c6193

Carlos Zamora (carlos-zamora) reviewed Nov 4, 2025

View reviewed changes

Carlos Zamora (carlos-zamora) approved these changes Nov 6, 2025

View reviewed changes

Leonard Hecker (lhecker) merged commit 2e78665 into main Nov 11, 2025
19 checks passed

Dustin L. Howett (DHowett) reviewed Nov 11, 2025

View reviewed changes

Comment thread src/renderer/base/renderer.cpp

}

}

why_does_cpp_not_have_labeled_loops:

Dustin L. Howett (DHowett) Nov 11, 2025

Copy link
Copy Markdown

Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol

Dustin L. Howett (DHowett) reviewed Nov 11, 2025

View reviewed changes

Dustin L. Howett (DHowett) deleted the dev/lhecker/cursor-blinker branch November 20, 2025 19:45

Dustin L. Howett (DHowett) mentioned this pull request Jan 12, 2026

[1.25] Preview Terminal in settings UI does not show cursor any longer #19735

Closed

Leonard Hecker (lhecker) mentioned this pull request Jan 19, 2026

Reduce input latency with double buffering #19757

Closed

2 of 4 tasks

Dustin L. Howett (DHowett) mentioned this pull request Jan 23, 2026

Continue SGR 5 blinking when Terminal is out of focus (but not minimized) #19524

Closed

Dustin L. Howett (DHowett) mentioned this pull request Mar 12, 2026

conhost: Unlock the console while tearing down during coniosrv focus evt #19967

Merged

Clint Rutkas (crutkas) mentioned this pull request Jul 25, 2026

Add Kitty graphics animation crutkas/terminal#58

Open

Dustin L. Howett (DHowett) mentioned this pull request Sep 22, 2026

Move AutoScroll down into Interactivity with a render timer #20710

Merged

Conversation

Leonard Hecker (lhecker) commented Sep 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Validation Steps Performed

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Dustin L. Howett (DHowett) left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Dustin L. Howett (DHowett) Sep 26, 2025

Choose a reason for hiding this comment

Uh oh!

Dustin L. Howett (DHowett) Sep 26, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Carlos Zamora (carlos-zamora) Nov 4, 2025

Choose a reason for hiding this comment

Uh oh!

Leonard Hecker (lhecker) Nov 6, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Carlos Zamora (carlos-zamora) Nov 4, 2025

Choose a reason for hiding this comment

Uh oh!

Leonard Hecker (lhecker) Nov 6, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Carlos Zamora (carlos-zamora) commented Nov 4, 2025

Uh oh!

Carlos Zamora (carlos-zamora) commented Nov 4, 2025

Uh oh!

Carlos Zamora (carlos-zamora) left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Leonard Hecker (lhecker) commented Nov 11, 2025

Uh oh!

Dustin L. Howett (DHowett) Nov 11, 2025

Choose a reason for hiding this comment

Uh oh!

Dustin L. Howett (DHowett) left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Leonard Hecker (lhecker) commented Sep 8, 2025 •

edited

Loading