diff options
author | Marvin Borner | 2020-07-26 13:34:29 +0200 |
---|---|---|
committer | Marvin Borner | 2020-07-26 13:34:29 +0200 |
commit | 0de8165d440c549847a1c600558305b04a36a77e (patch) | |
tree | 3949c82af1c559c3353d4cf83aac9bf536021145 /src/main.c | |
parent | 141ee54c3fc9a2f4f0b6c7158b9f1ccb22af3626 (diff) |
Added basic gui writer
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -3,12 +3,11 @@ #include <boot.h> #include <def.h> #include <fs.h> +#include <gui.h> #include <interrupts.h> #include <keyboard.h> #include <print.h> -#include <psf.h> #include <serial.h> -#include <vesa.h> u32 HEAP = 0x00200000; u32 HEAP_START; @@ -28,9 +27,10 @@ void main(struct mem_info *mem_info, struct vid_info *vid_info) serial_install(); ls_root(); - /* psf_parse(read_file("/font/spleen-8x16.psfu")); */ - /* psf_parse(read_file("/font/spleen-16x32.psfu")); */ - psf_parse(read_file("/font/spleen-12x24.psfu")); + gui_init("/font/spleen-16x32.psfu"); + + u32 c[] = { 0xff, 0xff, 0xff }; + gui_write(0, 0, c, "Hello, world!"); while (1) { }; |