Some user-side graphics

5 files changed, 60 insertions, 29 deletions

diff --git a/src/userspace/graphics/framebuffer.c b/src/userspace/graphics/framebuffer.c
new file mode 100644
index 0000000..f7b793b
--- /dev/null
+++ b/src/userspace/graphics/framebuffer.c
@@ -0,0 +1,34 @@
+#include <syscall.h>
+#include <graphics/graphics.h>
+
+unsigned char *fb;
+int vbe_bpl = 3;
+int vbe_pitch = 3000;
+int vbe_height = 1080;
+int vbe_width = 2560;
+
+void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const uint32_t color[3])
+{
+    int pos1 = x1 * vbe_bpl + y1 * vbe_pitch;
+    char *draw = (char *) &fb[pos1];
+    for (int i = 0; i <= y2 - y1; i++) {
+        for (int j = 0; j <= x2 - x1; j++) {
+            draw[vbe_bpl * j] = color[2];
+            draw[vbe_bpl * j + 1] = color[1];
+            draw[vbe_bpl * j + 2] = color[0];
+        }
+        draw += vbe_pitch;
+    }
+}
+
+void vesa_clear()
+{
+    vesa_draw_rectangle(0, 0, vbe_width - 1, vbe_height - 1, 0);
+}
+
+void init_framebuffer()
+{
+    struct userspace_pointers *pointers = (struct userspace_pointers *) syscall_get_pointers();
+    fb = pointers->fb;
+    vesa_clear();
+}
\ No newline at end of file
diff --git a/src/userspace/graphics/graphics.h b/src/userspace/graphics/graphics.h
new file mode 100644
index 0000000..6197020
--- /dev/null
+++ b/src/userspace/graphics/graphics.h
@@ -0,0 +1,18 @@
+#ifndef MELVIX_GRAPHICS_H
+#define MELVIX_GRAPHICS_H
+
+struct font {
+    uint16_t font_32[758][32];
+    uint16_t font_24[758][24];
+    uint8_t font_16[758][16];
+    uint16_t cursor[19];
+};
+
+struct userspace_pointers {
+    unsigned char *fb;
+    struct font *font;
+};
+
+void init_framebuffer();
+
+#endif
\ No newline at end of file
diff --git a/src/userspace/main.c b/src/userspace/main.c
index 4e036c5..9341bd0 100644
--- a/src/userspace/main.c
+++ b/src/userspace/main.c
@@ -1,37 +1,12 @@
 #include <syscall.h>
-
-char *fb;
-int vbe_bpl = 3;
-int vbe_pitch = 3000;
-int vbe_height = 1080;
-int vbe_width = 2560;
-
-void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const uint32_t color[3])
-{
-    int pos1 = x1 * vbe_bpl + y1 * vbe_pitch;
-    char *draw = (char *) &fb[pos1];
-    for (int i = 0; i <= y2 - y1; i++) {
-        for (int j = 0; j <= x2 - x1; j++) {
-            draw[vbe_bpl * j] = color[2];
-            draw[vbe_bpl * j + 1] = color[1];
-            draw[vbe_bpl * j + 2] = color[0];
-        }
-        draw += vbe_pitch;
-    }
-}
-
-void vesa_clear()
-{
-    vesa_draw_rectangle(0, 0, vbe_width - 1, vbe_height - 1, 0);
-}
+#include <graphics/graphics.h>
 
 void user_main()
 {
     char hello[] = "> Successfully switched to usermode!\n";
     syscall_write(hello);
 
-    // fb = (char *) 0x110048;
-    // vesa_clear();
+    init_framebuffer();
 
     while (1) {};
 
diff --git a/src/userspace/syscall.c b/src/userspace/syscall.c
index a6bdc80..b398728 100644
--- a/src/userspace/syscall.c
+++ b/src/userspace/syscall.c
@@ -13,6 +13,8 @@ DEFN_SYSCALL1(writec, 3, char *);
 
 DEFN_SYSCALL1(readc, 4, char *);
 
-DEFN_SYSCALL1(paging_alloc, 5, uint32_t);
+DEFN_SYSCALL0(get_pointers, 5);
 
-DEFN_SYSCALL2(paging_free, 6, uint32_t, uint32_t);
\ No newline at end of file
+DEFN_SYSCALL1(paging_alloc, 6, uint32_t);
+
+DEFN_SYSCALL2(paging_free, 7, uint32_t, uint32_t);
\ No newline at end of file
diff --git a/src/userspace/syscall.h b/src/userspace/syscall.h
index 5de717e..c46bb54 100644
--- a/src/userspace/syscall.h
+++ b/src/userspace/syscall.h
@@ -74,6 +74,8 @@ DECL_SYSCALL1(writec, char *);
 
 DECL_SYSCALL1(readc, char *);
 
+DECL_SYSCALL0(get_pointers);
+
 DECL_SYSCALL1(paging_alloc, uint32_t);
 
 DECL_SYSCALL2(paging_free, uint32_t, uint32_t);