a bit refactoring on kernel_init

[lunaix-os.git] / lunaix-os / kernel / tty / tty.c

diff --git a/lunaix-os/kernel/tty/tty.c b/lunaix-os/kernel/tty/tty.c
index db9c28b572decbe640339f229156da15816a0755..1ad0dd47e0390aad672ecd180d09cf1239bde5a3 100644 (file)
--- a/lunaix-os/kernel/tty/tty.c
+++ b/lunaix-os/kernel/tty/tty.c
@@ -1,21 +1,31 @@
 #include <libc/string.h>
 #include <lunaix/tty/tty.h>
 #include <libc/string.h>
 #include <lunaix/tty/tty.h>

+#include <lunaix/constants.h>

 #include <stdint.h>
 
 #define TTY_WIDTH 80
 #define TTY_HEIGHT 25
 
 #include <stdint.h>
 
 #define TTY_WIDTH 80
 #define TTY_HEIGHT 25
 

-vga_attribute* buffer = (vga_attribute*)0xB8000;
+vga_attribute* tty_vga_buffer = (vga_attribute*)VGA_BUFFER_PADDR;

 
 

-vga_attribute theme_color = VGA_COLOR_BLACK;
+vga_attribute tty_theme_color = VGA_COLOR_BLACK;

 
 uint32_t tty_x = 0;
 uint16_t tty_y = 0;
 
 
 uint32_t tty_x = 0;
 uint16_t tty_y = 0;
 

+void tty_init(void* vga_buf) {
+    tty_vga_buffer = (vga_attribute*)vga_buf;
+    tty_clear();
+}
+
+void tty_set_buffer(void* vga_buf) {
+    tty_vga_buffer = (vga_attribute*)vga_buf;
+}
+

 void
 tty_set_theme(vga_attribute fg, vga_attribute bg)
 {
 void
 tty_set_theme(vga_attribute fg, vga_attribute bg)
 {

-    theme_color = (bg << 4 | fg) << 8;
+    tty_theme_color = (bg << 4 | fg) << 8;

 }
 
 void
 }
 
 void


@@ -26,14 +36,13 @@ tty_put_char(char chr)
             tty_x += 4;
             break;
         case '\n':
             tty_x += 4;
             break;
         case '\n':

-            tty_x = 0;

             tty_y++;
             tty_y++;

-            break;
+            // fall through

         case '\r':
             tty_x = 0;
             break;
         default:
         case '\r':
             tty_x = 0;
             break;
         default:

-            *(buffer + tty_x + tty_y * TTY_WIDTH) = (theme_color | chr);
+            *(tty_vga_buffer + tty_x + tty_y * TTY_WIDTH) = (tty_theme_color | chr);

             tty_x++;
             break;
     }
             tty_x++;
             break;
     }


@@ -60,17 +69,39 @@ void
 tty_scroll_up()
 {
     size_t last_line = TTY_WIDTH * (TTY_HEIGHT - 1);
 tty_scroll_up()
 {
     size_t last_line = TTY_WIDTH * (TTY_HEIGHT - 1);

-    memcpy(buffer, buffer + TTY_WIDTH, last_line);
+    memcpy(tty_vga_buffer, tty_vga_buffer + TTY_WIDTH, last_line * 2);

     for (size_t i = 0; i < TTY_WIDTH; i++) {
     for (size_t i = 0; i < TTY_WIDTH; i++) {

-        *(buffer + i + last_line) = theme_color;
+        *(tty_vga_buffer + i + last_line) = tty_theme_color;

     }
     }

-    tty_y = tty_y == 0 ? 0 : tty_y - 1;
+    tty_y = tty_y == 0 ? 0 : TTY_HEIGHT - 1;

 }
 
 void
 tty_clear()
 {
     for (uint32_t i = 0; i < TTY_WIDTH * TTY_HEIGHT; i++) {
 }
 
 void
 tty_clear()
 {
     for (uint32_t i = 0; i < TTY_WIDTH * TTY_HEIGHT; i++) {

-        *(buffer + i) = theme_color;
+        *(tty_vga_buffer + i) = tty_theme_color;
+    }
+    tty_x = 0;
+    tty_y = 0;
+}
+
+void
+tty_clear_line(unsigned int y) {
+    for (size_t i = 0; i < TTY_WIDTH; i++)
+    {
+        *(tty_vga_buffer + i + y * TTY_WIDTH) = tty_theme_color;

     }
     }

+}
+
+void
+tty_set_cpos(unsigned int x, unsigned int y) {
+    tty_x = x % TTY_WIDTH;
+    tty_y = y % TTY_HEIGHT;
+}
+
+void
+tty_get_cpos(unsigned int* x, unsigned int* y) {
+    *x = tty_x;
+    *y = tty_y;

 }
\ No newline at end of file
 }
\ No newline at end of file