From 857c228909603d1a27a40f2714f8b9076fabba6e Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Tue, 15 Sep 2020 22:30:45 +0200
Subject: Keymaps n stuff

---
 apps/Makefile | 4 ++--
 apps/wm.c     | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'apps')

diff --git a/apps/Makefile b/apps/Makefile
index 84098c5..9ac92b7 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -5,14 +5,14 @@ CC = ../cross/opt/bin/i686-elf-gcc
 LD = ../cross/opt/bin/i686-elf-ld
 OC = ../cross/opt/bin/i686-elf-objcopy
 
-CFLAGS = -Wall -Wextra -nostdlib -nostdinc -fno-builtin -std=c99 -m32 -pedantic-errors -I../libc/inc/ -I../libgui/inc/ -fPIE -Duserspace -Os
+CFLAGS = -Wall -Wextra -nostdlib -nostdinc -fno-builtin -std=c99 -m32 -pedantic-errors -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -fPIE -Duserspace -Os
 
 all: $(COBJS)
 
 %.o: %.c
 	@mkdir -p ../build/apps/
 	@$(CC) -c $(CFLAGS) $< -o $@
-	@$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lc -lgui
+	@$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lc -lgui -ltxt
 	@$(OC) -O binary $(@:.o=.elf) ../build/apps/$(@:.o=)
 # @cp $(@:.o=.elf) ../build/apps/$(@:.o=.dbg)
 
diff --git a/apps/wm.c b/apps/wm.c
index ca032e7..0f7bf95 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -5,6 +5,7 @@
 #include <def.h>
 #include <gui.h>
 #include <input.h>
+#include <keymap.h>
 #include <list.h>
 #include <mem.h>
 #include <print.h>
@@ -23,6 +24,8 @@ static struct window cursor; // Cursor bitmap window
 static struct window *focused; // The focused window
 static struct list *windows; // List of all windows
 
+static struct keymap *keymap;
+
 static int mouse_x = 0;
 static int mouse_y = 0;
 
@@ -48,15 +51,16 @@ static struct window *window_at(int x, int y)
 	if (!windows->head || !windows->head->data)
 		return NULL;
 
+	struct window *ret = NULL;
 	struct node *iterator = windows->head;
 	while (iterator != NULL) {
 		struct window *win = iterator->data;
 		if (win != &root && x >= win->x && x <= win->x + (int)win->width && y >= win->y &&
 		    y <= win->y + (int)win->height)
-			return win;
+			ret = win;
 		iterator = iterator->next;
 	}
-	return NULL;
+	return ret;
 }
 
 static void redraw_all()
@@ -155,6 +159,7 @@ int main(int argc, char **argv)
 	vbe = *(struct vbe *)argv[1];
 	printf("VBE: %dx%d\n", vbe.width, vbe.height);
 
+	keymap = keymap_parse("/res/keymaps/en.keymap");
 	gui_init("/font/spleen-16x32.psfu");
 
 	windows = list_new();
-- 
cgit v1.2.3