Started new GFX/GUI abstraction

6 files changed, 318 insertions, 240 deletions

diff --git a/libgui/Makefile b/libgui/Makefile
index 29c8db4..a29a393 100644
--- a/libgui/Makefile
+++ b/libgui/Makefile
@@ -2,6 +2,7 @@
 
 COBJS = psf.o \
 	bmp.o \
+	gfx.o \
 	gui.o
 CC = ccache ../cross/opt/bin/i686-elf-gcc
 LD = ccache ../cross/opt/bin/i686-elf-ld
diff --git a/libgui/gfx.c b/libgui/gfx.c
new file mode 100644
index 0000000..30c10e3
--- /dev/null
+++ b/libgui/gfx.c
@@ -0,0 +1,184 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+// Some GFX functions
+// TODO: Better support for bpp < 32
+
+#include <assert.h>
+#include <bmp.h>
+#include <gfx.h>
+#include <mem.h>
+#include <psf.h>
+#include <str.h>
+#include <sys.h>
+#include <vesa.h>
+
+struct font *font;
+
+static void write_char(struct context *ctx, int x, int y, u32 c, char ch)
+{
+	int bypp = ctx->bpp >> 3;
+
+	int pos = x * bypp + y * ctx->pitch;
+	char *draw = (char *)&ctx->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 += ctx->pitch;
+	}
+}
+
+static void draw_rectangle(struct context *ctx, int x1, int y1, int x2, int y2, u32 c)
+{
+	int bypp = ctx->bpp >> 3;
+	u8 *draw = &ctx->fb[x1 * bypp + y1 * ctx->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 += ctx->pitch;
+	}
+}
+
+void gfx_write_char(struct context *ctx, int x, int y, u32 c, char ch)
+{
+	write_char(ctx, x, y, c, ch);
+	gfx_redraw();
+}
+
+void gfx_write(struct context *ctx, int x, int y, u32 c, char *text)
+{
+	for (u32 i = 0; i < strlen(text); i++) {
+		write_char(ctx, x + i * font->width, y, c, text[i]);
+	}
+	gfx_redraw();
+}
+
+void gfx_load_image(struct context *ctx, char *path, int x, int y)
+{
+	// TODO: Support x, y
+	struct bmp *bmp = bmp_load(path);
+	assert(bmp && bmp->width + x <= ctx->width);
+	assert(bmp && bmp->height + y <= ctx->height);
+
+	// TODO: Support padding with odd widths
+	int bypp = bmp->bpp >> 3;
+	u8 *srcfb = &bmp->data[bypp + (bmp->height - 1) * bmp->pitch];
+	u8 *destfb = &ctx->fb[bypp];
+	for (u32 cy = 0; cy < bmp->height; cy++) {
+		memcpy(destfb, srcfb, bmp->pitch);
+		srcfb -= bmp->pitch;
+		destfb += ctx->pitch;
+	}
+	gfx_redraw();
+}
+
+void gfx_load_wallpaper(struct context *ctx, char *path)
+{
+	gfx_load_image(ctx, path, 0, 0);
+}
+
+void gfx_copy(struct context *dest, struct context *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;
+	}
+}
+
+// TODO: Support alpha values other than 0x0 and 0xff (blending)
+// TODO: Optimize!
+void gfx_ctx_on_ctx(struct context *dest, struct context *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 (src->width > dest->width || src->height > dest->height)
+		return;
+
+	// 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;
+	}
+}
+
+void gfx_draw_rectangle(struct context *ctx, int x1, int y1, int x2, int y2, u32 c)
+{
+	draw_rectangle(ctx, x1, y1, x2, y2, c);
+	gfx_redraw();
+}
+
+void gfx_fill(struct context *ctx, u32 c)
+{
+	draw_rectangle(ctx, 0, 0, ctx->width, ctx->height, c);
+	gfx_redraw();
+}
+
+void gfx_border(struct context *ctx, u32 c, u32 width)
+{
+	if (width <= 0)
+		return;
+
+	int bypp = ctx->bpp >> 3;
+	u8 *draw = ctx->fb;
+	for (u32 i = 0; i < ctx->height; i++) {
+		for (u32 j = 0; j < ctx->width; j++) {
+			if (j <= width - 1 || i <= width - 1 ||
+			    j - ctx->width + width + 1 <= width ||
+			    i - ctx->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 += ctx->pitch;
+	}
+	gfx_redraw();
+}
+
+int gfx_font_height()
+{
+	return font->height;
+}
+
+int gfx_font_width()
+{
+	return font->width;
+}
+
+void gfx_init(char *font_path)
+{
+	font = psf_parse(read(font_path));
+	assert(font);
+}
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;
 }
diff --git a/libgui/inc/gfx.h b/libgui/inc/gfx.h
new file mode 100644
index 0000000..342fe84
--- /dev/null
+++ b/libgui/inc/gfx.h
@@ -0,0 +1,91 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+// Some GFX functions
+
+#ifndef GFX_H
+#define GFX_H
+
+#include <def.h>
+#include <gui.h>
+#include <sys.h>
+#include <vesa.h>
+
+#define GET_ALPHA(color) ((color >> 24) & 0x000000FF)
+#define GET_RED(color) ((color >> 16) & 0x000000FF)
+#define GET_GREEN(color) ((color >> 8) & 0x000000FF)
+#define GET_BLUE(color) ((color >> 0) & 0X000000FF)
+
+#define COLOR_BLACK 0xff0f0f0f
+#define COLOR_RED 0xfff07f7f
+#define COLOR_GREEN 0xff7ff088
+#define COLOR_YELLOW 0xffeef07f
+#define COLOR_BLUE 0xff7facf0
+#define COLOR_MAGENTA 0xffd67ff0
+#define COLOR_CYAN 0xff7fe7f0
+#define COLOR_WHITE 0xffe9e9e9
+#define COLOR_BRIGHT_BLACK 0xff928374
+#define COLOR_BRIGHT_RED 0xffed9a9a
+#define COLOR_BRIGHT_GREEN 0xff9ef0a5
+#define COLOR_BRIGHT_YELLOW 0xffe7e897
+#define COLOR_BRIGHT_BLUE 0xff98b9eb
+#define COLOR_BRIGHT_MAGENTA 0xffd196e3
+#define COLOR_BRIGHT_CYAN 0xff94dae0
+#define COLOR_BRIGHT_WHITE 0xffe3e3e3
+#define COLOR_FG COLOR_WHITE
+#define COLOR_BG COLOR_BLACK
+
+#define WF_DEFAULT (0 << 0)
+#define WF_NO_FOCUS (1 << 0)
+#define WF_NO_DRAG (1 << 1)
+#define WF_NO_RESIZE (1 << 2)
+
+enum message_type { WM_NEW_CONTEXT = EVENT_MAX + 1, WM_REDRAW, WM_KEYBOARD };
+
+// Generalized font struct
+struct font {
+	char *chars;
+	int height;
+	int width;
+	int char_size;
+};
+
+struct context {
+	u32 pid;
+	int x;
+	int y;
+	u32 width;
+	u32 height;
+	u8 *fb;
+	u32 bpp;
+	u32 pitch;
+	int flags;
+};
+
+struct msg_keyboard {
+	char ch;
+	int press;
+	int scancode;
+};
+
+void gfx_write_char(struct context *ctx, int x, int y, u32 c, char ch);
+void gfx_write(struct context *ctx, int x, int y, u32 c, char *text);
+void gfx_load_image(struct context *ctx, char *path, int x, int y);
+void gfx_load_wallpaper(struct context *ctx, char *path);
+void gfx_copy(struct context *dest, struct context *src, int x, int y, u32 width, u32 height);
+void gfx_ctx_on_ctx(struct context *dest, struct context *src, int x, int y);
+void gfx_draw_rectangle(struct context *ctx, int x1, int y1, int x2, int y2, u32 c);
+void gfx_fill(struct context *ctx, u32 c);
+void gfx_border(struct context *ctx, u32 c, u32 width);
+void gfx_init(char *font_path);
+
+int gfx_font_height();
+int gfx_font_width();
+
+/**
+ * Wrappers
+ */
+
+#define gfx_new_ctx(ctx)                                                                           \
+	(msg_send(2, WM_NEW_CONTEXT, (ctx)), (struct context *)msg_receive_loop()->data)
+#define gfx_redraw() (msg_send(2, WM_REDRAW, NULL)) // TODO: Partial redraw (optimization)
+
+#endif
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index 4186d43..565bcf6 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -1,89 +1,25 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
-// Some GUI functions
+// Mostly GFX function wrappers
 
 #ifndef GUI_H
 #define GUI_H
 
 #include <def.h>
-#include <sys.h>
-#include <vesa.h>
+#include <gfx.h>
 
-#define GET_ALPHA(color) ((color >> 24) & 0x000000FF)
-#define GET_RED(color) ((color >> 16) & 0x000000FF)
-#define GET_GREEN(color) ((color >> 8) & 0x000000FF)
-#define GET_BLUE(color) ((color >> 0) & 0X000000FF)
+#define MAX_CHILDS 100
 
-#define COLOR_BLACK 0xff0f0f0f
-#define COLOR_RED 0xfff07f7f
-#define COLOR_GREEN 0xff7ff088
-#define COLOR_YELLOW 0xffeef07f
-#define COLOR_BLUE 0xff7facf0
-#define COLOR_MAGENTA 0xffd67ff0
-#define COLOR_CYAN 0xff7fe7f0
-#define COLOR_WHITE 0xffe9e9e9
-#define COLOR_BRIGHT_BLACK 0xff928374
-#define COLOR_BRIGHT_RED 0xffed9a9a
-#define COLOR_BRIGHT_GREEN 0xff9ef0a5
-#define COLOR_BRIGHT_YELLOW 0xffe7e897
-#define COLOR_BRIGHT_BLUE 0xff98b9eb
-#define COLOR_BRIGHT_MAGENTA 0xffd196e3
-#define COLOR_BRIGHT_CYAN 0xff94dae0
-#define COLOR_BRIGHT_WHITE 0xffe3e3e3
-#define COLOR_FG COLOR_WHITE
-#define COLOR_BG COLOR_BLACK
-
-#define WF_DEFAULT (0 << 0)
-#define WF_NO_FOCUS (1 << 0)
-#define WF_NO_DRAG (1 << 1)
-#define WF_NO_RESIZE (1 << 2)
-
-enum message_type { WM_NEW_WINDOW = EVENT_MAX + 1, WM_REDRAW, WM_KEYBOARD };
-
-// Generalized font struct
-struct font {
-	char *chars;
-	int height;
-	int width;
-	int char_size;
+struct element {
+	struct context *ctx;
 };
 
 struct window {
-	u32 pid;
-	int x;
-	int y;
-	u32 width;
-	u32 height;
-	u8 *fb;
-	u32 bpp;
-	u32 pitch;
-	int flags;
+	const char *title;
+	struct element *childs[MAX_CHILDS];
+	struct context *ctx;
 };
 
-struct msg_keyboard {
-	char ch;
-	int press;
-	int scancode;
-};
-
-void gui_write_char(struct window *win, int x, int y, u32 c, char ch);
-void gui_write(struct window *win, int x, int y, u32 c, char *text);
-void gui_load_image(struct window *win, char *path, int x, int y);
-void gui_load_wallpaper(struct window *win, char *path);
-void gui_copy(struct window *dest, struct window *src, int x, int y, u32 width, u32 height);
-void gui_win_on_win(struct window *dest, struct window *src, int x, int y);
-void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, u32 c);
-void gui_fill(struct window *win, u32 c);
-void gui_border(struct window *win, u32 c, u32 width);
-void gui_init(char *font_path);
-
-int gui_font_height();
-int gui_font_width();
-
-/**
- * Wrappers
- */
+// TODO: Remove window return (internal)
+struct window *gui_init(const char *title, u32 width, u32 height);
 
-#define gui_new_window(flags)                                                                      \
-	(msg_send(2, WM_NEW_WINDOW, flags), (struct window *)msg_receive_loop()->data)
-#define gui_redraw() (msg_send(2, WM_REDRAW, NULL)) // TODO: Partial redraw (optimization)
 #endif
diff --git a/libgui/psf.c b/libgui/psf.c
index dbbf032..d6dc9c3 100644
--- a/libgui/psf.c
+++ b/libgui/psf.c
@@ -2,7 +2,7 @@
 // PSF parser
 
 #include <def.h>
-#include <gui.h>
+#include <gfx.h>
 #include <mem.h>
 #include <print.h>
 #include <psf.h>