Added mouse driver and better event system

7 files changed, 244 insertions, 16 deletions

diff --git a/apps/wm.c b/apps/wm.c
index c6a1a31..1e1a8bc 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -1,5 +1,7 @@
 // MIT License, Copyright (c) 2020 Marvin Borner
 
+#include <assert.h>
+#include <cpu.h>
 #include <def.h>
 #include <gui.h>
 #include <input.h>
@@ -15,7 +17,10 @@ struct window *direct; // Direct video memory window
 struct window *root; // Root window (wallpaper etc.)
 struct window *exchange; // Exchange buffer
 struct window *focused; // The focused window
-struct list *windows;
+struct list *windows; // List of all windows
+
+int mouse_x = 0;
+int mouse_y = 0;
 
 static struct window *new_window(int x, int y, u16 width, u16 height)
 {
@@ -30,6 +35,18 @@ static struct window *new_window(int x, int y, u16 width, u16 height)
 	return win;
 }
 
+static void redraw_all()
+{
+	if (windows->head && windows->head->data) {
+		struct node *iterator = windows->head;
+		do {
+			struct window *win = iterator->data;
+			gui_win_on_win(exchange, win, win->x, win->y);
+		} while ((iterator = iterator->next) != NULL);
+		memcpy(direct->fb, exchange->fb, exchange->pitch * exchange->height);
+	}
+}
+
 int main(int argc, char **argv)
 {
 	(void)argc;
@@ -56,6 +73,7 @@ int main(int argc, char **argv)
 	/* gui_load_wallpaper(root, "/wall.bmp"); */
 
 	event_register(EVENT_KEYBOARD);
+	event_register(EVENT_MOUSE);
 
 	struct message *msg;
 	while (1) {
@@ -73,22 +91,41 @@ int main(int argc, char **argv)
 			list_add(windows, win);
 			focused = win;
 			break;
-		case EVENT_KEYBOARD:
-			printf("Keypress %d!\n", msg->data);
-			focused->x += 50;
-			if (windows->head && windows->head->data) {
-				struct node *iterator = windows->head;
-				do {
-					struct window *win = iterator->data;
-					gui_win_on_win(exchange, win, win->x, win->y);
-				} while ((iterator = iterator->next) != NULL);
-				memcpy(direct->fb, exchange->fb,
-				       exchange->pitch * exchange->height);
-			}
+		case EVENT_KEYBOARD: {
+			struct event_keyboard *event = msg->data;
+			assert(event->magic == KEYBOARD_MAGIC);
+			printf("Keypress %d %s!\n", event->scancode,
+			       event->press ? "pressed" : "released");
+			/* focused->x += 50; */
+			/* redraw_all(); */
+			break;
+		}
+		case EVENT_MOUSE: {
+			struct event_mouse *event = msg->data;
+			assert(event->magic == MOUSE_MAGIC);
+			mouse_x += event->diff_x;
+			mouse_y -= event->diff_y;
+
+			if (mouse_x < 0)
+				mouse_x = 0;
+			else if (mouse_x > vbe->width - 1)
+				mouse_x = vbe->width - 1;
+
+			if (mouse_y < 0)
+				mouse_y = 0;
+			else if (mouse_y > vbe->height - 1)
+				mouse_y = vbe->height - 1;
+
+			focused->x = mouse_x;
+			focused->y = mouse_y;
+			redraw_all();
+			printf("%d %d\n", mouse_x, mouse_y);
 			break;
+		}
 		default:
 			printf("Unknown WM request %d from pid %d\n", msg->type, msg->src);
 		}
+		yield();
 	};
 
 	return 0;
diff --git a/kernel/Makefile b/kernel/Makefile
index e119933..07f985a 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -4,6 +4,7 @@ COBJS = main.o \
 	drivers/interrupts.o \
 	drivers/interrupts_asm.o \
 	drivers/keyboard.o \
+	drivers/mouse.o \
 	drivers/ide.o \
 	drivers/timer.o \
 	features/fs.o \
diff --git a/kernel/drivers/keyboard.c b/kernel/drivers/keyboard.c
index b60e437..14445d4 100644
--- a/kernel/drivers/keyboard.c
+++ b/kernel/drivers/keyboard.c
@@ -4,9 +4,12 @@
 #include <def.h>
 #include <event.h>
 #include <interrupts.h>
+#include <mem.h>
 #include <print.h>
+#include <sys.h>
 
 char keymap[128];
+struct event_keyboard *event;
 
 int state = 0;
 int merged = 0;
@@ -26,9 +29,10 @@ void keyboard_handler()
 	// TODO: "Merge" scancode to linux keycode?
 	/* printf("%x %x = %x\n", scancode, state ? 0xe0 : 0, merged); */
 
-	if ((scancode & 0x80) == 0) { // PRESS
-		event_trigger(EVENT_KEYBOARD, (u32 *)scancode);
-	}
+	event->magic = KEYBOARD_MAGIC;
+	event->press = (scancode & 0x80) == 0;
+	event->scancode = event->press ? scancode : scancode & ~0x80;
+	event_trigger(EVENT_KEYBOARD, event);
 
 	state = 0;
 	merged = 0;
@@ -50,6 +54,7 @@ void keyboard_rate()
 void keyboard_install()
 {
 	//keyboard_rate(); TODO: Fix keyboard rate?
+	event = malloc(sizeof(*event));
 	irq_install_handler(1, keyboard_handler);
 }
 
