Skip to content

Fixes #4236. CursesDriver erase the previous text under the cursor when moving if Force16Colors is true #4237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 10, 2025
Merged

Fixes #4236. CursesDriver erase the previous text under the cursor when moving if Force16Colors is true #4237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce8e19b
Fixes #4236. CursesDriver erase the previous text under the cursor wh…
BDisp Sep 6, 2025
ecfee32
Still trying to fix fluent unit tests
BDisp Sep 6, 2025
6a0705d
Fix nullable issue
BDisp Sep 8, 2025
02ca645
Merge branch 'v2_develop' into v2_4236_cursesdriver-force16colors-cur…
tig Sep 10, 2025
17a0149
Merge branch 'v2_develop' into v2_4236_cursesdriver-force16colors-cur…
tig Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions Terminal.Gui/Drivers/CursesDriver/CursesDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,8 @@ public override bool GetCursorVisibility (out CursorVisibility visibility)
return true;
}

private EscSeqUtils.DECSCUSR_Style? _currentDecscusrStyle;

/// <inheritdoc/>
public override bool SetCursorVisibility (CursorVisibility visibility)
{
Expand All @@ -547,17 +549,19 @@ public override bool SetCursorVisibility (CursorVisibility visibility)
if (!RunningUnitTests)
{
Curses.curs_set (((int)visibility >> 16) & 0x000000FF);
Curses.leaveok (_window!.Handle, !Force16Colors);
}

if (visibility != CursorVisibility.Invisible)
{
_mainLoopDriver?.WriteRaw (
EscSeqUtils.CSI_SetCursorStyle (
(EscSeqUtils.DECSCUSR_Style)
(((int)visibility >> 24)
& 0xFF)
)
);
if (_currentDecscusrStyle is null || _currentDecscusrStyle != (EscSeqUtils.DECSCUSR_Style)(((int)visibility >> 24) & 0xFF))
{
_currentDecscusrStyle = (EscSeqUtils.DECSCUSR_Style)(((int)visibility >> 24) & 0xFF);

_mainLoopDriver?.WriteRaw (
EscSeqUtils.CSI_SetCursorStyle ((EscSeqUtils.DECSCUSR_Style)_currentDecscusrStyle)
);
}
}

_currentCursorVisibility = visibility;
Expand Down
3 changes: 1 addition & 2 deletions Terminal.Gui/Drivers/CursesDriver/UnixMainLoop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,7 @@ private struct Pollfd

private class Watch
{
// BUGBUG: Fix this nullable issue.
public Func<MainLoop, bool> Callback;
public Func<MainLoop, bool>? Callback;
public Condition Condition;
public int File;
}
Expand Down
2 changes: 1 addition & 1 deletion Terminal.Gui/ViewBase/ViewCollectionHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ internal static View [] Snapshot (this IEnumerable<View> source)
// The list parameter might be the live `_subviews`, so freeze it under a lock
lock (list)
{
return [.. list]; // C# 12 slice copy (= new List<View>(list).ToArray())
return list.ToArray (); // It’s slightly less “fancy C# 12”, but much safer in multithreaded code
}
}

Expand Down
Loading