Skip to content

Commit

Permalink
Merge pull request CosmosOS#395 from jp2masa/ConsoleUpdate
Browse files Browse the repository at this point in the history 
Implemented some console methods and fixed a bug in the console, copying the behaviour of background color in windows console applications.
  • Loading branch information
@mterwoord
mterwoord authored Jun 26, 2016
2 parents 3f78163 + fbac0ca commit 218f3ef
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 78 deletions.
141 changes: 74 additions & 67 deletions source/Cosmos.HAL/TextScreen.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,82 +8,89 @@
namespace Cosmos.HAL {
// Dont hold state here. This is a raw to hardware class. Virtual screens should be done
// by memory moves
public class TextScreen : TextScreenBase {
protected byte Color = 0x0F; // White
protected UInt16 mClearCellValue;
protected UInt32 mRow2Addr;
protected UInt32 mScrollSize;
protected Int32 mCursorSize = 25; // 25 % as C# Console class
protected bool mCursorVisible = true;

protected Core.IOGroup.TextScreen IO = new Cosmos.Core.IOGroup.TextScreen();
protected readonly MemoryBlock08 mRAM;
public class TextScreen : TextScreenBase
{
protected byte Color = 0x0F; // White
protected UInt16 mBackgroundClearCellValue;
protected UInt16 mTextClearCellValue;
protected UInt32 mRow2Addr;
protected UInt32 mScrollSize;
protected Int32 mCursorSize = 25; // 25 % as C# Console class
protected bool mCursorVisible = true;

public TextScreen() {
protected Core.IOGroup.TextScreen IO = new Cosmos.Core.IOGroup.TextScreen();
protected readonly MemoryBlock08 mRAM;

if (this is TextScreen)
{
TextScreenHelpers.Debug("this is TextScreen");
}
else
{
TextScreenHelpers.Debug("ERROR: This is not of type TextScreen!");
}
mRAM = IO.Memory.Bytes;
// Set the Console default colors: White foreground on Black background, the default value of mClearCellValue is set there too as it is linked with the Color
SetColors(ConsoleColor.White, ConsoleColor.Black);
mRow2Addr = (UInt32)(Cols * 2);
mScrollSize = (UInt32)(Cols * (Rows - 1) * 2);
SetCursorSize(mCursorSize);
SetCursorVisible(mCursorVisible);
TextScreenHelpers.Debug("End of TextScreen..ctor");
}
public TextScreen()
{
if (this is TextScreen)
{
TextScreenHelpers.Debug("this is TextScreen");
}
else
{
TextScreenHelpers.Debug("ERROR: This is not of type TextScreen!");
}
mRAM = IO.Memory.Bytes;
// Set the Console default colors: White foreground on Black background, the default value of mClearCellValue is set there too as it is linked with the Color
SetColors(ConsoleColor.White, ConsoleColor.Black);
mBackgroundClearCellValue = mTextClearCellValue;
mRow2Addr = (UInt32)(Cols * 2);
mScrollSize = (UInt32)(Cols * (Rows - 1) * 2);
SetCursorSize(mCursorSize);
SetCursorVisible(mCursorVisible);
TextScreenHelpers.Debug("End of TextScreen..ctor");
}

public override UInt16 Rows { get { return 25; } }
public override UInt16 Cols { get { return 80; } }
public override UInt16 Rows { get { return 25; } }
public override UInt16 Cols { get { return 80; } }

public override void Clear() {
TextScreenHelpers.Debug("Clearing screen with value ");
TextScreenHelpers.DebugNumber(mClearCellValue);
IO.Memory.Fill(mClearCellValue);
}
public override void Clear() {
TextScreenHelpers.Debug("Clearing screen with value ");
TextScreenHelpers.DebugNumber(mTextClearCellValue);
IO.Memory.Fill(mTextClearCellValue);
mBackgroundClearCellValue = mTextClearCellValue;
}

public override void ScrollUp()
{
IO.Memory.MoveDown(0, mRow2Addr, mScrollSize);
//IO.Memory.Fill(mScrollSize, mRowSize32, mClearCellValue32);
IO.Memory.Fill(mScrollSize, Cols, mClearCellValue);
}
public override void ScrollUp()
{
IO.Memory.MoveDown(0, mRow2Addr, mScrollSize);
//IO.Memory.Fill(mScrollSize, mRowSize32, mClearCellValue32);
IO.Memory.Fill(mScrollSize, Cols, mBackgroundClearCellValue);
}

public override char this[int aX, int aY]
{
get {
var xScreenOffset = (UInt32)((aX + aY * Cols) * 2);
return (char)mRAM[xScreenOffset];
}
set {
var xScreenOffset = (UInt32)((aX + aY * Cols) * 2);
mRAM[xScreenOffset] = (byte)value;
mRAM[xScreenOffset + 1] = Color;
}
}
public override char this[int aX, int aY]
{
get
{
var xScreenOffset = (UInt32)((aX + aY * Cols) * 2);
return (char)mRAM[xScreenOffset];
}
set
{
var xScreenOffset = (UInt32)((aX + aY * Cols) * 2);
mRAM[xScreenOffset] = (byte)value;
mRAM[xScreenOffset + 1] = Color;
}
}

public override void SetColors(ConsoleColor aForeground, ConsoleColor aBackground) {
public override void SetColors(ConsoleColor aForeground, ConsoleColor aBackground)
{
Color = (byte)((byte)(aForeground) | ((byte)(aBackground) << 4));
// The Color | the NUL character this is used to Clear the Screen
mClearCellValue = (UInt16)(Color << 8 | 0x00);
mTextClearCellValue = (UInt16)(Color << 8 | 0x00);
}

public override void SetCursorPos(int aX, int aY)
{
char xPos = (char)((aY * Cols) + aX);
// Cursor low byte to VGA index register
IO.Idx3.Byte = 0x0F;
IO.Data3.Byte = (byte)(xPos & 0xFF);
// Cursor high byte to VGA index register
IO.Idx3.Byte = 0x0E;
IO.Data3.Byte = (byte)(xPos >> 8);
}
public override void SetCursorPos(int aX, int aY)
{
char xPos = (char)((aY * Cols) + aX);
// Cursor low byte to VGA index register
IO.Idx3.Byte = 0x0F;
IO.Data3.Byte = (byte)(xPos & 0xFF);
// Cursor high byte to VGA index register
IO.Idx3.Byte = 0x0E;
IO.Data3.Byte = (byte)(xPos >> 8);
}
public override byte GetColor()
{
return Color;
Expand All @@ -99,7 +106,7 @@ public override void SetCursorSize(int value)
TextScreenHelpers.Debug("Changing cursor size to", value, "%");
// We need to transform value from a percentage to a value from 15 to 0
value = 16 - ((16 * value) / 100);
// This is the case in which value is in reality 1% and a for a truncation error we get 16 (invalid value)
// This is the case in which value is in reality 1% and a for a truncation error we get 16 (invalid value)
if (value >= 16)
value = 15;
TextScreenHelpers.Debug("verticalSize is", value);
Expand All @@ -121,7 +128,7 @@ public override void SetCursorVisible(bool value)
byte cursorDisable;

mCursorVisible = value;

// The VGA Cursor is disabled when the value is 1 and enabled when is 0 so we need to invert 'value', sadly the ConvertToByte() function is not working
// so we need to do the if by hand...
if (value == true)
Expand Down
42 changes: 31 additions & 11 deletions source/Cosmos.System.Plugs/System/ConsoleImpl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ public static void set_BufferWidth(int aWidth)

public static bool get_CapsLock()
{
WriteLine("Not implemented: get_CapsLock");
return false;
return Global.CapsLock;
}

public static int get_CursorLeft()
Expand All @@ -80,7 +79,15 @@ public static void set_CursorLeft(int x)
// for now:
return;
}
xConsole.X = x;

if (x < get_WindowWidth())
{
xConsole.X = x;
}
else
{
WriteLine("x must be lower than the console width!");
}
}

public static int get_CursorSize()
Expand Down Expand Up @@ -124,13 +131,25 @@ public static void set_CursorTop(int y)
// for now:
return;
}
GetConsole().Y = y;

if (y < get_WindowHeight())
{
xConsole.Y = y;
}
else
{
WriteLine("y must be lower than the console height!");
}
}

public static bool get_CursorVisible()
{
WriteLine("Not implemented: get_CursorVisible");
return false;
var xConsole = GetConsole();
if (xConsole == null)
{
return false;
}
return GetConsole().CursorVisible;
}

public static void set_CursorVisible(bool value)
Expand Down Expand Up @@ -199,8 +218,7 @@ public static int get_LargestWindowWidth()

public static bool get_NumberLock()
{
WriteLine("Not implemented: get_NumberLock");
return false;
return Global.NumLock;
}

//public static TextWriter get_Out() {
Expand Down Expand Up @@ -493,7 +511,8 @@ public static String ReadLine()

public static void ResetColor()
{
WriteLine("Not implemented: ResetColor");
set_BackgroundColor(ConsoleColor.Black);
set_ForegroundColor(ConsoleColor.White);
}

public static void SetBufferSize(int width, int height)
Expand All @@ -503,7 +522,8 @@ public static void SetBufferSize(int width, int height)

public static void SetCursorPosition(int left, int top)
{
WriteLine("Not implemented: SetCursorPosition");
set_CursorLeft(left);
set_CursorTop(top);
}

//public static void SetError(TextWriter newError) {
Expand Down Expand Up @@ -822,4 +842,4 @@ public static void WriteLine(string format, object arg0, object arg1, object arg

#endregion
}
}
}

0 comments on commit 218f3ef

Please sign in to comment.