Innovation/dremdos
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Finally synchronize with local work. GUI is working. Now targeting .NET 6.0

Browse source
This commit is contained in:
Innovation 2024-01-22 17:13:32 -06:00
parent 57de6e022b
commit 305d7920c6
6 changed files with 145 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/DremDOS.sln
View file

@ -1,9 +1,9 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 17
VisualStudioVersion = 16.0.32002.261 VisualStudioVersion = 17.8.34511.84
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DremDOS", "DremDOS\DremDOS.csproj", "{E2D8A648-A174-4667-AE66-D25A9E976625}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DremDOS", "DremDOS\DremDOS.csproj", "{CCB00DFE-38D6-44CE-AAB4-64C9E382906D}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -11,15 +11,15 @@ Global
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E2D8A648-A174-4667-AE66-D25A9E976625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CCB00DFE-38D6-44CE-AAB4-64C9E382906D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E2D8A648-A174-4667-AE66-D25A9E976625}.Debug|Any CPU.Build.0 = Debug|Any CPU {CCB00DFE-38D6-44CE-AAB4-64C9E382906D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E2D8A648-A174-4667-AE66-D25A9E976625}.Release|Any CPU.ActiveCfg = Release|Any CPU {CCB00DFE-38D6-44CE-AAB4-64C9E382906D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E2D8A648-A174-4667-AE66-D25A9E976625}.Release|Any CPU.Build.0 = Release|Any CPU {CCB00DFE-38D6-44CE-AAB4-64C9E382906D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6262F00F-A1A7-4527-B16E-35ECD01B1C3C} SolutionGuid = {ED80186C-B13D-40DB-BDFB-0F685741A96C}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

81
src/DremDOS/Core/Console/Terminal.cs
View file

