Some work on the libgui

2 files changed, 18 insertions, 6 deletions

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();
 }