Added files demo and needed functions

9 files changed, 160 insertions, 4 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 99d60e9..28e447a 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -1,6 +1,6 @@
 # MIT License, Copyright (c) 2020 Marvin Borner
 
-COBJS = init.o wm.o mandelbrot.o window.o exec.o test.o
+COBJS = init.o wm.o mandelbrot.o window.o exec.o files.o test.o
 CC = ccache ../cross/opt/bin/i686-elf-gcc
 LD = ccache ../cross/opt/bin/i686-elf-ld
 OC = ccache ../cross/opt/bin/i686-elf-objcopy
diff --git a/apps/exec.c b/apps/exec.c
index 774362f..305e9ef 100644
--- a/apps/exec.c
+++ b/apps/exec.c
@@ -1,3 +1,5 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
 #include <gui.h>
 #include <mem.h>
 #include <print.h>
diff --git a/apps/files.c b/apps/files.c
new file mode 100644
index 0000000..2176a99
--- /dev/null
+++ b/apps/files.c
@@ -0,0 +1,74 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+// TODO: Fix green memory artifacts
+
+#include <gui.h>
+#include <mem.h>
+#include <print.h>
+#include <str.h>
+#include <sys.h>
+
+static struct element *root = NULL;
+
+struct dirent {
+	u32 inode_num;
+	u16 total_len;
+	u8 name_len;
+	u8 type_indicator;
+	char name[];
+};
+
+void render_list(char *path);
+void on_click(struct event_mouse *event, struct element *elem)
+{
+	(void)event;
+	char *value = ((struct element_label *)elem->data)->text;
+	u8 l = strlen(elem->attributes) + strlen(value) + 2;
+	char *full = malloc(l);
+	strcat(full, elem->attributes);
+	full[strlen(elem->attributes)] = '/';
+	strcat(full, value);
+	render_list(full);
+}
+
+// TODO: Dir iterator as kernel syscall?
+void render_list(char *path)
+{
+	static struct element *list = NULL;
+	if (list)
+		gui_remove_element(list);
+	list = gui_add_container(root, 0, 0, 600, 400, COLOR_BLACK);
+
+	struct dirent *d = read(path);
+
+	int sum = 0;
+	int calc = 0;
+	int cnt = 0;
+	do {
+		calc = (sizeof(struct dirent) + d->name_len + 4) & ~0x3;
+		sum += d->total_len;
+		d->name[d->name_len] = '\0';
+		struct element *label = gui_add_label(list, 5, cnt * (gfx_font_height(FONT_16) + 5),
+						      FONT_16, d->name, COLOR_BLACK, COLOR_WHITE);
+		label->attributes = path;
+
+		if (d->type_indicator == 2) // Dir
+			label->event.on_click = on_click;
+
+		if (d->total_len != calc && sum == 1024)
+			d->total_len = calc;
+		d = (struct dirent *)((u32)d + d->total_len);
+		cnt++;
+	} while (sum < 1024); // TODO: Remove magic constants
+}
+
+int main()
+{
+	root = gui_init("Files", 600, 400, COLOR_BLACK);
+
+	render_list("/.");
+	gfx_redraw_focused(); // TODO: Remove
+
+	gui_event_loop(root);
+
+	return 0;
+}
diff --git a/apps/wm.c b/apps/wm.c
index b3cb953..05d497c 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -115,6 +115,8 @@ static void handle_keyboard(struct event_keyboard *event)
 
 	if (special_keys_pressed & SHIFT_PRESSED)
 		msg->ch = keymap->shift_map[event->scancode];
+	else if (special_keys_pressed & ALT_PRESSED)
+		msg->ch = keymap->alt_map[event->scancode];
 	else
 		msg->ch = keymap->map[event->scancode];
 
