Add IntelliMouse support to PS/2 driver & support scroll-wheel events

Author: maxdev1

applications/desktop/src/background.cpp

@@ -57,6 +57,10 @@ void background_t::init()
 		{
 			onMouseRelease(position);
 		}
+		else if(e->type == G_MOUSE_EVENT_LEAVE)
+		{
+			onMouseRelease(position);
+		}
 	});
 
 	selection = g_selection::create();
@@ -217,7 +221,7 @@ void background_t::paint()
 	auto bounds = this->getBounds();
 
 	srand(g_millis());
-	static int r = rand() % 128 + 50;
+	static int r = rand() % 100 + 50;
 
 	cairo_pattern_t* gradient = cairo_pattern_create_linear(bounds.width * 0.4, 0, bounds.width * 0.8,
 	                                                        bounds.height);

applications/desktop/src/background.hpp

@@ -50,7 +50,8 @@ class background_t : virtual public g_canvas
 public:
     explicit background_t(g_ui_component_id id):
         g_component(id),
-        g_canvas(id), dragItems(false)
+        g_canvas(id), dragItems(false),
+        g_focusable_component(id)
     {
     }
 

applications/desktop/src/item.cpp

@@ -27,7 +27,8 @@
 
 item_t::item_t(uint32_t id):
 	g_component(id),
-	g_canvas(id)
+	g_canvas(id),
+	g_focusable_component(id)
 {
 	this->setBufferListener([this]()
 	{

applications/desktop/src/taskbar.cpp

@@ -30,7 +30,7 @@
 g_font* font = nullptr;
 
 taskbar_t::taskbar_t(g_ui_component_id id):
-	g_component(id), g_canvas(id)
+	g_component(id), g_canvas(id), g_focusable_component(id)
 {
 	textLayoutBuffer = g_text_layouter::getInstance()->initializeBuffer();
 }

applications/libinput/inc/libinput/mouse/mouse.hpp

@@ -32,6 +32,7 @@ struct g_mouse_info
 	bool button1 = false;
 	bool button2 = false;
 	bool button3 = false;
+	int scroll = 0;
 };
 
 class g_mouse

applications/libinput/src/mouse.cpp

@@ -35,6 +35,7 @@ g_mouse_info g_mouse::readMouse(g_fd in)
 		e.button1 = (packet.flags & (1 << 0));
 		e.button2 = (packet.flags & (1 << 1));
 		e.button3 = (packet.flags & (1 << 2));
+		e.scroll = packet.scroll;
 	}
 	return e;
 }

applications/libps2/inc/libps2/ps2.hpp

@@ -35,6 +35,6 @@ typedef uint8_t ps2_status_t;
 /**
  * Initializes the PS2 handling.
  */
-ps2_status_t ps2Initialize(void(*mouseCallback)(int16_t, int16_t, uint8_t), void(*keyboardCallback)(uint8_t));
+ps2_status_t ps2Initialize(void(*mouseCallback)(int16_t, int16_t, uint8_t, int8_t), void(*keyboardCallback)(uint8_t));
 
 #endif

applications/libps2/src/ps2.cpp

@@ -24,18 +24,21 @@
 #include <ghost.h>
 #include <stdio.h>
 
-uint8_t mouse_packet_number = 0;
-uint8_t mouse_packet_buffer[4];
+uint8_t mousePacketNumber = 0;
+uint8_t mousePacketBuffer[4];
+bool intelliMouseMode = false; // 4-byte sequences
 
 g_fd keyIrqIn;
 g_fd mouseIrqIn;
 
-uint32_t packets_count = 0;
+uint32_t packetCount = 0;
 
-void (*registeredMouseCallback)(int16_t, int16_t, uint8_t);
+void (*registeredMouseCallback)(int16_t, int16_t, uint8_t, int8_t);
 void (*registeredKeyboardCallback)(uint8_t);
 
-ps2_status_t ps2Initialize(void (*mouseCallback)(int16_t, int16_t, uint8_t),
+void ps2HandlePacket();
+
+ps2_status_t ps2Initialize(void (*mouseCallback)(int16_t, int16_t, uint8_t, int8_t),
                            void (*keyboardCallback)(uint8_t))
 {
 
@@ -113,7 +116,7 @@ void ps2CheckForData()
 			ps2HandleMouseData(value);
 		}
 
-		++packets_count;
+		++packetCount;
 	}
 }
 
@@ -158,56 +161,85 @@ ps2_status_t ps2InitializeMouse()
 		return G_PS2_STATUS_FAILED_INITIALIZE;
 	}
 
