New binary directory structure

6 files changed, 21 insertions, 9 deletions

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;
 }
 
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index 5d1a437..16931e3 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -186,7 +186,7 @@ void proc_init()
 	kernel_proc = proc_make();
 
 	struct node *new = list_add(proc_list, proc_make());
-	bin_load("/init", new->data);
+	bin_load("/bin/init", new->data);
 	current = new;
 
 	_eip = ((struct proc *)new->data)->regs.eip;
diff --git a/libgui/gui.c b/libgui/gui.c
index 675081e..db7845a 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -155,6 +155,7 @@ struct element *gui_add_button(struct element *container, int x, int y, enum fon
 	list_add(container->childs, button);
 	gui_sync_button(button);
 	merge_elements(get_root(container->window_id));
+	gfx_redraw_focused();
 
 	return button;
 }
@@ -185,6 +186,7 @@ struct element *gui_add_label(struct element *container, int x, int y, enum font
 	list_add(container->childs, label);
 	gui_sync_label(label);
 	merge_elements(get_root(container->window_id));
+	gfx_redraw_focused();
 
 	return label;
 }
@@ -214,6 +216,7 @@ struct element *gui_add_text_input(struct element *container, int x, int y, u32
 	list_add(container->childs, text_input);
 	gui_sync_text_input(text_input);
 	merge_elements(get_root(container->window_id));
+	gfx_redraw_focused();
 
 	return text_input;
 }
@@ -242,6 +245,7 @@ struct element *gui_add_container(struct element *container, int x, int y, u32 w
 	list_add(container->childs, new_container);
 	gui_sync_container(new_container);
 	merge_elements(get_root(container->window_id));
+	gfx_redraw_focused();
 
 	return new_container;
 }
diff --git a/run b/run
index cc5c405..f4434e6 100755
--- a/run
+++ b/run
@@ -155,7 +155,7 @@ make_build() {
         $SUDO mount build/disk.img mnt/
     fi
     $SUDO cp -r disk/* mnt/
-    $SUDO cp build/apps/* mnt/
+    $SUDO cp -r build/apps/ mnt/bin/
     $SUDO cp build/kernel.bin mnt/
     $SUDO umount mnt/
     rm -rf mnt/