19 files changed, 118 insertions, 1526 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 1afa879..e4ea24e 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -1,23 +1,15 @@
 # MIT License, Copyright (c) 2020 Marvin Borner
 
-COBJS = init.o idle.o wm.o test.o chess.o #mandelbrot.o window.o exec.o files.o test.o cc.o browser.o server.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
-ST = ccache ../cross/opt/bin/i686-elf-strip
+CFLAGS = $(CFLAGS_DEFAULT) -I$(LIBS)/ -I$(LIBS)/libc/inc/ -pie -fPIE -fPIC -DUSER
+LDFLAGS = --section-start=.text=0x42000000 -L$(BUILD)
+DIRS = $(wildcard */.)
 
-CFLAGS = $(CFLAGS_DEFAULT) -I../libs/ -I../libs/libc/inc/ -pie -fPIE -fPIC -DUSER
+export
 
-all: $(COBJS)
+all: $(DIRS)
+$(DIRS):
+	@mkdir -p $(BUILD)/apps/
+	@$(MAKE) --no-print-directory -C $@
+	@$(MAKE) clean --no-print-directory -C $@
 
-%.o: %.c
-	@mkdir -p ../build/apps/
-	@$(CC) -c $(CFLAGS) $< -o $@
-	@$(LD) -o $(@:.o=.elf) --section-start=.text=0x42000000 -L../build/ -pie -no-dynamic-linker $@ -lgui -ltxt -lc
-	@cp $(@:.o=.elf) ../build/apps/$(@:.o=)
-#@$(ST) --strip-all ../build/apps/$(@:.o=)
-
-# %.o: %.c
-# 	@mkdir -p ../build/apps/
-# 	@$(CC) -c $(CFLAGS) $< -o $@
-# 	@$(CC) -r $(CFLAGS) -o ../build/apps/$(@:.o=) -L../build $< -lc
+.PHONY: all $(DIRS)
diff --git a/apps/README.md b/apps/README.md
index 214ef31..93d1831 100644
--- a/apps/README.md
+++ b/apps/README.md
@@ -1,3 +1,3 @@
 # Userspace
 
