RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:57:36 +00:00
Code Issues Activity Actions

Convert VirtualConsole to the new coding style.

Browse source 
I'm still playing around with finding a style that I like.
This is starting to feel pleasing to the eye. I guess this is how long
it took me to break free from the habit of my previous Qt/WK coding style.
This commit is contained in:
Andreas Kling 2018-11-01 14:09:21 +01:00
parent fd03776443
commit dfaa2b6b02
4 changed files with 93 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Keyboard.cpp
View file

@ -69,7 +69,7 @@ void Keyboard::handleIRQ()
case '2': case '2':
case '3': case '3':
case '4': case '4':
VirtualConsole::switchTo(map[ch] - '0' - 1); VirtualConsole::switch_to(map[ch] - '0' - 1);
break; break;
default: default:
break; break;

156
Kernel/VirtualConsole.cpp
View file

@ -6,33 +6,33 @@
#include "Keyboard.h" #include "Keyboard.h"
#include <AK/String.h> #include <AK/String.h>
static byte* s_vgaBuffer; static byte* s_vga_buffer;
static VirtualConsole* s_consoles[6]; static VirtualConsole* s_consoles[6];
static int s_activeConsole; static int s_active_console;
void VirtualConsole::initialize() void VirtualConsole::initialize()
{ {
s_vgaBuffer = (byte*)0xb8000; s_vga_buffer = (byte*)0xb8000;
memset(s_consoles, 0, sizeof(s_consoles)); memset(s_consoles, 0, sizeof(s_consoles));
s_activeConsole = -1; s_active_console = -1;
} }
VirtualConsole::VirtualConsole(unsigned index, InitialContents initialContents) VirtualConsole::VirtualConsole(unsigned index, InitialContents initial_contents)
: TTY(4, index) : TTY(4, index)
, m_index(index) , m_index(index)
{ {
s_consoles[index] = this; s_consoles[index] = this;
m_buffer = (byte*)kmalloc_eternal(80 * 25 * 2); m_buffer = (byte*)kmalloc_eternal(80 * 25 * 2);
dbgprintf("VirtualConsole %u @ %p, m_buffer = %p\n", index, this, m_buffer); dbgprintf("VirtualConsole %u @ %p, m_buffer = %p\n", index, this, m_buffer);
if (initialContents == AdoptCurrentVGABuffer) { if (initial_contents == AdoptCurrentVGABuffer) {
memcpy(m_buffer, s_vgaBuffer, 80 * 25 * 2); memcpy(m_buffer, s_vga_buffer, 80 * 25 * 2);
auto vgaCursor = vga_get_cursor(); auto vgaCursor = vga_get_cursor();
m_cursorRow = vgaCursor / 80; m_cursor_row = vgaCursor / 80;
m_cursorColumn = vgaCursor % 80; m_cursor_column = vgaCursor % 80;
} else { } else {
word* linemem = (word*)m_buffer; word* line_mem = reinterpret_cast<word*>(m_buffer);
for (word i = 0; i < 80 * 25; ++i) for (word i = 0; i < 80 * 25; ++i)
linemem[i] = 0x0720; line_mem[i] = 0x0720;
} }
} }
@ -40,22 +40,22 @@ VirtualConsole::~VirtualConsole()
{ {
} }
void VirtualConsole::switchTo(unsigned index) void VirtualConsole::switch_to(unsigned index)
{ {
if ((int)index == s_activeConsole) if ((int)index == s_active_console)
return; return;
dbgprintf("VC: Switch to %u (%p)\n", index, s_consoles[index]); dbgprintf("VC: Switch to %u (%p)\n", index, s_consoles[index]);
ASSERT(index < 6); ASSERT(index < 6);
ASSERT(s_consoles[index]); ASSERT(s_consoles[index]);
InterruptDisabler disabler; InterruptDisabler disabler;
if (s_activeConsole != -1) if (s_active_console != -1)
s_consoles[s_activeConsole]->setActive(false); s_consoles[s_active_console]->set_active(false);
s_activeConsole = index; s_active_console = index;
s_consoles[s_activeConsole]->setActive(true); s_consoles[s_active_console]->set_active(true);
Console::the().setImplementation(s_consoles[s_activeConsole]); Console::the().setImplementation(s_consoles[s_active_console]);
} }
void VirtualConsole::setActive(bool b) void VirtualConsole::set_active(bool b)
{ {
if (b == m_active) if (b == m_active)
return; return;
@ -64,27 +64,27 @@ void VirtualConsole::setActive(bool b)
m_active = b; m_active = b;
if (!m_active) { if (!m_active) {
memcpy(m_buffer, s_vgaBuffer, 80 * 25 * 2); memcpy(m_buffer, s_vga_buffer, 80 * 25 * 2);
return; return;
} }
memcpy(s_vgaBuffer, m_buffer, 80 * 25 * 2); memcpy(s_vga_buffer, m_buffer, 80 * 25 * 2);
vga_set_cursor(m_cursorRow, m_cursorColumn); vga_set_cursor(m_cursor_row, m_cursor_column);
Keyboard::the().setClient(this); Keyboard::the().setClient(this);
} }
inline bool isParameter(byte ch) inline bool is_valid_parameter_character(byte ch)
{ {
return ch >= 0x30 && ch <= 0x3f; return ch >= 0x30 && ch <= 0x3f;
} }
inline bool isIntermediate(byte ch) inline bool is_valid_intermediate_character(byte ch)
{ {
return ch >= 0x20 && ch <= 0x2f; return ch >= 0x20 && ch <= 0x2f;
} }
inline bool isFinal(byte ch) inline bool is_valid_final_character(byte ch)
{ {
return ch >= 0x40 && ch <= 0x7e; return ch >= 0x40 && ch <= 0x7e;
} }
@ -142,7 +142,7 @@ enum class ANSIColor : byte {
White, White,
}; };
static inline VGAColor ansiColorToVGA(ANSIColor color) static inline VGAColor ansi_color_to_vga(ANSIColor color)
{ {
switch (color) { switch (color) {
case ANSIColor::Black: return VGAColor::Black; case ANSIColor::Black: return VGAColor::Black;
@ -166,9 +166,9 @@ static inline VGAColor ansiColorToVGA(ANSIColor color)
return VGAColor::LightGray; return VGAColor::LightGray;
} }
static inline byte ansiColorToVGA(byte color) static inline byte ansi_color_to_vga(byte color)
{ {
return (byte)ansiColorToVGA((ANSIColor)color); return (byte)ansi_color_to_vga((ANSIColor)color);
} }
void VirtualConsole::escape$m(const Vector<unsigned>& params) void VirtualConsole::escape$m(const Vector<unsigned>& params)
@ -177,11 +177,11 @@ void VirtualConsole::escape$m(const Vector<unsigned>& params)
switch (param) { switch (param) {
case 0: case 0:
// Reset // Reset
m_currentAttribute = 0x07; m_current_attribute = 0x07;
break; break;
case 1: case 1:
// Bold // Bold
m_currentAttribute |= 8; m_current_attribute |= 8;
break; break;
case 30: case 30:
case 31: case 31:
@ -192,8 +192,8 @@ void VirtualConsole::escape$m(const Vector<unsigned>& params)
case 36: case 36:
case 37: case 37:
// Foreground color // Foreground color
m_currentAttribute &= ~0x7; m_current_attribute &= ~0x7;
m_currentAttribute |= ansiColorToVGA(param - 30); m_current_attribute |= ansi_color_to_vga(param - 30);
break; break;
case 40: case 40:
case 41: case 41:
@ -204,8 +204,8 @@ void VirtualConsole::escape$m(const Vector<unsigned>& params)
case 46: case 46:
case 47: case 47:
// Background color // Background color
m_currentAttribute &= ~0x70; m_current_attribute &= ~0x70;
m_currentAttribute |= ansiColorToVGA(param - 30) << 8; m_current_attribute |= ansi_color_to_vga(param - 30) << 8;
break; break;
} }
} }
@ -213,13 +213,13 @@ void VirtualConsole::escape$m(const Vector<unsigned>& params)
void VirtualConsole::escape$s(const Vector<unsigned>&) void VirtualConsole::escape$s(const Vector<unsigned>&)
{ {
m_savedCursorRow = m_cursorRow; m_saved_cursor_row = m_cursor_row;
m_savedCursorColumn = m_cursorColumn; m_saved_cursor_column = m_cursor_column;
} }
void VirtualConsole::escape$u(const Vector<unsigned>&) void VirtualConsole::escape$u(const Vector<unsigned>&)
{ {
setCursor(m_savedCursorRow, m_savedCursorColumn); set_cursor(m_saved_cursor_row, m_saved_cursor_column);
} }
void VirtualConsole::escape$H(const Vector<unsigned>& params) void VirtualConsole::escape$H(const Vector<unsigned>& params)
@ -230,7 +230,7 @@ void VirtualConsole::escape$H(const Vector<unsigned>& params)
row = params[0]; row = params[0];
if (params.size() >= 2) if (params.size() >= 2)
col = params[1]; col = params[1];
setCursor(row - 1, col - 1); set_cursor(row - 1, col - 1);
} }
void VirtualConsole::escape$J(const Vector<unsigned>& params) void VirtualConsole::escape$J(const Vector<unsigned>& params)
@ -257,7 +257,7 @@ void VirtualConsole::escape$J(const Vector<unsigned>& params)
} }
} }
void VirtualConsole::executeEscapeSequence(byte final) void VirtualConsole::execute_escape_sequence(byte final)
{ {
auto paramparts = String((const char*)m_parameters.data(), m_parameters.size()).split(';'); auto paramparts = String((const char*)m_parameters.data(), m_parameters.size()).split(';');
Vector<unsigned> params; Vector<unsigned> params;
@ -283,9 +283,9 @@ void VirtualConsole::executeEscapeSequence(byte final)
m_intermediates.clear(); m_intermediates.clear();
} }
void VirtualConsole::scrollUp() void VirtualConsole::scroll_up()
{ {
if (m_cursorRow == (m_rows - 1)) { if (m_cursor_row == (m_rows - 1)) {
memcpy(m_buffer, m_buffer + 160, 160 * 24); memcpy(m_buffer, m_buffer + 160, 160 * 24);
word* linemem = (word*)&m_buffer[24 * 160]; word* linemem = (word*)&m_buffer[24 * 160];
for (word i = 0; i < 80; ++i) for (word i = 0; i < 80; ++i)
@ -293,66 +293,66 @@ void VirtualConsole::scrollUp()
if (m_active) if (m_active)
vga_scroll_up(); vga_scroll_up();
} else { } else {
++m_cursorRow; ++m_cursor_row;
} }
m_cursorColumn = 0; m_cursor_column = 0;
} }
void VirtualConsole::setCursor(unsigned row, unsigned column) void VirtualConsole::set_cursor(unsigned row, unsigned column)
{ {
ASSERT(row < m_rows); ASSERT(row < m_rows);
ASSERT(column < m_columns); ASSERT(column < m_columns);
m_cursorRow = row; m_cursor_row = row;
m_cursorColumn = column; m_cursor_column = column;
if (m_active) if (m_active)
vga_set_cursor(m_cursorRow, m_cursorColumn); vga_set_cursor(m_cursor_row, m_cursor_column);
} }
void VirtualConsole::putCharacterAt(unsigned row, unsigned column, byte ch) void VirtualConsole::put_character_at(unsigned row, unsigned column, byte ch)
{ {
ASSERT(row < m_rows); ASSERT(row < m_rows);
ASSERT(column < m_columns); ASSERT(column < m_columns);
word cur = (row * 160) + (column * 2); word cur = (row * 160) + (column * 2);
m_buffer[cur] = ch; m_buffer[cur] = ch;
m_buffer[cur + 1] = m_currentAttribute; m_buffer[cur + 1] = m_current_attribute;
if (m_active) if (m_active)
vga_putch_at(row, column, ch, m_currentAttribute); vga_putch_at(row, column, ch, m_current_attribute);
} }
void VirtualConsole::onChar(byte ch, bool shouldEmit) void VirtualConsole::on_char(byte ch, bool shouldEmit)
{ {
InterruptDisabler disabler; InterruptDisabler disabler;
if (shouldEmit) if (shouldEmit)
emit(ch); emit(ch);
switch (m_escState) { switch (m_escape_state) {
case ExpectBracket: case ExpectBracket:
if (ch == '[') if (ch == '[')
m_escState = ExpectParameter; m_escape_state = ExpectParameter;
else else
m_escState = Normal; m_escape_state = Normal;
return; return;
case ExpectParameter: case ExpectParameter:
if (isParameter(ch)) { if (is_valid_parameter_character(ch)) {
m_parameters.append(ch); m_parameters.append(ch);
return; return;
} }
m_escState = ExpectIntermediate; m_escape_state = ExpectIntermediate;
// fall through // fall through
case ExpectIntermediate: case ExpectIntermediate:
if (isIntermediate(ch)) { if (is_valid_intermediate_character(ch)) {
m_intermediates.append(ch); m_intermediates.append(ch);
return; return;
} }
m_escState = ExpectFinal; m_escape_state = ExpectFinal;
// fall through // fall through
case ExpectFinal: case ExpectFinal:
if (isFinal(ch)) { if (is_valid_final_character(ch)) {
m_escState = Normal; m_escape_state = Normal;
executeEscapeSequence(ch); execute_escape_sequence(ch);
return; return;
} }
m_escState = Normal; m_escape_state = Normal;
return; return;
case Normal: case Normal:
break; break;
@ -362,27 +362,27 @@ void VirtualConsole::onChar(byte ch, bool shouldEmit)
case '\0': case '\0':
return; return;
case '\033': case '\033':
m_escState = ExpectBracket; m_escape_state = ExpectBracket;
return; return;
case 8: // Backspace case 8: // Backspace
if (m_cursorColumn) { if (m_cursor_column) {
setCursor(m_cursorRow, m_cursorColumn - 1); set_cursor(m_cursor_row, m_cursor_column - 1);
putCharacterAt(m_cursorRow, m_cursorColumn, ' '); put_character_at(m_cursor_row, m_cursor_column, ' ');
return; return;
} }
break; break;
case '\n': case '\n':
scrollUp(); scroll_up();
setCursor(m_cursorRow, m_cursorColumn); set_cursor(m_cursor_row, m_cursor_column);
return; return;
} }
putCharacterAt(m_cursorRow, m_cursorColumn, ch); put_character_at(m_cursor_row, m_cursor_column, ch);
++m_cursorColumn; ++m_cursor_column;
if (m_cursorColumn >= m_columns) if (m_cursor_column >= m_columns)
scrollUp(); scroll_up();
setCursor(m_cursorRow, m_cursorColumn); set_cursor(m_cursor_row, m_cursor_column);
} }
void VirtualConsole::onKeyPress(byte ch) void VirtualConsole::onKeyPress(byte ch)
@ -392,15 +392,15 @@ void VirtualConsole::onKeyPress(byte ch)
void VirtualConsole::onConsoleReceive(byte ch) void VirtualConsole::onConsoleReceive(byte ch)
{ {
auto old_attribute = m_currentAttribute; auto old_attribute = m_current_attribute;
m_currentAttribute = 0x03; m_current_attribute = 0x03;
onChar(ch, false); on_char(ch, false);
m_currentAttribute = old_attribute; m_current_attribute = old_attribute;
} }
void VirtualConsole::onTTYWrite(byte ch) void VirtualConsole::onTTYWrite(byte ch)
{ {
onChar(ch, false); on_char(ch, false);
} }
String VirtualConsole::ttyName() const String VirtualConsole::ttyName() const

