From 89042ba754050f5b9a3f06c9348c7c34cf67467d Mon Sep 17 00:00:00 2001
From: onyad <timosha1113@gmail.com>
Date: Sat, 15 Jul 2023 18:36:36 +0300
Subject: [PATCH] update cpp terminal

---
 src/main.cpp          | 4 ++--
 src/window/window.cpp | 9 +++++----
 src/window/window.hpp | 8 +++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 819039a..b6bc04c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,7 +2,7 @@
 
 #include <window/window.hpp>
 
-#include <cpp-terminal/base.hpp>
+#include "cpp-terminal/io.hpp"
 #include <cpp-terminal/input.hpp>
 
 #include <thread>
@@ -98,7 +98,7 @@ int main() {
   auto [w, h] = win.GetSize();
 
   for (long long it = 0; it < 1000000000000000; ++it) {
-    float alp = it / 10.;
+    float alp = it / 100.;
     t.p.x = cos(alp);
     t.p.y = sin(alp);
     s.r = sin(alp * sqrt(2));
diff --git a/src/window/window.cpp b/src/window/window.cpp
index b026168..19fb65c 100644
--- a/src/window/window.cpp
+++ b/src/window/window.cpp
@@ -1,8 +1,9 @@
 #include <window/window.hpp>
 
 #include <iostream>
-#include <cpp-terminal/base.hpp>
+#include "cpp-terminal/io.hpp"
 #include "cpp-terminal/input.hpp"
+#include "cpp-terminal/screen.hpp"
 
 namespace gui {
 Window::Window() {
@@ -10,7 +11,7 @@ Window::Window() {
 }
 
 void Window::ReloadSize() {
-  std::tie(height_, width_) = Term::get_size();
+  std::tie(height_, width_) = Term::screen_size().size();
 
   current_grid_.resize(width_);
   buffer_grid_.resize(width_);
@@ -50,10 +51,10 @@ void Window::Draw() {
         cur = buf;
 
         if (buf.not_empty_background_color) {
-          std::cout << Term::color_bg(Term::Color4::DEFAULT);
+          std::cout << Term::color_bg(Term::Color::Name::Default);
         }
         if (buf.not_empty_font_color) {
-          std::cout << Term::color_fg(Term::Color4::DEFAULT);
+          std::cout << Term::color_fg(Term::Color::Name::Default);
         }
       }
     }
diff --git a/src/window/window.hpp b/src/window/window.hpp
index c264f9a..1719e72 100644
--- a/src/window/window.hpp
+++ b/src/window/window.hpp
@@ -2,8 +2,10 @@
 
 #include <cstddef>
 #include <vector>
+#include <tuple>
 
-#include <cpp-terminal/base.hpp>
+#include "cpp-terminal/io.hpp"
+#include "cpp-terminal/color.hpp"
 
 namespace gui {
 
@@ -15,8 +17,8 @@ struct Color {
   bool operator==(const Color&) const = default;
   bool operator!=(const Color&) const = default;
 
-  operator Term::RGB() {
-    return Term::RGB{r, g, b};
+  operator Term::Color() {
+    return Term::Color{r, g, b};
   }
 
   uint8_t r, g, b;