diff options
| -rwxr-xr-x | Source/Kernel/Melon.ke | bin | 168414 -> 168416 bytes | |||
| -rw-r--r-- | Source/Kernel/VTManager/VirtualTerminal.class.cpp | 4 | ||||
| -rw-r--r-- | Source/Kernel/VTManager/VirtualTerminal.class.h | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Source/Kernel/Melon.ke b/Source/Kernel/Melon.ke Binary files differindex de3493a..adf785c 100755 --- a/Source/Kernel/Melon.ke +++ b/Source/Kernel/Melon.ke diff --git a/Source/Kernel/VTManager/VirtualTerminal.class.cpp b/Source/Kernel/VTManager/VirtualTerminal.class.cpp index 7ee360b..8555bf0 100644 --- a/Source/Kernel/VTManager/VirtualTerminal.class.cpp +++ b/Source/Kernel/VTManager/VirtualTerminal.class.cpp @@ -5,7 +5,7 @@ #define BUFCHR(l, c) m_buff[((l) * m_cols) + (c)] VirtualTerminal::VirtualTerminal(u32int rows, u32int cols, u8int fgcolor, u8int bgcolor) : m_kbdMutex(false) { - m_buff = new chr[rows * cols]; + m_buff = new vtchr[rows * cols]; m_rows = rows; m_cols = cols; m_mapped = false; @@ -31,7 +31,7 @@ void VirtualTerminal::setColor(u8int fgcolor, u8int bgcolor) { void VirtualTerminal::putChar(u32int row, u32int col, WChar c) { if (row >= m_rows or col >= m_cols) return; - chr* ch = &BUFCHR(row, col); + vtchr* ch = &BUFCHR(row, col); ch->c = c; ch->color = m_color; if (m_mapped) diff --git a/Source/Kernel/VTManager/VirtualTerminal.class.h b/Source/Kernel/VTManager/VirtualTerminal.class.h index d8d7104..690ee2a 100644 --- a/Source/Kernel/VTManager/VirtualTerminal.class.h +++ b/Source/Kernel/VTManager/VirtualTerminal.class.h @@ -7,14 +7,14 @@ #include <DeviceManager/Kbd.ns.h> #include <Library/Vector.class.h> -struct chr { +struct vtchr { u8int color; WChar c; }; class VirtualTerminal { private: - chr* m_buff; + vtchr* m_buff; u32int m_rows, m_cols; u8int m_color; @@ -53,7 +53,6 @@ class VirtualTerminal { void hexDump(u8int* ptr, u32int sz); inline VirtualTerminal& operator<<(const String& s) { write(s); return *this; } - //inline VirtualTerminal& operator<<(WChar c) { put(c); return *this; } inline VirtualTerminal& operator<<(s32int i) { writeDec(i); return *this; } inline VirtualTerminal& operator<<(s64int i) { writeDec(i); return *this; } inline VirtualTerminal& operator<<(u32int i) { writeHex(i); return *this; } |