Merge pull request #230 from aura-systems/impl-svgaIIconsole

valentinbreiz · web-flow · commit 57b329961764 · 2022-01-18T22:44:37.000+01:00
Merge SVGAII changes.
diff --git a/Aura Operating System/Aura_Boot/Aura_Boot.csproj b/Aura Operating System/Aura_Boot/Aura_Boot.csproj
@@ -12,7 +12,7 @@
     <DebugEnabled>False</DebugEnabled>
     <DebugMode>Source</DebugMode>
     <IgnoreDebugStubAttribute>False</IgnoreDebugStubAttribute>
-    <ISOFile>bin\Debug\net5.0\Aura_OS.iso</ISOFile>
+    <ISOFile>bin\Debug\net5.0\Aura_Boot.iso</ISOFile>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <Profile>VMware</Profile>
     <Description>Use VMware Player or Workstation to deploy and debug.</Description>
@@ -39,7 +39,7 @@
     <ISO_PxeInterface>192.168.0.8</ISO_PxeInterface>
     <ISO_EnableGDB>False</ISO_EnableGDB>
     <ISO_StartCosmosGDB>False</ISO_StartCosmosGDB>
-    <ISO_ISOFile>bin\Debug\net5.0\Aura_OS.iso</ISO_ISOFile>
+    <ISO_ISOFile>bin\Debug\net5.0\Aura_Boot.iso</ISO_ISOFile>
     <VMware_StackCorruptionDetectionEnabled>True</VMware_StackCorruptionDetectionEnabled>
     <VMware_StackCorruptionDetectionLevel>MethodFooters</VMware_StackCorruptionDetectionLevel>
     <VMware_Description>Use VMware Player or Workstation to deploy and debug.</VMware_Description>
@@ -53,7 +53,7 @@
     <VMware_PxeInterface>192.168.0.8</VMware_PxeInterface>
     <VMware_EnableGDB>False</VMware_EnableGDB>
     <VMware_StartCosmosGDB>False</VMware_StartCosmosGDB>
-    <VMware_ISOFile>bin\Debug\net5.0\Aura_OS.iso</VMware_ISOFile>
+    <VMware_ISOFile>bin\Debug\net5.0\Aura_Boot.iso</VMware_ISOFile>
     <VMware_VMwareEdition>Workstation</VMware_VMwareEdition>
     <VMware_CompileVBEMultiboot>False</VMware_CompileVBEMultiboot>
     <VMware_VBEResolution>800x600x32</VMware_VBEResolution>
@@ -72,7 +72,7 @@
     <HyperV_VMwareEdition>Workstation</HyperV_VMwareEdition>
     <HyperV_EnableGDB>False</HyperV_EnableGDB>
     <HyperV_StartCosmosGDB>False</HyperV_StartCosmosGDB>
-    <HyperV_ISOFile>bin\Debug\net5.0\Aura_OS.iso</HyperV_ISOFile>
+    <HyperV_ISOFile>bin\Debug\net5.0\Aura_Boot.iso</HyperV_ISOFile>
     <HyperV_CompileVBEMultiboot>False</HyperV_CompileVBEMultiboot>
     <HyperV_VBEResolution>800x600x32</HyperV_VBEResolution>
     <HyperV_ExtractMapFile>False</HyperV_ExtractMapFile>
@@ -90,7 +90,7 @@
     <Bochs_VMwareEdition>Workstation</Bochs_VMwareEdition>
     <Bochs_EnableGDB>False</Bochs_EnableGDB>
     <Bochs_StartCosmosGDB>False</Bochs_StartCosmosGDB>
-    <Bochs_ISOFile>bin\Debug\net5.0\Aura_OS.iso</Bochs_ISOFile>
+    <Bochs_ISOFile>bin\Debug\net5.0\Aura_Boot.iso</Bochs_ISOFile>
     <Bochs_CompileVBEMultiboot>False</Bochs_CompileVBEMultiboot>
     <Bochs_VBEResolution>800x600x32</Bochs_VBEResolution>
     <Bochs_ExtractMapFile>False</Bochs_ExtractMapFile>