-All files in this directory run in the userspace. By default, apps will run in ring 3 and can be executed using the `exec` syscall. The default process that runs after the kernel is done initializing everything is `init.c`. This initial process may call GUI programs or other processes that can reproduce themself. The `idle.c` app however is the special idling process which runs if no other process is running (called in the process scheduler).
+Every directory represents a single program that's run in the userspace. By default, apps will run in ring 3 and can be executed using the `exec` syscall. The default process that runs after the kernel is done initializing everything is `init`. This initial process may call GUI programs or other processes that can reproduce themself. The `idle` app however is the special idling process which runs if no other process is running (called in the process scheduler).
diff --git a/apps/browser.c b/apps/browser.c
deleted file mode 100644
index f00f14b..0000000
--- a/apps/browser.c
+++ /dev/null
@@ -1,125 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-
-#include <conv.h>
-#include <def.h>
-#include <gfx.h>
-#include <gui.h>
-#include <html.h>
-#include <http.h>
-#include <input.h>
-#include <mem.h>
-#include <net.h>
-#include <print.h>
-#include <str.h>
-#include <xml.h>
-
-#define WIDTH 640
-#define HEIGHT 400
-#define FONT_HEIGHT 24
-#define LABEL_WIDTH 36 // Thx Lars
-
-static struct element *code_label;
-static struct element *output;
-
-u32 status_color(char *http_code)
-{
-	u32 c = 0;
-	switch (http_code[0]) {
-	case '1': // Information response
-		c = COLOR_BLUE;
-		break;
-	case '2': // Successful response
-		c = COLOR_GREEN;
-		break;
-	case '3': // Redirects
-		c = COLOR_YELLOW;
-		break;
-	case '4': // Client error
-		c = COLOR_RED;
-		break;
-	case '5': // Server error
-		c = COLOR_MAGENTA;
-		break;
-	default:
-		c = COLOR_WHITE;
-		break;
-	}
-	return c;
-}
-
-void print_indent(char *buf, u32 n)
-{
-	for (u32 i = 0; i < n; i++)
-		strcat(buf, "\t");
-}
-
-void print_error(const char *error)
-{
-	gui_add_label(output, 0, 0, FONT_24, error, COLOR_BLACK, COLOR_RED);
-}
-
-void on_submit(void *event, struct element *box)
-{
-	(void)event;
-	char *url = ((struct element_text_input *)box->data)->text;
-	gui_remove_childs(output);
-
-	u16 port = 80;
-	char *port_str = strchr(url, ':');
-	if (port_str) {
-		port_str[0] = '\0';
-		port_str++;
-		port = atoi(port_str);
-	}
-
-	char *path = strchr(url, '/');
-	if (path) {
-		path[0] = '\0';
-		path++;
-	}
-	char *query = http_query_get(url, path ? path : "/");
-
-	u32 ip = 0;
-	if (!ip_pton(url, &ip)) {
-		ip = dns_request(url);
-	}
-
-	struct element_label *c = code_label->data;
-
-	struct socket *socket = NULL;
-	if (ip && (socket = net_open(S_TCP)) && net_connect(socket, ip, port, NET_TIMEOUT)) {
-		net_send(socket, query, strlen(query));
-		char *buf = NULL;
-		if (!(buf = http_receive(socket)) || !html_render(output, http_data(buf), 4096)) {
-			print_error("HTML parsing failed.\n");
-		} else {
-			c->text = http_code(buf);
-			c->color_fg = status_color(c->text);
-		}
-	} else {
-		print_error("Can't connect to server.\n");
-		c->text = strdup("000");
-		c->color_fg = COLOR_RED;
-	}
-	gui_sync(output);
-	gui_sync(code_label);
-	net_close(socket);
-}
-
-int main()
-{
-	// TODO: Dynamic element positioning
-	struct element *root = gui_init("browser", WIDTH, HEIGHT, COLOR_BG);
-	code_label = gui_add_label(root, 0, 0, FONT_24, "000", COLOR_BLACK, COLOR_WHITE);
-	struct element *text_input =
-		gui_add_text_input(root, LABEL_WIDTH, 0, 100, FONT_24, COLOR_WHITE, COLOR_BLACK);
-	output = gui_add_container(root, 0, FONT_HEIGHT + 2, 100, 100, COLOR_WHITE);
-	gui_add_label(output, 0, 0, FONT_24, "Enter URL and press Enter :)", COLOR_WHITE,
-		      COLOR_BLACK);
-
-	text_input->event.on_submit = on_submit;
-
-	gui_event_loop(root);
-
-	return 0;
-}
diff --git a/apps/cc.c b/apps/cc.c
deleted file mode 100644
index 305d82e..0000000
--- a/apps/cc.c
+++ /dev/null
@@ -1,1083 +0,0 @@
-// Written by Robert Swierczek
-// Ported by Marvin Borner
-// TODO: Fix number conversion (ascii - 48?)
-
-#include <def.h>
-#include <mem.h>
-#include <print.h>
-#include <str.h>
-#include <sys.h>
-
-char *p, *lp, // current position in source code
-	*data; // data/bss pointer
-
-int *e, *le, // current position in emitted code
-	*id, // currently parsed identifier
-	*sym, // symbol table (simple list of identifiers)
-	tk, // current token
-	ival, // current token value
-	ty, // current expression type
-	loc, // local variable offset
-	line; // current line number
-
-// tokens and classes (operators last and in precedence order)
-enum {
-	Num = 128,
-	Fun,
-	Sys,
-	Glo,
-	Loc,
-	Id,
-	Char,
-	Else,
-	Enum,
-	If,
-	Int,
-	Return,
-	Sizeof,
-	While,
-	Assign,
-	Cond,
-	Lor,
-	Lan,
-	Or,
-	Xor,
-	And,
-	Eq,
-	Ne,
-	Lt,
-	Gt,
-	Le,
-	Ge,
-	Shl,
-	Shr,
-	Add,
-	Sub,
-	Mul,
-	Div,
-	Mod,
-	Inc,
-	Dec,
-	Brak
-};
-
-// opcodes
-enum {
-	LEA,
-	IMM,
-	JMP,
-	JSR,
-	BZ,
-	BNZ,
-	ENT,
-	ADJ,
-	LEV,
-	LI,
-	LC,
-	SI,
-	SC,
-	PSH,
-	OR,
-	XOR,
-	AND,
-	EQ,
-	NE,
-	LT,
-	GT,
-	LE,
-	GE,
-	SHL,
-	SHR,
-	ADD,
-	SUB,
-	MUL,
-	DIV,
-	MOD,
-	OPEN,
-	READ,
-	CLOS,
-	PRTF,
-	MALC,
-	FREE,
-	MSET,
-	MCMP,
-	EXIT
-};
-
-// types
-enum { CHAR, INT, PTR };
-
-// identifier offsets (since we can't create an ident struct)
-enum { Tk, Hash, Name, Class, Type, Val, HClass, HType, HVal, Idsz };
-
-void next()
-{
-	char *pp;
-
-	while ((tk = *p)) {
-		++p;
-		if (tk == '\n') {
-			++line;
-		} else if (tk == '#') {
-			while (*p != 0 && *p != '\n')
-				++p;
-		} else if ((tk >= 'a' && tk <= 'z') || (tk >= 'A' && tk <= 'Z') || tk == '_') {
-			pp = p - 1;
-			while ((*p >= 'a' && *p <= 'z') || (*p >= 'A' && *p <= 'Z') ||
-			       (*p >= '0' && *p <= '9') || *p == '_')
-				tk = tk * 147 + *p++;
-			tk = (tk << 6) + (p - pp);
-			id = sym;
-			while (id[Tk]) {
-				if (tk == id[Hash] && !memcmp((char *)id[Name], pp, p - pp)) {
-					tk = id[Tk];
-					return;
-				}
-				id = id + Idsz;
-			}
-			id[Name] = (int)pp;
-			id[Hash] = tk;
-			tk = id[Tk] = Id;
-			return;
-		} else if (tk >= '0' && tk <= '9') {
-			if ((ival = tk) - '0') {
-				while (*p >= '0' && *p <= '9')
-					ival = ival * 10 + *p++ - '0';
-			} else if (*p == 'x' || *p == 'X') {
-				while ((tk = *++p) &&
-				       ((tk >= '0' && tk <= '9') || (tk >= 'a' && tk <= 'f') ||
-					(tk >= 'A' && tk <= 'F')))
-					ival = ival * 16 + (tk & 15) + (tk >= 'A' ? 9 : 0);
-			} else {
-				while (*p >= '0' && *p <= '7')
-					ival = ival * 8 + *p++ - '0';
-			}
-			tk = Num;
-			return;
-		} else if (tk == '/') {
-			if (*p == '/') {
-				++p;
-				while (*p != 0 && *p != '\n')
-					++p;
-			} else {
-				tk = Div;
-				return;
-			}
-		} else if (tk == '\'' || tk == '"') {
-			pp = data;
-			while (*p != 0 && *p != tk) {
-				if ((ival = *p++) == '\\') {
-					if ((ival = *p++) == 'n')
-						ival = '\n';
-				}
-				if (tk == '"')
-					*data++ = ival;
-			}
-			++p;
-			if (tk == '"')
-				ival = (int)pp;
-			else
-				tk = Num;
-			return;
-		} else if (tk == '=') {
-			if (*p == '=') {
-				++p;
-				tk = Eq;
-			} else
-				tk = Assign;
-			return;
-		} else if (tk == '+') {
-			if (*p == '+') {
-				++p;
-				tk = Inc;
-			} else
-				tk = Add;
-			return;
-		} else if (tk == '-') {
-			if (*p == '-') {
-				++p;
-				tk = Dec;
-			} else
-				tk = Sub;
-			return;
-		} else if (tk == '!') {
-			if (*p == '=') {
-				++p;
-				tk = Ne;
-			}
-			return;
-		} else if (tk == '<') {
-			if (*p == '=') {
-				++p;
-				tk = Le;
-			} else if (*p == '<') {
-				++p;
-				tk = Shl;
-			} else
-				tk = Lt;
-			return;
-		} else if (tk == '>') {
-			if (*p == '=') {
-				++p;
-				tk = Ge;
-			} else if (*p == '>') {
-				++p;
-				tk = Shr;
-			} else
-				tk = Gt;
-			return;
-		} else if (tk == '|') {
-			if (*p == '|') {
-				++p;
-				tk = Lor;
-			} else
-				tk = Or;
-			return;
-		} else if (tk == '&') {
-			if (*p == '&') {
-				++p;
-				tk = Lan;
-			} else
-				tk = And;
-			return;
-		} else if (tk == '^') {
-			tk = Xor;
-			return;
-		} else if (tk == '%') {
-			tk = Mod;
-			return;
-		} else if (tk == '*') {
-			tk = Mul;
-			return;
-		} else if (tk == '[') {
-			tk = Brak;
-			return;
-		} else if (tk == '?') {
-			tk = Cond;
-			return;
-		} else if (tk == '~' || tk == ';' || tk == '{' || tk == '}' || tk == '(' ||
-			   tk == ')' || tk == ']' || tk == ',' || tk == ':')
-			return;
-	}
-}
-
-void expr(int lev)
-{
-	int t, *d;
-
-	if (!tk) {
-		printf("%d: unexpected eof in expression\n", line);
-		exit(-1);
-	} else if (tk == Num) {
-		*++e = IMM;
-		*++e = ival;
-		next();
-		ty = INT;
-	} else if (tk == '"') {
-		*++e = IMM;
-		*++e = ival;
-		next();
-		while (tk == '"')
-			next();
-		data = (char *)(((int)data + sizeof(int)) & -sizeof(int));
-		ty = PTR;
-	} else if (tk == Sizeof) {
-		next();
-		if (tk == '(')
-			next();
-		else {
-			printf("%d: open paren expected in sizeof\n", line);
-			exit(-1);
-		}
-		ty = INT;
-		if (tk == Int)
-			next();
-		else if (tk == Char) {
-			next();
-			ty = CHAR;
-		}
-		while (tk == Mul) {
-			next();
-			ty = ty + PTR;
-		}
-		if (tk == ')')
-			next();
-		else {
-			printf("%d: close paren expected in sizeof\n", line);
-			exit(-1);
-		}
-		*++e = IMM;
-		*++e = (ty == CHAR) ? sizeof(char) : sizeof(int);
-		ty = INT;
-	} else if (tk == Id) {
-		d = id;
-		next();
-		if (tk == '(') {
-			next();
-			t = 0;
-			while (tk != ')') {
-				expr(Assign);
-				*++e = PSH;
-				++t;
-				if (tk == ',')
-					next();
-			}
-			next();
-			if (d[Class] == Sys)
-				*++e = d[Val];
-			else if (d[Class] == Fun) {
-				*++e = JSR;
-				*++e = d[Val];
-			} else {
-				printf("%d: bad function call\n", line);
-				exit(-1);
-			}
-			if (t) {
-				*++e = ADJ;
-				*++e = t;
-			}
-			ty = d[Type];
-		} else if (d[Class] == Num) {
-			*++e = IMM;
-			*++e = d[Val];
-			ty = INT;
-		} else {
-			if (d[Class] == Loc) {
-				*++e = LEA;
-				*++e = loc - d[Val];
-			} else if (d[Class] == Glo) {
-				*++e = IMM;
-				*++e = d[Val];
-			} else {
-				printf("%d: undefined variable\n", line);
-				exit(-1);
-			}
-			*++e = ((ty = d[Type]) == CHAR) ? LC : LI;
-		}
-	} else if (tk == '(') {
-		next();
-		if (tk == Int || tk == Char) {
-			t = (tk == Int) ? INT : CHAR;
-			next();
-			while (tk == Mul) {
-				next();
-				t = t + PTR;
-			}
-			if (tk == ')')
-				next();
-			else {
-				printf("%d: bad cast\n", line);
-				exit(-1);
-			}
-			expr(Inc);
-			ty = t;
-		} else {
-			expr(Assign);
-			if (tk == ')')
-				next();
-			else {
-				printf("%d: close paren expected\n", line);
-				exit(-1);
-			}
-		}
-	} else if (tk == Mul) {
-		next();
-		expr(Inc);
-		if (ty > INT)
-			ty = ty - PTR;
-		else {
-			printf("%d: bad dereference\n", line);
-			exit(-1);
-		}
-		*++e = (ty == CHAR) ? LC : LI;
-	} else if (tk == And) {
-		next();
-		expr(Inc);
-		if (*e == LC || *e == LI)
-			--e;
-		else {
-			printf("%d: bad address-of\n", line);
-			exit(-1);
-		}
-		ty = ty + PTR;
-	} else if (tk == '!') {
-		next();
-		expr(Inc);
-		*++e = PSH;
-		*++e = IMM;
-		*++e = 0;
-		*++e = EQ;
-		ty = INT;
-	} else if (tk == '~') {
-		next();
-		expr(Inc);
-		*++e = PSH;
-		*++e = IMM;
-		*++e = -1;
-		*++e = XOR;
-		ty = INT;
-	} else if (tk == Add) {
-		next();
-		expr(Inc);
-		ty = INT;
-	} else if (tk == Sub) {
-		next();
-		*++e = IMM;
-		if (tk == Num) {
-			*++e = -ival;
-			next();
-		} else {
-			*++e = -1;
-			*++e = PSH;
-			expr(Inc);
-			*++e = MUL;
-		}
-		ty = INT;
-	} else if (tk == Inc || tk == Dec) {
-		t = tk;
-		next();
-		expr(Inc);
-		if (*e == LC) {
-			*e = PSH;
-			*++e = LC;
-		} else if (*e == LI) {
-			*e = PSH;
-			*++e = LI;
-		} else {
-			printf("%d: bad lvalue in pre-increment\n", line);
-			exit(-1);
-		}
-		*++e = PSH;
-		*++e = IMM;
-		*++e = (ty > PTR) ? sizeof(int) : sizeof(char);
-		*++e = (t == Inc) ? ADD : SUB;
-		*++e = (ty == CHAR) ? SC : SI;
-	} else {
-		printf("%d: bad expression\n", line);
-		exit(-1);
-	}
-
-	while (tk >= lev) { // "precedence climbing" or "Top Down Operator Precedence" method
-		t = ty;
-		if (tk == Assign) {
-			next();
-			if (*e == LC || *e == LI)
-				*e = PSH;
-			else {
-				printf("%d: bad lvalue in assignment\n", line);
-				exit(-1);
-			}
-			expr(Assign);
-			*++e = ((ty = t) == CHAR) ? SC : SI;
-		} else if (tk == Cond) {
-			next();
-			*++e = BZ;
-			d = ++e;
-			expr(Assign);
-			if (tk == ':')
-				next();
-			else {
-				printf("%d: conditional missing colon\n", line);
-				exit(-1);
-			}
-			*d = (int)(e + 3);
-			*++e = JMP;
-			d = ++e;
-			expr(Cond);
-			*d = (int)(e + 1);
-		} else if (tk == Lor) {
-			next();
-			*++e = BNZ;
-			d = ++e;
-			expr(Lan);
-			*d = (int)(e + 1);
-			ty = INT;
-		} else if (tk == Lan) {
-			next();
-			*++e = BZ;
-			d = ++e;
-			expr(Or);
-			*d = (int)(e + 1);
-			ty = INT;
-		} else if (tk == Or) {
-			next();
-			*++e = PSH;
-			expr(Xor);
-			*++e = OR;
-			ty = INT;
-		} else if (tk == Xor) {
-			next();
-			*++e = PSH;
-			expr(And);
-			*++e = XOR;
-			ty = INT;
-		} else if (tk == And) {
-			next();
-			*++e = PSH;
-			expr(Eq);
-			*++e = AND;
-			ty = INT;
-		} else if (tk == Eq) {
-			next();
-			*++e = PSH;
-			expr(Lt);
-			*++e = EQ;
-			ty = INT;
-		} else if (tk == Ne) {
-			next();
-			*++e = PSH;
-			expr(Lt);
-			*++e = NE;
-			ty = INT;
-		} else if (tk == Lt) {
-			next();
-			*++e = PSH;
-			expr(Shl);
-			*++e = LT;
-			ty = INT;
-		} else if (tk == Gt) {
-			next();
-			*++e = PSH;
-			expr(Shl);
-			*++e = GT;
-			ty = INT;
-		} else if (tk == Le) {
-			next();
-			*++e = PSH;
-			expr(Shl);
-			*++e = LE;
-			ty = INT;
-		} else if (tk == Ge) {
-			next();
-			*++e = PSH;
-			expr(Shl);
-			*++e = GE;
-			ty = INT;
-		} else if (tk == Shl) {
-			next();
-			*++e = PSH;
-			expr(Add);
-			*++e = SHL;
-			ty = INT;
-		} else if (tk == Shr) {
-			next();
-			*++e = PSH;
-			expr(Add);
-			*++e = SHR;
-			ty = INT;
-		} else if (tk == Add) {
-			next();
-			*++e = PSH;
-			expr(Mul);
-			if ((ty = t) > PTR) {
-				*++e = PSH;
-				*++e = IMM;
-				*++e = sizeof(int);
-				*++e = MUL;
-			}
-			*++e = ADD;
-		} else if (tk == Sub) {
-			next();
-			*++e = PSH;
-			expr(Mul);
-			if (t > PTR && t == ty) {
-				*++e = SUB;
-				*++e = PSH;
-				*++e = IMM;
-				*++e = sizeof(int);
-				*++e = DIV;
-				ty = INT;
-			} else if ((ty = t) > PTR) {
-				*++e = PSH;
-				*++e = IMM;
-				*++e = sizeof(int);
-				*++e = MUL;
-				*++e = SUB;
-			} else
-				*++e = SUB;
-		} else if (tk == Mul) {
-			next();
-			*++e = PSH;
-			expr(Inc);
-			*++e = MUL;
-			ty = INT;
-		} else if (tk == Div) {
-			next();
-			*++e = PSH;
-			expr(Inc);
-			*++e = DIV;
-			ty = INT;
-		} else if (tk == Mod) {
-			next();
-			*++e = PSH;
-			expr(Inc);
-			*++e = MOD;
-			ty = INT;
-		} else if (tk == Inc || tk == Dec) {
-			if (*e == LC) {
-				*e = PSH;
-				*++e = LC;
-			} else if (*e == LI) {
-				*e = PSH;
-				*++e = LI;
-			} else {
-				printf("%d: bad lvalue in post-increment\n", line);
-				exit(-1);
-			}
-			*++e = PSH;
-			*++e = IMM;
-			*++e = (ty > PTR) ? sizeof(int) : sizeof(char);
-			*++e = (tk == Inc) ? ADD : SUB;
-			*++e = (ty == CHAR) ? SC : SI;
-			*++e = PSH;
-			*++e = IMM;
-			*++e = (ty > PTR) ? sizeof(int) : sizeof(char);
-			*++e = (tk == Inc) ? SUB : ADD;
-			next();
-		} else if (tk == Brak) {
-			next();
-			*++e = PSH;
-			expr(Assign);
-			if (tk == ']')
-				next();
-			else {
-				printf("%d: close bracket expected\n", line);
-				exit(-1);
-			}
-			if (t > PTR) {
-				*++e = PSH;
-				*++e = IMM;
-				*++e = sizeof(int);
-				*++e = MUL;
-			} else if (t < PTR) {
-				printf("%d: pointer type expected\n", line);
-				exit(-1);
-			}
-			*++e = ADD;
-			*++e = ((ty = t - PTR) == CHAR) ? LC : LI;
-		} else {
-			printf("%d: compiler error tk=%d\n", line, tk);
-			exit(-1);
-		}
-	}
-}
-
-void stmt()
-{
-	int *a, *b;
-
-	if (tk == If) {
-		next();
-		if (tk == '(')
-			next();
-		else {
-			printf("%d: open paren expected\n", line);
-			exit(-1);
-		}
-		expr(Assign);
-		if (tk == ')')
-			next();
-		else {
-			printf("%d: close paren expected\n", line);
-			exit(-1);
-		}
-		*++e = BZ;
-		b = ++e;
-		stmt();
-		if (tk == Else) {
-			*b = (int)(e + 3);
-			*++e = JMP;
-			b = ++e;
-			next();
-			stmt();
-		}
-		*b = (int)(e + 1);
-	} else if (tk == While) {
-		next();
-		a = e + 1;
-		if (tk == '(')
-			next();
-		else {
-			printf("%d: open paren expected\n", line);
-			exit(-1);
-		}
-		expr(Assign);
-		if (tk == ')')
-			next();
-		else {
-			printf("%d: close paren expected\n", line);
-			exit(-1);
-		}
-		*++e = BZ;
-		b = ++e;
-		stmt();
-		*++e = JMP;
-		*++e = (int)a;
-		*b = (int)(e + 1);
-	} else if (tk == Return) {
-		next();
-		if (tk != ';')
-			expr(Assign);
-		*++e = LEV;
-		if (tk == ';')
-			next();
-		else {
-			printf("%d: semicolon expected\n", line);
-			exit(-1);
-		}
-	} else if (tk == '{') {
-		next();
-		while (tk != '}')
-			stmt();
-		next();
-	} else if (tk == ';') {
-		next();
-	} else {
-		expr(Assign);
-		if (tk == ';')
-			next();
-		else {
-			printf("%d: semicolon expected\n", line);
-			exit(-1);
-		}
-	}
-}
-
-int main(int argc, char **argv)
-{
-	int bt, poolsz, *idmain;
-	int *pc, *sp, *bp, a, cycle; // vm registers
-	int i, *t; // temps
-
-	--argc;
-	++argv;
-	if (argc < 1) {
-		printf("usage: cc file ...\n");
-		return -1;
-	}
-
-	poolsz = 256 * 1024; // arbitrary size
-	if (!(sym = malloc(poolsz))) {
-		printf("could not malloc(%d) symbol area\n", poolsz);
-		return -1;
-	}
-	if (!(le = e = malloc(poolsz))) {
-		printf("could not malloc(%d) text area\n", poolsz);
-		return -1;
-	}
-	if (!(data = malloc(poolsz))) {
-		printf("could not malloc(%d) data area\n", poolsz);
-		return -1;
-	}
-	if (!(sp = malloc(poolsz))) {
-		printf("could not malloc(%d) stack area\n", poolsz);
-		return -1;
-	}
-
-	memset(sym, 0, poolsz);
-	memset(e, 0, poolsz);
-	memset(data, 0, poolsz);
-
-	p = strdup("char else enum if int return sizeof while "
-		   "open read close printf malloc free memset memcmp exit void main");
-	i = Char;
-	while (i <= While) {
-		next();
-		id[Tk] = i++;
-	} // add keywords to symbol table
-	i = OPEN;
-	while (i <= EXIT) {
-		next();
-		id[Class] = Sys;
-		id[Type] = INT;
-		id[Val] = i++;
-	} // add library to symbol table
-	next();
-	id[Tk] = Char; // handle void type
-	next();
-	idmain = id; // keep track of main
-
-	if (!(lp = p = malloc(poolsz))) {
-		printf("could not malloc(%d) source area\n", poolsz);
-		return -1;
-	}
-
-	void *file;
-	if (!(file = sread(*argv))) {
-		printf("could not read file %s\n", *argv);
-		return -1;
-	}
-
-	memcpy(p, file, poolsz - 1);
-	//p[i] = 0;
-
-	// parse declarations
-	line = 1;
-	next();
-	while (tk) {
-		bt = INT; // basetype
-		if (tk == Int)
-			next();
-		else if (tk == Char) {
-			next();
-			bt = CHAR;
-		} else if (tk == Enum) {
-			next();
-			if (tk != '{')
-				next();
-			if (tk == '{') {
-				next();
-				i = 0;
-				while (tk != '}') {
-					if (tk != Id) {
-						printf("%d: bad enum identifier %d\n", line, tk);
-						return -1;
-					}
-					next();
-					if (tk == Assign) {
-						next();
-						if (tk != Num) {
-							printf("%d: bad enum initializer\n", line);
-							return -1;
-						}
-						i = ival;
-						next();
-					}
-					id[Class] = Num;
-					id[Type] = INT;
-					id[Val] = i++;
-					if (tk == ',')
-						next();
-				}
-				next();
-			}
-		}
-		while (tk != ';' && tk != '}') {
-			ty = bt;
-			while (tk == Mul) {
-				next();
-				ty = ty + PTR;
-			}
-			if (tk != Id) {
-				printf("%d: bad global declaration\n", line);
-				return -1;
-			}
-			if (id[Class]) {
-				printf("%d: duplicate global definition\n", line);
-				return -1;
-			}
-			next();
-			id[Type] = ty;
-			if (tk == '(') { // function
-				id[Class] = Fun;
-				id[Val] = (int)(e + 1);
-				next();
-				i = 0;
-				while (tk != ')') {
-					ty = INT;
-					if (tk == Int)
-						next();
-					else if (tk == Char) {
-						next();
-						ty = CHAR;
-					}
-					while (tk == Mul) {
-						next();
-						ty = ty + PTR;
-					}
-					if (tk != Id) {
-						printf("%d: bad parameter declaration\n", line);
-						return -1;
-					}
-					if (id[Class] == Loc) {
-						printf("%d: duplicate parameter definition\n",
-						       line);
-						return -1;
-					}
-					id[HClass] = id[Class];
-					id[Class] = Loc;
-					id[HType] = id[Type];
-					id[Type] = ty;
-					id[HVal] = id[Val];
-					id[Val] = i++;
-					next();
-					if (tk == ',')
-						next();
-				}
-				next();
-				if (tk != '{') {
-					printf("%d: bad function definition\n", line);
-					return -1;
-				}
-				loc = ++i;
-				next();
-				while (tk == Int || tk == Char) {
-					bt = (tk == Int) ? INT : CHAR;
-					next();
-					while (tk != ';') {
-						ty = bt;
-						while (tk == Mul) {
-							next();
-							ty = ty + PTR;
-						}
-						if (tk != Id) {
-							printf("%d: bad local declaration\n", line);
-							return -1;
-						}
-						if (id[Class] == Loc) {
-							printf("%d: duplicate local definition\n",
-							       line);
-							return -1;
-						}
-						id[HClass] = id[Class];
-						id[Class] = Loc;
-						id[HType] = id[Type];
-						id[Type] = ty;
-						id[HVal] = id[Val];
-						id[Val] = ++i;
-						next();
-						if (tk == ',')
-							next();
-					}
-					next();
-				}
-				*++e = ENT;
-				*++e = i - loc;
-				while (tk != '}')
-					stmt();
-				*++e = LEV;
-				id = sym; // unwind symbol table locals
-				while (id[Tk]) {
-					if (id[Class] == Loc) {
-						id[Class] = id[HClass];
-						id[Type] = id[HType];
-						id[Val] = id[HVal];
-					}
-					id = id + Idsz;
-				}
-			} else {
-				id[Class] = Glo;
-				id[Val] = (int)data;
-				data = data + sizeof(int);
-			}
-			if (tk == ',')
-				next();
-		}
-		next();
-	}
-
-	if (!(pc = (int *)idmain[Val])) {
-		printf("main() not defined\n");
-		return -1;
-	}
-
-	// setup stack
-	bp = sp = (int *)((int)sp + poolsz);
-	*--sp = EXIT; // call exit if main returns
-	*--sp = PSH;
-	t = sp;
-	*--sp = argc;
-	*--sp = (int)argv;
-	*--sp = (int)t;
-
-	// run...
-	cycle = a = 0;
-	while (1) {
-		i = *pc++;
-		++cycle;
-		if (i == LEA)
-			a = (int)(bp + *pc++); // load local address
-		else if (i == IMM)
-			a = *pc++; // load global address or immediate
-		else if (i == JMP)
-			pc = (int *)*pc; // jump
-		else if (i == JSR) {
-			*--sp = (int)(pc + 1);
-			pc = (int *)*pc;
-		} // jump to subroutine
-		else if (i == BZ)
-			pc = a ? pc + 1 : (int *)*pc; // branch if zero
-		else if (i == BNZ)
-			pc = a ? (int *)*pc : pc + 1; // branch if not zero
-		else if (i == ENT) {
-			*--sp = (int)bp;
-			bp = sp;
-			sp = sp - *pc++;
-		} // enter subroutine
-		else if (i == ADJ)
-			sp = sp + *pc++; // stack adjust
-		else if (i == LEV) {
-			sp = bp;
-			bp = (int *)*sp++;
-			pc = (int *)*sp++;
-		} // leave subroutine
-		else if (i == LI)
-			a = *(int *)a; // load int
-		else if (i == LC)
-			a = *(char *)a; // load char
-		else if (i == SI)
-			*(int *)*sp++ = a; // store int
-		else if (i == SC)
-			a = *(char *)*sp++ = a; // store char
-		else if (i == PSH)
-			*--sp = a; // push
-
-		else if (i == OR)
-			a = *sp++ | a;
-		else if (i == XOR)
-			a = *sp++ ^ a;
-		else if (i == AND)
-			a = *sp++ & a;
-		else if (i == EQ)
-			a = *sp++ == a;
-		else if (i == NE)
-			a = *sp++ != a;
-		else if (i == LT)
-			a = *sp++ < a;
-		else if (i == GT)
-			a = *sp++ > a;
-		else if (i == LE)
-			a = *sp++ <= a;
-		else if (i == GE)
-			a = *sp++ >= a;
-		else if (i == SHL)
-			a = *sp++ << a;
-		else if (i == SHR)
-			a = *sp++ >> a;
-		else if (i == ADD)
-			a = *sp++ + a;
-		else if (i == SUB)
-			a = *sp++ - a;
-		else if (i == MUL)
-			a = *sp++ * a;
-		else if (i == DIV)
-			a = *sp++ / a;
-		else if (i == MOD)
-			a = *sp++ % a;
-
-		/* else if (i == OPEN) */
-		/* 	a = open((char *)sp[1], *sp); */
-		/* else if (i == READ) */
-		/* 	a = read(sp[2], (char *)sp[1], *sp); */
-		/* else if (i == CLOS) */
-		/* 	a = close(*sp); */
-		else if (i == PRTF) {
-			t = sp + pc[1];
-			a = printf((char *)t[-1], t[-2], t[-3], t[-4], t[-5], t[-6]);
-		} else if (i == MALC)
-			a = (int)malloc(*sp);
-		else if (i == FREE)
-			free((void *)*sp);
-		else if (i == MSET)
-			a = (int)memset((char *)sp[2], sp[1], *sp);
-		else if (i == MCMP)
-			a = memcmp((char *)sp[2], (char *)sp[1], *sp);
-		else if (i == EXIT) {
-			printf("exit(%d) cycle = %d\n", *sp, cycle);
-			return *sp;
-		} else {
-			printf("unknown instruction = %d! cycle = %d\n", i, cycle);
-			return -1;
-		}
-	}
-}
diff --git a/apps/chess/Makefile b/apps/chess/Makefile
new file mode 100644
index 0000000..b22cb1a
--- /dev/null
+++ b/apps/chess/Makefile
@@ -0,0 +1,12 @@
+# MIT License, Copyright (c) 2021 Marvin Borner
+
+OBJS = chess.o
+
+all: $(OBJS)
+	@$(LD) -o $(BUILD)/apps/chess $(LDFLAGS) $< -lgui -ltxt -lc
+
+clean:
+	@$(RM) -f $(OBJS)
+
+%.o: %.c
+	@$(CC) -c $(CFLAGS) $< -o $@
diff --git a/apps/chess.c b/apps/chess/chess.c
index 833edb0..833edb0 100644
--- a/apps/chess.c
+++ b/apps/chess/chess.c
diff --git a/apps/exec.c b/apps/exec.c
deleted file mode 100644
index ae7ca35..0000000
--- a/apps/exec.c
+++ /dev/null
@@ -1,59 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-
-#include <gui.h>
-#include <mem.h>
-#include <print.h>
-#include <str.h>
-#include <sys.h>
-
-#define PATH "/bin/"
-
-#define HEIGHT 32
-#define WIDTH 300
-
-void on_submit(struct gui_event_keyboard *event, struct element *elem)
-{
-	(void)event;
-	struct element_text_input *inp_elem = (struct element_text_input *)elem->data;
-	char *inp = inp_elem->text;
-
-	// TODO: Support more than one arg
-	char *inp_copy = strdup(inp);
-	char *space = inp_copy;
-	char *arg = NULL;
-	if ((space = strchr(space, ' '))) {
-		inp[space - inp_copy] = '\0';
-		space++;
-		arg = space;
-	}
-	free(inp_copy);
-
-	u8 l = strlen(PATH) + strlen(inp) + 1;
-	char *final = malloc(l);
-	final[0] = '\0';
-	strcat(final, PATH);
-	strcat(final, inp);
-
-	struct stat s = { 0 };
-	if (stat(final, &s) == 0 && s.size) {
-		inp_elem->color_bg = COLOR_WHITE;
-		exec(final, inp, arg, NULL);
-	} else {
-		inp_elem->color_bg = COLOR_BRIGHT_RED;
-	}
-	gui_sync(elem);
-}
-
-int main()
-{
-	log("exec loaded\n");
-	struct element *root = gui_init("Exec", WIDTH, HEIGHT, COLOR_BLACK);
-	struct element *input =
-		gui_add_text_input(root, 0, 0, 100, FONT_32, COLOR_WHITE, COLOR_BLACK);
-
-	input->event.on_submit = on_submit;
-
-	gui_event_loop(root);
-
-	return 0;
-}
diff --git a/apps/files.c b/apps/files.c
deleted file mode 100644
index df590d9..0000000
--- a/apps/files.c
+++ /dev/null
@@ -1,74 +0,0 @@
-// 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(const 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(const char *path)
-{
-	static struct element *list = NULL;
-	if (list)
-		gui_remove_element(list);
-	list = gui_add_container(root, 0, 0, 100, 100, COLOR_BLACK);
-
-	struct dirent *d = sread(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 = (char *)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/idle/Makefile b/apps/idle/Makefile
new file mode 100644
index 0000000..3060ae3
--- /dev/null
+++ b/apps/idle/Makefile
@@ -0,0 +1,12 @@
+# MIT License, Copyright (c) 2021 Marvin Borner
+
+OBJS = idle.o
+
+all: $(OBJS)
+	@$(LD) -o $(BUILD)/apps/idle $(LDFLAGS) $< -lc
+
+clean:
+	@$(RM) -f $(OBJS)
+
+%.o: %.c
+	@$(CC) -c $(CFLAGS) $< -o $@
diff --git a/apps/idle.c b/apps/idle/idle.c
index 43186ff..43186ff 100644
--- a/apps/idle.c
+++ b/apps/idle/idle.c
diff --git a/apps/init/Makefile b/apps/init/Makefile
new file mode 100644
index 0000000..7dec3e8
--- /dev/null
+++ b/apps/init/Makefile
@@ -0,0 +1,12 @@
+# MIT License, Copyright (c) 2021 Marvin Borner
+
+OBJS = init.o
+
+all: $(OBJS)
+	@$(LD) -o $(BUILD)/apps/init $(LDFLAGS) $< -lc
+
+clean:
+	@$(RM) -f $(OBJS)
+
+%.o: %.c
+	@$(CC) -c $(CFLAGS) $< -o $@
diff --git a/apps/init.c b/apps/init/init.c
index 4ad63f2..a7d07df 100644
--- a/apps/init.c
+++ b/apps/init/init.c
@@ -9,8 +9,8 @@ int main(int argc, char **argv)
 	UNUSED(argc);
 	UNUSED(argv);
 
-	assert(exec("/bin/wm", "wm", NULL) == 0);
-	assert(exec("/bin/chess", "chess", NULL) == 0);
+	assert(exec("/bin/wm", "wm", NULL) == EOK);
+	/* assert(exec("/bin/chess", "chess", NULL) == EOK); */
 
 	return 0;
 }
diff --git a/apps/mandelbrot.c b/apps/mandelbrot.c
deleted file mode 100644
index 2414281..0000000
--- a/apps/mandelbrot.c
+++ /dev/null
@@ -1,74 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-
-#include <conv.h>
-#include <def.h>
-#include <gfx.h>
-#include <input.h>
-#include <print.h>
-#include <random.h>
-#include <str.h>
-#include <sys.h>
-
-void draw_pixel(struct context *ctx, int x, int y, u32 c)
-{
-	int pos = x * (ctx->bpp >> 3) + y * ctx->pitch;
-	ctx->fb[pos + 0] = GET_BLUE(c);
-	ctx->fb[pos + 1] = GET_GREEN(c);
-	ctx->fb[pos + 2] = GET_RED(c);
-	ctx->fb[pos + 3] = GET_ALPHA(c);
-}
-
-void draw_mandelbrot(struct context *ctx, int resolution)
-{
-	int height = ctx->height;
-	int width = ctx->width;
-	int max = resolution;
-
-	for (int row = 0; row < height; row++) {
-		for (int col = 0; col < width; col++) {
-			double c_re = (col - width / 2.0) * 4.0 / width;
-			double c_im = (row - height / 2.0) * 4.0 / width;
-			double x = 0, y = 0;
-			int iteration = 0;
-			while (x * x + y * y <= 4 && iteration < max) {
-				double x_new = x * x - y * y + c_re;
-				y = 2 * x * y + c_im;
-				x = x_new;
-				iteration++;
-			}
-			srand(iteration);
-			if (iteration < max)
-				draw_pixel(ctx, col, row,
-					   rand() << 16 | rand() << 8 | rand() | 0xff000000);
-			else
-				draw_pixel(ctx, col, row, 0xff000000);
-
-			if (row % 50 == 0 && col == 0)
-				gfx_redraw();
-		}
-	}
-	gfx_redraw();
-	print("Rendered mandelbrot successfully\n");
-	yield();
-}
-
-int main()
-{
-	/* print("[mandelbrot context loaded]\n"); */
-
-	struct context ctx = { 0 };
-	ctx.x = 500;
-	ctx.y = 500;
-	ctx.width = 500;
-	ctx.height = 300;
-	gfx_new_ctx(&ctx);
-	gfx_fill(&ctx, COLOR_BG);
-
-	draw_mandelbrot(&ctx, 50);
-
-	while (1) {
-		yield();
-	};
-
-	return 0;
-}
diff --git a/apps/server.c b/apps/server.c
deleted file mode 100644
index 58d6091..0000000
--- a/apps/server.c
+++ /dev/null
@@ -1,55 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-
-#include <assert.h>
-#include <http.h>
-#include <mem.h>
-#include <net.h>
-#include <print.h>
-#include <str.h>
-
-#define PORT 8000
-#define PATH "/res/www"
-#define ERROR PATH "/404.html"
-
-int main()
-{
-	printf("Server running on port %d\n", PORT);
-
-	while (1) {
-		struct socket *socket = net_open(S_TCP);
-		assert(socket);
-		socket->src_port = PORT;
-		socket->state = S_CONNECTED;
-
-		char buf[4096] = { 0 };
-		if (!net_receive(socket, buf, 4096, NET_NO_TIMEOUT))
-			break;
-
-		char path[128] = { 0 };
-		strcat(path, PATH);
-		http_query_path(buf, path);
-		if (strlen(path) == strlen(PATH) + 1)
-			strcat(path, "index.html");
-
-		memset(buf, 0, 4096);
-
-		struct stat s_file = { 0 };
-		int res_file = stat(path, &s_file);
-
-		struct stat s_error = { 0 };
-		stat(ERROR, &s_error);
-
-		int len;
-		if (res_file == 0 && s_file.size)
-			len = http_response(HTTP_200, s_file.size, sread(path), buf);
-		else
-			len = http_response(HTTP_404, s_error.size, sread(ERROR), buf);
-
-		net_send(socket, buf, len);
-		net_close(socket);
-	}
-
-	print("Server closed!\n");
-
-	return 1;
-}
diff --git a/apps/test/Makefile b/apps/test/Makefile
new file mode 100644
index 0000000..7959154
--- /dev/null
+++ b/apps/test/Makefile
@@ -0,0 +1,12 @@
+# MIT License, Copyright (c) 2021 Marvin Borner
+
+OBJS = test.o
+
+all: $(OBJS)
+	@$(LD) -o $(BUILD)/apps/test $(LDFLAGS) $< -lc
+
+clean:
+	@$(RM) -f $(OBJS)
+
+%.o: %.c
+	@$(CC) -c $(CFLAGS) $< -o $@
diff --git a/apps/test.c b/apps/test/test.c
index ac1bb2c..ac1bb2c 100644
--- a/apps/test.c
+++ b/apps/test/test.c
diff --git a/apps/window.c b/apps/window.c
deleted file mode 100644
index de397a9..0000000
--- a/apps/window.c
+++ /dev/null
@@ -1,27 +0,0 @@
-// MIT License, Copyright (c) 2021 Marvin Borner
-
-#include <assert.h>
-#include <libgui/gui.h>
-#include <print.h>
-
-static void mousemove(vec2 pos)
-{
-	log("%d %d\n", pos.x, pos.y);
-}
-
-int main(void)
-{
-	u32 win;
-	assert((win = gui_new_window()) > 0);
-
-	u32 main;
-	assert((main = gui_new_widget(win, gui_window_size(win), vec2(0, 0))) > 0);
-
-	assert(gui_fill(win, main, COLOR_BLACK) == EOK);
-	assert(gui_redraw_widget(win, main) == EOK);
-
-	assert(gui_listen_widget(win, main, GUI_LISTEN_MOUSEMOVE, (u32)mousemove) == EOK);
-
-	gui_loop();
-	return 0;
-}
diff --git a/apps/wm/Makefile b/apps/wm/Makefile
new file mode 100644
index 0000000..66f68f6
--- /dev/null
+++ b/apps/wm/Makefile
@@ -0,0 +1,12 @@
+# MIT License, Copyright (c) 2021 Marvin Borner
+
+OBJS = wm.o
+
+all: $(OBJS)
+	@$(LD) -o $(BUILD)/apps/wm $(LDFLAGS) $< -lgui -ltxt -lc
+
+clean:
+	@$(RM) -f $(OBJS)
+
+%.o: %.c
+	@$(CC) -c $(CFLAGS) $< -o $@
diff --git a/apps/wm.c b/apps/wm/wm.c
index bc58793..0b3689f 100644
--- a/apps/wm.c
+++ b/apps/wm/wm.c
@@ -13,8 +13,6 @@
 #include <list.h>
 #include <random.h>
 
-//#define FLUSH_TIMEOUT 6
-
 struct client {
 	u32 pid;
 };
@@ -89,7 +87,7 @@ static void windows_at_rec(vec2 pos1, vec2 pos2, struct list *list)
 			vec2_add(win->pos, vec2(0, win->ctx.size.y)),
 		};
 
