Changeset 47208 in vbox for trunk/src/VBox/ExtPacks/BusMouseSample

Timestamp:

Jul 17, 2013 11:01:51 AM (12 years ago)

Author:

vboxsync

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

87321

Message:

Devices/Input: more multi-touch plumbing.

File:

• trunk/src/VBox/ExtPacks/BusMouseSample/BusMouse.cpp (modified) (5 diffs)

trunk/src/VBox/ExtPacks/BusMouseSample/BusMouse.cpp

@@ -200 +200 @@
     PPDMIMOUSECONNECTOR pDrv = pThis->Mouse.pDrv;
     bool fEnabled = !!pThis->mouse_enabled;
-    pDrv->pfnReportModes(pDrv, fEnabled, false);
+    pDrv->pfnReportModes(pDrv, fEnabled, false, false);
 }
 
@@ -584 +584 @@
  * @interface_method_impl{PDMIMOUSEPORT, pfnPutEvent}
  */
-static DECLCALLBACK(int) mouPutEvent(PPDMIMOUSEPORT pInterface, int32_t iDeltaX, int32_t iDeltaY,
-                                     int32_t iDeltaZ, int32_t iDeltaW, uint32_t fButtonStates)
+static DECLCALLBACK(int) mouPutEvent(PPDMIMOUSEPORT pInterface, int32_t dx,
+                                     int32_t dy, int32_t dz, int32_t dw,
+                                     uint32_t fButtons)
 {
     MouState *pThis = RT_FROM_MEMBER(pInterface, MouState, Mouse.IPort);
@@ -591 +592 @@
     AssertReleaseRC(rc);
 
-    bms_mouse_event(pThis, iDeltaX, iDeltaY, iDeltaZ, iDeltaW, fButtonStates);
+    bms_mouse_event(pThis, dx, dy, dz, dw, fButtons);
 
     PDMCritSectLeave(pThis->CTX_SUFF(pDevIns)->CTX_SUFF(pCritSectRo));
@@ -600 +601 @@
  * @interface_method_impl{PDMIMOUSEPORT, pfnPutEventAbs}
  */
-static DECLCALLBACK(int) mouPutEventAbs(PPDMIMOUSEPORT pInterface, uint32_t uX, uint32_t uY, int32_t iDeltaZ, int32_t iDeltaW, uint32_t fButtons)
+static DECLCALLBACK(int) mouPutEventAbs(PPDMIMOUSEPORT pInterface, uint32_t x,
+                                        uint32_t y, int32_t dz, int32_t dw,
+                                        uint32_t fButtons)
+{
+    AssertFailedReturn(VERR_NOT_SUPPORTED);
+}
+
+/**
+ * @interface_method_impl{PDMIMOUSEPORT, pfnPutEventMT}
+ */
+static DECLCALLBACK(int) mouPutEventMT(PPDMIMOUSEPORT pInterface, uint32_t x,
+                                       uint32_t y, uint32_t cContact,
+                                       bool fContact)
 {
     AssertFailedReturn(VERR_NOT_SUPPORTED);
@@ -758 +771 @@
     pThis->Mouse.IPort.pfnPutEvent       = mouPutEvent;
     pThis->Mouse.IPort.pfnPutEventAbs    = mouPutEventAbs;
+    pThis->Mouse.IPort.pfnPutEventMT     = mouPutEventMT;
 
     /*