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/wm.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'apps/wm.c') 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 #include #include +#include #include #include #include @@ -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