Added container functions

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

4 files changed, 22 insertions, 17 deletions

diff --git a/apps/init.c b/apps/init.c
index 192224b..23f0773 100644
--- a/apps/init.c
+++ b/apps/init.c
@@ -6,8 +6,9 @@
 
 int main(int argc, char **argv)
 {
-	printf("ARGC: %d\n", argc);
-	printf("[%s loaded]\n", argv[0]);
+	(void)argc;
+	/* printf("ARGC: %d\n", argc); */
+	/* printf("[%s loaded]\n", argv[0]); */
 
 	int wm = exec("/wm", "wm", argv[1], NULL);
 	int test = exec("/window", "test", NULL);
diff --git a/apps/mandelbrot.c b/apps/mandelbrot.c
index dad9100..2414281 100644
--- a/apps/mandelbrot.c
+++ b/apps/mandelbrot.c
@@ -54,9 +54,11 @@ void draw_mandelbrot(struct context *ctx, int resolution)
 
 int main()
 {
-	print("[mandelbrot context loaded]\n");
+	/* print("[mandelbrot context loaded]\n"); */
 
 	struct context ctx = { 0 };
+	ctx.x = 500;
+	ctx.y = 500;
 	ctx.width = 500;
 	ctx.height = 300;
 	gfx_new_ctx(&ctx);
diff --git a/apps/window.c b/apps/window.c
index 6c360f8..86e4467 100644
--- a/apps/window.c
+++ b/apps/window.c
@@ -15,12 +15,13 @@ void on_click()
 
 int main()
 {
-	print("[test context loaded]\n");
+	/* print("[test context loaded]\n"); */
 
-	struct element *container = gui_init("test", 0, 0);
+	struct element *root = gui_init("test", 600, 400);
+	struct element *container =
+		gui_add_container(root, 100, 0, root->ctx->width / 2, root->ctx->height, COLOR_RED);
 	struct element_button *button =
-		gui_add_button(container, 10, 10, FONT_24, "Baum!", COLOR_WHITE, COLOR_BLACK);
-	gfx_border(container->ctx, COLOR_FG, 2);
+		gui_add_button(container, 10, 10, FONT_24, "Baum!", COLOR_WHITE, COLOR_BLACK)->data;
 
 	button->on_click = on_click;
 
diff --git a/apps/wm.c b/apps/wm.c
index ed1a4dd..c7622ed 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -66,6 +66,7 @@ static struct context *context_at(int x, int y)
 	return ret;
 }
 
+// TODO: Add dirty bitmap redraw (and clipping?): https://github.com/JMarlin/wsbe
 static void redraw_all()
 {
 	if (!contexts->head || !contexts->head->data)
@@ -74,15 +75,13 @@ static void redraw_all()
 	struct node *iterator = contexts->head;
 	while (iterator != NULL) {
 		struct context *ctx = iterator->data;
-		if (ctx != focused && !(ctx->flags & WF_RELATIVE)) {
+		if (ctx != focused && !(ctx->flags & WF_RELATIVE))
 			gfx_ctx_on_ctx(&exchange, ctx, ctx->x, ctx->y);
-		}
 		iterator = iterator->next;
 	}
 
-	if (focused) {
+	if (focused)
 		gfx_ctx_on_ctx(&exchange, focused, focused->x, focused->y);
-	}
 
 	memcpy(direct.fb, exchange.fb, exchange.pitch * exchange.height);
 }
@@ -171,8 +170,10 @@ static void handle_mouse(struct event_mouse *event)
 			mouse_skip = 0;
 			if (mouse_x - focused->x > 0)
 				focused->width = mouse_x - focused->x;
-			if (mouse_y - focused->y > 0)
+			if (mouse_y - focused->y > 0) {
 				focused->height = mouse_y - focused->y;
+				focused->pitch = focused->height * (focused->bpp >> 3);
+			}
 			redraw_all(); // TODO: Function to redraw one context
 		}
 		mouse_pressed[1] = 1;
@@ -203,7 +204,7 @@ int main(int argc, char **argv)
 	(void)argc;
 	int pid = getpid();
 	vbe = *(struct vbe *)argv[1];
-	printf("VBE: %dx%d\n", vbe.width, vbe.height);
+	/* printf("VBE: %dx%d\n", vbe.width, vbe.height); */
 
 	keymap = keymap_parse("/res/keymaps/en.keymap");
 
@@ -241,10 +242,10 @@ int main(int argc, char **argv)
 		case GFX_NEW_CONTEXT:
 			printf("New context for pid %d\n", msg->src);
 			struct context *ctx = msg->data;
-			int width = ctx->width ? ctx->width : 1000;
-			int height = ctx->height ? ctx->height : 800;
-			int x = ctx->x ? ctx->x : vbe.width / 2 - (width / 2);
-			int y = ctx->y ? ctx->y : vbe.height / 2 - (height / 2);
+			int width = ctx->width;
+			int height = ctx->height;
+			int x = ctx->x;
+			int y = ctx->y;
 			ctx->pid = msg->src;
 			new_context(ctx, msg->src, x, y, width, height, ctx->flags);
 			list_add(contexts, ctx);