Added killing combo

Isn't that dangerous though

3 files changed, 42 insertions, 5 deletions

diff --git a/apps/wm.c b/apps/wm.c
index 04947a4..de34c67 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -65,8 +65,6 @@ static void remove_context(struct context *ctx)
 	ctx->fb = NULL;
 	free(ctx);
 	ctx = NULL;
-	free(ctx);
-	ctx = NULL;
 }
 
 static struct context *context_at(int x, int y)
@@ -132,14 +130,24 @@ static void handle_keyboard(struct event_keyboard *event)
 	if (!focused)
 		return;
 
-	struct gui_event_keyboard *msg = malloc(sizeof(*msg));
+	// Special key combos
+	char ch = keymap->map[event->scancode];
+	if (event->press && special_keys_pressed & ALT_PRESSED && ch == 'q') {
+		msg_send(focused->pid, GUI_KILL, NULL);
+		remove_context(focused);
+		focused = NULL;
+		redraw_all();
+		return;
+	}
 
+	// Key maps
+	struct gui_event_keyboard *msg = malloc(sizeof(*msg));
 	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];
+		msg->ch = ch;
 
 	msg->press = event->press;
 	msg->scancode = event->scancode;
diff --git a/libgui/gui.c b/libgui/gui.c
index 8494221..cd5798c 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -110,6 +110,29 @@ static void remove_childs(struct element *elem)
 	list_destroy(elem->childs);
 }
 
+static void remove_window(struct window *win)
+{
+	if (!win || !win->childs || !win->childs->head)
+		return;
+
+	struct node *iterator = win->childs->head;
+	while (iterator != NULL) {
+		struct element *child = iterator->data;
+		remove_element(child);
+		iterator = iterator->next;
+	}
+
+	free_context(win->ctx);
+	list_destroy(win->childs);
+}
+
+static void remove_all()
+{
+	for (int i = 0; i < MAX_WINDOWS; i++) {
+		remove_window(&windows[i]);
+	}
+}
+
 static struct element *element_at(struct element *container, int x, int y)
 {
 	if (!container || !container->childs || !container->childs->head)
@@ -516,6 +539,10 @@ void gui_event_loop(struct element *container)
 		}
 
 		switch (msg->type) {
+		case GUI_KILL: {
+			remove_all();
+			exit(0);
+		}
 		case GUI_MOUSE: {
 			struct gui_event_mouse *event = msg->data;
 			focused = element_at(container, event->x, event->y);
@@ -564,6 +591,8 @@ void gui_event_loop(struct element *container)
 		}
 		}
 	}
+
+	exit(1);
 }
 
 struct element *gui_init(const char *title, u32 width, u32 height, u32 color_bg)
diff --git a/libgui/inc/gui.h b/libgui/inc/gui.h
index e44f566..331d8b1 100644
--- a/libgui/inc/gui.h
+++ b/libgui/inc/gui.h
@@ -13,7 +13,7 @@
 #define MAX_INPUT_LENGTH 100
 
 // TODO: Improve event types (maybe as struct header)
-enum window_event_type { GUI_KEYBOARD = GFX_MAX + 1, GUI_MOUSE, GUI_RESIZE, GUI_MAX };
+enum window_event_type { GUI_KILL, GUI_KEYBOARD = GFX_MAX + 1, GUI_MOUSE, GUI_RESIZE, GUI_MAX };
 enum element_type {
 	GUI_TYPE_ROOT,
 	GUI_TYPE_CONTAINER,