Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Make Render from buffer public tty function

This commit is contained in:
Bananymous 2022-12-30 19:57:44 +02:00
parent b60af90538
commit fc05642b74
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/arch/i386/TTY.cpp
View File

@ -35,7 +35,7 @@ TTY::TTY()
void TTY::Clear() void TTY::Clear()
{ {
for (size_t i = 0; i < m_width * m_height; i++) for (uint32_t i = 0; i < m_width * m_height; i++)
m_buffer[i] = { .foreground = m_foreground, .background = m_background, .character = ' ' }; m_buffer[i] = { .foreground = m_foreground, .background = m_background, .character = ' ' };
VESA::Clear(m_background); VESA::Clear(m_background);
} }
@ -239,7 +239,13 @@ void TTY::HandleAnsiEscape(uint16_t ch)
} }
} }
void TTY::PutCharAt(uint16_t ch, size_t x, size_t y) void TTY::RenderFromBuffer(uint32_t x, uint32_t y)
{
const auto& cell = m_buffer[y * m_width + x];
VESA::PutCharAt(cell.character, x, y, cell.foreground, cell.background);
}
void TTY::PutCharAt(uint16_t ch, uint32_t x, uint32_t y)
{ {
auto& cell = m_buffer[y * m_width + x]; auto& cell = m_buffer[y * m_width + x];
cell.character = ch; cell.character = ch;
@ -301,12 +307,12 @@ void TTY::PutChar(char ch)
memmove(m_buffer, m_buffer + m_width, m_width * (m_height - 1) * sizeof(Cell)); memmove(m_buffer, m_buffer + m_width, m_width * (m_height - 1) * sizeof(Cell));
// Clear last line in buffer // Clear last line in buffer
for (size_t x = 0; x < m_width; x++) for (uint32_t x = 0; x < m_width; x++)
m_buffer[(m_height - 1) * m_width + x] = { .foreground = m_foreground, .background = m_background, .character = ' ' }; m_buffer[(m_height - 1) * m_width + x] = { .foreground = m_foreground, .background = m_background, .character = ' ' };
// Render the whole buffer to the screen // Render the whole buffer to the screen
for (size_t y = 0; y < m_height; y++) for (uint32_t y = 0; y < m_height; y++)
for (size_t x = 0; x < m_width; x++) for (uint32_t x = 0; x < m_width; x++)
RenderFromBuffer(x, y); RenderFromBuffer(x, y);
m_column = 0; m_column = 0;
@ -339,8 +345,8 @@ void TTY::PutCharCurrent(char ch)
} }
else else
{ {
static size_t x = 0; static uint32_t x = 0;
static size_t y = 0; static uint32_t y = 0;
switch (ch) switch (ch)
{ {

13
kernel/include/kernel/TTY.h
View File

@ -13,18 +13,19 @@ public:
void WriteString(const char* data); void WriteString(const char* data);
void SetCursorPosition(uint32_t x, uint32_t y); void SetCursorPosition(uint32_t x, uint32_t y);
uint32_t Height() const { return m_height; }
uint32_t Width() const { return m_width; }
void RenderFromBuffer(uint32_t x, uint32_t y);
// for kprint
static void PutCharCurrent(char ch); static void PutCharCurrent(char ch);
private: private:
void ResetAnsiEscape(); void ResetAnsiEscape();
void HandleAnsiSGR(); void HandleAnsiSGR();
void HandleAnsiEscape(uint16_t ch); void HandleAnsiEscape(uint16_t ch);
void PutCharAt(uint16_t ch, size_t x, size_t y); void PutCharAt(uint16_t ch, uint32_t x, uint32_t y);
inline void RenderFromBuffer(size_t x, size_t y)
{
const auto& cell = m_buffer[y * m_width + x];
VESA::PutCharAt(cell.character, x, y, cell.foreground, cell.background);
}
private: private:
struct Cell struct Cell