Chu chuu, using the bus for everything now!

Well, I know: bus != train. But I like trains. So I don't care.

Go away!

4 files changed, 66 insertions, 26 deletions

diff --git a/libs/libgui/gui.c b/libs/libgui/gui.c
index 4e3b4cb..ef99d92 100644
--- a/libs/libgui/gui.c
+++ b/libs/libgui/gui.c
@@ -8,8 +8,6 @@
 #include <list.h>
 #include <print.h>
 
-#define WM_PATH "wm"
-
 struct gui_widget {
 	u32 id;
 	vec2 pos;
@@ -105,6 +103,21 @@ static struct gui_widget *gui_widget_by_id(u32 win_id, u32 widget_id)
 }
 
 /**
+ * Bus stuff
+ */
+
+static u32 wm_conn = 0;
+static void gui_connect_wm(void)
+{
+	if (wm_conn) {
+		// TODO: Fix
+		assert(msg_connect_conn(wm_conn) == EOK);
+	} else {
+		assert(msg_connect_bus("wm", &wm_conn) == EOK);
+	}
+}
+
+/**
  * GFX wrappers
  */
 
@@ -398,7 +411,7 @@ vec2 gui_window_size(u32 win_id)
  * Window manager interfaces
  */
 
-res gui_new_window(void)
+res gui_new_window(u32 *id)
 {
 	if (!windows)
 		windows = list_new();
@@ -406,8 +419,8 @@ res gui_new_window(void)
 	struct gui_window *win = zalloc(sizeof(*win));
 
 	struct message_new_window msg = { .header.state = MSG_NEED_ANSWER };
-	if (msg_send(pidof(WM_PATH), GUI_NEW_WINDOW, &msg, sizeof(msg)) > 0 &&
-	    msg_receive(&msg, sizeof(msg)) > 0 &&
+	gui_connect_wm();
+	if (msg_send(GUI_NEW_WINDOW, &msg, sizeof(msg)) > 0 && msg_receive(&msg, sizeof(msg)) > 0 &&
 	    msg.header.type == (GUI_NEW_WINDOW | MSG_SUCCESS)) {
 		win->id = msg.id;
 		win->ctx = msg.ctx;
@@ -418,7 +431,8 @@ res gui_new_window(void)
 		list_add(windows, win);
 		win->widgets = list_new();
 
-		return win->id;
+		*id = win->id;
+		return_errno(EOK);
 	}
 
 	return_errno(EINVAL);
@@ -431,7 +445,8 @@ res gui_redraw_window(u32 id)
 		return_errno(ENOENT);
 
 	struct message_redraw_window msg = { .id = id, .header.state = MSG_NEED_ANSWER };
-	if (msg_send(pidof(WM_PATH), GUI_REDRAW_WINDOW, &msg, sizeof(msg)) > 0 &&
+	gui_connect_wm();
+	if (msg_send(GUI_REDRAW_WINDOW, &msg, sizeof(msg)) > 0 &&
 	    msg_receive(&msg, sizeof(msg)) > 0 &&
 	    msg.header.type == (GUI_REDRAW_WINDOW | MSG_SUCCESS))
 		return EOK;
@@ -456,17 +471,20 @@ static res gui_handle_ping(struct message_ping *msg)
 
 	msg->header.type |= MSG_SUCCESS;
 	msg->ping = MSG_PING_RECV;
-	msg_send(msg->header.src, GUI_PING, &msg, sizeof(msg));
-
-	return errno;
+	if (msg_connect_conn(msg->header.bus.conn) == EOK &&
+	    msg_send(GUI_PING, msg, sizeof(msg)) == EOK)
+		return EOK;
+	else
+		return errno;
 }
 
 static res gui_handle_mouse(struct message_mouse *msg)
 {
 	if (msg->header.state == MSG_NEED_ANSWER) {
-		msg_send(msg->header.src, msg->header.type | MSG_SUCCESS, msg, sizeof(*msg));
-
-		if (errno != EOK)
+		if (msg_connect_conn(msg->header.bus.conn) == EOK &&
+		    msg_send(msg->header.type | MSG_SUCCESS, msg, sizeof(msg)) == EOK)
+			return EOK;
+		else
 			return errno;
 	}
 
@@ -495,7 +513,8 @@ static void gui_handle_exit(void)
 	while (iterator) {
 		struct gui_window *win = iterator->data;
 		struct message_destroy_window msg = { .id = win->id };
-		msg_send(pidof(WM_PATH), GUI_DESTROY_WINDOW, &msg, sizeof(msg));
+		gui_connect_wm();
+		msg_send(GUI_DESTROY_WINDOW, &msg, sizeof(msg));
 		iterator = iterator->next;
 	}
 
@@ -514,7 +533,7 @@ void gui_loop(void)
 		err(1, "Create some windows first\n");
 
 	void *msg = zalloc(4096);
-	while (msg_receive(msg, 4096)) {
+	while (gui_connect_wm(), msg_receive(msg, 4096) > 0) {
 		struct message_header *head = msg;
 		switch (head->type) {
 		case GUI_PING:
@@ -528,4 +547,7 @@ void gui_loop(void)
 			gui_handle_error("loop", EINVAL);
 		}
 	}
+
+	free(msg);
+	err(1, "Gui loop failed\n");
 }
diff --git a/libs/libgui/gui.h b/libs/libgui/gui.h
index f4c213b..abc50fb 100644
--- a/libs/libgui/gui.h
+++ b/libs/libgui/gui.h
@@ -18,7 +18,7 @@ enum gui_layer {
 	GUI_LAYER_FG,
 };
 
-res gui_new_window(void);
+res gui_new_window(u32 *id);
 res gui_redraw_window(u32 id);
 
 res gui_fill(u32 win_id, u32 widget_id, enum gui_layer layer, u32 c);
diff --git a/libs/libgui/msg.c b/libs/libgui/msg.c
index 051072e..70a77a1 100644
--- a/libs/libgui/msg.c
+++ b/libs/libgui/msg.c
@@ -6,24 +6,39 @@
 #include <print.h>
 #include <sys.h>
 
-res msg_send(u32 pid, enum message_type type, void *data, u32 size)
+// TODO: Remove debug assertions?
+
+res msg_connect_bus(const char *bus, u32 *conn)
+{
+	res ret = io_control(IO_BUS, IOCTL_BUS_CONNECT_BUS, bus, conn);
+	assert(ret == EOK && *conn);
+	return EOK;
+}
+
+res msg_connect_conn(u32 conn)
+{
+	res ret = io_control(IO_BUS, IOCTL_BUS_CONNECT_CONN, conn);
+	assert(ret == EOK);
+	return ret;
+}
+
+res msg_send(enum message_type type, void *data, u32 size)
 {
-	assert((signed)pid != -1 && size >= sizeof(struct message_header));
-	char path[32] = { 0 };
-	snprintf(path, sizeof(path), "/proc/%d/msg", pid);
+	assert(size >= sizeof(struct message_header));
 	struct message_header *header = data;
 	header->magic = MSG_MAGIC;
-	header->src = getpid();
 	header->type = type;
-	return write(path, data, 0, size);
+	res ret = io_write(IO_BUS, (u8 *)data + sizeof(struct bus_header), 0, size);
+	assert(ret >= EOK);
+	return ret;
 }
 
 res msg_receive(void *buf, u32 size)
 {
-	int ret = read("/proc/self/msg", buf, 0, size);
+	res ret = io_read(IO_BUS, buf, 0, size);
 	struct message_header *header = buf;
 	if (header->magic == MSG_MAGIC)
 		return ret;
 	else
-		return -1;
+		return -EINVAL;
 }
diff --git a/libs/libgui/msg.h b/libs/libgui/msg.h
index c25e95e..857042c 100644
--- a/libs/libgui/msg.h
+++ b/libs/libgui/msg.h
@@ -5,6 +5,7 @@
 
 #include <def.h>
 #include <libgui/gfx.h>
+#include <sys.h>
 
 #define MSG_PING_SEND 0x07734
 #define MSG_PING_RECV 0x7474
@@ -19,8 +20,8 @@ enum message_state {
 };
 
 struct message_header {
+	struct bus_header bus;
 	u32 magic;
-	u32 src;
 	u32 type;
 	enum message_state state;
 };
@@ -66,7 +67,9 @@ enum message_type {
 	GUI_KEYBOARD,
 };
 
-res msg_send(u32 pid, enum message_type type, void *data, u32 size) NONNULL;
+res msg_connect_bus(const char *bus, u32 *conn);
+res msg_connect_conn(u32 conn);
+res msg_send(enum message_type type, void *data, u32 size) NONNULL;
 res msg_receive(void *buf, u32 size) NONNULL;
 
 #endif