Added container functions

And some other stuff - as always in this highly professional project

3 files changed, 59 insertions, 12 deletions

diff --git a/libgui/gfx.c b/libgui/gfx.c
index 13cdcd3..63306e6 100644
--- a/libgui/gfx.c
+++ b/libgui/gfx.c
@@ -165,17 +165,17 @@ void gfx_ctx_on_ctx(struct context *dest, struct context *src, int x, int y)
 	u8 *destfb = &dest->fb[x * bypp + y * dest->pitch];
 	for (u32 cy = 0; cy < src->height && cy + y < dest->height; cy++) {
 		int diff = 0;
-		// TODO: Fix cursor
 		for (u32 cx = 0; cx < src->width && cx + x < dest->width; cx++) {
 			if (srcfb[3]) {
 				destfb[0] = srcfb[0];
 				destfb[1] = srcfb[1];
 				destfb[2] = srcfb[2];
 				destfb[3] = srcfb[3];
-				srcfb += bypp;
-				destfb += bypp;
-				diff += bypp;
 			}
+
+			srcfb += bypp;
+			destfb += bypp;
+			diff += bypp;
 		}
 		srcfb += src->pitch - diff;
 		destfb += dest->pitch - diff;
diff --git a/libgui/gui.c b/libgui/gui.c
index 024c5d7..922a11a 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -40,6 +40,7 @@ static struct window *new_window(const char *title, int x, int y, u32 width, u32
 	return win;
 }
 
+// TODO: Fix relative position in container
 static void merge_elements(struct element *container)
 {
 	if (!container || !container->childs || !container->childs->head)
@@ -49,6 +50,8 @@ static void merge_elements(struct element *container)
 	while (iterator != NULL) {
 		struct element *elem = iterator->data;
 		struct context *ctx = elem->ctx;
+		printf("Merging %dx%d onto %dx%d\n", ctx->width, ctx->height, container->ctx->width,
+		       container->ctx->height);
 		merge_elements(elem);
 		gfx_ctx_on_ctx(container->ctx, ctx, ctx->x, ctx->y);
 		iterator = iterator->next;
@@ -80,9 +83,15 @@ void gui_sync_button(struct element *elem)
 	gfx_write(elem->ctx, 0, 0, button->font_type, button->color_fg, button->text);
 }
 
-struct element_button *gui_add_button(struct element *container, int x, int y,
-				      enum font_type font_type, char *text, u32 color_bg,
-				      u32 color_fg)
+void gui_sync_container(struct element *elem)
+{
+	struct element_container *container = elem->data;
+	gfx_fill(elem->ctx, container->color_bg);
+	// TODO: Handle container flags
+}
+
+struct element *gui_add_button(struct element *container, int x, int y, enum font_type font_type,
+			       char *text, u32 color_bg, u32 color_fg)
 {
 	if (!container || !container->childs)
 		return NULL;
@@ -104,12 +113,41 @@ struct element_button *gui_add_button(struct element *container, int x, int y,
 	((struct element_button *)button->data)->color_fg = color_fg;
 	((struct element_button *)button->data)->color_bg = color_bg;
 	((struct element_button *)button->data)->font_type = font_type;
+
 	gfx_new_ctx(button->ctx);
 	list_add(container->childs, button);
 	gui_sync_button(button);
 	merge_elements(container);
 
-	return button->data;
+	return button;
+}
+
+struct element *gui_add_container(struct element *container, int x, int y, u32 width, u32 height,
+				  u32 color_bg)
+{
+	if (!container || !container->childs)
+		return NULL;
+
+	struct element *new_container = malloc(sizeof(*new_container));
+	new_container->type = GUI_TYPE_CONTAINER;
+	new_container->window_id = container->window_id;
+	new_container->ctx = malloc(sizeof(*new_container->ctx));
+	new_container->ctx->x = x;
+	new_container->ctx->y = y;
+	new_container->ctx->width = width;
+	new_container->ctx->height = height;
+	new_container->ctx->flags = WF_RELATIVE;
+	new_container->childs = list_new();
+	new_container->data = malloc(sizeof(struct element_container));
+	((struct element_container *)new_container->data)->color_bg = color_bg;
+	((struct element_container *)new_container->data)->flags = 0;
+
+	gfx_new_ctx(new_container->ctx);
+	list_add(container->childs, new_container);
+	gui_sync_container(new_container);
+	merge_elements(container);
+
+	return new_container;
 }
 
 void gui_event_loop(struct element *container)
@@ -146,7 +184,8 @@ struct element *gui_init(const char *title, u32 width, u32 height)
 	if (window_count != 0)
 		return NULL;
 
-	struct window *win = new_window(title, 0, 0, width, height, WF_DEFAULT);
+	// TODO: Add center flag
+	struct window *win = new_window(title, 30, 30, width, height, WF_DEFAULT);
 	if (!win)
 		return NULL;
 
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index 8149381..14f2e4e 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -14,6 +14,13 @@
 enum window_event_type { GUI_KEYBOARD = GFX_MAX + 1, GUI_MOUSE, GUI_MAX };
 enum element_type { GUI_TYPE_CONTAINER, GUI_TYPE_BUTTON, GUI_TYPE_TEXTBOX };
 
+enum container_flags { SPLIT };
+
+struct element_container {
+	u32 color_bg;
+	enum container_flags flags;
+};
+
 struct element_button {
 	char *text;
 	u32 color_fg;
@@ -59,8 +66,9 @@ struct gui_event_mouse {
 
 struct element *gui_init(const char *title, u32 width, u32 height);
 void gui_event_loop(struct element *container);
-struct element_button *gui_add_button(struct element *container, int x, int y,
-				      enum font_type font_type, char *text, u32 color_bg,
-				      u32 color_fg);
+struct element *gui_add_button(struct element *container, int x, int y, enum font_type font_type,
+			       char *text, u32 color_bg, u32 color_fg);
+struct element *gui_add_container(struct element *container, int x, int y, u32 width, u32 height,
+				  u32 color_bg);
 
 #endif