Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-01 16:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify MakePrintable by using AND and avoiding converting to string and back.

Browse Source
This commit is contained in:
Alexandru Ciobanu
2022-10-19 09:37:52 +01:00
committed by BDisp
parent 2c63d92ccf
commit 327980dea0
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Terminal.Gui/Core/ConsoleDriver.cs
View File

@@ -681,11 +681,13 @@ namespace Terminal.Gui {
/// <param name="col">Column to move the cursor to.</param> /// <param name="col">Column to move the cursor to.</param>
/// <param name="row">Row to move the cursor to.</param> /// <param name="row">Row to move the cursor to.</param>
public abstract void Move (int col, int row); public abstract void Move (int col, int row);
/// <summary> /// <summary>
/// Adds the specified rune to the display at the current cursor position /// Adds the specified rune to the display at the current cursor position
/// </summary> /// </summary>
/// <param name="rune">Rune to add.</param> /// <param name="rune">Rune to add.</param>
public abstract void AddRune (Rune rune); public abstract void AddRune (Rune rune);
/// <summary> /// <summary>
/// Ensures a Rune is not a control character and can be displayed by translating characters below 0x20 /// Ensures a Rune is not a control character and can be displayed by translating characters below 0x20
/// to equivalent, printable, Unicode chars. /// to equivalent, printable, Unicode chars.
@@ -694,21 +696,14 @@ namespace Terminal.Gui {
/// <returns></returns> /// <returns></returns>
public static Rune MakePrintable (Rune c) public static Rune MakePrintable (Rune c)
{ {
var controlChars = gethexaformat (c, 4); var controlChars = c & 0xFFFF;
if (controlChars <= 0x1F || (controlChars >= 0X7F && controlChars <= 0x9F)) { if (controlChars <= 0x1F || controlChars >= 0X7F && controlChars <= 0x9F) {
// ASCII (C0) control characters. // ASCII (C0) control characters.
// C1 control characters (https://www.aivosto.com/articles/control-characters.html#c1) // C1 control characters (https://www.aivosto.com/articles/control-characters.html#c1)
return new Rune (controlChars + 0x2400); return new Rune (controlChars + 0x2400);
} else {
return c;
} }
}
static uint gethexaformat (uint rune, int length) return c;
{
var hex = rune.ToString ($"x{length}");
var hexstr = hex.Substring (hex.Length - length, length);
return (uint)int.Parse (hexstr, System.Globalization.NumberStyles.HexNumber);
} }
/// <summary> /// <summary>