Started GUI rewrite

It's a mess right now..

7 files changed, 63 insertions, 71 deletions

diff --git a/libgui/Makefile b/libgui/Makefile
index b37bc3b..cb02fed 100644
--- a/libgui/Makefile
+++ b/libgui/Makefile
@@ -4,7 +4,6 @@ COBJS = psf.o \
 	bmp.o \
 	png.o \
 	gfx.o \
-	gui.o \
 	msg.o
 CC = ccache ../cross/opt/bin/i686-elf-gcc
 LD = ccache ../cross/opt/bin/i686-elf-ld
diff --git a/libgui/bmp.c b/libgui/bmp.c
index 9fffbf5..c8795e8 100644
--- a/libgui/bmp.c
+++ b/libgui/bmp.c
@@ -19,11 +19,11 @@ struct bmp *bmp_load(const char *path)
 	// TODO: Support padding with odd widths
 	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->size.x = info->width;
+	bmp->size.y = info->height;
 	bmp->data = (u8 *)((u32)buf + h->offset);
 	bmp->bpp = info->bpp;
-	bmp->pitch = bmp->width * (bmp->bpp >> 3);
+	bmp->pitch = bmp->size.x * (bmp->bpp >> 3);
 
 	return bmp;
 }
diff --git a/libgui/gfx.c b/libgui/gfx.c
index a6e23e6..bd7165a 100644
--- a/libgui/gfx.c
+++ b/libgui/gfx.c
@@ -59,16 +59,15 @@ static void load_font(enum font_type font_type)
 	assert(fonts[font_type]);
 }
 
