2 files changed, 10 insertions, 121 deletions

diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index 380d02b..460bf88 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -1,133 +1,18 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-// Mostly GFX function wrappers
+// MIT License, Copyright (c) 2021 Marvin Borner
 
 #ifndef GUI_H
 #define GUI_H
 
 #include <def.h>
 #include <gfx.h>
-#include <list.h>
 
-// TODO: Remove limits
-#define MAX_CHILDS 100
-#define MAX_INPUT_LENGTH 100
-
-enum element_type {
-	GUI_TYPE_ROOT,
-	GUI_TYPE_CONTAINER,
-	GUI_TYPE_BUTTON,
-	GUI_TYPE_LABEL,
-	GUI_TYPE_TEXT_BOX,
-	GUI_TYPE_TEXT_INPUT
-};
-
-enum container_flags { SPLIT };
-
-struct element_event {
-	void (*on_click)();
-	void (*on_key)();
-	void (*on_submit)();
-};
-
-struct element_container {
-	int x;
-	int y;
-	u32 width;
-	u32 height;
-	u32 color_bg;
-	enum container_flags flags;
-};
-
-struct element_button {
-	int x;
-	int y;
-	char *text;
-	u32 color_fg;
-	u32 color_bg;
-	enum font_type font_type;
-};
-
-struct element_label {
-	int x;
-	int y;
-	char *text;
-	u32 color_fg;
-	u32 color_bg;
-	enum font_type font_type;
-};
-
-struct element_text_box {
-	int x;
-	int y;
-	char *text;
-	u32 width;
-	u32 height;
-	u32 color_fg;
-	u32 color_bg;
-	enum font_type font_type;
-};
-
-struct element_text_input {
-	int x;
-	int y;
-	u32 width;
-	char text[MAX_INPUT_LENGTH];
-	u32 color_fg;
-	u32 color_bg;
-	enum font_type font_type;
-};
-
-struct element {
-	enum element_type type;
-	u32 window_id;
-	struct context *ctx; // Coordinates are relative to container
-	struct element_event event;
-	void *attributes;
-	struct element *parent;
-	struct list *childs;
-	void *data; // Who needs static types anyways :)
-};
-
-struct window {
+struct gui_window {
 	u32 id;
-	const char *title;
-	struct list *childs;
 	struct context *ctx;
+	vec2 *pos;
 };
 
-struct gui_event_keyboard {
-	char ch;
-	int press;
-	int scancode;
-};
-
-struct gui_event_mouse {
-	int x;
-	int y;
-	int but1;
-	int but2;
-	int but3;
-};
-
-struct gui_event_resize {
-	struct context *new_ctx;
-};
-
-struct element *gui_init(const char *title, u32 width, u32 height, u32 color_bg);
-void gui_event_loop(struct element *container);
-struct element *gui_add_button(struct element *container, int x, int y, enum font_type font_type,
-			       const char *text, u32 color_bg, u32 color_fg);
-struct element *gui_add_label(struct element *container, int x, int y, enum font_type font_type,
-			      const char *text, u32 color_bg, u32 color_fg);
-struct element *gui_add_text_box(struct element *container, int x, int y, u32 width, u32 height,
-				 enum font_type font_type, const char *text, u32 color_bg,
-				 u32 color_fg);
-struct element *gui_add_text_input(struct element *container, int x, int y, u32 width,
-				   enum font_type font_type, 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);
-void gui_sync(struct element *elem);
-void gui_remove_childs(struct element *elem);
-void gui_remove_element(struct element *elem);
+s32 gui_new_window(struct gui_window *win);
+s32 gui_redraw_window(u32 id);
 
 #endif
diff --git a/libgui/inc/msg.h b/libgui/inc/msg.h
index e120b70..db00460 100644
--- a/libgui/inc/msg.h
+++ b/libgui/inc/msg.h
@@ -6,6 +6,8 @@
 #include <def.h>
 
 #define MSG_MAGIC 0x42042069
+#define MSG_SUCCESS (1 << 29)
+#define MSG_FAILURE (1 << 30)
 
 struct message {
 	u32 magic;
@@ -15,12 +17,14 @@ struct message {
 };
 
 enum message_type {
-	// GFX
+	// GFX // TODO: Remove
 	GFX_NEW_CONTEXT,
 	GFX_REDRAW,
 	GFX_REDRAW_FOCUSED,
 
 	// GUI
+	GUI_NEW_WINDOW,
+	GUI_REDRAW_WINDOW,
 	GUI_KILL,
 	GUI_KEYBOARD,
 	GUI_MOUSE,