Changeset 95271 in vbox for trunk/include/VBox/vmm

Timestamp:

Jun 14, 2022 9:52:49 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151852

Message:

Touchpad: First part of touchpad support, PDM interface and device emulation (see bugref:9891).

File:

• trunk/include/VBox/vmm/pdmifs.h (modified) (3 diffs)

trunk/include/VBox/vmm/pdmifs.h

@@ -330 +330 @@
                                               uint32_t fButtons));
     /**
-     * Puts a multi-touch event.
+     * Puts a multi-touch absolute (touchscreen) event.
      *
      * @returns VBox status code. Return VERR_TRY_AGAIN if you cannot process the
@@ -350 +350 @@
      *                              time between event is important.
      */
-    DECLR3CALLBACKMEMBER(int, pfnPutEventMultiTouch,(PPDMIMOUSEPORT pInterface,
-                                                     uint8_t cContacts,
-                                                     const uint64_t *pau64Contacts,
-                                                     uint32_t u32ScanTime));
+    DECLR3CALLBACKMEMBER(int, pfnPutEventTouchScreen,(PPDMIMOUSEPORT pInterface,
+                                                      uint8_t cContacts,
+                                                      const uint64_t *pau64Contacts,
+                                                      uint32_t u32ScanTime));
+
+    /**
+     * Puts a multi-touch relative (touchpad) event.
+     *
+     * @returns VBox status code. Return VERR_TRY_AGAIN if you cannot process the
+     *          event now and want it to be repeated at a later point.
+     *
+     * @param   pInterface          Pointer to this interface structure.
+     * @param   cContacts           How many touch contacts in this event.
+     * @param   pau64Contacts       Pointer to array of packed contact information.
+     *                              Each 64bit element contains:
+     *                              Bits 0..15:  Normalized X coordinate (range: 0 - 0xffff).
+     *                              Bits 16..31: Normalized Y coordinate (range: 0 - 0xffff).
+     *                              Bits 32..39: contact identifier.
+     *                              Bit 40:      "in contact" flag, which indicates that
+     *                                           there is a contact with the touch surface.
+     *                              All other bits are reserved for future use and must be set to 0.
+     * @param   u32ScanTime         Timestamp of this event in milliseconds. Only relative
+     *                              time between event is important.
+     */
+
+    DECLR3CALLBACKMEMBER(int, pfnPutEventTouchPad,(PPDMIMOUSEPORT pInterface,
+                                                   uint8_t cContacts,
+                                                   const uint64_t *pau64Contacts,
+                                                   uint32_t u32ScanTime));
 } PDMIMOUSEPORT;
 /** PDMIMOUSEPORT interface ID. */
-#define PDMIMOUSEPORT_IID                       "359364f0-9fa3-4490-a6b4-7ed771901c93"
+#define PDMIMOUSEPORT_IID                       "d2bb54b7-d877-441b-9d25-d2d3329465c2"
 
 /** Mouse button defines for PDMIMOUSEPORT::pfnPutEvent.
@@ -383 +408 @@
      * @param   fRelative       Whether relative mode is currently supported.
      * @param   fAbsolute       Whether absolute mode is currently supported.
-     * @param   fMultiTouch     Whether multi-touch mode is currently supported.
-     */
-    DECLR3CALLBACKMEMBER(void, pfnReportModes,(PPDMIMOUSECONNECTOR pInterface, bool fRelative, bool fAbsolute, bool fMultiTouch));
+     * @param   fMTAbsolute     Whether absolute multi-touch mode is currently supported.
+     * @param   fMTRelative     Whether relative multi-touch mode is currently supported.
+     */
+    DECLR3CALLBACKMEMBER(void, pfnReportModes,(PPDMIMOUSECONNECTOR pInterface, bool fRelative, bool fAbsolute, bool fMTAbsolute, bool fMTRelative));
 
     /**