x86_64/vga: extract buffer type

3 files changed, 161 insertions, 148 deletions

diff --git a/arch/x86_64/src/vga/text.cpp b/arch/x86_64/src/vga/text.cpp
deleted file mode 100644
index 1ee69f6..0000000
--- a/arch/x86_64/src/vga/text.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-#include "x86_64/vga/text.hpp"
-
-#include "kapi/boot.hpp"
-#include "kapi/cio.hpp"
-
-#include "x86_64/boot/boot.hpp"
-#include "x86_64/boot/ld.hpp"
-#include "x86_64/vga/crtc.hpp"
-
-#include <algorithm>
-#include <bit>
-#include <cstddef>
-#include <cstdint>
-#include <span>
-#include <string_view>
-#include <utility>
-
-namespace teachos::vga::x86_64::text
-{
-  namespace
-  {
-    constexpr auto default_buffer_address = std::uintptr_t{0xb8000};
-    constexpr auto default_buffer_width = 80z;
-    constexpr auto default_buffer_height = 25z;
-
-    constexpr auto bit_cursor_enabled = 5U;
-
-    [[maybe_unused]] constexpr auto black_on_black = attribute{.foreground_color = color::black,
-                                                               .foreground_flag = foreground_flag::none,
-                                                               .background_color = color::black,
-                                                               .background_flag = background_flag::none};
-  }  // namespace
-
-  device::device()
-      : m_width{default_buffer_width}
-      , m_height{default_buffer_height}
-      , m_buffer{std::bit_cast<device::cell *>(default_buffer_address +
-                                               std::bit_cast<std::uintptr_t>(&teachos::boot::x86_64::TEACHOS_VMA)),
-                 m_width * m_height}
-      , m_position{boot::bootstrap_information.vga_buffer_index}
-  {
-    clear();
-  }
-
-  auto device::clear() -> void
-  {
-    m_position = 0;
-    std::ranges::fill(m_buffer, std::pair{' ', std::bit_cast<std::byte>(black_on_black)});
-  }
-
-  auto device::cursor(bool enabled) -> void
-  {
-    auto cursor_disable_byte = std::byte{!enabled} << bit_cursor_enabled;
-
-    crtc::address::write(crtc::registers::cursor_start);
-    crtc::data::write(crtc::data::read() | cursor_disable_byte);
-  }
-
-  [[nodiscard]] auto device::column() const noexcept -> std::ptrdiff_t
-  {
-    return m_position % m_width;
-  }
-
-  [[nodiscard]] auto device::line() const noexcept -> std::ptrdiff_t
-  {
-    return m_position / m_width;
-  }
-
-  auto device::handle_special_code_point(char code_point, attribute attribute) -> bool
-  {
-    switch (code_point)
-    {
-      case '\n':
-        newline();
-        return true;
-      case '\r':
-        m_position -= column();
-        return true;
-      case '\t':
-        put("  ", attribute);
-        return true;
-      default:
-        return false;
-    }
-  }
-
-  auto device::put(std::string_view code_points, attribute attribute) -> void
-  {
-    std::ranges::for_each(code_points, [&](auto code_point) -> void { put(code_point, attribute); });
-  }
-
-  auto device::put(char code_point, attribute attribute) -> void
-  {
-    m_buffer[m_position++] = std::pair{code_point, std::bit_cast<std::byte>(attribute)};
-  }
-
-  auto device::newline() -> void
-  {
-    auto free_glyphs_in_line = m_width - column();
-    m_position += free_glyphs_in_line;
-  }
-
-  auto device::scroll(std::size_t nof_lines) -> void
-  {
-    auto scroll_count = std::min(nof_lines, m_height);
-
-    auto scroll_start = m_buffer.begin() + (scroll_count * m_width);
-    std::ranges::move(scroll_start, m_buffer.end(), m_buffer.begin());
-
-    auto clear_start = m_buffer.begin() + (m_height - scroll_count) * m_width;
-    std::ranges::fill(clear_start, m_buffer.end(), cell{});
-
-    m_position = (line() - scroll_count) * m_width;
-  }
-
-  auto device::write(cio::output_stream stream, std::string_view text) -> void
-  {
-    auto attributes = [&] -> attribute {
-      switch (stream)
-      {
-        case cio::output_stream::stderr:
-          return red_on_black;
-        default:
-          return green_on_black;
-      }
-    }();
-    write(text, attributes);
-  }
-
-  auto device::write(std::string_view code_points, attribute attribute) -> void
-  {
-    std::ranges::for_each(code_points, [&](auto code_point) -> void { write(code_point, attribute); });
-  }
-
-  auto device::write(char code_point, attribute attribute) -> void
-  {
-    if (m_position + 1 > static_cast<std::ptrdiff_t>(m_height * m_width))
-    {
-      scroll();
-    }
-
-    if (!handle_special_code_point(code_point, attribute))
-    {
-      put(code_point, attribute);
-    }
-  };
-
-}  // namespace teachos::vga::x86_64::text
diff --git a/arch/x86_64/src/vga/text/buffer.cpp b/arch/x86_64/src/vga/text/buffer.cpp
new file mode 100644
index 0000000..2dcf084
--- /dev/null
+++ b/arch/x86_64/src/vga/text/buffer.cpp
@@ -0,0 +1,101 @@
+#include "x86_64/vga/text/buffer.hpp"
+
+#include "x86_64/vga/text/attribute.hpp"
+
+#include <algorithm>
+#include <bit>
+#include <cstddef>
+#include <span>
+#include <string_view>
+#include <utility>
+
+namespace teachos::vga::x86_64::text
+{
+  buffer::buffer(std::size_t width, std::size_t height, cell * start, std::size_t position)
+      : m_width{width}
+      , m_height{height}
+      , m_buffer{start, m_width * m_height}
+      , m_position{position}
+  {}
+
+  auto buffer::clear() -> void
+  {
+    m_position = 0;
+    std::ranges::fill(m_buffer, std::pair{'\0', static_cast<std::byte>(0x00)});
+  }
+
+  auto buffer::write(std::string_view code_points, attribute attribute) -> void
+  {
+    std::ranges::for_each(code_points, [&](auto code_point) -> void { write(code_point, attribute); });
+  }
+
+  auto buffer::write(char code_point, attribute attribute) -> void
+  {
+    if (m_position + 1 > m_height * m_width)
+    {
+      scroll();
+    }
+
+    if (!handle_special_code_point(code_point, attribute))
+    {
+      do_write(code_point, attribute);
+    }
+  };
+
+  auto buffer::newline() -> void
+  {
+    auto free_glyphs_in_line = m_width - column();
+    m_position += free_glyphs_in_line;
+  }
+
+  auto buffer::scroll(std::size_t nof_lines) -> void
+  {
+    auto scroll_count = std::min(nof_lines, m_height);
+
+    auto scroll_start = m_buffer.begin() + (scroll_count * m_width);
+    std::ranges::move(scroll_start, m_buffer.end(), m_buffer.begin());
+
+    auto clear_start = m_buffer.begin() + (m_height - scroll_count) * m_width;
+    std::ranges::fill(clear_start, m_buffer.end(), cell{});
+
+    m_position = (line() - scroll_count) * m_width;
+  }
+
+  auto buffer::column() const noexcept -> std::ptrdiff_t
+  {
+    return m_position % m_width;
+  }
+
+  auto buffer::line() const noexcept -> std::ptrdiff_t
+  {
+    return m_position / m_width;
+  }
+  auto buffer::handle_special_code_point(char code_point, attribute attribute) -> bool
+  {
+    switch (code_point)
+    {
+      case '\n':
+        newline();
+        return true;
+      case '\r':
+        m_position -= column();
+        return true;
+      case '\t':
+        do_write("  ", attribute);
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  auto buffer::do_write(std::string_view code_points, attribute attribute) -> void
+  {
+    std::ranges::for_each(code_points, [&](auto code_point) -> void { do_write(code_point, attribute); });
+  }
+
+  auto buffer::do_write(char code_point, attribute attribute) -> void
+  {
+    m_buffer[m_position++] = std::pair{code_point, std::bit_cast<std::byte>(attribute)};
+  }
+
+}  // namespace teachos::vga::x86_64::text
diff --git a/arch/x86_64/src/vga/text/device.cpp b/arch/x86_64/src/vga/text/device.cpp
new file mode 100644
index 0000000..2da9e06
--- /dev/null
+++ b/arch/x86_64/src/vga/text/device.cpp
@@ -0,0 +1,60 @@
+#include "kapi/cio.hpp"
+
+#include "x86_64/boot/boot.hpp"
+#include "x86_64/boot/ld.hpp"
+#include "x86_64/vga/crtc.hpp"
+#include "x86_64/vga/text.hpp"
+
+#include <bit>
+#include <cstddef>
+#include <cstdint>
+#include <string_view>
+
+namespace teachos::vga::x86_64::text
+{
+  namespace
+  {
+    constexpr auto default_buffer_address = std::uintptr_t{0xb8000};
+    constexpr auto default_buffer_width = 80z;
+    constexpr auto default_buffer_height = 25z;
+
+    constexpr auto bit_cursor_enabled = 5U;
+  }  // namespace
+
+  device::device()
+      : m_buffer{default_buffer_width, default_buffer_height,
+                 std::bit_cast<buffer::cell *>(default_buffer_address +
+                                               std::bit_cast<std::uintptr_t>(&teachos::boot::x86_64::TEACHOS_VMA)),
+                 boot::bootstrap_information.vga_buffer_index}
+  {
+    clear();
+  }
+
+  auto device::clear() -> void
+  {
+    m_buffer.clear();
+  }
+
+  auto device::cursor(bool enabled) -> void
+  {
+    auto cursor_disable_byte = std::byte{!enabled} << bit_cursor_enabled;
+
+    crtc::address::write(crtc::registers::cursor_start);
+    crtc::data::write(crtc::data::read() | cursor_disable_byte);
+  }
+
+  auto device::write(cio::output_stream stream, std::string_view text) -> void
+  {
+    auto attributes = [&] -> attribute {
+      switch (stream)
+      {
+        case cio::output_stream::stderr:
+          return red_on_black;
+        default:
+          return green_on_black;
+      }
+    }();
+    m_buffer.write(text, attributes);
+  }
+
+}  // namespace teachos::vga::x86_64::text