diff --git a/Aura Operating System/Aura_Boot/Kernel.cs b/Aura Operating System/Aura_Boot/Kernel.cs
@@ -33,15 +33,15 @@ protected override void BeforeRun()
 
                 #region Console Encoding Provider
 
-                if (Global.AConsole.Type == System.AConsole.ConsoleType.Graphical && Global.AConsole.Name != "SVGAII")
+                Encoding.RegisterProvider(CosmosEncodingProvider.Instance);
+
+                if (Global.AConsole.Type == System.AConsole.ConsoleType.Graphical)
                 {
-                    Encoding.RegisterProvider(CosmosEncodingProvider.Instance);
                     Console.InputEncoding = Encoding.Unicode;
                     Console.OutputEncoding = Encoding.Unicode;
                 }
-                else if (Global.AConsole.Type == System.AConsole.ConsoleType.Text)
+                else
                 {
-                    Encoding.RegisterProvider(CosmosEncodingProvider.Instance);
                     Console.InputEncoding = Encoding.GetEncoding(437);
                     Console.OutputEncoding = Encoding.GetEncoding(437);
                 }
diff --git a/Aura Operating System/Aura_OS/Global.cs b/Aura Operating System/Aura_OS/Global.cs
@@ -13,7 +13,7 @@ public class Global
 
         public static Setup setup = new Setup();
         public static bool running;
-        public static string version = "0.5.2";
+        public static string version = "0.5.3";
         public static string revision = VersionInfo.revision;
         public static string current_directory = @"0:\";
         public static string langSelected = "en_US";
diff --git a/Aura Operating System/Aura_OS/Properties/VersionInfo.cs b/Aura Operating System/Aura_OS/Properties/VersionInfo.cs
@@ -2,6 +2,6 @@ namespace Aura_OS
 {
     public class VersionInfo
     {
-        public static string revision = "170120222212";
+        public static string revision = "180120220352";
     }
 }
diff --git a/Aura Operating System/Aura_OS/System/CustomConsole.cs b/Aura Operating System/Aura_OS/System/CustomConsole.cs
@@ -15,17 +15,17 @@ public class CustomConsole
         public static void WriteLineInfo(string text)
         {
             Console.ForegroundColor = ConsoleColor.Cyan;
-            Global.AConsole.Write("[Info] ".ToCharArray());
+            Console.Write("[Info] ");
             Console.ForegroundColor = ConsoleColor.White;
-            Global.AConsole.Write((text + "\n").ToCharArray());
+            Console.Write(text + "\n");
             Global.debugger.Send("[Info] " + text);
         }
         public static void WriteLineWarning(string text)
         {
             Console.ForegroundColor = ConsoleColor.Yellow;
-            Global.AConsole.Write("[WARNING] ".ToCharArray());
+            Console.Write("[WARNING] ");
             Console.ForegroundColor = ConsoleColor.White;
-            Global.AConsole.Write((text + "\n").ToCharArray());
+            Console.Write(text + "\n");
             Global.debugger.Send("[WARNING] " + text);
         }
         /// <summary>
@@ -35,29 +35,29 @@ public static void WriteLineWarning(string text)
         /// <param name="tipColor"></param>
         /// <param name="text"></param>
         /// <param name="tipText"></param>
-        public static void WriteLineCustom(ConsoleColor tipColor,string text,string tipText)
+        public static void WriteLineCustom(ConsoleColor tipColor, string text, string tipText)
         {
             Console.ForegroundColor = tipColor;
-            Global.AConsole.Write(("[" + tipText + "] ").ToCharArray());
+            Console.Write("[" + tipText + "] ");
             Console.ForegroundColor = ConsoleColor.White;
-            Global.AConsole.Write((text + "\n").ToCharArray());
+            Console.Write(text + "\n");
             Global.debugger.Send("[" + tipText + "] " + text);
         }
         public static void WriteLineOK(string text)
         {
             Console.ForegroundColor = ConsoleColor.Green;
-            Global.AConsole.Write("[OK] ".ToCharArray());
+            Console.Write("[OK] ");
             Console.ForegroundColor = ConsoleColor.White;
-            Global.AConsole.Write((text + "\n").ToCharArray());
+            Console.Write(text + "\n");
             Global.debugger.Send("[OK] " + text);
         }
         public static void WriteLineError(string text)
         {
             Console.ForegroundColor = ConsoleColor.DarkRed;
-            Global.AConsole.Write(("[Error] ").ToCharArray());
+            Console.Write("[Error] ");
             Console.ForegroundColor = ConsoleColor.White;
-            Global.AConsole.Write((text + "\n").ToCharArray());
+            Console.Write(text + "\n");
             Global.debugger.Send("[Error] " + text);
         }
     }
