Some work on the libgui

8 files changed, 129 insertions, 56 deletions

diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
index 30cda3a..b92f171 100644
--- a/src/kernel/graphics/vesa.c
+++ b/src/kernel/graphics/vesa.c
@@ -125,6 +125,7 @@ void set_optimal_resolution()
 			debug("Found mode: %dx%dx%d", mode_info->width, mode_info->height,
 			      mode_info->bpp);
 			highest = *mode;
+			current_mode_info = mode_info;
 			vbe_width = mode_info->width;
 			vbe_height = mode_info->height;
 			vbe_pitch = mode_info->pitch;
@@ -222,33 +223,6 @@ void vesa_set_font(int height)
 	font_height = height;
 }
 
-void vesa_convert_color(uint32_t *color_array, uint32_t color)
-{
-	uint8_t red = (uint8_t)((color >> 16) & 255);
-	uint8_t green = (uint8_t)((color >> 8) & 255);
-	uint8_t blue = (uint8_t)(color & 255);
-
-	if ((vbe_bpl << 3) == 8) {
-		uint32_t new_color =
-			((red * 7 / 255) << 5) + ((green * 7 / 255) << 2) + (blue * 3 / 255);
-		color_array[0] = (new_color >> 16) & 255;
-		color_array[1] = (new_color >> 8) & 255;
-		color_array[2] = new_color & 255;
-	} else if ((vbe_bpl << 3) == 16) {
-		uint32_t new_color =
-			(((red & 0b11111000) << 8) + ((green & 0b11111100) << 3) + (blue >> 3));
-		color_array[0] = (new_color >> 16) & 255;
-		color_array[1] = (new_color >> 8) & 255;
-		color_array[2] = new_color & 255;
-	} else if ((vbe_bpl << 3) == 24 || (vbe_bpl << 3) == 32) {
-		color_array[0] = red;
-		color_array[1] = green;
-		color_array[2] = blue;
-	} else {
-		panic("Unknown color bpp!");
-	}
-}
-
 void vesa_set_pixel(uint16_t x, uint16_t y, const uint32_t color[3])
 {
 	uint8_t pos = (uint8_t)(x * vbe_bpl + y * vbe_pitch);
@@ -362,10 +336,4 @@ void vesa_draw_cursor(int x, int y)
 		draw += vbe_pitch;
 		prev += vbe_pitch;
 	}
-}
-
-void vesa_set_color(uint32_t color)
-{
-	vesa_convert_color(terminal_color, color);
-	vesa_convert_color(terminal_background, default_background_color);
 }
\ No newline at end of file
diff --git a/src/kernel/graphics/vesa.h b/src/kernel/graphics/vesa.h
index 50bf85c..bbe5aaf 100644
--- a/src/kernel/graphics/vesa.h
+++ b/src/kernel/graphics/vesa.h
@@ -128,21 +128,6 @@ void vbe_set_mode(unsigned short mode);
 void set_optimal_resolution();
 
 /**
- * Draws a efficient rectangle
- * @param x1 First X coordinate
- * @param y1 First Y coordinate
- * @param x2 Second X coordinate
- * @param y2 Second Y coordinate
- * @param color Rectangle color
- */
-void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const uint32_t color[3]);
-
-/**
- * Clears the screen with black
- */
-void vesa_clear();
-
-/**
  * Sets one of the fonts inside the font header file
  * @param height The desired font height
  */
@@ -226,7 +211,7 @@ char text[1024];
 /**
  * The current video mode
  */
