Added bmp loading and other stuff

5 files changed, 127 insertions, 0 deletions

diff --git a/libgui/Makefile b/libgui/Makefile
index bcd2016..2638cb0 100644
--- a/libgui/Makefile
+++ b/libgui/Makefile
@@ -2,6 +2,7 @@
 
 COBJS = vesa.o \
 	psf.o \
+	bmp.o \
 	gui.o
 CC = ../cross/opt/bin/i686-elf-gcc
 LD = ../cross/opt/bin/i686-elf-ld
diff --git a/libgui/bmp.c b/libgui/bmp.c
new file mode 100644
index 0000000..0b08aeb
--- /dev/null
+++ b/libgui/bmp.c
@@ -0,0 +1,28 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#include <bmp.h>
+#include <def.h>
+#include <mem.h>
+#include <print.h>
+#include <sys.h>
+
+struct bmp *bmp_load(char *path)
+{
+	void *buf = read(path);
+	if (!buf)
+		return NULL;
+
+	struct bmp_header *h = buf;
+	if (h->signature[0] != 'B' || h->signature[1] != 'M')
+		return NULL;
+
+	struct bmp_info *info = (struct bmp_info *)((u32)buf + sizeof(*h));
+	struct bmp *bmp = malloc(sizeof(*bmp));
+	bmp->width = info->width;
+	bmp->height = info->height;
+	bmp->data = (u8 *)((u32)buf + h->offset);
+	bmp->bpp = info->bpp;
+	bmp->pitch = bmp->width * (bmp->bpp >> 3);
+
+	return bmp;
+}
diff --git a/libgui/gui.c b/libgui/gui.c
index e42e0f6..3b918e7 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -1,6 +1,8 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
 // Some GUI functions
 
+#include <assert.h>
+#include <bmp.h>
 #include <gui.h>
 #include <psf.h>
 #include <str.h>
@@ -38,6 +40,59 @@ void gui_write(struct vbe *vbe, int x, int y, const u32 c[3], char *text)
 	}
 }
 
+void gui_load_wallpaper(struct vbe *vbe, char *path)
+{
+	struct bmp *bmp = bmp_load(path);
+	assert(bmp);
+
+	int bpl = bmp->bpp >> 3;
+	int x1 = 0;
+	int x2 = bmp->width;
+	int y1 = 0;
+	int y2 = bmp->height;
+
+	// TODO: Support padding with odd widths
+	/* int pitch = bmp->width * bpl; */
+	/* int padding = 1; */
+	/* while ((pitch + padding) % 4 != 0) */
+	/* 	padding++; */
+	/* int psw = pitch + padding; */
+
+	int pos1 = x1 * bpl + y1 * vbe->pitch;
+	u8 *draw = &vbe->fb[pos1];
+	u8 *data = bmp->data;
+	for (int i = 0; i <= y2 - y1; i++) {
+		for (int j = 0; j <= x2 - x1; j++) {
+			draw[bpl * j] = data[bpl * j];
+			draw[bpl * j + 1] = data[bpl * j + 1];
+			draw[bpl * j + 2] = data[bpl * j + 2];
+		}
+		draw += vbe->pitch;
+		data += bmp->pitch;
+	}
+}
+
+void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, const u32 color[3])
+{
+	int bpl = win->vbe->bpp >> 3;
+
+	int pos1 = x1 * bpl + y1 * win->vbe->pitch;
+	u8 *draw = &win->fb[pos1];
+	for (int i = 0; i <= y2 - y1; i++) {
+		for (int j = 0; j <= x2 - x1; j++) {
+			draw[bpl * j] = color[2];
+			draw[bpl * j + 1] = color[1];
+			draw[bpl * j + 2] = color[0];
+		}
+		draw += win->vbe->pitch;
+	}
+}
+
+void gui_fill(struct window *win, const u32 color[3])
+{
+	gui_draw_rectangle(win, 0, 0, win->width - 1, win->height - 1, color);
+}
+
 void gui_init(char *font_path)
 {
 	font = psf_parse(read(font_path));
diff --git a/libgui/inc/bmp.h b/libgui/inc/bmp.h
new file mode 100644
index 0000000..909bc92
--- /dev/null
+++ b/libgui/inc/bmp.h
@@ -0,0 +1,39 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef BMP_H
+#define BMP_H
+
+#include <def.h>
+
+struct bmp_header {
+	u8 signature[2];
+	u32 size;
+	u32 reserved;
+	u32 offset;
+} __attribute__((packed));
+
+struct bmp_info {
+	u32 size;
+	u32 width;
+	u32 height;
+	u16 planes;
+	u16 bpp;
+	u32 compression;
+	u32 compressed_size;
+	u32 x_pixel_meter;
+	u32 y_pixel_meter;
+	u32 colors;
+	u32 important_colors;
+};
+
+struct bmp {
+	u32 width;
+	u32 height;
+	u8 *data;
+	u32 bpp;
+	u32 pitch;
+};
+
+struct bmp *bmp_load(char *path);
+
+#endif
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index 5f35372..467496a 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -21,9 +21,13 @@ struct window {
 	int y;
 	u16 width;
 	u16 height;
+	struct vbe *vbe;
 	u8 *fb;
 };
 
+void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, const u32 color[3]);
+void gui_fill(struct window *win, const u32 color[3]);
+void gui_load_wallpaper(struct vbe *vbe, char *path);
 void gui_init(char *font_path);
 
 /**