Move the cursor around as if we were a trackpad, heh

Author: lazd

VoodooI2CGoodix.xcodeproj/xcuserdata/lazd.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>VoodooI2CGoodix.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>4</integer>
 		</dict>
 	</dict>
 </dict>

VoodooI2CGoodix/VoodooI2CGoodixTouchDriver.cpp

@@ -233,14 +233,17 @@ IOReturn VoodooI2CGoodixTouchDriver::goodix_process_events() {
         return kIOReturnSuccess;
     }
 
+    AbsoluteTime timestamp;
+    clock_get_uptime(&timestamp);
+
     /*
      * Bit 4 of the first byte reports the status of the capacitive
      * Windows/Home button.
      */
 //    input_report_key(ts->input_dev, KEY_LEFTMETA, point_data[0] & BIT(4));
 
     for (i = 0; i < touch_num; i++) {
-        goodix_ts_report_touch(ts, &point_data[1 + GOODIX_CONTACT_SIZE * i]);
+        goodix_ts_report_touch(ts, &point_data[1 + GOODIX_CONTACT_SIZE * i], timestamp);
     }
 
     IOReturn retVal = goodix_write_reg(GOODIX_READ_COOR_ADDR, 0);
@@ -249,6 +252,16 @@ IOReturn VoodooI2CGoodixTouchDriver::goodix_process_events() {
         return retVal;
     }
 
+    if (touch_num > 0) {
+        VoodooI2CMultitouchEvent event;
+        event.contact_count = touch_num;
+        event.transducers = transducers;
+        // send the event into the multitouch interface
+        if (mt_interface) {
+            mt_interface->handleInterruptReport(event, timestamp);
+        }
+    }
+
     return kIOReturnSuccess;
 }
 
@@ -309,7 +322,7 @@ int VoodooI2CGoodixTouchDriver::goodix_ts_read_input_report(struct goodix_ts_dat
     return 0;
 }
 
-void VoodooI2CGoodixTouchDriver::goodix_ts_report_touch(struct goodix_ts_data *ts, UInt8 *coor_data) {
+void VoodooI2CGoodixTouchDriver::goodix_ts_report_touch(struct goodix_ts_data *ts, UInt8 *coor_data, AbsoluteTime timestamp) {
     int id = coor_data[0] & 0x0F;
     int input_x = get_unaligned_le16(&coor_data[1]);
     int input_y = get_unaligned_le16(&coor_data[3]);
@@ -323,14 +336,41 @@ void VoodooI2CGoodixTouchDriver::goodix_ts_report_touch(struct goodix_ts_data *t
 //    if (ts->swapped_x_y)
 //        swap(input_x, input_y);
 
+    // Hacky bits
+    int input_z = input_x;
+    input_x = input_y;
+    input_y = input_z;
+    input_y = 1080 - input_y;
 //    input_mt_slot(ts->input_dev, id);
 //    input_mt_report_slot_state(ts->input_dev, MT_TOOL_FINGER, true);
 //    input_report_abs(ts->input_dev, ABS_MT_POSITION_X, input_x);
 //    input_report_abs(ts->input_dev, ABS_MT_POSITION_Y, input_y);
 //    input_report_abs(ts->input_dev, ABS_MT_TOUCH_MAJOR, input_w);
 //    input_report_abs(ts->input_dev, ABS_MT_WIDTH_MAJOR, input_w);
 
-    IOLog("%s::Touch %d at %d, %d with width %d\n", getName(), id, input_x, input_y, input_w);
+//    IOLog("%s::Touch %d at %d, %d with width %d\n", getName(), id, input_x, input_y, input_w);
+
+    if (!transducers) {
+        IOLog("%s::No transducers, cannot report", getName());
+        return;
+    }
+
+    VoodooI2CDigitiserTransducer* transducer = OSDynamicCast(VoodooI2CDigitiserTransducer, transducers->getObject(id));
+    transducer->type = kDigitiserTransducerFinger;
+
+    transducer->is_valid = true;
+
+    if (mt_interface) {
+        transducer->logical_max_x = mt_interface->logical_max_x;
+        transducer->logical_max_y = mt_interface->logical_max_y;
+    }
+
+    transducer->coordinates.x.update(input_x, timestamp);
+    transducer->coordinates.y.update(input_y, timestamp);
+    transducer->tip_switch.update(1, timestamp); // wat
+
+    transducer->id = id;
+    transducer->secondary_id = id;
 }
 
 void VoodooI2CGoodixTouchDriver::stop(IOService* provider) {
@@ -546,5 +586,12 @@ bool VoodooI2CGoodixTouchDriver::init_device() {
         return false;
     }
 
+    if (mt_interface){
+        mt_interface->physical_max_x = ts->abs_x_max;
+        mt_interface->physical_max_y = ts->abs_y_max;
+        mt_interface->logical_max_x = ts->abs_x_max;
+        mt_interface->logical_max_y = ts->abs_y_max;
+    }
+
     return true;
 }

VoodooI2CGoodix/VoodooI2CGoodixTouchDriver.hpp

@@ -126,7 +126,7 @@ class VoodooI2CGoodixTouchDriver : public IOService {
      */
     IOReturn goodix_process_events();
 
-    void goodix_ts_report_touch(struct goodix_ts_data *ts, UInt8 *coor_data);
+    void goodix_ts_report_touch(struct goodix_ts_data *ts, UInt8 *coor_data, AbsoluteTime timestamp);
 
     int goodix_ts_read_input_report(struct goodix_ts_data *ts, UInt8 *data);
 };