@@ -245,8 +247,7 @@ int main(int argc, char **argv)
 		}
 
 		switch (msg->type) {
-		case GFX_NEW_CONTEXT:
-			printf("New context for pid %d\n", msg->src);
+		case GFX_NEW_CONTEXT: {
 			struct context *ctx = msg->data;
 			int width = ctx->width;
 			int height = ctx->height;
@@ -260,6 +261,7 @@ int main(int argc, char **argv)
 			redraw_all();
 			msg_send(msg->src, GFX_NEW_CONTEXT, ctx);
 			break;
+		}
 		case GFX_REDRAW:
 			redraw_all();
 			break;
diff --git a/kernel/features/fs.c b/kernel/features/fs.c
index c52a7b6..ceb345d 100644
--- a/kernel/features/fs.c
+++ b/kernel/features/fs.c
@@ -151,7 +151,8 @@ int find_inode(const char *name, int dir_inode)
 	do {
 		// Calculate the 4byte aligned size of each entry
 		sum += d->total_len;
-		if (strncmp((void *)d->name, name, d->name_len) == 0) {
+		if (strlen(name) == d->name_len &&
+		    strncmp((void *)d->name, name, d->name_len) == 0) {
 			free(buf);
 			return d->inode_num;
 		}
diff --git a/libc/inc/list.h b/libc/inc/list.h
index 0c3668d..50b21c2 100644
--- a/libc/inc/list.h
+++ b/libc/inc/list.h
@@ -17,6 +17,7 @@ struct node {
 };
 
 struct list *list_new();
+void list_destroy(struct list *list);
 /* struct node *list_new_node(); */ // TODO: Make node-specific things static/private?
 /* void list_add_node(struct list *list, struct node *node); */
 struct node *list_add(struct list *list, void *data);
diff --git a/libc/list.c b/libc/list.c
index 7baae92..6e1f95d 100644
--- a/libc/list.c
+++ b/libc/list.c
@@ -13,6 +13,22 @@ struct list *list_new()
 	return list;
 }
 
+void list_destroy(struct list *list)
+{
+	struct node *iterator = list->head;
+	while (iterator != NULL) {
+		if (iterator->next == NULL) {
+			free(iterator);
+			break;
+		}
+		iterator = iterator->next;
+		free(iterator->prev);
+	}
+	list->head = NULL;
+	free(list);
+	list = NULL;
+}
+
 struct node *list_new_node()
 {
 	struct node *node = malloc(sizeof(*node));
diff --git a/libgui/gui.c b/libgui/gui.c
index db7845a..7a47bc9 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -67,6 +67,38 @@ static void merge_elements(struct element *container)
 	}
 }
 
+static void remove_childs(struct element *elem);
+static void remove_element(struct element *elem)
+{
+	if (!elem)
+		return;
+
+	remove_childs(elem);
+	free(elem->ctx->fb);
+	elem->ctx->fb = NULL;
+	free(elem->ctx);
+	elem->ctx = NULL;
+	free(elem->data);
+	elem->data = NULL;
+	free(elem);
+	elem = NULL;
+}
+
+static void remove_childs(struct element *elem)
+{
+	if (!elem || !elem->childs || !elem->childs->head)
+		return;
+
+	struct node *iterator = elem->childs->head;
+	while (iterator != NULL) {
+		struct element *child = iterator->data;
+		remove_element(child);
+		iterator = iterator->next;
+	}
+
+	list_destroy(elem->childs);
+}
+
 static struct element *element_at(struct element *container, int x, int y)
 {
 	if (!container || !container->childs || !container->childs->head)
@@ -250,6 +282,31 @@ struct element *gui_add_container(struct element *container, int x, int y, u32 w
 	return new_container;
 }
 
+void gui_remove_childs(struct element *elem)
+{
+	remove_childs(elem);
+	elem->childs = list_new();
+	gui_sync_container(elem);
+	merge_elements(get_root(elem->window_id));
+	gfx_redraw_focused();
+}
+
+void gui_remove_element(struct element *elem)
+{
+	if (!elem)
+		return;
+
+	u32 id = elem->window_id;
+	struct element *root = get_root(id);
+	u8 is_root = root == elem;
+	remove_element(elem);
+	elem = NULL;
+	if (!is_root) {
+		merge_elements(get_root(id));
+		gfx_redraw_focused();
+	}
+}
+
 // TODO: Split into small functions
 void gui_event_loop(struct element *container)
 {
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index 8ed8f4e..90e07ae 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -61,6 +61,7 @@ struct element {
 	u32 window_id;
 	struct context *ctx; // Coordinates are relative to container
 	struct element_event event;
+	void *attributes;
 	struct list *childs;
 	void *data; // Who needs static types anyways :)
 };
@@ -96,5 +97,7 @@ struct element *gui_add_text_input(struct element *container, int x, int y, u32
 				   enum font_type font_type, u32 color_bg, u32 color_fg);
 struct element *gui_add_container(struct element *container, int x, int y, u32 width, u32 height,
 				  u32 color_bg);
+void gui_remove_childs(struct element *elem);
+void gui_remove_element(struct element *elem);
 
 #endif