-		for (int i = 0; i < 4; i++) {
+		for (u8 i = 0; i < 4; i++) {
 			vec2 corner = corners[i];
 			if ((pos1.x <= corner.x && pos1.y <= corner.y) &&
 			    (pos2.x >= corner.x && pos2.y >= corner.y)) {
@@ -103,7 +101,7 @@ static void windows_at_rec(vec2 pos1, vec2 pos2, struct list *list)
 
 		vec2 win_pos1 = win->pos;
 		vec2 win_pos2 = vec2_add(win->pos, win->ctx.size);
-		for (int i = 0; i < 4; i++) {
+		for (u8 i = 0; i < 4; i++) {
 			vec2 corner = rec_corners[i];
 			if ((win_pos1.x <= corner.x && win_pos1.y <= corner.y) &&
 			    (win_pos2.x >= corner.x && win_pos2.y >= corner.y)) {
@@ -227,6 +225,7 @@ static struct window *window_new(struct client client, const char *name, struct
 		win->ctx.fb = NULL;
 	} else {
 		assert(shalloc(win->ctx.bytes, (u32 *)&win->ctx.fb, &win->shid) == EOK);
+		memset(win->ctx.fb, COLOR_BLACK, win->ctx.bytes);
 	}
 	win->client = client;
 	win->flags = flags;
@@ -267,6 +266,30 @@ static struct window *window_at(vec2 pos)
 static void window_redraw(struct window *win)
 {
 	// TODO: Only redraw difference of prev/curr (difficult with negative directions)
+	/*s32 diff_x = win->pos_prev.x - win->pos.x;
+	s32 diff_y = win->pos_prev.y - win->pos.y;
+
+	if (!diff_x && !diff_y)
+		return;
+
+	vec2 pos1 = { 0 };
+	vec2 pos2 = { 0 };
+
+	if (diff_x < 0) { // Right
+		pos1.x = win->pos_prev.x;
+		pos2.x = pos1.x + -diff_x;
+	} else if (diff_x > 0) { // Left
+		pos1 = win->pos_prev;
+		pos2.x = win->pos_prev.x + diff_x;
+		pos1.x = pos1.x - diff_x;
+	}
+
+	if (diff_y < 0) { // Down
+		pos1.y = win->pos_prev.y;
+		pos2.x = pos1.x + -diff_x;
+	} else if (diff_y > 0) { // Up
+	}*/
+
 	vec2 pos1 = win->pos_prev;
 	vec2 pos2 = vec2(pos1.x + win->ctx.size.x, pos1.y + win->ctx.size.y);
 
@@ -442,10 +465,23 @@ static void handle_exit(void)
 {
 	if (keymap)
 		free(keymap);
-	if (windows)
-		list_destroy(windows);
+
 	if (screen.fb)
 		memset(screen.fb, COLOR_RED, screen.height * screen.pitch);
+
+	if (windows) {
+		struct node *iterator = windows->head;
+		while (iterator) {
+			struct window *win = iterator->data;
+			if (win->ctx.fb == screen.fb)
+				sys_free(win->ctx.fb);
+			else if (win->ctx.fb)
+				free(win->ctx.fb);
+			free(win);
+			iterator = iterator->next;
+		}
+		list_destroy(windows);
+	}
 }
 
 /**
@@ -479,6 +515,7 @@ int main(int argc, char **argv)
 
 	/* gfx_write(&direct->ctx, vec2(0, 0), FONT_32, COLOR_FG, "Loading Melvix..."); */
 	gfx_load_wallpaper(&wallpaper->ctx, "/res/wall.png");
+	memset(cursor->ctx.fb, 0, cursor->ctx.bytes);
 	gfx_load_wallpaper(&cursor->ctx, "/res/cursor.png");
 	window_redraw(wallpaper);
 
@@ -502,7 +539,7 @@ int main(int argc, char **argv)
 					continue;
 				}
 			} else if (poll_ret == 2) {
-				if (msg_receive(msg, 1024) > 0) {
+				if (msg_receive(msg, sizeof(msg)) > 0) {
 					handle_message(msg);
 					continue;
 				}
@@ -511,5 +548,5 @@ int main(int argc, char **argv)
 		panic("Poll/read error: %s\n", strerror(errno));
 	}
 
-	return 0;
+	return 1;
 }