diff options
| author | Marvin Borner | 2020-08-22 15:08:57 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-08-22 15:08:57 +0200 |
| commit | d748a6f54ce7af45afde487936d5a02cb2a91b05 (patch) | |
| tree | 1ec6b0c8b3576fa15f21a305dfcad5196aac6e01 /apps | |
| parent | 00a64ff4675b4c1e22d6b4856e1f6b7c04ed96d8 (diff) | |
Added event resolving
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/init.c | 4 | ||||
| -rw-r--r-- | apps/wm.c | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/apps/init.c b/apps/init.c index 07977ee..ba3e15a 100644 --- a/apps/init.c +++ b/apps/init.c @@ -1,12 +1,8 @@ // MIT License, Copyright (c) 2020 Marvin Borner -#include <conv.h> #include <def.h> -#include <gui.h> -#include <mem.h> #include <print.h> #include <sys.h> -#include <vesa.h> int main(int argc, char **argv) { @@ -1,6 +1,5 @@ // MIT License, Copyright (c) 2020 Marvin Borner -#include <cpu.h> #include <def.h> #include <gui.h> #include <input.h> @@ -10,10 +9,11 @@ void onkey(u32 scancode) { - printf("KEY EVENT %d\n", scancode); + printf("WM KEY EVENT %d\n", scancode); if (KEY_ALPHANUMERIC(scancode)) { printf("ALPHANUMERIC!\n"); } + event_resolve(); } int main(int argc, char **argv) @@ -31,8 +31,7 @@ int main(int argc, char **argv) gui_init("/font/spleen-16x32.psfu"); gui_write(vbe, 50, 50, text, "hallo"); - printf("onkey: %x\n", onkey); - map(EVENT_KEYBOARD, onkey); + event_map(EVENT_KEYBOARD, onkey); while (1) { }; |