Skip to content

Simplify MakePrintable by using AND and avoiding converting to string #2101

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
tig merged 5 commits into from
Oct 21, 2022
Merged

Simplify MakePrintable by using AND and avoiding converting to string #2101

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76dab4a
Simplify MakePrintable by using AND and avoiding converting to string…
pavkam Oct 19, 2022
441960e
Added two unit tests to check for the MakePrintable cases.
pavkam Oct 19, 2022
f68cc7a
Merge branch 'develop' into cleanup_3
tig Oct 19, 2022
350f1eb
Merge branch 'develop' into cleanup_3
tig Oct 20, 2022
c0da5a4
Merge branch 'develop' into cleanup_3
tig Oct 21, 2022
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
15 changes: 5 additions & 10 deletions Terminal.Gui/Core/ConsoleDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,11 +681,13 @@ public abstract class ConsoleDriver {
/// <param name="col">Column to move the cursor to.</param>
/// <param name="row">Row to move the cursor to.</param>
public abstract void Move (int col, int row);

/// <summary>
/// Adds the specified rune to the display at the current cursor position
/// </summary>
/// <param name="rune">Rune to add.</param>
public abstract void AddRune (Rune rune);

/// <summary>
/// Ensures a Rune is not a control character and can be displayed by translating characters below 0x20
/// to equivalent, printable, Unicode chars.
Expand All @@ -694,21 +696,14 @@ public abstract class ConsoleDriver {
/// <returns></returns>
public static Rune MakePrintable (Rune c)
{
var controlChars = gethexaformat (c, 4);
if (controlChars <= 0x1F || (controlChars >= 0X7F && controlChars <= 0x9F)) {
var controlChars = c & 0xFFFF;
if (controlChars <= 0x1F || controlChars >= 0X7F && controlChars <= 0x9F) {
// ASCII (C0) control characters.
// C1 control characters (https://www.aivosto.com/articles/control-characters.html#c1)
return new Rune (controlChars + 0x2400);
} else {
return c;
}
}

static uint gethexaformat (uint rune, int length)
{
var hex = rune.ToString ($"x{length}");
var hexstr = hex.Substring (hex.Length - length, length);
return (uint)int.Parse (hexstr, System.Globalization.NumberStyles.HexNumber);
return c;
}

/// <summary>
Expand Down