From e0d3b1671b3f94657d70223b51285ed287c882df Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sun, 1 Nov 2020 00:02:33 +0100
Subject: New binary directory structure

---
 apps/exec.c | 11 +++++++++--
 apps/init.c |  4 ++--
 apps/wm.c   |  7 ++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'apps')

diff --git a/apps/exec.c b/apps/exec.c
index 038d2ce..774362f 100644
--- a/apps/exec.c
+++ b/apps/exec.c
@@ -1,7 +1,11 @@
 #include <gui.h>
+#include <mem.h>
 #include <print.h>
+#include <str.h>
 #include <sys.h>
 
+#define PATH "/bin/"
+
 #define HEIGHT 32
 #define WIDTH 300
 #define BORDER 2
@@ -10,7 +14,11 @@ void on_submit(struct gui_event_keyboard *event, struct element *elem)
 {
 	(void)event;
 	char *inp = ((struct element_text_input *)elem->data)->text;
-	exec(inp, inp, NULL);
+	u8 l = strlen(PATH) + strlen(inp) + 1;
+	char *final = malloc(l);
+	strcat(final, PATH);
+	strcat(final, inp);
+	exec(final, inp, NULL);
 }
 
 int main()
@@ -22,7 +30,6 @@ int main()
 
 	input->event.on_submit = on_submit;
 
-	gfx_redraw_focused(); // TODO: Remove once partial redrawing is finished
 	gui_event_loop(root);
 
 	return 0;
diff --git a/apps/init.c b/apps/init.c
index 73ea745..9d64388 100644
--- a/apps/init.c
+++ b/apps/init.c
@@ -10,8 +10,8 @@ int main(int argc, char **argv)
 	/* printf("ARGC: %d\n", argc); */
 	/* printf("[%s loaded]\n", argv[0]); */
 
-	int wm = exec("/wm", "wm", argv[1], NULL);
-	int exec = exec("/exec", "test", NULL);
+	int wm = exec("/bin/wm", "wm", argv[1], NULL);
+	int exec = exec("/bin/exec", "test", NULL);
 
 	return wm + exec;
 }
diff --git a/apps/wm.c b/apps/wm.c
index c0e1da2..b3cb953 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -43,10 +43,11 @@ static struct context *new_context(struct context *ctx, u32 pid, int x, int y, u
 	ctx->fb = malloc(height * ctx->pitch);
 	memset(ctx->fb, 0, height * ctx->pitch);
 	ctx->flags = flags;
-	if (!(flags & WF_RELATIVE))
+	if (!(flags & WF_RELATIVE)) {
 		context_count++;
-	if (context_count % 2 == 1)
-		MOUSE_SKIP++;
+		if (context_count % 2 == 1)
+			MOUSE_SKIP++;
+	}
 	return ctx;
 }
 
-- 
cgit v1.2.3