Added little keyboard demo and stuff

2 files changed, 37 insertions, 0 deletions

diff --git a/apps/test.c b/apps/test.c
index 6585c33..c542ca1 100644
--- a/apps/test.c
+++ b/apps/test.c
@@ -3,6 +3,7 @@
 #include <conv.h>
 #include <def.h>
 #include <gui.h>
+#include <input.h>
 #include <print.h>
 #include <str.h>
 
@@ -18,8 +19,39 @@ int main()
 	gui_init("/font/spleen-12x24.psfu");
 	char *hello = "Hello, world!";
 	gui_write(win, win->width / 2 - (strlen(hello) * 12) / 2, 5, FG_COLOR, hello);
+	event_register(EVENT_KEYBOARD);
 
+	struct message *msg;
+	int char_x = 0;
+	int char_y = 1;
 	while (1) {
+		if (!(msg = msg_receive())) {
+			yield();
+			continue;
+		}
+		switch (msg->type) {
+		case EVENT_KEYBOARD: {
+			struct event_keyboard *event = msg->data;
+
+			if (event->magic != KEYBOARD_MAGIC)
+				break;
+
+			if (!event->press)
+				break;
+
+			int key = event->scancode;
+			if (key == KEY_ENTER) {
+				char_x = 0;
+				char_y++;
+			} else if (KEY_ALPHABETIC(key)) {
+				gui_write_char(win, 12 * char_x++, 24 * char_y + 5, FG_COLOR, 'a');
+			}
+
+			break;
+		}
+		default:
+			break;
+		}
 		yield();
 	}
 	return 0;
diff --git a/apps/wm.c b/apps/wm.c
index 421971b..c45a30c 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -54,6 +54,8 @@ int main(int argc, char **argv)
 	vbe = (struct vbe *)argv[1];
 	printf("VBE: %dx%d\n", vbe->width, vbe->height);
 
+	gui_init("/font/spleen-16x32.psfu");
+
 	windows = list_new();
 	root = new_window(0, 0, vbe->width, vbe->height);
 	exchange = new_window(0, 0, vbe->width, vbe->height);
@@ -63,6 +65,9 @@ int main(int argc, char **argv)
 	direct->fb = vbe->fb;
 	list_add(windows, root);
 
+	gui_write(direct, 0, 0, FG_COLOR, "Welcome to Melvix!");
+	gui_write(direct, 0, 32, FG_COLOR, "Loading resources...");
+
 	gui_fill(root, BG_COLOR);
 	gui_border(root, FG_COLOR, 2);
 	gui_load_image(cursor, "/res/cursor.bmp", 0, 0);