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

Kernel: Disable VGA console in graphical mode

Browse source
This commit is contained in:
Conrad Pankoff 2019-08-18 12:04:09 +10:00 • committed by Andreas Kling
parent 36e3e7b75a
commit 879bc28e14
3 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Kernel/TTY/VirtualConsole.cpp
View file

@ -81,12 +81,20 @@ void VirtualConsole::switch_to(unsigned index)
{ {
if ((int)index == s_active_console) if ((int)index == s_active_console)
return; return;
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_active_console != -1) if (s_active_console != -1) {
s_consoles[s_active_console]->set_active(false); auto* active_console = s_consoles[s_active_console];
// We won't know how to switch away from a graphical console until we
// can set the video mode on our own. Just stop anyone from trying for
// now.
if (active_console->is_graphical())
return;
active_console->set_active(false);
}
dbgprintf("VC: Switch to %u (%p)\n", index, s_consoles[index]);
s_active_console = index; s_active_console = index;
s_consoles[s_active_console]->set_active(true); s_consoles[s_active_console]->set_active(true);
Console::the().set_implementation(s_consoles[s_active_console]); Console::the().set_implementation(s_consoles[s_active_console]);
@ -420,6 +428,10 @@ void VirtualConsole::put_character_at(unsigned row, unsigned column, u8 ch)
void VirtualConsole::on_char(u8 ch) void VirtualConsole::on_char(u8 ch)
{ {
// ignore writes in graphical mode
if (m_graphical)
return;
switch (m_escape_state) { switch (m_escape_state) {
case ExpectBracket: case ExpectBracket:
if (ch == '[') if (ch == '[')
@ -494,6 +506,10 @@ void VirtualConsole::on_char(u8 ch)
void VirtualConsole::on_key_pressed(KeyboardDevice::Event key) void VirtualConsole::on_key_pressed(KeyboardDevice::Event key)
{ {
// ignore keyboard in graphical mode
if (m_graphical)
return;
if (!key.is_press()) if (!key.is_press())
return; return;
if (key.ctrl()) { if (key.ctrl()) {

4
Kernel/TTY/VirtualConsole.h
View file

@ -20,6 +20,9 @@ public:
static void switch_to(unsigned); static void switch_to(unsigned);
static void initialize(); static void initialize();
bool is_graphical() { return m_graphical; }
void set_graphical(bool graphical) { m_graphical = graphical; }
private: private:
// ^KeyboardClient // ^KeyboardClient
virtual void on_key_pressed(KeyboardDevice::Event) override; virtual void on_key_pressed(KeyboardDevice::Event) override;
@ -43,6 +46,7 @@ private:
u8* m_buffer; u8* m_buffer;
unsigned m_index; unsigned m_index;
bool m_active { false }; bool m_active { false };
bool m_graphical { false };
void scroll_up(); void scroll_up();
void set_cursor(unsigned row, unsigned column); void set_cursor(unsigned row, unsigned column);

5
Kernel/init.cpp
View file

@ -138,6 +138,11 @@ VFS* vfs;
int error; int error;
// SystemServer will start WindowServer, which will be doing graphics.
// From this point on we don't want to touch the VGA text terminal or
// accept keyboard input.
tty0->set_graphical(true);
auto* system_server_process = Process::create_user_process("/bin/SystemServer", (uid_t)0, (gid_t)0, (pid_t)0, error, {}, {}, tty0); auto* system_server_process = Process::create_user_process("/bin/SystemServer", (uid_t)0, (gid_t)0, (pid_t)0, error, {}, {}, tty0);
if (error != 0) { if (error != 0) {
kprintf("init_stage2: error spawning SystemServer: %d\n", error); kprintf("init_stage2: error spawning SystemServer: %d\n", error);