Changeset 47174 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jul 16, 2013 3:27:24 AM (12 years ago)

Author:

vboxsync

Message:

Devices/Input: most of the Main plumbing for guest multi-touch.

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (1 diff)
• MouseImpl.h (modified) (5 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -269 +269 @@
                                    uint32_t width, uint32_t height,
                                    ComSafeArrayIn(uint8_t, aShape));
-    void onMouseCapabilityChange(BOOL supportsAbsolute, BOOL supportsRelative, BOOL needsHostCursor);
+    void onMouseCapabilityChange(BOOL supportsAbsolute, BOOL supportsRelative,
+                                 BOOL supportsMT, BOOL needsHostCursor);
     void onStateChange(MachineState_T aMachineState);
     void onAdditionsStateChange();

trunk/src/VBox/Main/include/MouseImpl.h

@@ -58 +58 @@
     STDMETHOD(COMGETTER(AbsoluteSupported)) (BOOL *absoluteSupported);
     STDMETHOD(COMGETTER(RelativeSupported)) (BOOL *relativeSupported);
+    STDMETHOD(COMGETTER(MultiTouchSupported)) (BOOL *multiTouchSupported);
     STDMETHOD(COMGETTER(NeedsHostCursor)) (BOOL *needsHostCursor);
 
@@ -84 +85 @@
 
     static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID);
-    static DECLCALLBACK(void)   mouseReportModes (PPDMIMOUSECONNECTOR pInterface, bool fRel, bool fAbs, bool);
+    static DECLCALLBACK(void)   mouseReportModes (PPDMIMOUSECONNECTOR pInterface, bool fRel, bool fAbs, bool fMT);
     static DECLCALLBACK(int)    drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
     static DECLCALLBACK(void)   drvDestruct(PPDMDRVINS pDrvIns);
@@ -93 +94 @@
     HRESULT reportAbsEventToMouseDev(int32_t mouseXAbs, int32_t mouseYAbs,
                                  int32_t dz, int32_t dw, uint32_t fButtons);
+    HRESULT reportMTEventToMouseDev(int32_t mouseX, int32_t mouseY,
+                                 uint32_t cContact, bool fContact);
     HRESULT reportAbsEventToVMMDev(int32_t mouseXAbs, int32_t mouseYAbs);
     HRESULT reportAbsEvent(int32_t mouseXAbs, int32_t mouseYAbs,
@@ -100 +103 @@
                               bool *pfValid);
 
-    void getDeviceCaps(bool *pfAbs, bool *pfRel);
+    void getDeviceCaps(bool *pfAbs, bool *pfRel, bool *fMT);
     void sendMouseCapsNotifications(void);
     bool guestNeedsHostCursor(void);
@@ -107 +110 @@
     bool supportsAbs(void);
     bool supportsRel(void);
+    bool supportsMT(void);
 
     Console * const         mParent;