To be continued

3 files changed, 15 insertions, 10 deletions

diff --git a/libgui/gfx.c b/libgui/gfx.c
index 3eb388a..b93ee62 100644
--- a/libgui/gfx.c
+++ b/libgui/gfx.c
@@ -96,6 +96,14 @@ static void draw_rectangle(struct context *ctx, int x1, int y1, int x2, int y2,
 	}
 }
 
+struct context *gfx_new_ctx(struct context *ctx)
+{
+	struct message msg = { 0 };
+	msg_send(2, GFX_NEW_CONTEXT, ctx);
+	memcpy(ctx, msg_receive_loop(&msg)->data, sizeof(*ctx));
+	return ctx;
+}
+
 // On-demand font loading
 struct font *gfx_resolve_font(enum font_type font_type)
 {
diff --git a/libgui/gui.c b/libgui/gui.c
index b675586..8ab6260 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -531,28 +531,28 @@ void gui_event_loop(struct element *container)
 	if (!container)
 		return;
 
-	struct message *msg;
+	struct message msg = { 0 };
 	struct element *focused = NULL;
 	while (1) {
-		if (!(msg = msg_receive())) {
+		if (!msg_receive(&msg)) {
 			yield();
 			continue;
 		}
 
-		switch (msg->type) {
+		switch (msg.type) {
 		case GUI_KILL: {
 			remove_all();
 			exit(0);
 		}
 		case GUI_MOUSE: {
-			struct gui_event_mouse *event = msg->data;
+			struct gui_event_mouse *event = msg.data;
 			focused = element_at(container, event->x, event->y);
 			if (focused && focused->event.on_click && event->but1)
 				focused->event.on_click(event, focused);
 			break;
 		}
 		case GUI_KEYBOARD: {
-			struct gui_event_keyboard *event = msg->data;
+			struct gui_event_keyboard *event = msg.data;
 
 			if (focused && focused->type == GUI_TYPE_TEXT_INPUT && event->press) {
 				char *s = ((struct element_text_input *)focused->data)->text;
@@ -584,15 +584,13 @@ void gui_event_loop(struct element *container)
 			break;
 		}
 		case GUI_RESIZE: {
-			struct gui_event_resize *event = msg->data;
+			struct gui_event_resize *event = msg.data;
 			struct element *root = get_root(container->window_id);
 			root->ctx = event->new_ctx;
 			gui_sync_window(container->window_id);
 			break;
 		}
 		}
-
-		free(msg);
 	}
 
 	exit(1);
diff --git a/libgui/inc/gfx.h b/libgui/inc/gfx.h
index 0f4c631..d096005 100644
--- a/libgui/inc/gfx.h
+++ b/libgui/inc/gfx.h
@@ -64,6 +64,7 @@ struct context {
 	int flags;
 };
 
+struct context *gfx_new_ctx(struct context *ctx);
 struct font *gfx_resolve_font(enum font_type font_type);
 void gfx_write_char(struct context *ctx, int x, int y, enum font_type font_type, u32 c, char ch);
 void gfx_write(struct context *ctx, int x, int y, enum font_type font_type, u32 c,
@@ -83,8 +84,6 @@ int gfx_font_width(enum font_type);
  * Wrappers
  */
 
-#define gfx_new_ctx(ctx)                                                                           \
-	(msg_send(2, GFX_NEW_CONTEXT, (ctx)), (struct context *)msg_receive_loop()->data)
 #define gfx_redraw() (msg_send(2, GFX_REDRAW, NULL)) // TODO: Partial redraw (optimization)
 #define gfx_redraw_focused() (msg_send(2, GFX_REDRAW_FOCUSED, NULL))