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

Kernel: Rework whole Terminal structure

Browse Source 
Serial monitors can now be used as a output. This requires editing
init code for the stdio opening. Serial input is not supported, so qemu
still needs graphical window for ps/2 keyboard.
This commit is contained in:
Bananymous
2023-09-04 19:34:18 +03:00
parent 52b9fddfd7
commit 323de3c866
17 changed files with 833 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/include/kernel/FS/DevFS/FileSystem.h
View File

@@ -16,7 +16,7 @@ namespace Kernel
void add_device(BAN::StringView path, BAN::RefPtr<Device>);
dev_t get_next_rdev();
dev_t get_next_dev();
private:
DevFileSystem(size_t size)

28
kernel/include/kernel/Serial.h
View File

@@ -1,28 +0,0 @@
#pragma once
#include <BAN/Errors.h>
namespace Kernel
{
class Serial
{
public:
static void initialize();
static bool has_devices();
static void putchar_any(char);
void putchar(char);
private:
static bool port_has_device(uint16_t);
bool is_transmit_empty() const;
bool is_valid() const { return m_port != 0; }
private:
uint16_t m_port { 0 };
};
}

58
kernel/include/kernel/Terminal/Serial.h Normal file
View File

@@ -0,0 +1,58 @@
#pragma once
#include <BAN/Errors.h>
#include <kernel/Terminal/TTY.h>
namespace Kernel
{
class Serial
{
public:
static void initialize();
static bool has_devices();
static void putchar_any(char);
static void initialize_devices();
void putchar(char);
char getchar();
uint16_t port() const { return m_port; }
uint32_t width() const { return m_width; }
uint32_t height() const { return m_height; }
private:
static bool port_has_device(uint16_t);
bool initialize_size();
bool is_valid() const { return m_port != 0; }
private:
uint16_t m_port { 0 };
uint32_t m_width { 0 };
uint32_t m_height { 0 };
};
class SerialTTY final : public TTY
{
public:
static BAN::ErrorOr<BAN::RefPtr<SerialTTY>> create(Serial);
virtual uint32_t width() const override;
virtual uint32_t height() const override;
virtual void putchar(uint8_t) override;
private:
SerialTTY(Serial);
bool initialize();
private:
Serial m_serial;
public:
virtual dev_t rdev() const override { return m_rdev; }
private:
const dev_t m_rdev;
};
}

98
kernel/include/kernel/Terminal/TTY.h
View File

