Added buttons

3 files changed, 11 insertions, 56 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 155e069..3e4aaa0 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -12,7 +12,7 @@ all: $(COBJS)
 %.o: %.c
 	@mkdir -p ../build/apps/
 	@$(CC) -c $(CFLAGS) $< -o $@
-	@$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lc -lgui -ltxt
+	@$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lgui -ltxt -lc
 	@$(OC) -O binary $(@:.o=.elf) ../build/apps/$(@:.o=)
 # @cp $(@:.o=.elf) ../build/apps/$(@:.o=.dbg)
 
diff --git a/apps/window.c b/apps/window.c
index 70131a6..601f187 100644
--- a/apps/window.c
+++ b/apps/window.c
@@ -12,61 +12,15 @@ int main()
 {
 	print("[test context loaded]\n");
 
-	struct window *win = gui_init("test", 0, 0);
-	struct context *ctx = win->ctx;
-
-	int font_height = gfx_font_height();
-	int font_width = gfx_font_width();
-
-	char *hello = "Hello, world!";
-	gfx_write(ctx, ctx->width / 2 - (strlen(hello) * font_width) / 2, 0, COLOR_GREEN, hello);
+	struct element *container = gui_init("test", 0, 0);
+	gui_add_button(container, 10, 10, 100, 20, "hallo", COLOR_RED);
 
 	struct message *msg;
-	int char_x = 0;
-	int char_y = 1;
 	while (1) {
 		if (!(msg = msg_receive())) {
 			yield();
 			continue;
 		}
-
-		// TODO: Export to text widget or sth
-		switch (msg->type) {
-		case WM_KEYBOARD: {
-			struct msg_keyboard *event = msg->data;
-			char ch = event->ch;
-			if (!event->press)
-				break;
-
-			if (char_x * font_width >= (int)ctx->width) {
-				char_y++;
-				char_x = 0;
-			}
-
-			if (ch == '\n') {
-				char_x = 0;
-				char_y++;
-			} else if (ch == '\t') {
-				char_x += 8;
-			} else if (ch == '\b') {
-				if (char_x > 0) {
-					char_x--;
-					gfx_draw_rectangle(ctx, font_width * char_x,
-							   font_height * char_y,
-							   font_width * (char_x + 1),
-							   font_height * (char_y + 1), COLOR_BG);
-				}
-			} else if (ch == ' ' && event->scancode == KEY_SPACE) {
-				char_x++;
-			} else if (ch != ' ' && ch != '\0') {
-				gfx_write_char(ctx, font_width * char_x++, font_height * char_y,
-					       COLOR_CYAN, ch);
-			}
-			break;
-		}
-		default:
-			break;
-		}
 	}
 	return 0;
 }
diff --git a/apps/wm.c b/apps/wm.c
index 2443d87..0ce9a18 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -57,8 +57,8 @@ static struct context *context_at(int x, int y)
 	struct node *iterator = contexts->head;
 	while (iterator != NULL) {
 		struct context *ctx = iterator->data;
-		if (ctx != &root && x >= ctx->x && x <= ctx->x + (int)ctx->width && y >= ctx->y &&
-		    y <= ctx->y + (int)ctx->height)
+		if (ctx != &root && !(ctx->flags & WF_RELATIVE) && x >= ctx->x &&
+		    x <= ctx->x + (int)ctx->width && y >= ctx->y && y <= ctx->y + (int)ctx->height)
 			ret = ctx;
 		iterator = iterator->next;
 	}
@@ -73,7 +73,7 @@ static void redraw_all()
 	struct node *iterator = contexts->head;
 	while (iterator != NULL) {
 		struct context *ctx = iterator->data;
-		if (ctx != focused)
+		if (ctx != focused && !(ctx->flags & WF_RELATIVE))
 			gfx_ctx_on_ctx(&exchange, ctx, ctx->x, ctx->y);
 		iterator = iterator->next;
 	}
@@ -207,10 +207,10 @@ int main(int argc, char **argv)
 	gfx_write(&direct, 0, 0, COLOR_FG, "Welcome to Melvix!");
 	gfx_write(&direct, 0, 32, COLOR_FG, "Loading resources...");
 
-	gfx_fill(&root, COLOR_BG);
-	gfx_border(&root, COLOR_FG, 2);
+	gfx_fill(&root, COLOR_FG);
+	//gfx_border(&root, COLOR_FG, 2);
 	gfx_load_image(&cursor, "/res/cursor.bmp", 0, 0);
-	gfx_load_wallpaper(&root, "/res/wall.bmp");
+	//gfx_load_wallpaper(&root, "/res/wall.bmp");
 	redraw_all();
 
 	event_register(EVENT_MOUSE);
@@ -234,7 +234,8 @@ int main(int argc, char **argv)
 			ctx->pid = msg->src;
 			new_context(ctx, msg->src, x, y, width, height, ctx->flags);
 			list_add(contexts, ctx);
-			focused = ctx;
+			if (!(ctx->flags & WF_RELATIVE))
+				focused = ctx;
 			redraw_all();
 			msg_send(msg->src, WM_NEW_CONTEXT, ctx);
 			break;