28
Kernel/VirtualConsole.h
View file

@ -12,10 +12,7 @@ public:
VirtualConsole(unsigned index, InitialContents = Cleared); VirtualConsole(unsigned index, InitialContents = Cleared);
virtual ~VirtualConsole() override; virtual ~VirtualConsole() override;
void adoptCurrentVGABuffer(); static void switch_to(unsigned);
void setActive(bool);
static void switchTo(unsigned);
static void initialize(); static void initialize();
private: private:
@ -29,15 +26,16 @@ private:
virtual void onTTYWrite(byte) override; virtual void onTTYWrite(byte) override;
virtual String ttyName() const override; virtual String ttyName() const override;
void onChar(byte, bool shouldEmit); void set_active(bool);
void on_char(byte, bool shouldEmit);
byte* m_buffer; byte* m_buffer;
unsigned m_index; unsigned m_index;
bool m_active { false }; bool m_active { false };
void scrollUp(); void scroll_up();
void setCursor(unsigned row, unsigned column); void set_cursor(unsigned row, unsigned column);
void putCharacterAt(unsigned row, unsigned column, byte ch); void put_character_at(unsigned row, unsigned column, byte ch);
void escape$H(const Vector<unsigned>&); void escape$H(const Vector<unsigned>&);
void escape$J(const Vector<unsigned>&); void escape$J(const Vector<unsigned>&);
@ -47,13 +45,13 @@ private:
const byte m_rows { 25 }; const byte m_rows { 25 };
const byte m_columns { 80 }; const byte m_columns { 80 };
byte m_cursorRow { 0 }; byte m_cursor_row { 0 };
byte m_cursorColumn { 0 }; byte m_cursor_column { 0 };
byte m_savedCursorRow { 0 }; byte m_saved_cursor_row { 0 };
byte m_savedCursorColumn { 0 }; byte m_saved_cursor_column { 0 };
byte m_currentAttribute { 0x07 }; byte m_current_attribute { 0x07 };
void executeEscapeSequence(byte final); void execute_escape_sequence(byte final);
enum EscapeState { enum EscapeState {
Normal, Normal,
@ -62,7 +60,7 @@ private:
ExpectIntermediate, ExpectIntermediate,
ExpectFinal, ExpectFinal,
}; };
EscapeState m_escState { Normal }; EscapeState m_escape_state { Normal };
Vector<byte> m_parameters; Vector<byte> m_parameters;
Vector<byte> m_intermediates; Vector<byte> m_intermediates;
}; };

2
Kernel/init.cpp
View file

@ -231,7 +231,7 @@ void init()
tty1 = new VirtualConsole(1); tty1 = new VirtualConsole(1);
tty2 = new VirtualConsole(2); tty2 = new VirtualConsole(2);
tty3 = new VirtualConsole(3); tty3 = new VirtualConsole(3);
VirtualConsole::switchTo(0); VirtualConsole::switch_to(0);
kprintf("Starting Serenity Operating System...\n"); kprintf("Starting Serenity Operating System...\n");