+	// enable extended stuff for scrolling
+	if(ps2WriteToMouse(0xF3) ||
+	   ps2WriteToMouse(200) ||
+	   ps2WriteToMouse(0xF3) ||
+	   ps2WriteToMouse(100) ||
+	   ps2WriteToMouse(0xF3) ||
+	   ps2WriteToMouse(80))
+	{
+		intelliMouseMode = false;
+		klog("failed to enable intellimouse mode");
+	}
+	else
+	{
+		intelliMouseMode = true;
+	}
+
 	return G_PS2_STATUS_SUCCESS;
 }
 
 void ps2HandleMouseData(uint8_t value)
 {
-
-	switch(mouse_packet_number)
+	if(mousePacketNumber == 0)
 	{
-		case 0:
-			mouse_packet_buffer[0] = value;
-
-			if((value & 0x08) == 0)
-			{
-				mouse_packet_number = 0; // otherwise restart the cycle
-			}
-			else
-			{
-				mouse_packet_number = 1;
-			}
-			break;
-
-		case 1:
-			mouse_packet_buffer[1] = value;
-			mouse_packet_number = 2;
-			break;
-
-		case 2:
-			mouse_packet_buffer[2] = value;
-
-			int8_t flags = mouse_packet_buffer[0];
-			uint8_t valX = mouse_packet_buffer[1];
-			uint8_t valY = mouse_packet_buffer[2];
+		mousePacketBuffer[0] = value;
+		// The first byte must always have the 4th bit (0x08) set
+		if((value & 0x08) == 0)
+		{
+			mousePacketNumber = 0; // wait for a valid starting byte
+		}
+		else
+		{
+			mousePacketNumber = 1;
+		}
+	}
+	else if(mousePacketNumber == 1)
+	{
+		mousePacketBuffer[1] = value;
+		mousePacketNumber = 2;
+	}
+	else if(mousePacketNumber == 2)
+	{
+		if(intelliMouseMode)
+		{
+			mousePacketBuffer[2] = value;
+			mousePacketNumber = 3;
+		}
+		else
+		{
+			mousePacketBuffer[2] = value;
+			mousePacketNumber = 0;
+			ps2HandlePacket();
+		}
+	}
+	else if(mousePacketNumber == 3) // IntelliMouse only
+	{
+		mousePacketBuffer[3] = value;
+		mousePacketNumber = 0;
+		ps2HandlePacket();
+	}
+}
 
-			if((flags & (1 << 6)) || (flags & (1 << 7)))
-			{
-				// ignore overflowing values
-			}
-			else
-			{
-				int16_t offX = (valX | ((flags & 0x10) ? 0xFF00 : 0));
-				int16_t offY = (valY | ((flags & 0x20) ? 0xFF00 : 0));
+void ps2HandlePacket()
+{
+	int8_t flags = mousePacketBuffer[0];
+	uint8_t valX = mousePacketBuffer[1];
+	uint8_t valY = mousePacketBuffer[2];
+	int8_t scroll = intelliMouseMode ? (int8_t) mousePacketBuffer[3] : 0;
 
-				if(registeredMouseCallback)
-				{
-					registeredMouseCallback(offX, -offY, flags);
-				}
-			}
+	if((flags & (1 << 6)) || (flags & (1 << 7)))
+	{
+		// ignore overflowing values
+	}
+	else
+	{
+		int16_t offX = (valX | ((flags & 0x10) ? 0xFF00 : 0));
+		int16_t offY = (valY | ((flags & 0x20) ? 0xFF00 : 0));
 
-			mouse_packet_number = 0;
-			break;
+		if(registeredMouseCallback)
+			registeredMouseCallback(offX, -offY, flags, scroll);
 	}
 }
 

applications/libps2driver/inc/libps2driver/ps2driver.hpp

@@ -75,6 +75,7 @@ struct g_ps2_mouse_packet
     int16_t x;
     int16_t y;
     uint8_t flags;
+    int8_t scroll;
 }__attribute__((packed));
 
 /**

applications/libwindow/inc/libwindow/interface.hpp

@@ -557,6 +557,7 @@ typedef uint8_t g_mouse_event_type;
 #define G_MOUSE_EVENT_DRAG ((g_mouse_event_type) 5)
 #define G_MOUSE_EVENT_ENTER ((g_mouse_event_type) 6)
 #define G_MOUSE_EVENT_LEAVE ((g_mouse_event_type) 7)
+#define G_MOUSE_EVENT_SCROLL ((g_mouse_event_type) 8)
 
 typedef struct
 {