Added basic PS/2 mouse support

4 files changed, 49 insertions, 14 deletions

diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
index 639ec2b..eb70583 100644
--- a/src/kernel/graphics/vesa.c
+++ b/src/kernel/graphics/vesa.c
@@ -341,6 +341,14 @@ void vesa_draw_number(int n) {
     vesa_draw_string(itoa(n, string));
 }
 
+void vesa_draw_cursor(int x, int y) {
+    if (x < 0) x = 0;
+    if (y < 0) y = 0;
+    if (x > vbe_width - 1) x = vbe_width - 1;
+    if (y > vbe_height - 1) y = vbe_height - 1;
+    vesa_draw_rectangle(x, y, x + font_width, y + font_height, terminal_color);
+}
+
 void vesa_set_color(uint32_t color) {
     vesa_convert_color(terminal_color, color);
     vesa_convert_color(terminal_background, default_background_color);
diff --git a/src/kernel/graphics/vesa.h b/src/kernel/graphics/vesa.h
index 8a16516..1e49cd0 100644
--- a/src/kernel/graphics/vesa.h
+++ b/src/kernel/graphics/vesa.h
@@ -118,6 +118,16 @@ void vbe_set_mode(unsigned short mode);
 void set_optimal_resolution();
 
 /**
+ * Draws a efficient rectangle
+ * @param x1 First X coordinate
+ * @param y1 First Y coordinate
+ * @param x2 Second X coordinate
+ * @param y2 Second Y coordinate
+ * @param color Rectangle color
+ */
+void vesa_draw_rectangle(int x1, int y1, int x2, int y2, const uint32_t color[3]);
+
+/**
  * Clears the screen with black
  */
 void vesa_clear();
@@ -153,6 +163,13 @@ void vesa_draw_string(const char *data);
 void vesa_draw_number(int n);
 
 /**
+ * Updates the cursor
+ * @param x The X position
+ * @param y The Y position
+ */
+void vesa_draw_cursor(int x, int y);
+
+/**
  * Sets the color using a rgb number
  * @param color The color
  */
@@ -187,6 +204,11 @@ enum vesa_color {
 const uint32_t default_text_color;
 
 /**
+ * The current text color (as normalized array)
+ */
+uint32_t terminal_color[3];
+
+/**
  * The current input
  */
 char text[1024];
diff --git a/src/kernel/input/ps2/mouse.c b/src/kernel/input/ps2/mouse.c
index bef226c..0ee7b2b 100644
--- a/src/kernel/input/ps2/mouse.c
+++ b/src/kernel/input/ps2/mouse.c
@@ -3,17 +3,19 @@
 #include <kernel/graphics/vesa.h>
 
 char mouse_cycle = 0;
-signed char mouse_byte[3];
-signed char mouse_x = 0;
-signed char mouse_y = 0;
+char mouse_byte[3];
+int mouse_x = 0;
+int mouse_y = 0;
 int mouse_but_1 = 0;
 int mouse_but_2 = 0;
+int mouse_but_3 = 0;
 
 void mouse_handler(struct regs *a_r) {
     switch (mouse_cycle) {
         case 0:
             mouse_byte[0] = receive_b(0x60);
-            mouse_cycle++;
+            if (((mouse_byte[0] >> 3) & 1) == 1) mouse_cycle++;
+            else mouse_cycle = 0;
             break;
         case 1:
             mouse_byte[1] = receive_b(0x60);
@@ -21,18 +23,17 @@ void mouse_handler(struct regs *a_r) {
             break;
         case 2:
             mouse_byte[2] = receive_b(0x60);
-            mouse_x = mouse_byte[1];
-            mouse_y = mouse_byte[2];
-            mouse_but_1 = (mouse_byte[0] % 2);
-            mouse_but_2 = ((mouse_byte[0] % 4) - (mouse_byte[0] % 2)) / 2;
+            mouse_x += mouse_byte[1];
+            mouse_y -= mouse_byte[2];
+            mouse_but_1 = mouse_byte[0] & 1;
+            mouse_but_2 = (mouse_byte[0] >> 1) & 1;
+            mouse_but_3 = (mouse_byte[0] >> 2) & 1;
             mouse_cycle = 0;
+            vesa_draw_cursor(mouse_x, mouse_y);
             break;
         default:
             break;
     }
-
-    if (mouse_but_1 == 1)
-        vesa_draw_string("CLICK!\n");
 }
 
 void mouse_wait(unsigned char a_type) {
@@ -88,5 +89,5 @@ void mouse_install() {
     mouse_read();
 
     // Setup the mouse handler
-    irq_install_handler(2, mouse_handler);
+    irq_install_handler(12, mouse_handler);
 }
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 9be7914..c2ab13e 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -24,11 +24,13 @@ void kernel_main(struct multiboot *mboot_ptr) {
     idt_install();
     isrs_install();
     irq_install();
+    set_optimal_resolution();
 
     // Install drivers
-    asm volatile ("sti");
-    set_optimal_resolution();
+    asm volatile ("cli");
+    mouse_install();
     keyboard_install();
+    asm volatile ("sti");
 
     // Get hardware information
     get_smbios();
@@ -42,11 +44,13 @@ void kernel_main(struct multiboot *mboot_ptr) {
     initrd_test();
 
     // User mode!
+    /* COMMENTED FOR DEVELOPMENT OF KERNEL
     info("Switching to user mode...");
     syscalls_install();
     switch_to_user();
 
     panic("This should NOT happen!");
+    */
 
     // asm volatile  ("div %0" :: "r"(0)); // Exception testing x/0
     loop: