Text input demo

2 files changed, 41 insertions, 5 deletions

diff --git a/apps/window.c b/apps/window.c
index a38d121..6c71fc6 100644
--- a/apps/window.c
+++ b/apps/window.c
@@ -12,14 +12,14 @@ int main()
 	print("[test window loaded]\n");
 
 	struct window win = { 0 };
-	win.height = 200;
-	win.width = 300;
+	win.height = 400;
+	win.width = 600;
 	win.x = 50;
 	win.y = 50;
 	gui_new_window(&win);
 
 	gui_fill(&win, COLOR_BG);
-	gui_border(&win, COLOR_FG, 2);
+	/* gui_border(&win, COLOR_FG, 2); */
 
 	gui_init("/font/spleen-12x24.psfu");
 	char *hello = "Hello, world!";
@@ -34,12 +34,32 @@ int main()
 			continue;
 		}
 
+		// TODO: Export to text widget or sth
 		switch (msg->type) {
 		case WM_KEYBOARD: {
 			struct msg_keyboard *event = msg->data;
+			char ch = event->ch;
 			if (!event->press)
 				break;
-			gui_write_char(&win, 12 * char_x++, 24 * char_y + 5, COLOR_CYAN, event->ch);
+
+			if (ch == '\n') {
+				char_x = 0;
+				char_y++;
+			} else if (ch == '\t') {
+				char_x += 8;
+			} else if (ch == '\b') {
+				if (char_x > 0) {
+					char_x--;
+					gui_draw_rectangle(&win, 12 * char_x, 24 * char_y + 5,
+							   12 * (char_x + 1) - 1,
+							   24 * (char_y + 1) + 4, COLOR_BG);
+				}
+			} else if (ch == ' ' && event->scancode == KEY_SPACE) {
+				char_x++;
+			} else if (ch != ' ' && ch != '\0') {
+				gui_write_char(&win, 12 * char_x++, 24 * char_y + 5, COLOR_CYAN,
+					       ch);
+			}
 			break;
 		}
 		default:
diff --git a/apps/wm.c b/apps/wm.c
index 151c272..e016eda 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -155,12 +155,28 @@ static void handle_mouse(struct event_mouse *event)
 	mouse_skip++;
 }
 
+#define SHIFT_PRESSED 1 << 0
+#define ALT_PRESSED 1 << 1
+#define CTRL_PRESSED 1 << 2
+static u32 special_keys_pressed;
 static void handle_keyboard(struct event_keyboard *event)
 {
 	if (event->magic != KEYBOARD_MAGIC || !focused)
 		return;
+
 	struct msg_keyboard *msg = malloc(sizeof(*msg));
-	msg->ch = keymap->map[event->scancode];
+	if (event->scancode == KEY_LEFTSHIFT || event->scancode == KEY_RIGHTSHIFT)
+		special_keys_pressed ^= SHIFT_PRESSED;
+	else if (event->scancode == KEY_LEFTALT || event->scancode == KEY_RIGHTALT)
+		special_keys_pressed ^= ALT_PRESSED;
+	else if (event->scancode == KEY_LEFTCTRL || event->scancode == KEY_RIGHTCTRL)
+		special_keys_pressed ^= CTRL_PRESSED;
+
+	if (special_keys_pressed & SHIFT_PRESSED)
+		msg->ch = keymap->shift_map[event->scancode];
+	else
+		msg->ch = keymap->map[event->scancode];
+
 	msg->press = event->press;
 	msg->scancode = event->scancode;
 	msg_send(focused->pid, WM_KEYBOARD, msg);