-int vbe_current_mode;
+struct vbe_mode_info *current_mode_info;
 
 /**
  * The width of the current video mode
diff --git a/src/kernel/syscall/actions/sys_pointers.c b/src/kernel/syscall/actions/sys_pointers.c
index 1a2d8f7..ced95de 100644
--- a/src/kernel/syscall/actions/sys_pointers.c
+++ b/src/kernel/syscall/actions/sys_pointers.c
@@ -2,16 +2,27 @@
 #include <kernel/graphics/vesa.h>
 #include <kernel/fs/load.h>
 #include <kernel/memory/alloc.h>
+#include <kernel/memory/paging.h>
+#include <kernel/tasks/process.h>
 
 struct pointers {
-	uint8_t *fb;
+	struct vbe_mode_info *current_mode_info;
 	struct font *font;
 };
 
 uint32_t sys_pointers()
 {
-	struct pointers *pointers = kmalloc(sizeof(struct pointers));
-	pointers->fb = fb;
+	struct vbe_mode_info *ret = (struct vbe_mode_info *)umalloc(sizeof(struct vbe_mode_info));
+	ret->attributes = current_mode_info->attributes;
+	ret->pitch = current_mode_info->pitch;
+	ret->width = current_mode_info->width;
+	ret->height = current_mode_info->height;
+	ret->bpp = current_mode_info->bpp;
+	ret->memory_model = current_mode_info->memory_model;
+	ret->framebuffer = current_mode_info->framebuffer;
+
+	struct pointers *pointers = umalloc(sizeof(struct pointers));
+	pointers->current_mode_info = ret;
 	pointers->font = font;
 
 	return pointers;
diff --git a/src/kernel/syscall/syscall.c b/src/kernel/syscall/syscall.c
index af59499..dec3d38 100644
--- a/src/kernel/syscall/syscall.c
+++ b/src/kernel/syscall/syscall.c
@@ -4,6 +4,7 @@
 #include <kernel/system.h>
 #include <kernel/lib/stdio.h>
 #include <kernel/io/io.h>
+#include <kernel/tasks/process.h>
 
 typedef uint32_t (*syscall_func)(uint32_t, ...);
 
@@ -18,7 +19,6 @@ uint32_t (*syscalls[])() = { [0] = (uint32_t(*)())halt_loop, // DEBUG!
 void syscall_handler(struct regs *r)
 {
 	cli();
-	log("Received syscall!");
 
 	if (r->eax >= sizeof(syscalls) / sizeof(*syscalls))
 		return;
@@ -27,10 +27,11 @@ void syscall_handler(struct regs *r)
 	if (!location)
 		return;
 
-	log("[SYSCALL] %d (0x%x) 0x%x 0x%x 0x%x 0x%x 0x%x", r->eax, location, r->ebx, r->ecx,
-	    r->edx, r->esi, r->edi);
+	log("[SYSCALL] %s called %d with 0x%x 0x%x 0x%x 0x%x 0x%x", current_proc->name, r->eax,
+	    location, r->ebx, r->ecx, r->edx, r->esi, r->edi);
 
 	r->eax = location(r->ebx, r->ecx, r->edx, r->esi, r->edi);
+
 	sti();
 }
 
diff --git a/src/userspace/libgui/draw.c b/src/userspace/libgui/draw.c
new file mode 100644
index 0000000..adcdec2
--- /dev/null
+++ b/src/userspace/libgui/draw.c
@@ -0,0 +1,21 @@
+#include <stdint.h>
+#include <gui.h>
+
+void gui_draw_rectangle(int x1, int y1, int x2, int y2, const u32 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] = (char)color[2];
+			draw[vbe_bpl * j + 1] = (char)color[1];
+			draw[vbe_bpl * j + 2] = (char)color[0];
+		}
+		draw += vbe_pitch;
+	}
+}
+
+void gui_screen_clear()
+{
+	gui_draw_rectangle(0, 0, vbe_width - 1, vbe_height - 1, terminal_background);
+}
\ No newline at end of file
diff --git a/src/userspace/libgui/gui.h b/src/userspace/libgui/gui.h
index b056dea..d210999 100644
--- a/src/userspace/libgui/gui.h
+++ b/src/userspace/libgui/gui.h
@@ -3,6 +3,16 @@
 
 #include <stdint.h>
 
+struct vbe_mode_info {
+	u16 attributes;
+	u16 pitch;
+	u16 width;
+	u16 height;
+	u8 bpp;
+	u8 memory_model;
+	u32 framebuffer;
+};
+
 struct font {
 	u16 font_32[758][32];
 	u16 font_24[758][24];
@@ -11,12 +21,44 @@ struct font {
 };
 
 struct pointers {
-	u8 *fb;
+	struct vbe_mode_info *mode_info;
 	struct font *font;
 };
 
+u32 terminal_color[3];
+u32 terminal_background[3];
+enum gui_color {
+	gui_black = 0x1d1f24,
+	gui_red = 0xE06C75,
+	gui_green = 0x98C379,
+	gui_yellow = 0xE5C07B,
+	gui_blue = 0x61AFEF,
+	gui_magenta = 0xC678DD,
+	gui_cyan = 0x56B6C2,
+	gui_white = 0xABB2BF,
+	gui_dark_black = 0x3E4452,
+	gui_dark_red = 0xBE5046,
+	gui_dark_green = 0x98C379,
+	gui_dark_yellow = 0xD19A66,
+	gui_dark_blue = 0x61AFEF,
+	gui_dark_magenta = 0xC678DD,
+	gui_dark_cyan = 0x56B6C2,
+	gui_dark_white = 0x5C6370,
+};
+
+u8 *fb;
+int vbe_width;
+int vbe_height;
+int vbe_pitch;
+int vbe_bpl;
+
 struct pointers *pointers;
 
 void gui_init();
 
+void gui_draw_rectangle(int x1, int y1, int x2, int y2, const u32 color[3]);
+void gui_screen_clear();
+
+void gui_convert_color(u32 *color_array, u32 color);
+
 #endif
\ No newline at end of file
diff --git a/src/userspace/libgui/init.c b/src/userspace/libgui/init.c
index dfc42eb..7cd1fc3 100644
--- a/src/userspace/libgui/init.c
+++ b/src/userspace/libgui/init.c
@@ -4,7 +4,19 @@
 
 struct pointers *pointers;
 
+u32 terminal_color[3] = { 0xab, 0xb2, 0xbf };
+u32 terminal_background[3] = { 0x1d, 0x1f, 0x24 };
+
 void gui_init()
 {
 	pointers = syscall_pointers();
+
+	return; // TODO: Fix GUI page fault
+	vbe_width = pointers->mode_info->width;
+	vbe_height = pointers->mode_info->height;
+	vbe_pitch = pointers->mode_info->pitch;
+	vbe_bpl = pointers->mode_info->bpp >> 3;
+	fb = pointers->mode_info->framebuffer;
+
+	gui_screen_clear();
 }
\ No newline at end of file
diff --git a/src/userspace/libgui/util.c b/src/userspace/libgui/util.c
new file mode 100644
index 0000000..5019175
--- /dev/null
+++ b/src/userspace/libgui/util.c
@@ -0,0 +1,33 @@
+#include <stdint.h>
+#include <gui.h>
+
+void gui_convert_color(u32 *color_array, u32 color)
+{
+	u8 red = (u8)((color >> 16) & 255);
+	u8 green = (u8)((color >> 8) & 255);
+	u8 blue = (u8)(color & 255);
+
+	if ((vbe_bpl << 3) == 8) {
+		u32 new_color =
+			((red * 7 / 255) << 5) + ((green * 7 / 255) << 2) + (blue * 3 / 255);
+		color_array[0] = (new_color >> 16) & 255;
+		color_array[1] = (new_color >> 8) & 255;
+		color_array[2] = new_color & 255;
+	} else if ((vbe_bpl << 3) == 16) {
+		u32 new_color =
+			(((red & 0b11111000) << 8) + ((green & 0b11111100) << 3) + (blue >> 3));
+		color_array[0] = (new_color >> 16) & 255;
+		color_array[1] = (new_color >> 8) & 255;
+		color_array[2] = new_color & 255;
+	} else if ((vbe_bpl << 3) == 24 || (vbe_bpl << 3) == 32) {
+		color_array[0] = red;
+		color_array[1] = green;
+		color_array[2] = blue;
+	}
+}
+
+void gui_set_color(u32 color)
+{
+	gui_convert_color(terminal_color, color);
+	gui_convert_color(terminal_background, gui_black);
+}
\ No newline at end of file