-static void write_char(struct context *ctx, int x, int y, struct font *font, u32 c, char ch)
+static void write_char(struct context *ctx, vec2 pos, struct font *font, u32 c, char ch)
 {
 	int bypp = ctx->bpp >> 3;
 
-	int pos = x * bypp + y * ctx->pitch;
-	char *draw = (char *)&ctx->fb[pos];
+	char *draw = (char *)&ctx->fb[pos.x * bypp + pos.y * ctx->pitch];
 
-	u32 stride = font->char_size / font->height;
-	for (int cy = 0; cy < font->height; cy++) {
-		for (int cx = 0; cx < font->width; cx++) {
+	u32 stride = font->char_size / font->size.y;
+	for (u32 cy = 0; cy < font->size.y; cy++) {
+		for (u32 cx = 0; cx < font->size.x; cx++) {
 			u8 bits = font->chars[ch * font->char_size + cy * stride + cx / 8];
 			u8 bit = bits >> (7 - cx % 8) & 1;
 			if (bit) {
@@ -82,12 +81,12 @@ static void write_char(struct context *ctx, int x, int y, struct font *font, u32
 	}
 }
 
-static void draw_rectangle(struct context *ctx, int x1, int y1, int x2, int y2, u32 c)
+static void draw_rectangle(struct context *ctx, vec2 pos1, vec2 pos2, 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++) {
+	u8 *draw = &ctx->fb[pos1.x * bypp + pos1.y * ctx->pitch];
+	for (u32 i = 0; i < pos2.y - pos1.y; i++) {
+		for (u32 j = 0; j < pos2.x - pos1.x; j++) {
 			draw[bypp * j] = GET_BLUE(c);
 			draw[bypp * j + 1] = GET_GREEN(c);
 			draw[bypp * j + 2] = GET_RED(c);
@@ -114,14 +113,14 @@ struct font *gfx_resolve_font(enum font_type font_type)
 	return fonts[font_type];
 }
 
-void gfx_write_char(struct context *ctx, int x, int y, enum font_type font_type, u32 c, char ch)
+void gfx_write_char(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, char ch)
 {
 	struct font *font = gfx_resolve_font(font_type);
-	write_char(ctx, x, y, font, c, ch);
+	write_char(ctx, pos, font, c, ch);
 	/* gfx_redraw(); */
 }
 
-void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32 c, const char *text)
+void gfx_write(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, const char *text)
 {
 	struct font *font = gfx_resolve_font(font_type);
 	u32 cnt = 0;
@@ -131,37 +130,37 @@ void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32
 			cnt = 0;
 		} else if (text[i] == '\n') {
 			cnt = 0;
-			y += font->height;
+			pos.y += font->size.y;
 		} else if (text[i] == '\t') {
 			cnt += 4;
 		} else {
 			// TODO: Overflow on single line input
-			if ((cnt + 1) * font->width > ctx->width) {
+			if ((cnt + 1) * font->size.x > ctx->size.x) {
 				cnt = 0;
-				y += font->height;
+				pos.y += font->size.y;
 			}
-			write_char(ctx, x + cnt * font->width, y, font, c, text[i]);
+			write_char(ctx, vec2(pos.x + cnt * font->size.x, pos.y), font, c, text[i]);
 			cnt++;
 		}
 	}
 	/* gfx_redraw(); */
 }
 
-void gfx_load_image(struct context *ctx, const char *path, int x, int y)
+void gfx_load_image(struct context *ctx, vec2 pos, const char *path)
 {
 	// TODO: Support x, y
 	// TODO: Detect image type
 	// struct bmp *bmp = bmp_load(path);
 	struct bmp *bmp = png_load(path);
-	assert(bmp && bmp->width + x <= ctx->width);
-	assert(bmp && bmp->height + y <= ctx->height);
+	assert(bmp && bmp->size.x + pos.x <= ctx->size.x);
+	assert(bmp && bmp->size.y + pos.y <= ctx->size.y);
 
 	// TODO: Fix reversed png in decoder
 	int bypp = bmp->bpp >> 3;
-	// u8 *srcfb = &bmp->data[bypp + (bmp->height - 1) * bmp->pitch];
+	// u8 *srcfb = &bmp->data[bypp + (bmp->size.y - 1) * bmp->pitch];
 	u8 *srcfb = bmp->data;
 	u8 *destfb = &ctx->fb[bypp];
-	for (u32 cy = 0; cy < bmp->height; cy++) {
+	for (u32 cy = 0; cy < bmp->size.y; cy++) {
 		memcpy(destfb, srcfb, bmp->pitch);
 		// srcfb -= bmp->pitch;
 		srcfb += bmp->pitch;
@@ -172,16 +171,16 @@ void gfx_load_image(struct context *ctx, const char *path, int x, int y)
 
 void gfx_load_wallpaper(struct context *ctx, const char *path)
 {
-	gfx_load_image(ctx, path, 0, 0);
+	gfx_load_image(ctx, vec2(0, 0), path);
 }
 
-void gfx_copy(struct context *dest, struct context *src, int x, int y, u32 width, u32 height)
+void gfx_copy(struct context *dest, struct context *src, vec2 pos, vec2 size)
 {
 	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 * bypp);
+	u8 *srcfb = &src->fb[pos.x * bypp + pos.y * src->pitch];
+	u8 *destfb = &dest->fb[pos.x * bypp + pos.y * dest->pitch];
+	for (u32 cy = 0; cy < size.y; cy++) {
+		memcpy(destfb, srcfb, size.x * bypp);
 		srcfb += src->pitch;
 		destfb += dest->pitch;
 	}
@@ -189,24 +188,23 @@ void gfx_copy(struct context *dest, struct context *src, int x, int y, u32 width
 
 // 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)
+void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos)
 {
-	if (src->width == dest->width && src->height == dest->height && src->x == 0 &&
-	    dest->y == 0) {
-		memcpy(dest->fb, src->fb, dest->pitch * dest->height);
+	if (src->size.x == dest->size.x && src->size.y == dest->size.y) {
+		memcpy(dest->fb, src->fb, dest->pitch * dest->size.y);
 		return;
 	}
 
-	if (src->width > dest->width || src->height > dest->height)
+	if (src->size.x > dest->size.x || src->size.y > dest->size.y)
 		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++) {
+	u8 *destfb = &dest->fb[pos.x * bypp + pos.y * dest->pitch];
+	for (u32 cy = 0; cy < src->size.y && cy + pos.y < dest->size.y; cy++) {
 		int diff = 0;
-		for (u32 cx = 0; cx < src->width && cx + x < dest->width; cx++) {
+		for (u32 cx = 0; cx < src->size.x && cx + pos.x < dest->size.x; cx++) {
 			if (srcfb[3]) {
 				destfb[0] = srcfb[0];
 				destfb[1] = srcfb[1];
@@ -223,15 +221,15 @@ 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_draw_rectangle(struct context *ctx, vec2 pos1, vec2 pos2, u32 c)
 {
-	draw_rectangle(ctx, x1, y1, x2, y2, c);
+	draw_rectangle(ctx, pos1, pos2, c);
 	/* gfx_redraw(); */
 }
 
 void gfx_fill(struct context *ctx, u32 c)
 {
-	draw_rectangle(ctx, 0, 0, ctx->width, ctx->height, c);
+	draw_rectangle(ctx, vec2(0, 0), vec2(ctx->size.x, ctx->size.y), c);
 	/* gfx_redraw(); */
 }
 
@@ -242,11 +240,11 @@ void gfx_border(struct context *ctx, u32 c, u32 width)
 
 	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++) {
+	for (u32 i = 0; i < ctx->size.y; i++) {
+		for (u32 j = 0; j < ctx->size.x; j++) {
 			if (j <= width - 1 || i <= width - 1 ||
-			    j - ctx->width + width + 1 <= width ||
-			    i - ctx->height + width <= width) {
+			    j - ctx->size.x + width + 1 <= width ||
+			    i - ctx->size.y + width <= width) {
 				draw[bypp * j + 0] = GET_BLUE(c);
 				draw[bypp * j + 1] = GET_GREEN(c);
 				draw[bypp * j + 2] = GET_RED(c);
@@ -261,11 +259,11 @@ void gfx_border(struct context *ctx, u32 c, u32 width)
 int gfx_font_height(enum font_type font_type)
 {
 	struct font *font = gfx_resolve_font(font_type);
-	return font->height;
+	return font->size.y;
 }
 
 int gfx_font_width(enum font_type font_type)
 {
 	struct font *font = gfx_resolve_font(font_type);
-	return font->width;
+	return font->size.x;
 }
diff --git a/libgui/inc/bmp.h b/libgui/inc/bmp.h
index ea7a07f..ff8360b 100644
--- a/libgui/inc/bmp.h
+++ b/libgui/inc/bmp.h
@@ -4,6 +4,7 @@
 #define BMP_H
 
 #include <def.h>
+#include <vec.h>
 
 struct bmp_header {
 	u8 signature[2];
@@ -27,8 +28,7 @@ struct bmp_info {
 };
 
 struct bmp {
-	u32 width;
-	u32 height;
+	vec2 size;
 	u8 *data;
 	u32 bpp;
 	u32 pitch;
diff --git a/libgui/inc/gfx.h b/libgui/inc/gfx.h
index fd8d4ab..a283459 100644
--- a/libgui/inc/gfx.h
+++ b/libgui/inc/gfx.h
@@ -7,6 +7,7 @@
 #include <def.h>
 #include <msg.h>
 #include <sys.h>
+#include <vec.h>
 #include <vesa.h>
 
 #define WM_PATH "/bin/wm"
@@ -41,40 +42,34 @@
 #define WF_NO_FOCUS (1 << 0)
 #define WF_NO_DRAG (1 << 1)
 #define WF_NO_RESIZE (1 << 2)
-#define WF_RELATIVE (1 << 3)
+#define WF_NO_FB (1 << 3)
+/* #define WF_RELATIVE (1 << 4) */
 
 enum font_type { FONT_8, FONT_12, FONT_16, FONT_24, FONT_32, FONT_64 };
 
 // Generalized font struct
 struct font {
 	char *chars;
-	int height;
-	int width;
+	vec2 size;
 	int char_size;
 };
 
 struct context {
-	u32 pid;
-	int x;
-	int y;
-	u32 width;
-	u32 height;
+	vec2 size;
 	u8 *fb;
 	u32 bpp;
 	u32 pitch;
-	int flags;
 };
 
 struct context *gfx_new_ctx(struct context *ctx);
 struct font *gfx_resolve_font(enum font_type font_type);
-void gfx_write_char(struct context *ctx, int x, int y, enum font_type font_type, u32 c, char ch);
-void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32 c,
-	       const char *text);
-void gfx_load_image(struct context *ctx, const char *path, int x, int y);
+void gfx_write_char(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, char ch);
+void gfx_write(struct context *ctx, vec2 pos, enum font_type font_type, u32 c, const char *text);
+void gfx_load_image(struct context *ctx, vec2 pos, const char *path);
 void gfx_load_wallpaper(struct context *ctx, const 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_copy(struct context *dest, struct context *src, vec2 pos, vec2 size);
+void gfx_ctx_on_ctx(struct context *dest, struct context *src, vec2 pos);
+void gfx_draw_rectangle(struct context *ctx, vec2 pos1, vec2 pos2, u32 c);
 void gfx_fill(struct context *ctx, u32 c);
 void gfx_border(struct context *ctx, u32 c, u32 width);
 
diff --git a/libgui/png.c b/libgui/png.c
index ad65eba..48089e3 100644
--- a/libgui/png.c
+++ b/libgui/png.c
@@ -1182,8 +1182,8 @@ struct bmp *png_load(const char *path)
 	assert(png->error == PNG_EOK);
 
 	struct bmp *bmp = malloc(sizeof(*bmp));
-	bmp->width = png->width;
-	bmp->height = png->height;
+	bmp->size.x = png->width;
+	bmp->size.y = png->height;
 	bmp->data = png->buffer;
 	bmp->bpp = png_get_bpp(png);
 	bmp->pitch = png->width * (bmp->bpp >> 3);
diff --git a/libgui/psf.c b/libgui/psf.c
index f7271a8..655fb07 100644
--- a/libgui/psf.c
+++ b/libgui/psf.c
@@ -52,8 +52,8 @@ struct font *psf_parse(char *data)
 
 	struct font *font = malloc(sizeof(*font));
 	font->chars = chars;
-	font->height = height;
-	font->width = width;
+	font->size.x = width;
+	font->size.y = height;
 	font->char_size = char_size;
 
 	return font;