diff --git a/kernel/drivers/mouse.c b/kernel/drivers/mouse.c
new file mode 100644
index 0000000..64204c3
--- /dev/null
+++ b/kernel/drivers/mouse.c
@@ -0,0 +1,157 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#include <cpu.h>
+#include <event.h>
+#include <interrupts.h>
+#include <mem.h>
+#include <print.h>
+#include <sys.h>
+
+char mouse_cycle = 0;
+char mouse_byte[3];
+
+struct event_mouse *event;
+
+void mouse_handler()
+{
+	switch (mouse_cycle) {
+	case 0:
+		mouse_byte[0] = inb(0x60);
+		if (((mouse_byte[0] >> 3) & 1) == 1)
+			mouse_cycle++;
+		else
+			mouse_cycle = 0;
+		break;
+	case 1:
+		mouse_byte[1] = inb(0x60);
+		mouse_cycle++;
+		break;
+	case 2:
+		mouse_byte[2] = inb(0x60);
+
+		event->magic = MOUSE_MAGIC;
+		event->diff_x = mouse_byte[1];
+		event->diff_y = mouse_byte[2];
+		event->but1 = mouse_byte[0] & 1;
+		event->but2 = (mouse_byte[0] >> 1) & 1;
+		event->but3 = (mouse_byte[0] >> 2) & 1;
+		event_trigger(EVENT_MOUSE, event);
+
+		mouse_cycle = 0;
+		break;
+	default:
+		break;
+	}
+}
+
+void mouse_wait(u8 a_type)
+{
+	u32 time_out = 100000;
+	if (a_type == 0) {
+		while (time_out--)
+			if ((inb(0x64) & 1) == 1)
+				return;
+		return;
+	} else {
+		while (time_out--)
+			if ((inb(0x64) & 2) == 0)
+				return;
+		return;
+	}
+}
+
+void mouse_write(u8 a_write)
+{
+	mouse_wait(1);
+	outb(0x64, 0xD4);
+	mouse_wait(1);
+	outb(0x60, a_write);
+}
+
+char mouse_read()
+{
+	mouse_wait(0);
+	return inb(0x60);
+}
+
+void mouse_install()
+{
+	event = malloc(sizeof(*event));
+
+	u8 status;
+
+	// Enable auxiliary mouse device
+	mouse_wait(1);
+	outb(0x64, 0xA8);
+
+	// Enable interrupts
+	mouse_wait(1);
+	outb(0x64, 0x20);
+	mouse_wait(0);
+	status = (u8)(inb(0x60) | 3);
+	mouse_wait(1);
+	outb(0x64, 0x60);
+	mouse_wait(1);
+	outb(0x60, status);
+
+	// Enable mousewheel
+	mouse_write(0xF2);
+	mouse_read();
+	mouse_read();
+	mouse_write(0xF3);
+	mouse_read();
+	mouse_write(200);
+	mouse_read();
+	mouse_write(0xF3);
+	mouse_read();
+	mouse_write(100);
+	mouse_read();
+	mouse_write(0xF3);
+	mouse_read();
+	mouse_write(80);
+	mouse_read();
+	mouse_write(0xF2);
+	mouse_read();
+	status = (u8)mouse_read();
+	if (status == 3)
+		printf("Scrollwheel support!\n");
+
+	// Activate 4th and 5th mouse buttons
+	mouse_write(0xF2);
+	mouse_read();
+	mouse_read();
+	mouse_write(0xF3);
+	mouse_read();
+	mouse_write(200);
+	mouse_read();
+	mouse_write(0xF3);
+	mouse_read();
+	mouse_write(200);
+	mouse_read();
+	mouse_write(0xF3);
+	mouse_read();
+	mouse_write(80);
+	mouse_read();
+	mouse_write(0xF2);
+	mouse_read();
+	status = (u8)mouse_read();
+	if (status == 4)
+		printf("4th and 5th mouse button support!\n");
+
+	/* TODO: Fix mouse laggyness
+    mouse_write(0xE8);
+    mouse_read();
+    mouse_write(0x03);
+    mouse_read();
+    mouse_write(0xF3);
+    mouse_read();
+    mouse_write(200);
+    mouse_read(); */
+
+	// Enable mouse
+	mouse_write(0xF4);
+	mouse_read();
+
+	// Setup the mouse handler
+	irq_install_handler(12, mouse_handler);
+}
diff --git a/kernel/inc/mouse.h b/kernel/inc/mouse.h
new file mode 100644
index 0000000..ccea383
--- /dev/null
+++ b/kernel/inc/mouse.h
@@ -0,0 +1,8 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef MOUSE_H
+#define MOUSE_H
+
+void mouse_install();
+
+#endif
diff --git a/kernel/main.c b/kernel/main.c
index 42f0d54..e97dad1 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -6,6 +6,7 @@
 #include <keyboard.h>
 #include <load.h>
 #include <mem.h>
+#include <mouse.h>
 #include <serial.h>
 #include <syscall.h>
 #include <timer.h>
@@ -25,6 +26,7 @@ void kernel_main(struct vid_info *vid_info)
 	interrupts_install();
 	timer_install();
 	keyboard_install();
+	mouse_install();
 
 	// Enable drivers
 	sti();
diff --git a/libc/inc/sys.h b/libc/inc/sys.h
index 77a8069..ebb3836 100644
--- a/libc/inc/sys.h
+++ b/libc/inc/sys.h
@@ -4,6 +4,9 @@
 #ifndef SYS_H
 #define SYS_H
 
+#define KEYBOARD_MAGIC 0x555555
+#define MOUSE_MAGIC 0xaaaaaa
+
 enum sys {
 	SYS_LOOP, // To infinity and beyond (debug)!
 	SYS_MALLOC, // Allocate memory
@@ -27,6 +30,21 @@ struct message {
 	void *data;
 };
 
+struct event_keyboard {
+	int magic;
+	int press;
+	int scancode;
+};
+
+struct event_mouse {
+	int magic;
+	int diff_x;
+	int diff_y;
+	int but1;
+	int but2;
+	int but3;
+};
+
 #if defined(userspace)
 
 int sys0(enum sys num);