@@ -10,18 +10,13 @@
namespace Kernel
{
class TTY : public CharacterDevice
{
public:
TTY(TerminalDriver*);
void set_termios(const termios& termios) { m_termios = termios; }
termios get_termios() const { return m_termios; }
void set_font(const Kernel::Font&);
uint32_t height() const { return m_height; }
uint32_t width() const { return m_width; }
virtual void set_font(const Font&) {};
void set_foreground_pgrp(pid_t pgrp) { m_foreground_pgrp = pgrp; }
pid_t foreground_pgrp() const { return m_foreground_pgrp; }
@@ -30,80 +25,40 @@ namespace Kernel
static void putchar_current(uint8_t ch);
static bool is_initialized();
static BAN::RefPtr<TTY> current();
void set_as_current();
void initialize_device();
static void initialize_devices();
void on_key_event(Input::KeyEvent);
virtual bool is_tty() const override { return true; }
virtual BAN::ErrorOr<size_t> read(size_t, void*, size_t) override;
virtual BAN::ErrorOr<size_t> write(size_t, const void*, size_t) override;
virtual bool has_data() const override;
virtual uint32_t height() const = 0;
virtual uint32_t width() const = 0;
virtual void putchar(uint8_t ch) = 0;
bool has_data() const;
protected:
TTY(mode_t mode, uid_t uid, gid_t gid)
: CharacterDevice(mode, uid, gid)
{ }
private:
void clear();
void putchar(uint8_t ch);
void reset_ansi();
void handle_ansi_csi(uint8_t ch);
void handle_ansi_csi_color();
void putchar_at(uint32_t codepoint, uint32_t x, uint32_t y);
void render_from_buffer(uint32_t x, uint32_t y);
void set_cursor_position(uint32_t x, uint32_t y);
void on_key(Input::KeyEvent);
void do_backspace();
private:
enum class State
{
Normal,
WaitingAnsiEscape,
WaitingAnsiCSI,
WaitingUTF8,
};
struct AnsiState
{
int32_t nums[2] { -1, -1 };
int32_t index { 0 };
bool question { false };
};
struct UTF8State
{
uint32_t codepoint { 0 };
uint8_t bytes_missing { 0 };
};
struct Cell
{
TerminalDriver::Color foreground { TerminalColor::BRIGHT_WHITE };
TerminalDriver::Color background { TerminalColor::BLACK };
uint32_t codepoint { ' ' };
};
private:
protected:
mutable Kernel::SpinLock m_lock;
State m_state { State::Normal };
AnsiState m_ansi_state { };
UTF8State m_utf8_state { };
uint32_t m_width { 0 };
uint32_t m_height { 0 };
uint32_t m_saved_row { 0 };
uint32_t m_saved_column { 0 };
uint32_t m_row { 0 };
uint32_t m_column { 0 };
Cell* m_buffer { nullptr };
bool m_show_cursor { true };
TerminalDriver::Color m_foreground { TerminalColor::BRIGHT_WHITE };
TerminalDriver::Color m_background { TerminalColor::BLACK };
pid_t m_foreground_pgrp { 0 };
termios m_termios;
private:
pid_t m_foreground_pgrp { 0 };
struct Buffer
{
BAN::Array<uint8_t, 1024> buffer;
@@ -112,15 +67,6 @@ namespace Kernel
Semaphore semaphore;
};
Buffer m_output;
TerminalDriver* m_terminal_driver { nullptr };
public:
virtual dev_t rdev() const override { return m_rdev; }
virtual bool is_tty() const override { return true; }
private:
dev_t m_rdev;
};
}

90
kernel/include/kernel/Terminal/VirtualTTY.h Normal file
View File

@@ -0,0 +1,90 @@
#pragma once
#include <BAN/Array.h>
#include <kernel/Device/Device.h>
#include <kernel/Input/KeyEvent.h>
#include <kernel/SpinLock.h>
#include <kernel/Terminal/TerminalDriver.h>
#include <kernel/Terminal/termios.h>
#include <kernel/Terminal/TTY.h>
#include <kernel/Semaphore.h>
namespace Kernel
{
class VirtualTTY : public TTY
{
public:
static BAN::ErrorOr<BAN::RefPtr<VirtualTTY>> create(TerminalDriver*);
virtual void set_font(const Font&) override;
virtual uint32_t height() const override { return m_height; }
virtual uint32_t width() const override { return m_width; }
virtual void putchar(uint8_t ch) override;
private:
VirtualTTY(TerminalDriver*);
void clear();
void reset_ansi();
void handle_ansi_csi(uint8_t ch);
void handle_ansi_csi_color();
void putchar_at(uint32_t codepoint, uint32_t x, uint32_t y);
void render_from_buffer(uint32_t x, uint32_t y);
void set_cursor_position(uint32_t x, uint32_t y);
private:
enum class State
{
Normal,
WaitingAnsiEscape,
WaitingAnsiCSI,
WaitingUTF8,
};
struct AnsiState
{
int32_t nums[2] { -1, -1 };
int32_t index { 0 };
bool question { false };
};
struct UTF8State
{
uint32_t codepoint { 0 };
uint8_t bytes_missing { 0 };
};
struct Cell
{
TerminalDriver::Color foreground { TerminalColor::BRIGHT_WHITE };
TerminalDriver::Color background { TerminalColor::BLACK };
uint32_t codepoint { ' ' };
};
private:
State m_state { State::Normal };
AnsiState m_ansi_state { };
UTF8State m_utf8_state { };
uint32_t m_width { 0 };
uint32_t m_height { 0 };
uint32_t m_saved_row { 0 };
uint32_t m_saved_column { 0 };
uint32_t m_row { 0 };
uint32_t m_column { 0 };
Cell* m_buffer { nullptr };
bool m_show_cursor { true };
TerminalDriver* m_terminal_driver { nullptr };
public:
virtual dev_t rdev() const override { return m_rdev; }
private:
const dev_t m_rdev;
};
}