Added psf/gui to libgui

...and some other things

5 files changed, 203 insertions, 1 deletions

diff --git a/libgui/Makefile b/libgui/Makefile
index 89bbb35..59254d4 100644
--- a/libgui/Makefile
+++ b/libgui/Makefile
@@ -1,6 +1,8 @@
 # MIT License, Copyright (c) 2020 Marvin Borner
 
-COBJS = vesa.o
+COBJS = vesa.o \
+	psf.o \
+	gui.o
 CC = ../cross/opt/bin/i686-elf-gcc
 LD = ../cross/opt/bin/i686-elf-ld
 OC = ../cross/opt/bin/i686-elf-ar
@@ -10,6 +12,8 @@ CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os
 
 CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Iinc/ -I../libc/inc/ -Duserspace -fPIE
 
+all: libgui clean
+
 %.o: %.c
 	@$(CC) -c $(CFLAGS) $< -o $@
 
diff --git a/libgui/gui.c b/libgui/gui.c
new file mode 100644
index 0000000..460cf07
--- /dev/null
+++ b/libgui/gui.c
@@ -0,0 +1,70 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+// Some GUI functions
+
+#include <gui.h>
+#include <psf.h>
+#include <str.h>
+#include <sys.h>
+#include <vesa.h>
+
+struct font *font;
+
+void gui_write_char(struct vbe *vbe, int x, int y, const u32 c[3], char ch)
+{
+	int bpl = vbe->bpp >> 3;
+
+	int pos = x * bpl + y * vbe->pitch;
+	char *draw = (char *)&vbe->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[bpl * cx] = c[2];
+				draw[bpl * cx + 1] = c[1];
+				draw[bpl * cx + 2] = c[0];
+			}
+		}
+		draw += vbe->pitch;
+	}
+}
+
+void gui_write(struct vbe *vbe, int x, int y, const u32 c[3], char *text)
+{
+	for (u32 i = 0; i < strlen(text); i++) {
+		gui_write_char(vbe, x + i * font->width, y, c, text[i]);
+	}
+}
+
+// Abstraction
+int x, y = 0;
+const u32 c[3] = { 0xff, 0xff, 0xff };
+void gui_term_write_char(struct vbe *vbe, char ch)
+{
+	if (x + font->width > vbe->width) {
+		x = 0;
+		y += font->height;
+	}
+
+	if (ch >= ' ' && ch <= '~') {
+		gui_write_char(vbe, x, y, c, ch);
+		x += font->width;
+	} else if (ch == '\n') {
+		x = 0;
+		y += font->height;
+	}
+}
+
+void gui_term_write(struct vbe *vbe, char *text)
+{
+	for (u32 i = 0; i < strlen(text); i++) {
+		gui_term_write_char(vbe, text[i]);
+	}
+}
+
+void gui_init(char *font_path)
+{
+	font = psf_parse(read(font_path));
+}
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
new file mode 100644
index 0000000..52fe805
--- /dev/null
+++ b/libgui/inc/gui.h
@@ -0,0 +1,23 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+// Some GUI functions
+
+#ifndef GUI_H
+#define GUI_H
+
+#include <def.h>
+#include <vesa.h>
+
+// Generalized font struct
+struct font {
+	char *chars;
+	int height;
+	int width;
+	int char_size;
+};
+
+void gui_write(struct vbe *vbe, int x, int y, const u32 c[3], char *text);
+void gui_term_write_char(struct vbe *vbe, char ch);
+void gui_term_write(struct vbe *vbe, char *text);
+void gui_init(char *font_path);
+
+#endif
diff --git a/libgui/inc/psf.h b/libgui/inc/psf.h
new file mode 100644
index 0000000..63a3d1e
--- /dev/null
+++ b/libgui/inc/psf.h
@@ -0,0 +1,48 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+// PSF parser
+
+#ifndef PSF_H
+#define PSF_H
+
+#include <def.h>
+
+/**
+ * PSF version 1
+ */
+
+#define PSF1_MAGIC_0 0x36
+#define PSF1_MAGIC_1 0x04
+#define PSF1_MODE_256 0
+#define PSF1_MODE_512 1
+#define PSF1_MODE_256_UNICODE 2
+#define PSF1_MODE_512_UNICODE 3
+
+struct psf1_header {
+	u8 magic[2];
+	u8 mode;
+	u8 char_size;
+};
+
+/**
+ * PSF version 2
+ */
+
+#define PSF2_MAGIC_0 0x72
+#define PSF2_MAGIC_1 0xb5
+#define PSF2_MAGIC_2 0x4a
+#define PSF2_MAGIC_3 0x86
+
+struct psf2_header {
+	u8 magic[4];
+	u32 version;
+	u32 size;
+	u32 flags;
+	u32 glyph_count;
+	u32 char_size;
+	u32 height;
+	u32 width;
+};
+
+struct font *psf_parse(char *data);
+
+#endif
diff --git a/libgui/psf.c b/libgui/psf.c
new file mode 100644
index 0000000..56c673b
--- /dev/null
+++ b/libgui/psf.c
@@ -0,0 +1,57 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+// PSF parser
+
+#include <def.h>
+#include <gui.h>
+#include <mem.h>
+#include <print.h>
+#include <psf.h>
+
+// Verifies the PSF magics
+// Returns the PSF version or 0
+int psf_verify(char *data)
+{
+	struct psf1_header *header1 = (struct psf1_header *)data;
+	struct psf2_header *header2 = (struct psf2_header *)data;
+
+	if (header1->magic[0] == PSF1_MAGIC_0 && header1->magic[1] == PSF1_MAGIC_1)
+		return 1;
+	else if (header2->magic[0] == PSF2_MAGIC_0 && header2->magic[1] == PSF2_MAGIC_1 &&
+		 header2->magic[2] == PSF2_MAGIC_2 && header2->magic[3] == PSF2_MAGIC_3)
+		return 2;
+	else
+		return 0;
+}
+
+struct font *psf_parse(char *data)
+{
+	int version = psf_verify(data);
+
+	char *chars;
+	int height;
+	int width;
+	int char_size;
+
+	if (version == 1) {
+		chars = data + sizeof(struct psf1_header);
+		height = ((struct psf1_header *)data)->char_size;
+		width = 8;
+		char_size = ((struct psf1_header *)data)->char_size;
+	} else if (version == 2) {
+		chars = data + ((struct psf2_header *)data)->size;
+		height = ((struct psf2_header *)data)->height;
+		width = ((struct psf2_header *)data)->width;
+		char_size = ((struct psf2_header *)data)->char_size;
+	} else {
+		print("Unknown font!\n");
+		return 0;
+	}
+
+	struct font *font = malloc(sizeof(*font));
+	font->chars = chars;
+	font->height = height;
+	font->width = width;
+	font->char_size = char_size;
+
+	return font;
+}