-}
+}
diff --git a/Aura Operating System/Aura_OS/System/Shell/cmdIntr/Settings/Settings.cs b/Aura Operating System/Aura_OS/System/Shell/cmdIntr/Settings/Settings.cs
@@ -10,7 +10,7 @@
 
 namespace Aura_OS.System.Shell.cmdIntr.Settings
 {
-    class Settings
+    /*class Settings
     {
         private static string HelpInfo = "";
 
@@ -20,7 +20,7 @@ class Settings
         public static string HI
         {
             get { return HelpInfo; }
-            set { HelpInfo = value; /*PUSHED OUT VALUE (in)*/}
+            set { HelpInfo = value; /*PUSHED OUT VALUE (in)*//*}
         }
 
         /// <summary>
@@ -176,5 +176,5 @@ public static void c_Settings(string settings)
             }
 
         }
-    }
+    }*/
 }
diff --git a/Aura Operating System/Aura_OS/System/Shell/cmdIntr/Util/Help.cs b/Aura Operating System/Aura_OS/System/Shell/cmdIntr/Util/Help.cs
@@ -71,7 +71,7 @@ private ReturnInfo ExecuteHelp(bool showaliases)
                 Console.WriteLine(" (" + command.Description + ")");
 
                 count++;
-                if (count == Global.AConsole.Rows)
+                if (count == Global.AConsole.Rows - 3)
                 {
                     Console.ReadKey();
                     count = 0;
diff --git a/Aura Operating System/Aura_OS/System/Shell/cmdIntr/Util/Lspci.cs b/Aura Operating System/Aura_OS/System/Shell/cmdIntr/Util/Lspci.cs
@@ -30,7 +30,7 @@ public override ReturnInfo Execute()
             {
                 Console.WriteLine(Conversion.D2(device.bus) + ":" + Conversion.D2(device.slot) + ":" + Conversion.D2(device.function) + " - " + "0x" + Conversion.D4(Conversion.DecToHex(device.VendorID)) + ":0x" + Conversion.D4(Conversion.DecToHex(device.DeviceID)) + " : " + DeviceClass.GetTypeString(device) + ": " + DeviceClass.GetDeviceString(device));
                 count++;
-                if (count == Global.AConsole.Rows)
+                if (count == Global.AConsole.Rows - 4)
                 {
                     Console.ReadKey();
                     count = 0;
diff --git a/Aura Operating System/Aura_Plugs/HAL/Global.cs b/Aura Operating System/Aura_Plugs/HAL/Global.cs
@@ -21,13 +21,9 @@ public static class Global
 
         static public void Init(TextScreenBase textScreen, bool InitScrollWheel, bool InitPS2, bool InitNetwork, bool IDEInit)
         {
-            Cosmos.HAL.Global.mDebugger.Send("Before Core.Global.Init");
-            Cosmos.Core.Global.Init();
-
             PCI.Setup();
-            var _SVGAIIDevice = PCI.GetDevice(VendorID.VMWare, DeviceID.SVGAIIAdapter);
 
-            if (VBEAvailable() || (_SVGAIIDevice != null && PCI.Exists(_SVGAIIDevice)))
+            if (VBEAvailable())
             {
                 Aura_OS.Global.AConsole = new Aura_OS.System.AConsole.GraphicConsole();
             }
@@ -36,11 +32,10 @@ static public void Init(TextScreenBase textScreen, bool InitScrollWheel, bool In
                 Aura_OS.Global.AConsole = new Aura_OS.System.AConsole.VGAConsole(textScreen);
             }
 
-            Aura_OS.Global.AConsole.Write(("[Aura Operating System v" + Aura_OS.Global.version + " - Made by valentinbreiz and geomtech]\n").ToCharArray());
+            Console.WriteLine("[Aura Operating System v" + Aura_OS.Global.version + " - Made by valentinbreiz and geomtech]");
             Aura_OS.System.CustomConsole.WriteLineInfo("Starting Cosmos kernel...");
 
             Aura_OS.System.CustomConsole.WriteLineOK("PCI Devices Scan");
-            Aura_OS.System.CustomConsole.WriteLineOK("Plugged Console");
 
             ACPI.Start();
             Aura_OS.System.CustomConsole.WriteLineOK("ACPI Initialization");
@@ -58,7 +53,6 @@ static public void Init(TextScreenBase textScreen, bool InitScrollWheel, bool In
             Aura_OS.System.CustomConsole.WriteLineOK("Network Devices Initialization");
 
             Aura_OS.System.CustomConsole.WriteLineOK("Kernel successfully initialized!");
-
         }
 
         /// <summary>
diff --git a/Aura Operating System/Aura_Plugs/System/ConsoleImpl.cs b/Aura Operating System/Aura_Plugs/System/ConsoleImpl.cs
@@ -861,10 +861,6 @@ public static void Write(string aText)
             {
                 GetConsole().Write(aText.ToCharArray());
             }
-            else
-            {
-                GetConsole().Write(aText.ToCharArray());
-            }
         }
 
         public static void Write(uint aInt) => Write(aInt.ToString());

Original file line number	Diff line number	Diff line change
`@@ -33,15 +33,15 @@ protected override void BeforeRun()`
`33`	`33`
`34`	`34`	`#region Console Encoding Provider`
`35`	`35`
`36`		`- if (Global.AConsole.Type == System.AConsole.ConsoleType.Graphical && Global.AConsole.Name != "SVGAII")`
	`36`	`+ Encoding.RegisterProvider(CosmosEncodingProvider.Instance);`
	`37`	`+`
	`38`	`+ if (Global.AConsole.Type == System.AConsole.ConsoleType.Graphical)`
`37`	`39`	`{`
`38`		`- Encoding.RegisterProvider(CosmosEncodingProvider.Instance);`
`39`	`40`	`Console.InputEncoding = Encoding.Unicode;`
`40`	`41`	`Console.OutputEncoding = Encoding.Unicode;`
`41`	`42`	`}`
`42`		`- else if (Global.AConsole.Type == System.AConsole.ConsoleType.Text)`
	`43`	`+ else`
`43`	`44`	`{`
`44`		`- Encoding.RegisterProvider(CosmosEncodingProvider.Instance);`
`45`	`45`	`Console.InputEncoding = Encoding.GetEncoding(437);`
`46`	`46`	`Console.OutputEncoding = Encoding.GetEncoding(437);`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ namespace Aura_OS`
`2`	`2`	`{`
`3`	`3`	`public class VersionInfo`
`4`	`4`	`{`
`5`		`- public static string revision = "170120222212";`
	`5`	`+ public static string revision = "180120220352";`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,17 +15,17 @@ public class CustomConsole`
`15`	`15`	`public static void WriteLineInfo(string text)`
`16`	`16`	`{`
`17`	`17`	`Console.ForegroundColor = ConsoleColor.Cyan;`
`18`		`- Global.AConsole.Write("[Info] ".ToCharArray());`
	`18`	`+ Console.Write("[Info] ");`
`19`	`19`	`Console.ForegroundColor = ConsoleColor.White;`
`20`		`- Global.AConsole.Write((text + "\n").ToCharArray());`
	`20`	`+ Console.Write(text + "\n");`
`21`	`21`	`Global.debugger.Send("[Info] " + text);`
`22`	`22`	`}`
`23`	`23`	`public static void WriteLineWarning(string text)`
`24`	`24`	`{`
`25`	`25`	`Console.ForegroundColor = ConsoleColor.Yellow;`
`26`		`- Global.AConsole.Write("[WARNING] ".ToCharArray());`
	`26`	`+ Console.Write("[WARNING] ");`
`27`	`27`	`Console.ForegroundColor = ConsoleColor.White;`
`28`		`- Global.AConsole.Write((text + "\n").ToCharArray());`
	`28`	`+ Console.Write(text + "\n");`
`29`	`29`	`Global.debugger.Send("[WARNING] " + text);`
`30`	`30`	`}`
`31`	`31`	`/// <summary>`
`@@ -35,29 +35,29 @@ public static void WriteLineWarning(string text)`
`35`	`35`	`/// <param name="tipColor"></param>`
`36`	`36`	`/// <param name="text"></param>`
`37`	`37`	`/// <param name="tipText"></param>`
`38`		`- public static void WriteLineCustom(ConsoleColor tipColor,string text,string tipText)`
	`38`	`+ public static void WriteLineCustom(ConsoleColor tipColor, string text, string tipText)`
`39`	`39`	`{`
`40`	`40`	`Console.ForegroundColor = tipColor;`
`41`		`- Global.AConsole.Write(("[" + tipText + "] ").ToCharArray());`
	`41`	`+ Console.Write("[" + tipText + "] ");`
`42`	`42`	`Console.ForegroundColor = ConsoleColor.White;`
`43`		`- Global.AConsole.Write((text + "\n").ToCharArray());`
	`43`	`+ Console.Write(text + "\n");`
`44`	`44`	`Global.debugger.Send("[" + tipText + "] " + text);`
`45`	`45`	`}`
`46`	`46`	`public static void WriteLineOK(string text)`
`47`	`47`	`{`
`48`	`48`	`Console.ForegroundColor = ConsoleColor.Green;`
`49`		`- Global.AConsole.Write("[OK] ".ToCharArray());`
	`49`	`+ Console.Write("[OK] ");`
`50`	`50`	`Console.ForegroundColor = ConsoleColor.White;`
`51`		`- Global.AConsole.Write((text + "\n").ToCharArray());`
	`51`	`+ Console.Write(text + "\n");`
`52`	`52`	`Global.debugger.Send("[OK] " + text);`
`53`	`53`	`}`
`54`	`54`	`public static void WriteLineError(string text)`
`55`	`55`	`{`
`56`	`56`	`Console.ForegroundColor = ConsoleColor.DarkRed;`
`57`		`- Global.AConsole.Write(("[Error] ").ToCharArray());`
	`57`	`+ Console.Write("[Error] ");`
`58`	`58`	`Console.ForegroundColor = ConsoleColor.White;`
`59`		`- Global.AConsole.Write((text + "\n").ToCharArray());`
	`59`	`+ Console.Write(text + "\n");`
`60`	`60`	`Global.debugger.Send("[Error] " + text);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`		`-}`
	`63`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`namespace Aura_OS.System.Shell.cmdIntr.Settings`
`12`	`12`	`{`
`13`		`- class Settings`
	`13`	`+ /*class Settings`
`14`	`14`	`{`
`15`	`15`	`private static string HelpInfo = "";`
`16`	`16`
`@@ -20,7 +20,7 @@ class Settings`
`20`	`20`	`public static string HI`
`21`	`21`	`{`
`22`	`22`	`get { return HelpInfo; }`
`23`		`- set { HelpInfo = value; /PUSHED OUT VALUE (in)/}`
	`23`	`+ set { HelpInfo = value; /PUSHED OUT VALUE (in)//*}`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`/// <summary>`
`@@ -176,5 +176,5 @@ public static void c_Settings(string settings)`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`}`
`179`		`- }`
	`179`	`+ }*/`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private ReturnInfo ExecuteHelp(bool showaliases)`
`71`	`71`	`Console.WriteLine(" (" + command.Description + ")");`
`72`	`72`
`73`	`73`	`count++;`
`74`		`- if (count == Global.AConsole.Rows)`
	`74`	`+ if (count == Global.AConsole.Rows - 3)`
`75`	`75`	`{`
`76`	`76`	`Console.ReadKey();`
`77`	`77`	`count = 0;`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public override ReturnInfo Execute()`
`30`	`30`	`{`
`31`	`31`	`Console.WriteLine(Conversion.D2(device.bus) + ":" + Conversion.D2(device.slot) + ":" + Conversion.D2(device.function) + " - " + "0x" + Conversion.D4(Conversion.DecToHex(device.VendorID)) + ":0x" + Conversion.D4(Conversion.DecToHex(device.DeviceID)) + " : " + DeviceClass.GetTypeString(device) + ": " + DeviceClass.GetDeviceString(device));`
`32`	`32`	`count++;`
`33`		`- if (count == Global.AConsole.Rows)`
	`33`	`+ if (count == Global.AConsole.Rows - 4)`
`34`	`34`	`{`
`35`	`35`	`Console.ReadKey();`
`36`	`36`	`count = 0;`
Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,9 @@ public static class Global`
`21`	`21`
`22`	`22`	`static public void Init(TextScreenBase textScreen, bool InitScrollWheel, bool InitPS2, bool InitNetwork, bool IDEInit)`
`23`	`23`	`{`
`24`		`- Cosmos.HAL.Global.mDebugger.Send("Before Core.Global.Init");`
`25`		`- Cosmos.Core.Global.Init();`
`26`		`-`
`27`	`24`	`PCI.Setup();`
`28`		`- var _SVGAIIDevice = PCI.GetDevice(VendorID.VMWare, DeviceID.SVGAIIAdapter);`
`29`	`25`
`30`		`- if (VBEAvailable() \|\| (_SVGAIIDevice != null && PCI.Exists(_SVGAIIDevice)))`
	`26`	`+ if (VBEAvailable())`
`31`	`27`	`{`
`32`	`28`	`Aura_OS.Global.AConsole = new Aura_OS.System.AConsole.GraphicConsole();`
`33`	`29`	`}`
`@@ -36,11 +32,10 @@ static public void Init(TextScreenBase textScreen, bool InitScrollWheel, bool In`
`36`	`32`	`Aura_OS.Global.AConsole = new Aura_OS.System.AConsole.VGAConsole(textScreen);`
`37`	`33`	`}`
`38`	`34`
`39`		`- Aura_OS.Global.AConsole.Write(("[Aura Operating System v" + Aura_OS.Global.version + " - Made by valentinbreiz and geomtech]\n").ToCharArray());`
	`35`	`+ Console.WriteLine("[Aura Operating System v" + Aura_OS.Global.version + " - Made by valentinbreiz and geomtech]");`
`40`	`36`	`Aura_OS.System.CustomConsole.WriteLineInfo("Starting Cosmos kernel...");`
`41`	`37`
`42`	`38`	`Aura_OS.System.CustomConsole.WriteLineOK("PCI Devices Scan");`
`43`		`- Aura_OS.System.CustomConsole.WriteLineOK("Plugged Console");`
`44`	`39`
`45`	`40`	`ACPI.Start();`
`46`	`41`	`Aura_OS.System.CustomConsole.WriteLineOK("ACPI Initialization");`
`@@ -58,7 +53,6 @@ static public void Init(TextScreenBase textScreen, bool InitScrollWheel, bool In`
`58`	`53`	`Aura_OS.System.CustomConsole.WriteLineOK("Network Devices Initialization");`
`59`	`54`
`60`	`55`	`Aura_OS.System.CustomConsole.WriteLineOK("Kernel successfully initialized!");`
`61`		`-`
`62`	`56`	`}`
`63`	`57`
`64`	`58`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -861,10 +861,6 @@ public static void Write(string aText)`
`861`	`861`	`{`
`862`	`862`	`GetConsole().Write(aText.ToCharArray());`
`863`	`863`	`}`
`864`		`- else`
`865`		`- {`
`866`		`- GetConsole().Write(aText.ToCharArray());`
`867`		`- }`
`868`	`864`	`}`
`869`	`865`
`870`	`866`	`public static void Write(uint aInt) => Write(aInt.ToString());`