1 files changed, 10 insertions, 74 deletions

diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index 4186d43..565bcf6 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -1,89 +1,25 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
-// Some GUI functions
+// Mostly GFX function wrappers
 
 #ifndef GUI_H
 #define GUI_H
 
 #include <def.h>
-#include <sys.h>
-#include <vesa.h>
+#include <gfx.h>
 
-#define GET_ALPHA(color) ((color >> 24) & 0x000000FF)
-#define GET_RED(color) ((color >> 16) & 0x000000FF)
-#define GET_GREEN(color) ((color >> 8) & 0x000000FF)
-#define GET_BLUE(color) ((color >> 0) & 0X000000FF)
+#define MAX_CHILDS 100
 
-#define COLOR_BLACK 0xff0f0f0f
-#define COLOR_RED 0xfff07f7f
-#define COLOR_GREEN 0xff7ff088
-#define COLOR_YELLOW 0xffeef07f
-#define COLOR_BLUE 0xff7facf0
-#define COLOR_MAGENTA 0xffd67ff0
-#define COLOR_CYAN 0xff7fe7f0
-#define COLOR_WHITE 0xffe9e9e9
-#define COLOR_BRIGHT_BLACK 0xff928374
-#define COLOR_BRIGHT_RED 0xffed9a9a
-#define COLOR_BRIGHT_GREEN 0xff9ef0a5
-#define COLOR_BRIGHT_YELLOW 0xffe7e897
-#define COLOR_BRIGHT_BLUE 0xff98b9eb
-#define COLOR_BRIGHT_MAGENTA 0xffd196e3
-#define COLOR_BRIGHT_CYAN 0xff94dae0
-#define COLOR_BRIGHT_WHITE 0xffe3e3e3
-#define COLOR_FG COLOR_WHITE
-#define COLOR_BG COLOR_BLACK
-
-#define WF_DEFAULT (0 << 0)
-#define WF_NO_FOCUS (1 << 0)
-#define WF_NO_DRAG (1 << 1)
-#define WF_NO_RESIZE (1 << 2)
-
-enum message_type { WM_NEW_WINDOW = EVENT_MAX + 1, WM_REDRAW, WM_KEYBOARD };
-
-// Generalized font struct
-struct font {
-	char *chars;
-	int height;
-	int width;
-	int char_size;
+struct element {
+	struct context *ctx;
 };
 
 struct window {
-	u32 pid;
-	int x;
-	int y;
-	u32 width;
-	u32 height;
-	u8 *fb;
-	u32 bpp;
-	u32 pitch;
-	int flags;
+	const char *title;
+	struct element *childs[MAX_CHILDS];
+	struct context *ctx;
 };
 
-struct msg_keyboard {
-	char ch;
-	int press;
-	int scancode;
-};
-
-void gui_write_char(struct window *win, int x, int y, u32 c, char ch);
-void gui_write(struct window *win, int x, int y, u32 c, char *text);
-void gui_load_image(struct window *win, char *path, int x, int y);
-void gui_load_wallpaper(struct window *win, char *path);
-void gui_copy(struct window *dest, struct window *src, int x, int y, u32 width, u32 height);
-void gui_win_on_win(struct window *dest, struct window *src, int x, int y);
-void gui_draw_rectangle(struct window *win, int x1, int y1, int x2, int y2, u32 c);
-void gui_fill(struct window *win, u32 c);
-void gui_border(struct window *win, u32 c, u32 width);
-void gui_init(char *font_path);
-
-int gui_font_height();
-int gui_font_width();
-
-/**
- * Wrappers
- */
+// TODO: Remove window return (internal)
+struct window *gui_init(const char *title, u32 width, u32 height);
 
-#define gui_new_window(flags)                                                                      \
-	(msg_send(2, WM_NEW_WINDOW, flags), (struct window *)msg_receive_loop()->data)
-#define gui_redraw() (msg_send(2, WM_REDRAW, NULL)) // TODO: Partial redraw (optimization)
 #endif