@ -18,6 +18,7 @@ namespace DremDOS.Core.Terminal
class Terminal class Terminal
{ {
private VGATerminal LinkedVGATerminal; private VGATerminal LinkedVGATerminal;
private Kernel kernel;
private char[] CommandBuffer = new char[1000]; private char[] CommandBuffer = new char[1000];
public bool ShowOutput = false; public bool ShowOutput = false;
private int CommandBufferCurrentLocation = 0; private int CommandBufferCurrentLocation = 0;
@ -27,8 +28,9 @@ namespace DremDOS.Core.Terminal
private bool ConsoleMode; private bool ConsoleMode;
private bool RunCommandReady; private bool RunCommandReady;
public Terminal(bool IsInConsoleMode) public Terminal(bool IsInConsoleMode, Kernel k)
{ {
kernel = k;
Initialize(IsInConsoleMode); Initialize(IsInConsoleMode);
} }
@ -135,9 +137,7 @@ namespace DremDOS.Core.Terminal
} }
else else
{ {
Console.Beep(100, 1000);
Pen ColorPen = StringToPen(Color); Pen ColorPen = StringToPen(Color);
Console.Beep(500, 1000);
LinkedVGATerminal.AppendText(Text, ColorPen); LinkedVGATerminal.AppendText(Text, ColorPen);
} }
return; return;
@ -148,6 +148,7 @@ namespace DremDOS.Core.Terminal
ConsoleColor Color; ConsoleColor Color;
Color = ConsoleColor.White; Color = ConsoleColor.White;
// TODO: Unfugg this now that switch statements exist.
if (ColorIn == "Black") { if (ColorIn == "Black") {
Color = ConsoleColor.Black; Color = ConsoleColor.Black;
} else if (ColorIn == "DarkBlue") { } else if (ColorIn == "DarkBlue") {
@ -178,7 +179,7 @@ namespace DremDOS.Core.Terminal
Color = ConsoleColor.Magenta; Color = ConsoleColor.Magenta;
} else if (ColorIn == "Yellow") { } else if (ColorIn == "Yellow") {
Color = ConsoleColor.Yellow; Color = ConsoleColor.Yellow;
} else if (ColorIn == "White") { } else { // Consider having it throw an exception if the color is invalid.
Color = ConsoleColor.White; Color = ConsoleColor.White;
} // This hurts to look at } // This hurts to look at
@ -188,18 +189,71 @@ namespace DremDOS.Core.Terminal
private Pen StringToPen(string ColorIn) private Pen StringToPen(string ColorIn)
{ {
Pen PenColor; Pen PenColor;
PenColor = new Pen(Color.FromName(ColorIn)); //PenColor = new Pen(Color.FromName(ColorIn));
/*switch(ColorIn) // I'll only support some colors for now // This is not the full list of available colors, but it matches the available colors to Console.
// This is a temporary stop-gap until System.Drawing.Color.FromName finally works.
switch(ColorIn)
{ {
case "White":
PenColor = new Pen(Color.White);
break;
case "Black": case "Black":
PenColor = new Pen(Color.Black); PenColor = new Pen(Color.Black);
break; break;
case "DarkBlue":
PenColor = new Pen(Color.DarkBlue);
break;
case "DarkGreen":
PenColor = new Pen(Color.DarkGreen);
break;
case "DarkCyan":
PenColor = new Pen(Color.DarkCyan);
break;
case "DarkRed":
PenColor = new Pen(Color.DarkRed);
break;
case "DarkMagenta":
PenColor = new Pen(Color.DarkMagenta);
break;
case "DarkYellow":
//PenColor = new Pen(ColorTranslator.FromHtml("#cc7722"));
PenColor = new Pen(Color.Yellow); // DarkYellow == Yellow for now.
break;
case "Gray":
PenColor = new Pen(Color.Gray);
break;
case "DarkGray":
PenColor = new Pen(Color.DarkGray);
break;
case "Blue":
PenColor = new Pen(Color.Blue);
break;
case "Green":
PenColor = new Pen(Color.Green);
break;
case "Cyan":
PenColor = new Pen(Color.Cyan);
break;
case "Red":
PenColor = new Pen(Color.Red);
break;
case "Magenta":
PenColor = new Pen(Color.Magenta);
break;
case "Yellow":
PenColor = new Pen(Color.Yellow);
break;
default: // Consider having it throw an exception if the color is invalid.
// Check if user wanted a hex value
// This is a pretty poor and inefficient way of doing this but... eh I don't care.
// The hex conversion should really be a different function.
/*if (ColorIn[0] == '0') // This can be uncommented when ColorTranslator is implemented.
{
// More validation is required.
PenColor = new Pen(ColorTranslator.FromHtml(ColorIn));
break;
}*/ }*/
PenColor = new Pen(Color.White);
break;
}
return PenColor; return PenColor;
} }
@ -207,7 +261,6 @@ namespace DremDOS.Core.Terminal
public void RunCommand(string cmd) public void RunCommand(string cmd)
{ {
string[] arguments = GetArguments(cmd); string[] arguments = GetArguments(cmd);
Console.Beep(500, 1000);
//RunCommand(arguments); //RunCommand(arguments);
Command(); Command();
//Console.Beep(1000, 1000); //Console.Beep(1000, 1000);
@ -219,7 +272,6 @@ namespace DremDOS.Core.Terminal
{ {
//Console.Beep(1500, 1000); //Console.Beep(1500, 1000);
Command(); Command();
Console.Beep(2000, 1000);
} }
else if (arguments[0] == "checktime") else if (arguments[0] == "checktime")
{ {
@ -259,7 +311,7 @@ namespace DremDOS.Core.Terminal
private void Command() { private void Command() {
if (ShowOutput) if (ShowOutput)
{ {
/*AppendText(@" _..._" + '\n', "Blue"); // Blue AppendText(@" _..._" + '\n', "Blue"); // Blue
AppendText(@" ___ ___ ____ ____ ", "Red"); // Red AppendText(@" ___ ___ ____ ____ ", "Red"); // Red
AppendText(@".: '." + '\n', "DarkBlue"); // Dark Blue AppendText(@".: '." + '\n', "DarkBlue"); // Dark Blue
AppendText(@" / _ \_______ __ _ / _ \/ __ \/ __/ ", "Yellow"); // Yellow AppendText(@" / _ \_______ __ _ / _ \/ __ \/ __/ ", "Yellow"); // Yellow
@ -269,8 +321,7 @@ namespace DremDOS.Core.Terminal
AppendText(@" /____/_/ \__/_/_/_/____/\____/___/ ", "Blue"); // Blue AppendText(@" /____/_/ \__/_/_/_/____/\____/___/ ", "Blue"); // Blue
AppendText(@"`::::::::.'" + '\n', "DarkMagenta"); // Dark Magenta AppendText(@"`::::::::.'" + '\n', "DarkMagenta"); // Dark Magenta
AppendText(@" `':::''" + '\n', "Magenta"); // Magenta AppendText(@" `':::''" + '\n', "Magenta"); // Magenta
AppendText(Kernel._OS_NAME + " " + Kernel._OS_VERSION_FULL + "\n");*/ AppendText(kernel._OS_NAME + " " + kernel._OS_VERSION_FULL + "\n");
AppendText("Pain");
} }
} }

18
src/DremDOS/Core/Console/VGATerminal.cs
View file

@ -47,13 +47,14 @@ namespace DremDOS.Core.Terminal
private Terminal LinkedTerminal; private Terminal LinkedTerminal;
private Sys.Graphics.Fonts.PCScreenFont Font = Sys.Graphics.Fonts.PCScreenFont.Default; private Sys.Graphics.Fonts.PCScreenFont Font = Sys.Graphics.Fonts.PCScreenFont.Default;
private Canvas canvas = Kernel.GetCanvas(); private Canvas canvas;
//private Canvas ConsoleCanvas; //private Canvas ConsoleCanvas;
private Pen WhitePen = new Pen(Color.White); private Pen WhitePen = new Pen(Color.White);
private Pen BlackPen = new Pen(Color.Black); private Pen BlackPen = new Pen(Color.Black);
public VGATerminal(Terminal Term, int TextWidth, int TextHeight, int PositionX, int PositionY) public VGATerminal(Terminal Term, int TextWidth, int TextHeight, int PositionX, int PositionY, Kernel kernel)
{ {
canvas = kernel.GetCanvas();
Initialize(Term, TextWidth, TextHeight, PositionX, PositionY); Initialize(Term, TextWidth, TextHeight, PositionX, PositionY);
} }
/*public VGATerminal(Terminal term, int TextWidth, int TextHeight, int PositionX, int PositionY) /*public VGATerminal(Terminal term, int TextWidth, int TextHeight, int PositionX, int PositionY)
@ -96,40 +97,27 @@ namespace DremDOS.Core.Terminal
} }
public void WriteText(string Text, int x, int y) // Writes text to the TextBuffer. Sets associated ColorBuffer to white color (default). public void WriteText(string Text, int x, int y) // Writes text to the TextBuffer. Sets associated ColorBuffer to white color (default).
{ {
Console.Beep(100, 1000);
//CoverCursor(); //CoverCursor();
Console.Beep(250, 1000);
char[] Temp = Text.ToCharArray(); char[] Temp = Text.ToCharArray();
Console.Beep(500, 1000);
for (int i = 0; i < Temp.Length; i++) for (int i = 0; i < Temp.Length; i++)
{ {
if (Temp[i] == '\n') { NextLine(); y = CursorY; x = CursorX; } if (Temp[i] == '\n') { NextLine(); y = CursorY; x = CursorX; }
else else
{ {
Console.Beep(600, 500);
if (x > (TextWidth-1)) { NextLine(); x = CursorX; y = CursorY; } if (x > (TextWidth-1)) { NextLine(); x = CursorX; y = CursorY; }
Console.Beep(700, 500);
TextBuffer[y][x] = Temp[i]; TextBuffer[y][x] = Temp[i];
Console.Beep(800, 500);
ColorBuffer[y][x] = ForegroundColor; ColorBuffer[y][x] = ForegroundColor;
Console.Beep(900, 500);
if (!Hidden) UpdateCharacter(x, y); if (!Hidden) UpdateCharacter(x, y);
Console.Beep(1000, 500);
x++; x++;
} }
} }
Console.Beep(1500, 1000);
SetCursorPosition(x, y); SetCursorPosition(x, y);
if(ShowCursor) { WriteCursor(); } if(ShowCursor) { WriteCursor(); }
Console.Beep(2000, 1000);
} }
public void WriteText(string Text, Pen Color, int x, int y) // Writes text to the TextBuffer. Lets the programmer set the string's color. public void WriteText(string Text, Pen Color, int x, int y) // Writes text to the TextBuffer. Lets the programmer set the string's color.
{ {
Console.Beep(750, 1000);
if (ShowCursor) { CoverCursor(); } if (ShowCursor) { CoverCursor(); }
Console.Beep(1000, 1000);
char[] Temp = Text.ToCharArray(); char[] Temp = Text.ToCharArray();
Console.Beep(Temp.Length + 2000, 1000);
for (int i = 0; i < Text.Length; i++) for (int i = 0; i < Text.Length; i++)
{ {
if (Temp[i] == '\n') { NextLine(); y = CursorY; x = CursorX; } if (Temp[i] == '\n') { NextLine(); y = CursorY; x = CursorX; }

12
src/DremDOS/Core/Graphics/BUI.cs
View file

@ -91,14 +91,14 @@ namespace DremDOS.Core.Graphics
new Color [43] { Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue }, new Color [43] { Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue, Color.Blue },
}; };
public static void DrawBUI(Canvas canvas) public static void DrawBUI(Canvas canvas, Kernel kernel)
{ {
for (ushort x = 0; x < 43; x++) for (ushort y = 0; y < 14; y++) canvas.DrawPoint(new Pen(NewButton[y][x]), new Sys.Graphics.Point((ushort)((Kernel._SCREEN_WIDTH - 268) + x), (ushort)(20 + y))); for (ushort x = 0; x < 43; x++) for (ushort y = 0; y < 14; y++) canvas.DrawPoint(new Pen(NewButton[y][x]), new Sys.Graphics.Point((ushort)((kernel._SCREEN_WIDTH - 268) + x), (ushort)(20 + y)));
for (ushort x = 0; x < 43; x++) for (ushort y = 0; y < 14; y++) canvas.DrawPoint(new Pen(CloseButton[y][x]), new Sys.Graphics.Point((ushort)((Kernel._SCREEN_WIDTH - 268) + x), (ushort)(20 + y))); for (ushort x = 0; x < 43; x++) for (ushort y = 0; y < 14; y++) canvas.DrawPoint(new Pen(CloseButton[y][x]), new Sys.Graphics.Point((ushort)((kernel._SCREEN_WIDTH - 268) + x), (ushort)(20 + y)));
for (ushort x = 0; x < 14; x++) for (ushort y = 0; y < 14; y++) canvas.DrawPoint(new Pen(ArrowLeft[y][x]), new Sys.Graphics.Point((ushort)((Kernel._SCREEN_WIDTH - 268) + x), (ushort)(20 + y))); for (ushort x = 0; x < 14; x++) for (ushort y = 0; y < 14; y++) canvas.DrawPoint(new Pen(ArrowLeft[y][x]), new Sys.Graphics.Point((ushort)((kernel._SCREEN_WIDTH - 268) + x), (ushort)(20 + y)));
//canvas.DrawACSIIString(new Pen(Color.Red), Kernel.CurrentConsole + " of " + Kernel.TotalConsoles, Kernel._SCREEN_WIDTH - 122, 20); //canvas.DrawACSIIString(new Pen(Color.Red), Kernel.CurrentConsole + " of " + Kernel.TotalConsoles, Kernel._SCREEN_WIDTH - 122, 20);
canvas.DrawString(Kernel.CurrentConsole + " of " + Kernel.TotalConsoles, Kernel.Font, new Pen(Color.Red), Kernel._SCREEN_WIDTH - 122, 20); canvas.DrawString(kernel.CurrentConsole + " of " + kernel.TotalConsoles, kernel.Font, new Pen(Color.Red), kernel._SCREEN_WIDTH - 122, 20);
for (ushort x = 0; x < 14; x++) for (ushort y = 0; y < 14; y++) canvas.DrawPoint(new Pen(ArrowRight[y][x]), new Sys.Graphics.Point((ushort)((Kernel._SCREEN_WIDTH - 268) + x), (ushort)(20 + y))); for (ushort x = 0; x < 14; x++) for (ushort y = 0; y < 14; y++) canvas.DrawPoint(new Pen(ArrowRight[y][x]), new Sys.Graphics.Point((ushort)((kernel._SCREEN_WIDTH - 268) + x), (ushort)(20 + y)));
} }
} }
} }

16
src/DremDOS/DremDOS.csproj
View file

@ -1,21 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<!--<RuntimeIdentifier>cosmos</RuntimeIdentifier>--> <!--<RuntimeIdentifier>cosmos</RuntimeIdentifier>-->
<Platform>cosmos</Platform> <Platform>cosmos</Platform>
<SupportsX86Intrinsics>false</SupportsX86Intrinsics> <SupportsX86Intrinsics>false</SupportsX86Intrinsics>
<SelfContained>True</SelfContained> <SelfContained>True</SelfContained>
<BinFormat>ELF</BinFormat>
<StackCorruptionDetectionEnabled>True</StackCorruptionDetectionEnabled>
<StackCorruptionDetectionLevel>MethodFooters</StackCorruptionDetectionLevel>
<Deployment>ISO</Deployment>
<DebugEnabled>True</DebugEnabled>
<DebugMode>Source</DebugMode>
<IgnoreDebugStubAttribute>False</IgnoreDebugStubAttribute>
<ISOFile>bin\Debug\net5.0\DremDOS.iso</ISOFile>
<CompileVBEMultiboot>False</CompileVBEMultiboot>
<ExtractMapFile>False</ExtractMapFile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@ -29,10 +19,6 @@
<PxeInterface>192.168.0.8</PxeInterface> <PxeInterface>192.168.0.8</PxeInterface>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugEnabled>False</DebugEnabled>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Cosmos.Build" Version="0-*" NoWarn="NU1604" /> <PackageReference Include="Cosmos.Build" Version="0-*" NoWarn="NU1604" />
<PackageReference Include="Cosmos.Debug.Kernel" Version="0-*" NoWarn="NU1604" /> <PackageReference Include="Cosmos.Debug.Kernel" Version="0-*" NoWarn="NU1604" />

114
src/DremDOS/Kernel.cs
View file

@ -26,37 +26,44 @@ using DremDOS.Core.Terminal;
using DremDOS.Core.Graphics; using DremDOS.Core.Graphics;
using DremDOS.Core.Drivers; using DremDOS.Core.Drivers;
using DremDOS.Core.Sound; using DremDOS.Core.Sound;
using Cosmos.Debug.Kernel;
namespace DremDOS namespace DremDOS
{ {
public class Kernel : Sys.Kernel public class Kernel : Sys.Kernel
{ {
public static int _SCREEN_WIDTH; public int _SCREEN_WIDTH = 800;
public static int _SCREEN_HEIGHT; public int _SCREEN_HEIGHT = 600;
public static string _OS_NAME = "DremDOS"; public string _OS_NAME = "DremDOS";
public static int _OS_VERSION_MAJOR = 0; public int _OS_VERSION_MAJOR = 0;
public static int _OS_VERSION_MINOR = 1; public int _OS_VERSION_MINOR = 1;
public static int _OS_VERSION_PATCH = 0; public int _OS_VERSION_PATCH = 0;
public static string _OS_VERSION_TACKON = " (Multitasking Console Test)"; public string _OS_VERSION_TACKON = " (Multitasking Console Test)";
public static string _OS_VERSION_FULL = _OS_VERSION_MAJOR + "." + _OS_VERSION_MINOR + "." + _OS_VERSION_PATCH + _OS_VERSION_TACKON; public string _OS_VERSION_FULL = "Unknown";
public static int CurrentConsole = 1; public int CurrentConsole = 1;
public static int TotalConsoles = 1; public int TotalConsoles = 1;
public static Color BorderColor = Color.Purple; public Color BorderColor = Color.Purple;
public static Pen BorderPen = new Pen(Color.Purple); public Pen BorderPen = new Pen(Color.Purple);
public static Pen WhitePen = new Pen(Color.White); public Pen WhitePen = new Pen(Color.White);
private static Canvas canvas; private Canvas canvas;
private static Terminal MainTerminal; private Terminal MainTerminal;
//private static VGATerminal ConsoleA = new VGATerminal(MainTerminal, 80, 25, 50, 50); //private static VGATerminal ConsoleA = new VGATerminal(MainTerminal, 80, 25, 50, 50);
private static VGATerminal ConsoleA; private VGATerminal ConsoleA;
public static MouseDriver mouseDriver; public MouseDriver mouseDriver;
public static Sys.Graphics.Fonts.PCScreenFont Font; public Sys.Graphics.Fonts.PCScreenFont Font;
//VMWareSVGAII driver; //VMWareSVGAII driver;
private bool ConsoleMode; private bool ConsoleMode;
private bool BlackBoxHasBeenFixed; private bool BlackBoxHasBeenFixed;
private VGATerminal SelectedConsole;
protected override void BeforeRun() protected override void BeforeRun()
{ {
// Temporary stuff to get this thing to BEHAVE
_OS_VERSION_FULL = _OS_VERSION_MAJOR + "." + _OS_VERSION_MINOR + "." + _OS_VERSION_PATCH + _OS_VERSION_TACKON;
mDebugger.Send("BeforeRun start");
ConsoleMode = false; ConsoleMode = false;
Console.Clear(); Console.Clear();
Sound.Startup(); Sound.Startup();
@ -94,6 +101,7 @@ namespace DremDOS
Console.WriteLine("\n"); Console.WriteLine("\n");
bool ValidResolutionChoiceFlag = false; bool ValidResolutionChoiceFlag = false;
while (!ValidResolutionChoiceFlag) { while (!ValidResolutionChoiceFlag) {
mDebugger.Send("Request resolution setting");
Console.WriteLine(" 1.) 800x600 2.) 1024x768 3.) 1280x720"); Console.WriteLine(" 1.) 800x600 2.) 1024x768 3.) 1280x720");
Console.WriteLine(" 4.) 1920x1080"); Console.WriteLine(" 4.) 1920x1080");
Console.WriteLine(" C.) Single console mode"); Console.WriteLine(" C.) Single console mode");
@ -127,6 +135,7 @@ namespace DremDOS
_SCREEN_HEIGHT = 24; _SCREEN_HEIGHT = 24;
ValidResolutionChoiceFlag = true; ValidResolutionChoiceFlag = true;
ConsoleMode = true; ConsoleMode = true;
mDebugger.Send("Single console mode");
break; break;
default: default:
break; break;
@ -135,81 +144,71 @@ namespace DremDOS
if (!ConsoleMode) if (!ConsoleMode)
{ {
mDebugger.Send("Resolution has been set to " + _SCREEN_WIDTH + "x" + _SCREEN_HEIGHT);
mDebugger.Send("Set font, init canvas and graphics driver");
Font = Sys.Graphics.Fonts.PCScreenFont.Default; Font = Sys.Graphics.Fonts.PCScreenFont.Default;
canvas = FullScreenCanvas.GetFullScreenCanvas(new Mode(_SCREEN_WIDTH, _SCREEN_HEIGHT, ColorDepth.ColorDepth32)); canvas = FullScreenCanvas.GetFullScreenCanvas(new Mode(_SCREEN_WIDTH, _SCREEN_HEIGHT, ColorDepth.ColorDepth32));
} }
} }
protected override void Run() protected override void Run()
{ {
try try
{ {
Terminal MainTerminal = new Terminal(ConsoleMode); Terminal MainTerminal = new Terminal(ConsoleMode, this);
if (!ConsoleMode) if (!ConsoleMode)
{ {
canvas.Clear(BorderColor); canvas.Clear(BorderColor);
canvas.Display(); canvas.Display();
MouseDriver mouseDriver = new MouseDriver(checked((uint)_SCREEN_WIDTH), checked((uint)_SCREEN_HEIGHT)); mouseDriver = new MouseDriver(checked((uint)_SCREEN_WIDTH), checked((uint)_SCREEN_HEIGHT));
//VMWareSVGAII driver = new VMWareSVGAII();
//VMWareSVGAII driver = new VMWareSVGAII();
//driver.SetMode(checked((uint)_SCREEN_WIDTH), checked((uint)_SCREEN_HEIGHT));
//driver.Update(0, 0, checked((uint)_SCREEN_WIDTH), checked((uint)_SCREEN_HEIGHT));
VGATerminal ConsoleA = new VGATerminal(MainTerminal, (_SCREEN_WIDTH / 8) - 12, (_SCREEN_HEIGHT / 16) - 6, 50, 50); ConsoleA = new VGATerminal(MainTerminal, (_SCREEN_WIDTH / 8) - 12, (_SCREEN_HEIGHT / 16) - 6, 50, 50, this);
ConsoleA.ShowCursor = true; ConsoleA.ShowCursor = true;
ConsoleA.EnableWrite = true; ConsoleA.EnableWrite = true;
//Console.Beep(100, 100);
MainTerminal.SetLinkedVGATerminal(ConsoleA); MainTerminal.SetLinkedVGATerminal(ConsoleA);
MainTerminal.ShowOutput = true;
//Console.Beep(500, 100);
canvas.Clear(BorderColor); canvas.Clear(BorderColor);
canvas.Display(); canvas.Display();
//Console.Beep(1000, 100);
//canvas.DrawACSIIString(WhitePen, _OS_NAME + " " + _OS_VERSION_FULL, 50, 5);
//canvas.DrawACSIIString(WhitePen, ConsoleA.VGATerminalName, 50, 20);
canvas.DrawString(_OS_NAME + " " + _OS_VERSION_FULL, Font, WhitePen, 50, 5); canvas.DrawString(_OS_NAME + " " + _OS_VERSION_FULL, Font, WhitePen, 50, 5);
canvas.DrawString(ConsoleA.VGATerminalName, Font, WhitePen, 50, 20); canvas.DrawString(ConsoleA.VGATerminalName, Font, WhitePen, 50, 20);
//Console.Beep(1500, 1000);
ConsoleA.UpdateEntireScreen(true); ConsoleA.UpdateEntireScreen(true);
//Console.Beep(2000, 1000);
int TempX; int TempX;
int TempY; int TempY;
BUI.DrawBUI(canvas); BUI.DrawBUI(canvas, this);
canvas.Display(); canvas.Display();
BlackBoxHasBeenFixed = false; BlackBoxHasBeenFixed = false;
}
if (!ConsoleMode) MainTerminal.ShowOutput = true;
ConsoleA.RunTerminalCommand("command");
} else
{ {
//ConsoleA.RunTerminalCommand("command"); // Yay sketti code cause past me wrote code like a mongol
} MainTerminal.ShowOutput = true;
else
{
Console.Clear();
MainTerminal.RunCommand("command"); MainTerminal.RunCommand("command");
} }
ConsoleA.WriteText("Hello World!", 0, 0);
Console.Beep(2500, 1000); SelectedConsole = ConsoleA;
mDebugger.Send("Entering main OS loop.");
while (true) while (true)
{ {
//Console.Beep(3000, 1000); //CurrentConsole = ConsoleA;
//ConsoleKeyInfo inputchar = Console.ReadKey();
//ConsoleA.InterpretKeyInput(inputchar);
//ConsoleA.UpdateEntireScreen();
//int inputchar = Console.Read();
int InputCharInt = Console.Read(); int InputCharInt = Console.Read();
//ConsoleKeyInfo InputChar = new ConsoleKeyInfo((char)InputCharInt, (ConsoleKey)InputCharInt, false, false, false);
if (InputCharInt != -1) if (InputCharInt != -1)
{ {
if (InputCharInt == 42) // Note: This will change to 8 once a bug with the PS/2 Controller is fixed if (InputCharInt == 42) // Note: This will change to 8 once a bug with the PS/2 Controller is fixed
{ {
if (!ConsoleMode) if (!ConsoleMode)
{ {
ConsoleA.InterpretKeyInput(new ConsoleKeyInfo('\b', ConsoleKey.Backspace, false, false, false));
SelectedConsole.InterpretKeyInput(new ConsoleKeyInfo('\b', ConsoleKey.Backspace, false, false, false));
} }
else else
{ {
@ -220,7 +219,7 @@ namespace DremDOS
{ {
if (!ConsoleMode) if (!ConsoleMode)
{ {
ConsoleA.InterpretKeyInput(new ConsoleKeyInfo('\n', ConsoleKey.Enter, false, false, false)); SelectedConsole.InterpretKeyInput(new ConsoleKeyInfo('\n', ConsoleKey.Enter, false, false, false));
} }
else else
{ {
@ -232,7 +231,7 @@ namespace DremDOS
//ConsoleA.AppendText(((char)inputchar).ToString()); //ConsoleA.AppendText(((char)inputchar).ToString());
if (!ConsoleMode) if (!ConsoleMode)
{ {
ConsoleA.InterpretKeyInput(new ConsoleKeyInfo((char)InputCharInt, ConsoleKey.NoName, false, false, false)); SelectedConsole.InterpretKeyInput(new ConsoleKeyInfo((char)InputCharInt, ConsoleKey.NoName, false, false, false));
} }
else else
{ {
@ -243,24 +242,25 @@ namespace DremDOS
if (!ConsoleMode) if (!ConsoleMode)
{ {
//mouseDriver.Draw(canvas); mouseDriver.Draw(canvas);
canvas.Display(); canvas.Display();
//driver.Update(0, 0, checked((uint)_SCREEN_WIDTH), checked((uint)_SCREEN_HEIGHT));
// Quick and dirty solution but dammit it works. // Quick and dirty solution but dammit it works.
if (!BlackBoxHasBeenFixed && mouseDriver.HasMoved()) if (!BlackBoxHasBeenFixed && mouseDriver.HasMoved())
{ {
canvas.DrawFilledRectangle(BorderPen, new Sys.Graphics.Point(0, 0), 20, 20); canvas.DrawFilledRectangle(BorderPen, new Sys.Graphics.Point(0, 0), 20, 20);
BlackBoxHasBeenFixed = true; BlackBoxHasBeenFixed = true;
mDebugger.Send("Fixed black rectangle");
} }
} }
} }
} catch } catch (Exception e)
{ {
mDebugger.Send("EXCEPTION: " + e.GetType + ", " + e.Message);
// Crash handler will eventually go here
} }
} }
public static Canvas GetCanvas() { return canvas; } public Canvas GetCanvas() { return canvas; }
} }
} }