VoodooInput: new "Update dimensions" message

acidanthera · Nov 29, 2019 · 2a71655 · 2a71655
1 parent e3e381d
commit 2a71655
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/VoodooInput/VoodooInput.cpp b/VoodooInput/VoodooInput.cpp
@@ -132,9 +132,15 @@ IOReturn VoodooInput::message(UInt32 type, IOService *provider, void *argument)
         if (argument && simulator) {
             simulator->constructReport(*(VoodooInputEvent*)argument);
         }
-
     }
-
+    else if (type == kIOMessageVoodooInputUpdateDimensionsMessage && provider == parentProvider) {
+        if (argument) {
+            const VoodooInputDimensions& dimensions = *(VoodooInputDimensions*)argument;
+            logicalMaxX = dimensions.max_x - dimensions.min_x;
+            logicalMaxY = dimensions.max_y - dimensions.min_y;
+        }
+    }
+
     return super::message(type, provider, argument);
 }
 

diff --git a/VoodooInput/VoodooInputMultitouch/VoodooInputEvent.h b/VoodooInput/VoodooInputMultitouch/VoodooInputEvent.h
@@ -15,4 +15,11 @@ typedef struct {
     VoodooInputTransducer transducers[VOODOO_INPUT_MAX_TRANSDUCERS];
 } VoodooInputEvent;
 
+typedef struct {
+    SInt32 min_x;
+    SInt32 max_x;
+    SInt32 min_y;
+    SInt32 max_y;
+} VoodooInputDimensions;
+
 #endif /* VoodooInputEvent_h */
diff --git a/VoodooInput/VoodooInputMultitouch/VoodooInputMessages.h b/VoodooInput/VoodooInputMultitouch/VoodooInputMessages.h
@@ -19,6 +19,7 @@
 
 #define VOODOO_INPUT_MAX_TRANSDUCERS 10
 #define kIOMessageVoodooInputMessage 12345
+#define kIOMessageVoodooInputUpdateDimensionsMessage 12346
 
 #define kVoodooInputTransducerFingerType 1
 #define kVoodooInputTransducerStylusType 2

diff --git a/VoodooInput/VoodooInputSimulator/VoodooInputSimulatorDevice.cpp b/VoodooInput/VoodooInputSimulator/VoodooInputSimulatorDevice.cpp
@@ -24,14 +24,14 @@ UInt16 abs(SInt16 x) {
 
 const unsigned char report_descriptor[] = {0x05, 0x01, 0x09, 0x02, 0xa1, 0x01, 0x09, 0x01, 0xa1, 0x00, 0x05, 0x09, 0x19, 0x01, 0x29, 0x03, 0x15, 0x00, 0x25, 0x01, 0x85, 0x02, 0x95, 0x03, 0x75, 0x01, 0x81, 0x02, 0x95, 0x01, 0x75, 0x05, 0x81, 0x01, 0x05, 0x01, 0x09, 0x30, 0x09, 0x31, 0x15, 0x81, 0x25, 0x7f, 0x75, 0x08, 0x95, 0x02, 0x81, 0x06, 0x95, 0x04, 0x75, 0x08, 0x81, 0x01, 0xc0, 0xc0, 0x05, 0x0d, 0x09, 0x05, 0xa1, 0x01, 0x06, 0x00, 0xff, 0x09, 0x0c, 0x15, 0x00, 0x26, 0xff, 0x00, 0x75, 0x08, 0x95, 0x10, 0x85, 0x3f, 0x81, 0x22, 0xc0, 0x06, 0x00, 0xff, 0x09, 0x0c, 0xa1, 0x01, 0x06, 0x00, 0xff, 0x09, 0x0c, 0x15, 0x00, 0x26, 0xff, 0x00, 0x85, 0x44, 0x75, 0x08, 0x96, 0x6b, 0x05, 0x81, 0x00, 0xc0};
 
-void VoodooInputSimulatorDevice::constructReport(VoodooInputEvent multitouch_event) {
+void VoodooInputSimulatorDevice::constructReport(const VoodooInputEvent& multitouch_event) {
     if (!ready_for_reports)
         return;
 
-    command_gate->runAction(OSMemberFunctionCast(IOCommandGate::Action, this, &VoodooInputSimulatorDevice::constructReportGated), &multitouch_event);
+    command_gate->runAction(OSMemberFunctionCast(IOCommandGate::Action, this, &VoodooInputSimulatorDevice::constructReportGated), (void*)&multitouch_event);
 }
 
-void VoodooInputSimulatorDevice::constructReportGated(VoodooInputEvent& multitouch_event) {
+void VoodooInputSimulatorDevice::constructReportGated(const VoodooInputEvent& multitouch_event) {
     if (!ready_for_reports)
         return;
 
@@ -44,7 +44,7 @@ void VoodooInputSimulatorDevice::constructReportGated(VoodooInputEvent& multitou
     input_report.Unused[3] = 0;
     input_report.Unused[4] = 0;
 
-    VoodooInputTransducer* transducer = &multitouch_event.transducers[0];
+    const VoodooInputTransducer* transducer = &multitouch_event.transducers[0];
 
     if (!transducer)
         return;
@@ -85,7 +85,7 @@ void VoodooInputSimulatorDevice::constructReportGated(VoodooInputEvent& multitou
     bool is_error_input_active = false;
 
     for (int i = 0; i < multitouch_event.contact_count + 1; i++) {
-        VoodooInputTransducer* transducer = &multitouch_event.transducers[i + stylus_check];
+        const VoodooInputTransducer* transducer = &multitouch_event.transducers[i + stylus_check];
 
         new_touch_state[i] = touch_state[i];
         touch_state[i] = 0;

diff --git a/VoodooInput/VoodooInputSimulator/VoodooInputSimulatorDevice.hpp b/VoodooInput/VoodooInputSimulator/VoodooInputSimulatorDevice.hpp
@@ -42,14 +42,15 @@ struct __attribute__((__packed__)) MAGIC_TRACKPAD_INPUT_REPORT {
     UInt8 multitouch_report_id;
     UInt8 timestamp_buffer[3];
 
-    MAGIC_TRACKPAD_INPUT_REPORT_FINGER FINGERS[12]; // May support more fingers
+    MAGIC_TRACKPAD_INPUT_REPORT_FINGER FINGERS[VOODOO_INPUT_MAX_TRANSDUCERS]; // May support more fingers
 };
 
 class EXPORT VoodooInputSimulatorDevice : public IOHIDDevice {
     OSDeclareDefaultStructors(VoodooInputSimulatorDevice);
 
 public:
-    void constructReport(VoodooInputEvent multitouch_event);
+    void constructReport(const VoodooInputEvent& multitouch_event);
+
     IOReturn setReport(IOMemoryDescriptor* report, IOHIDReportType reportType, IOOptionBits options) override;
 
     IOReturn getReport(IOMemoryDescriptor* report, IOHIDReportType reportType, IOOptionBits options) override;
@@ -99,7 +100,7 @@ class EXPORT VoodooInputSimulatorDevice : public IOHIDDevice {
     IOCommandGate* command_gate;
     MAGIC_TRACKPAD_INPUT_REPORT input_report;
 
-    void constructReportGated(VoodooInputEvent& multitouch_event);
+    void constructReportGated(const VoodooInputEvent& multitouch_event);
 };