Added basic gui writer

6 files changed, 80 insertions, 37 deletions

diff --git a/Makefile b/Makefile
index d1576dc..5fe442c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ COBJS = src/main.o \
 		src/drivers/ide.o \
 		src/features/fs.o \
 		src/features/psf.o \
+		src/features/gui.o \
 		src/lib/str.o \
 		src/lib/mem.o \
 		src/lib/math.o \
diff --git a/src/features/gui.c b/src/features/gui.c
new file mode 100644
index 0000000..ddf1c60
--- /dev/null
+++ b/src/features/gui.c
@@ -0,0 +1,44 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+// Some GUI functions
+
+#include <fs.h>
+#include <gui.h>
+#include <psf.h>
+#include <str.h>
+#include <vesa.h>
+
+struct font *font;
+
+void gui_write_char(int x, int y, const u32 c[3], char ch)
+{
+	/* const u32 c[3] = { 0xff, 0x00, 0x00 }; */
+
+	int pos = x * vbe_bpl + y * vbe_pitch;
+	char *draw = (char *)&fb[pos];
+
+	u32 stride = font->char_size / font->height;
+	for (int cy = 0; cy < font->height; cy++) {
+		for (int cx = 0; cx < font->width; cx++) {
+			u8 bits = font->chars[ch * font->char_size + cy * stride + cx / 8];
+			u8 bit = bits >> (7 - cx % 8) & 1;
+			if (bit) {
+				draw[vbe_bpl * cx] = c[2];
+				draw[vbe_bpl * cx + 1] = c[1];
+				draw[vbe_bpl * cx + 2] = c[0];
+			}
+		}
+		draw += vbe_pitch;
+	}
+}
+
+void gui_write(int x, int y, const u32 c[3], char *text)
+{
+	for (u32 i = 0; i < strlen(text); i++) {
+		gui_write_char(x + i * font->width, y, c, text[i]);
+	}
+}
+
+void gui_init(char *font_path)
+{
+	font = psf_parse(read_file(font_path));
+}
diff --git a/src/features/psf.c b/src/features/psf.c
index 3294431..c713bb4 100644
--- a/src/features/psf.c
+++ b/src/features/psf.c
@@ -2,6 +2,8 @@
 // PSF parser
 
 #include <def.h>
+#include <gui.h>
+#include <mem.h>
 #include <print.h>
 #include <psf.h>
 #include <vesa.h>
@@ -22,35 +24,7 @@ int psf_verify(char *data)
 		return 0;
 }
 
-// Will be removed in the future
-void psf_test(char *chars, int height, int width, int char_size)
-{
-	char ch = 'a';
-	int x = 0;
-	int y = 0;
-	const u32 c[3] = { 0xff, 0x00, 0x00 };
-
-	printf("%d %d %d\n", height, width, char_size);
-
-	int pos = x * vbe_bpl + y * vbe_pitch;
-	char *draw = (char *)&fb[pos];
-
-	u32 stride = char_size / height;
-	for (int cy = 0; cy < height; cy++) {
-		for (int cx = 0; cx < width; cx++) {
-			u8 bits = chars[ch * char_size + cy * stride + cx / 8];
-			u8 bit = bits >> (7 - cx % 8) & 1;
-			if (bit) {
-				draw[vbe_bpl * cx] = (char)c[2];
-				draw[vbe_bpl * cx + 1] = (char)c[1];
-				draw[vbe_bpl * cx + 2] = (char)c[0];
-			}
-		}
-		draw += vbe_pitch;
-	}
-}
-
-char *psf_parse(char *data)
+struct font *psf_parse(char *data)
 {
 	int version = psf_verify(data);
 
@@ -73,7 +47,11 @@ char *psf_parse(char *data)
 		return 0;
 	}
 
-	psf_test(chars, height, width, char_size);
+	struct font *font = malloc(sizeof(*font));
+	font->chars = chars;
+	font->height = height;
+	font->width = width;
+	font->char_size = char_size;
 
-	return chars;
+	return font;
 }
diff --git a/src/inc/gui.h b/src/inc/gui.h
new file mode 100644
index 0000000..130db8b
--- /dev/null
+++ b/src/inc/gui.h
@@ -0,0 +1,20 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+// Some GUI functions
+
+#ifndef GUI_H
+#define GUI_H
+
+#include <def.h>
+
+// Generalized font struct
+struct font {
+	char *chars;
+	int height;
+	int width;
+	int char_size;
+};
+
+void gui_write(int x, int y, const u32 c[3], char *text);
+void gui_init(char *font_path);
+
+#endif
diff --git a/src/inc/psf.h b/src/inc/psf.h
index ced3025..63a3d1e 100644
--- a/src/inc/psf.h
+++ b/src/inc/psf.h
@@ -43,6 +43,6 @@ struct psf2_header {
 	u32 width;
 };
 
-char *psf_parse(char *data);
+struct font *psf_parse(char *data);
 
 #endif
diff --git a/src/main.c b/src/main.c
index 3fa8ffd..2c7d063 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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) {
 	};