Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #4466 - FillRect Corrupts Wide Characters When Overlapping (#4486)

Browse Source 
* Improve wide character handling in output buffer

Enhances rendering and state management for wide (double-width) characters. Marks both cells as clean after rendering wide graphemes, ensures replacement cells are marked dirty when partially clipped, and uses Move/AddStr for proper wide character handling and invalidation.

* Fix FillRect to handle wide Unicode chars correctly

Refactored OutputBufferImpl.FillRect to properly handle wide (double-width) Unicode characters, fixing visual corruption when overwriting CJK text (e.g., with MessageBox borders). Removed the char-based FillRect overload in favor of Rune-based handling. Added helper methods for attribute/dirty management and wide glyph invalidation. Updated OutputBase.Write to always mark adjacent cells dirty for wide chars. Updated tests and added OutputBufferWideCharTests to verify correct behavior in all scenarios. This resolves issue #4466 and ensures robust rendering for wide Unicode text.

* Handle wide grapheme clusters in OutputBase rendering

Added logic to mark both cells of wide grapheme clusters as clean after rendering, preventing unnecessary redraws. Also included a commented-out preprocessor directive and using statement for potential future use.

* Clarify comment for IsDirty logic on wide graphemes

Updated the comment explaining why the next cell is marked clean (IsDirty = false) after handling wide graphemes, and added a reference to GitHub issue #4466 for context.

* Update test for dirty flag after wide glyph write

Adjusted OutputBaseTests to expect column 1's dirty flag to be cleared after writing a wide glyph to column 0, matching current OutputBase.Write behavior. Added clarifying comment and GitHub issue reference.

* Update Tests/UnitTestsParallelizable/Drivers/OutputBufferWideCharTests.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Terminal.Gui/Drivers/OutputBufferImpl.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update Terminal.Gui/Drivers/OutputBase.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Tig
2025-12-12 16:57:29 -07:00
committed by GitHub
parent e7a4df492d
commit 48d6e13138
8 changed files with 443 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/UnitTestsParallelizable/Drivers/ClipRegionTests.cs
View File

@@ -23,12 +23,12 @@ public class ClipRegionTests (ITestOutputHelper output) : FakeDriverBase
Assert.Equal ("x", driver.Contents [5, 5].Grapheme);
// Clear the contents
driver.FillRect (new Rectangle (0, 0, driver.Rows, driver.Cols), ' ');
driver.FillRect (new (0, 0, driver.Rows, driver.Cols), new Rune(' '));
Assert.Equal (" ", driver.Contents [0, 0].Grapheme);
// Setup the region with a single rectangle, fill screen with 'x'
driver.Clip = new (new Rectangle (5, 5, 5, 5));
driver.FillRect (new Rectangle (0, 0, driver.Rows, driver.Cols), 'x');
driver.Clip = new (new (5, 5, 5, 5));
driver.FillRect (new (0, 0, driver.Rows, driver.Cols), new Rune ('x'));
Assert.Equal (" ", driver.Contents [0, 0].Grapheme);
Assert.Equal (" ", driver.Contents [4, 9].Grapheme);
Assert.Equal ("x", driver.Contents [5, 5].Grapheme);