1 files changed, 31 insertions, 165 deletions

diff --git a/libgui/gui.c b/libgui/gui.c
index 3bbf3d2..8ed79af 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -1,184 +1,50 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
-// Some GUI functions
-// TODO: Better support for bpp < 32
+// Mostly GFX function wrappers
 
-#include <assert.h>
-#include <bmp.h>
+#include <def.h>
+#include <gfx.h>
 #include <gui.h>
 #include <mem.h>
-#include <psf.h>
-#include <str.h>
-#include <sys.h>
-#include <vesa.h>
 
-struct font *font;
+#define MAX_WINDOWS 10
 
-static void write_char(struct window *win, int x, int y, u32 c, char ch)
-{
-	int bypp = win->bpp >> 3;
-
-	int pos = x * bypp + y * win->pitch;
-	char *draw = (char *)&win->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[bypp * cx] = GET_BLUE(c);
-				draw[bypp * cx + 1] = GET_GREEN(c);
-				draw[bypp * cx + 2] = GET_RED(c);
-				draw[bypp * cx + 3] = GET_ALPHA(c);
-			}
-		}
-		draw += win->pitch;
-	}
-}
-
-static void draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, u32 c)
-{
-	int bypp = win->bpp >> 3;
-	u8 *draw = &win->fb[x1 * bypp + y1 * win->pitch];
-	for (int i = 0; i < y2 - y1; i++) {
-		for (int j = 0; j < x2 - x1; j++) {
-			draw[bypp * j] = GET_BLUE(c);
-			draw[bypp * j + 1] = GET_GREEN(c);
-			draw[bypp * j + 2] = GET_RED(c);
-			draw[bypp * j + 3] = GET_ALPHA(c);
-		}
-		draw += win->pitch;
-	}
-}
-
-void gui_write_char(struct window *win, int x, int y, u32 c, char ch)
-{
-	write_char(win, x, y, c, ch);
-	gui_redraw();
-}
-
-void gui_write(struct window *win, int x, int y, u32 c, char *text)
-{
-	for (u32 i = 0; i < strlen(text); i++) {
-		write_char(win, x + i * font->width, y, c, text[i]);
-	}
-	gui_redraw();
-}
-
-void gui_load_image(struct window *win, char *path, int x, int y)
-{
-	// TODO: Support x, y
-	struct bmp *bmp = bmp_load(path);
-	assert(bmp && bmp->width + x <= win->width);
-	assert(bmp && bmp->height + y <= win->height);
-
-	// TODO: Support padding with odd widths
-	int bypp = bmp->bpp >> 3;
-	u8 *srcfb = &bmp->data[bypp + (bmp->height - 1) * bmp->pitch];
-	u8 *destfb = &win->fb[bypp];
-	for (u32 cy = 0; cy < bmp->height; cy++) {
-		memcpy(destfb, srcfb, bmp->pitch);
-		srcfb -= bmp->pitch;
-		destfb += win->pitch;
-	}
-	gui_redraw();
-}
+u32 window_count = 0;
+static struct window windows[MAX_WINDOWS] = { 0 };
 
-void gui_load_wallpaper(struct window *win, char *path)
+struct window *new_window(const char *title, int x, int y, u32 width, u32 height, int flags)
 {
-	gui_load_image(win, path, 0, 0);
-}
+	if (window_count + 1 >= MAX_WINDOWS)
+		return NULL;
 
-void gui_copy(struct window *dest, struct window *src, int x, int y, u32 width, u32 height)
-{
-	int bypp = dest->bpp >> 3;
-	u8 *srcfb = &src->fb[x * bypp + y * src->pitch];
-	u8 *destfb = &dest->fb[x * bypp + y * dest->pitch];
-	for (u32 cy = 0; cy < height; cy++) {
-		memcpy(destfb, srcfb, width * (dest->bpp >> 3));
-		srcfb += src->pitch;
-		destfb += dest->pitch;
-	}
-}
+	struct window *win = &windows[window_count + 1];
+	win->ctx = malloc(sizeof(*win->ctx));
+	win->ctx->x = x > 0 ? x : 50;
+	win->ctx->y = y > 0 ? y : 50;
+	win->ctx->width = width > 0 ? width : 600;
+	win->ctx->height = height > 0 ? height : 400;
+	win->ctx->flags = flags;
+	win->title = title;
+	gfx_new_ctx(windows[window_count + 1].ctx);
 
-// TODO: Support alpha values other than 0x0 and 0xff (blending)
-// TODO: Optimize!
-void gui_win_on_win(struct window *dest, struct window *src, int x, int y)
-{
-	if (src->width == dest->width && src->height == dest->height && src->x == 0 &&
-	    dest->y == 0) {
-		memcpy(dest->fb, src->fb, dest->pitch * dest->height);
-		return;
-	}
+	if (!win->ctx->fb)
+		return NULL;
 
-	if (src->width > dest->width || src->height > dest->height)
-		return;
+	window_count++;
 
-	// TODO: Negative x and y
-	int bypp = dest->bpp >> 3;
-	u8 *srcfb = src->fb;
-	u8 *destfb = &dest->fb[x * bypp + y * dest->pitch];
-	for (u32 cy = 0; cy < src->height && cy + y < dest->height; cy++) {
-		for (u32 cx = 0; cx < src->width && cx + x < dest->width; cx++) {
-			if (srcfb[bypp * cx + 3]) {
-				destfb[bypp * cx + 0] = srcfb[bypp * cx + 0];
-				destfb[bypp * cx + 1] = srcfb[bypp * cx + 1];
-				destfb[bypp * cx + 2] = srcfb[bypp * cx + 2];
-				destfb[bypp * cx + 3] = srcfb[bypp * cx + 3];
-			}
-		}
-		srcfb += src->pitch;
-		destfb += dest->pitch;
-	}
+	return win;
 }
 
-void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, u32 c)
+struct window *gui_init(const char *title, u32 width, u32 height)
 {
-	draw_rectangle(win, x1, y1, x2, y2, c);
-	gui_redraw();
-}
+	if (window_count != 0)
+		return NULL;
 
-void gui_fill(struct window *win, u32 c)
-{
-	draw_rectangle(win, 0, 0, win->width, win->height, c);
-	gui_redraw();
-}
+	struct window *win = new_window(title, 0, 0, width, height, WF_DEFAULT);
+	if (!win)
+		return NULL;
 
-void gui_border(struct window *win, u32 c, u32 width)
-{
-	if (width <= 0)
-		return;
+	gfx_fill(win->ctx, COLOR_BG);
+	gfx_init("/font/spleen-12x24.psfu");
 
-	int bypp = win->bpp >> 3;
-	u8 *draw = win->fb;
-	for (u32 i = 0; i < win->height; i++) {
-		for (u32 j = 0; j < win->width; j++) {
-			if (j <= width - 1 || i <= width - 1 ||
-			    j - win->width + width + 1 <= width ||
-			    i - win->height + width <= width) {
-				draw[bypp * j + 0] = GET_BLUE(c);
-				draw[bypp * j + 1] = GET_GREEN(c);
-				draw[bypp * j + 2] = GET_RED(c);
-				draw[bypp * j + 3] = GET_ALPHA(c);
-			}
-		}
-		draw += win->pitch;
-	}
-	gui_redraw();
-}
-
-int gui_font_height()
-{
-	return font->height;
-}
-
-int gui_font_width()
-{
-	return font->width;
-}
-
-void gui_init(char *font_path)
-{
-	font = psf_parse(read(font_path));
-	assert(font);
+	return win;
 }