diff options
author | Alexis211 <alexis211@gmail.com> | 2009-09-11 16:22:30 +0200 |
---|---|---|
committer | Alexis211 <alexis211@gmail.com> | 2009-09-11 16:22:30 +0200 |
commit | 7b0d6ac9f903296c7537cec9ac606d49cb364049 (patch) | |
tree | c9bc6aaf4e7237cf5577f3a78291f1f591fe1563 /Source/Kernel/Devices/Display | |
parent | d95452c5452b4ca7418505fa5597f000596fcb78 (diff) | |
download | Melon-7b0d6ac9f903296c7537cec9ac606d49cb364049.tar.gz Melon-7b0d6ac9f903296c7537cec9ac606d49cb364049.zip |
Nothing, really
Diffstat (limited to 'Source/Kernel/Devices/Display')
-rw-r--r-- | Source/Kernel/Devices/Display/Display.proto.h | 5 | ||||
-rw-r--r-- | Source/Kernel/Devices/Display/VGATextOutput.class.cpp | 2 | ||||
-rw-r--r-- | Source/Kernel/Devices/Display/VGATextOutput.class.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Source/Kernel/Devices/Display/Display.proto.h b/Source/Kernel/Devices/Display/Display.proto.h index f2a98af..d4bd8fc 100644 --- a/Source/Kernel/Devices/Display/Display.proto.h +++ b/Source/Kernel/Devices/Display/Display.proto.h @@ -3,13 +3,14 @@ #include <Core/common.wtf.h> #include <Devices/Device.proto.h> -#include <Library/wchar.class.h> +#include <Library/WChar.class.h> class Display : public Device { public: + virtual ~Display() {} virtual u16int textCols() = 0; virtual u16int textRows() = 0; - virtual void putChar(u16int line, u16int col, wchar c, u8int color) = 0; //Color : <bg 4byte><fg 4byte> + virtual void putChar(u16int line, u16int col, WChar c, u8int color) = 0; //Color : <bg 4byte><fg 4byte> virtual void moveCursor(u16int line, u16int col) = 0; virtual void clear() = 0; }; diff --git a/Source/Kernel/Devices/Display/VGATextOutput.class.cpp b/Source/Kernel/Devices/Display/VGATextOutput.class.cpp index 2a69754..aca5ce6 100644 --- a/Source/Kernel/Devices/Display/VGATextOutput.class.cpp +++ b/Source/Kernel/Devices/Display/VGATextOutput.class.cpp @@ -21,7 +21,7 @@ u16int VGATextOutput::textRows() { return 25; } -void VGATextOutput::putChar(u16int line, u16int col, wchar c, u8int color) { +void VGATextOutput::putChar(u16int line, u16int col, WChar c, u8int color) { u16int* where = (u16int*)RAM_ADDR; where[(80 * line) + col] = (color << 8) | c.toAscii(); } diff --git a/Source/Kernel/Devices/Display/VGATextOutput.class.h b/Source/Kernel/Devices/Display/VGATextOutput.class.h index 7746a7b..864ae35 100644 --- a/Source/Kernel/Devices/Display/VGATextOutput.class.h +++ b/Source/Kernel/Devices/Display/VGATextOutput.class.h @@ -10,7 +10,7 @@ class VGATextOutput : public Display { u16int textCols(); u16int textRows(); - void putChar(u16int line, u16int col, wchar c, u8int color); + void putChar(u16int line, u16int col, WChar c, u8int color); void moveCursor(u16int line, u16int col); void clear(); }; |