3.1.2 patch

Terminal/Color.cs

@@ -202,6 +202,14 @@ public string ToForegroundANSI() {
     /// </summary>
     public static readonly Color Yellow = new(255, 255, 0);
     /// <summary>
+    /// 255, 0, 255
+    /// </summary>
+    public static readonly Color Magenta = new(255, 0, 255);
+    /// <summary>
+    /// 0, 255, 255
+    /// </summary>
+    public static readonly Color Cyan = new(0, 255, 255);
+    /// <summary>
     /// 255, 160, 0
     /// </summary>
     public static readonly Color Orange = new(255, 160, 0);
@@ -210,6 +218,10 @@ public string ToForegroundANSI() {
     /// </summary>
     public static readonly Color Gray = new(180, 180, 180);
     /// <summary>
+    /// 64, 64, 64
+    /// </summary>
+    public static readonly Color DarkGray = new(64, 64, 64);
+    /// <summary>
     /// 0, 0, 0
     /// </summary>
     public static readonly Color Black = new(0, 0, 0);

Terminal/Style.cs

@@ -43,11 +43,11 @@ public struct Style {
     /// <summary>
     /// The text color.
     /// </summary>
-    public Color foregroundColor = Colors.Default;
+    public Color ForegroundColor = Colors.Default;
     /// <summary>
     /// The color behind the text.
     /// </summary>
-    public Color backgroundColor = Colors.Default;
+    public Color BackgroundColor = Colors.Default;
 
     /// <summary>
     /// Creates a basic style.
@@ -71,6 +71,6 @@ public readonly string ToANSI() {
             (Striketrough ? ANSI.Styles.Striketrough : ANSI.Styles.ResetStriketrough) +
             (DoubleUnderline ? ANSI.Styles.DoubleUnderline : "") +
             ((!(Underline||DoubleUnderline)) ? ANSI.Styles.ResetUnderline : "") +
-            backgroundColor.ToBackgroundANSI() + foregroundColor.ToForegroundANSI();
+            BackgroundColor.ToBackgroundANSI() + ForegroundColor.ToForegroundANSI();
     }
 }

Terminal/Terminal.cs

@@ -1,7 +1,5 @@
 using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
 using System.Text;
-using OxDED.Terminal.Logging;
 using OxDED.Terminal.Window;
 
 namespace OxDED.Terminal;
@@ -80,7 +78,7 @@ public static bool ListenForKeys {set {
     /// </summary>
     public static Encoding OutEncoding {get { return Console.OutputEncoding; } set {Console.OutputEncoding = value; }}
     /// <summary>
-    /// Creates a new Terminal Window.
+    /// Creates a new Terminal Window (Experimental).
     /// </summary>
     /// <param name="title">The name of the window</param>
     /// <returns></returns>
@@ -124,7 +122,7 @@ public static void WriteLine(Style? style = null) {
     /// <param name="text">The text to write to the error output stream.</param>
     /// <param name="style">The style to use (default: with red foreground).</param>
     public static void WriteErrorLine<T>(T? text, Style? style = null) {
-        Error.WriteLine((style ?? new Style {foregroundColor = Colors.Red}).ToANSI()+text?.ToString()+ANSI.Styles.ResetAll);
+        Error.WriteLine((style ?? new Style {ForegroundColor = Colors.Red}).ToANSI()+text?.ToString()+ANSI.Styles.ResetAll);
     }
     /// <summary>
     /// Writes a line to the error stream, with a style.
@@ -140,7 +138,7 @@ public static void WriteErrorLine(Style? style = null) {
     /// <param name="text">The text to write to the error output stream.</param>
     /// <param name="style">The style to use (default: with red foreground).</param>
     public static void WriteError<T>(T? text, Style? style = null) {
-        Error.Write((style ?? new Style {foregroundColor = Colors.Red}).ToANSI()+text?.ToString()+ANSI.Styles.ResetAll);
+        Error.Write((style ?? new Style {ForegroundColor = Colors.Red}).ToANSI()+text?.ToString()+ANSI.Styles.ResetAll);
     }
     /// <summary>
     /// Sets the cursor to that position.
@@ -150,7 +148,7 @@ public static void WriteError<T>(T? text, Style? style = null) {
     public static void Goto((int x, int y) pos) {
         if (pos.x >= Width || pos.x < 0) { throw new ArgumentOutOfRangeException(nameof(pos), "pos x is higher than the width or is lower than 0."); }
         if (pos.y >= Height || pos.y < 0) { throw new ArgumentOutOfRangeException(nameof(pos), "pos y is higher than the height or is lower than 0."); }
-        Out.Write(ANSI.MoveCursor(pos.x, pos.y));
+        Out.Write(ANSI.MoveCursor(pos.x+1, pos.y+1));
     }
     /// <summary>
     /// Gets the cursor position.

Terminal/Terminal.csproj

@@ -7,7 +7,7 @@
     <PublishTrimmed>true</PublishTrimmed>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageId>0xDED.Terminal</PackageId>
-    <Version>3.1.1</Version>
+    <Version>3.1.2</Version>
     <Authors>0xDED</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageReadmeFile>README.md</PackageReadmeFile>

Terminal/Window/TerminalWindow.cs

@@ -74,7 +74,7 @@ public virtual void WriteLine<T>(T? text, Style? style = null) {
     /// <param name="text">The text to write to the error output stream.</param>
     /// <param name="style">The style to use (default: with red foreground).</param>
     public virtual void WriteErrorLine<T>(T? text, Style? style = null) {
-        Error.WriteLine((style ?? new Style {foregroundColor = Colors.Red}).ToANSI()+text?.ToString()+ANSI.Styles.ResetAll);
+        Error.WriteLine((style ?? new Style {ForegroundColor = Colors.Red}).ToANSI()+text?.ToString()+ANSI.Styles.ResetAll);
     }
     /// <summary>
     /// Writes something (<see cref="object.ToString"/>) to the error stream, with a style.
@@ -83,7 +83,7 @@ public virtual void WriteErrorLine<T>(T? text, Style? style = null) {
     /// <param name="text">The text to write to the error output stream.</param>
     /// <param name="style">The style to use (default: with red foreground).</param>
     public virtual void WriteError<T>(T? text, Style? style = null) {
-        Error.Write((style ?? new Style {foregroundColor = Colors.Red}).ToANSI()+text?.ToString()+ANSI.Styles.ResetAll);
+        Error.Write((style ?? new Style {ForegroundColor = Colors.Red}).ToANSI()+text?.ToString()+ANSI.Styles.ResetAll);
     }
     /// <summary>
     /// Sets the cursor to that position.

Terminal/Window/WinTerminalWindow.cs

@@ -26,7 +26,7 @@ internal struct KEY_EVENT_RECORD {
         internal ushort wVirtualScanCode;
         private ushort _uChar;
         internal uint dwControlKeyState;
-        internal char uChar => (char)_uChar;
+        internal readonly char uChar => (char)_uChar;
     }
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
     internal struct INPUT_RECORD {

examples/Colors/Program.cs

@@ -4,7 +4,7 @@
 class Program {
     public static void Main(string[] args) {
         // * Using style.
-        Terminal.WriteLine("Red", new Style{foregroundColor = Color.Red});
+        Terminal.WriteLine("Red", new Style{ForegroundColor = Color.Red});
 
         // Will reset to default color (used many times).
         string defaultColor = ((Color)Colors.Default).ToForegroundANSI();