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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (4 diffs)
• include/ConsoleImpl.h (modified) (1 diff)
• include/MouseImpl.h (modified) (5 diffs)
• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-client/MouseImpl.cpp (modified) (15 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -14297 +14297 @@
     </attribute>
 
+    <attribute name="multiTouchSupported" type="boolean" readonly="yes">
+      <desc>
+        Whether the guest OS supports multi-touch event reporting.
+        <note>
+          You can use the <link to="IMouseCapabilityChangedEvent"/>
+          event to be instantly informed about changes of this attribute
+          during virtual machine execution.
+        </note>
+        <see><link to="#putMouseEvent"/></see>
+      </desc>
+    </attribute>
+
     <attribute name="needsHostCursor" type="boolean" readonly="yes">
       <desc>
@@ -20214 +20226 @@
   </interface>
 
+  <enum
+    name="GuestMouseEventMode"
+    uuid="ef172985-7e36-4297-95be-e46396968d66"
+    >
+
+    <desc>
+      The mode (relative, absolute, multi-touch) of a pointer event.
+      TODO: a clear pattern seems to be emerging that we should usually have
+      multiple input devices active for different types of reporting, so we
+      should really have different event types for relative (including wheel),
+      absolute (not including wheel) and multi-touch events.
+    </desc>
+
+    <const name="Relative" value="0">
+      <desc>
+        Relative event.
+      </desc>
+    </const>
+
+    <const name="Absolute" value="1">
+      <desc>
+        Absolute event.
+      </desc>
+    </const>
+
+    <const name="MultiTouch" value="2">
+      <desc>
+        Multi-touch event.
+      </desc>
+    </const>
+  </enum>
+
   <interface
     name="IGuestMouseEvent" extends="IReusableEvent"
@@ -20223 +20267 @@
     </desc>
 
-    <attribute name="absolute" type="boolean" readonly="yes">
-      <desc>
-        If this event is relative or absolute.
+    <attribute name="mode" type="GuestMouseEventMode" readonly="yes">
+      <desc>
+        If this event is relative, absolute or multi-touch.
       </desc>
     </attribute>
@@ -20253 +20297 @@
     </attribute>
 
+    <attribute name="contact" type="long" readonly="yes">
+      <desc>
+        The multi-touch contact identifier.  This remains valid as long as a
+        touch is in progress and can and should be re-used after a touch has
+        terminated (see @a buttons).
+      </desc>
+    </attribute>
+
     <attribute name="buttons" type="long" readonly="yes">
       <desc>
-        Button state bitmask.
+        Button state bitmask.  Multi-touch events should have the first bit set
+        as long as the touch is in progress and terminate with an event with no
+        bits set.
       </desc>
     </attribute>

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;

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -6097 +6097 @@
  */
 #endif
-void Console::onMouseCapabilityChange(BOOL supportsAbsolute, BOOL supportsRelative, BOOL needsHostCursor)
+void Console::onMouseCapabilityChange(BOOL supportsAbsolute, BOOL supportsRelative,
+                                      BOOL supportsMT, BOOL needsHostCursor)
 {
     LogFlowThisFunc(("supportsAbsolute=%d supportsRelative=%d needsHostCursor=%d\n",

trunk/src/VBox/Main/src-client/MouseImpl.cpp

@@ -37 +37 @@
     MOUSE_DEVCAP_RELATIVE = 1,
     /** The mouse device can do absolute reporting */
-    MOUSE_DEVCAP_ABSOLUTE = 2
+    MOUSE_DEVCAP_ABSOLUTE = 2,
+    /** The mouse device can do absolute reporting */
+    MOUSE_DEVCAP_MULTI_TOUCH = 4
 };
 /** @} */
@@ -171 +173 @@
 
 /**
- * Returns whether the current setup can accept absolute mouse events, either
- * because an emulated absolute pointing device is active or because the Guest
- * Additions are.
+ * Returns whether the currently active device portfolio can accept absolute
+ * mouse events.
  *
  * @returns COM status code
@@ -191 +192 @@
 
 /**
- * Returns whether the current setup can accept relative mouse events, that is,
- * whether an emulated relative pointing device is active.
+ * Returns whether the currently active device portfolio can accept relative
+ * mouse events.
  *
  * @returns COM status code
@@ -206 +207 @@
 
     *relativeSupported = supportsRel();
+    return S_OK;
+}
+
+/**
+ * Returns whether the currently active device portfolio can accept multi-touch
+ * mouse events.
+ *
+ * @returns COM status code
+ * @param multiTouchSupported address of result variable
+ */
+STDMETHODIMP Mouse::COMGETTER(MultiTouchSupported) (BOOL *multiTouchSupported)
+{
+    if (!multiTouchSupported)
+        return E_POINTER;
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    *multiTouchSupported = FALSE;
     return S_OK;
 }
@@ -344 +364 @@
 
 /**
+ * Send an absolute pointer event to the emulated absolute device we deem most
+ * appropriate.
+ *
+ * @returns   COM status code
+ */
+HRESULT Mouse::reportMTEventToMouseDev(int32_t mouseX, int32_t mouseY,
+                                       uint32_t cContact, bool fContact)
+{
+    return E_NOTIMPL;
+}
+
+
+/**
  * Send an absolute position event to the VMM device.
  * @note all calls out of this object are made with no locks held!
@@ -583 +616 @@
 /** Check what sort of reporting can be done using the devices currently
  * enabled.  Does not consider the VMM device. */
-void Mouse::getDeviceCaps(bool *pfAbs, bool *pfRel)
+void Mouse::getDeviceCaps(bool *pfAbs, bool *pfRel, bool *pfMT)
 {
     bool fAbsDev = false;
     bool fRelDev = false;
+    bool fMTDev  = false;
 
     AutoReadLock aLock(this COMMA_LOCKVAL_SRC_POS);
@@ -597 +631 @@
            if (mpDrv[i]->u32DevCaps & MOUSE_DEVCAP_RELATIVE)
                fRelDev = true;
+           if (mpDrv[i]->u32DevCaps & MOUSE_DEVCAP_MULTI_TOUCH)
+               fMTDev  = true;
         }
     if (pfAbs)
@@ -610 +646 @@
     bool fRelDev;
 
-    getDeviceCaps(NULL, &fRelDev);
+    getDeviceCaps(NULL, &fRelDev, NULL);
     return    (mfVMMDevGuestCaps & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
            && fRelDev;
@@ -621 +657 @@
     bool fAbsDev;
 
-    getDeviceCaps(&fAbsDev, NULL);
+    getDeviceCaps(&fAbsDev, NULL, NULL);
     return fAbsDev;
 }
@@ -631 +667 @@
     bool fRelDev;
 
-    getDeviceCaps(NULL, &fRelDev);
+    getDeviceCaps(NULL, &fRelDev, NULL);
     return fRelDev;
 }
@@ -641 +677 @@
     bool fAbsDev;
 
-    getDeviceCaps(&fAbsDev, NULL);
+    getDeviceCaps(&fAbsDev, NULL, NULL);
     return fAbsDev || vmmdevCanAbs();
+}
+
+
+/** Can we currently send absolute events to the guest? */
+bool Mouse::supportsMT(void)
+{
+    bool fMTDev;
+
+    getDeviceCaps(NULL, NULL, &fMTDev);
+    return fMTDev;
 }
 
@@ -651 +697 @@
 void Mouse::sendMouseCapsNotifications(void)
 {
-    bool fAbsDev, fRelDev, fCanAbs, fNeedsHostCursor;
+    bool fAbsDev, fRelDev, fMTDev, fCanAbs, fNeedsHostCursor;
 
     {
         AutoReadLock aLock(this COMMA_LOCKVAL_SRC_POS);
 
-        getDeviceCaps(&fAbsDev, &fRelDev);
+        getDeviceCaps(&fAbsDev, &fRelDev, &fMTDev);
         fCanAbs = supportsAbs();
         fNeedsHostCursor = guestNeedsHostCursor();
@@ -667 +713 @@
      * callback data atomically.  However I can't see any sign that the cached
      * data is ever used again. */
-    mParent->onMouseCapabilityChange(fCanAbs, fRelDev, fNeedsHostCursor);
+    mParent->onMouseCapabilityChange(fCanAbs, fRelDev, fMTDev, fNeedsHostCursor);
 }
 
@@ -675 +721 @@
  * A virtual device is notifying us about its current state and capabilities
  */
-DECLCALLBACK(void) Mouse::mouseReportModes(PPDMIMOUSECONNECTOR pInterface, bool fRel, bool fAbs, bool)
+DECLCALLBACK(void) Mouse::mouseReportModes(PPDMIMOUSECONNECTOR pInterface, bool fRel, bool fAbs, bool fMT)
 {
     PDRVMAINMOUSE pDrv = RT_FROM_MEMBER(pInterface, DRVMAINMOUSE, IConnector);
@@ -686 +732 @@
     else
         pDrv->u32DevCaps &= ~MOUSE_DEVCAP_ABSOLUTE;
+    if (fMT)
+        pDrv->u32DevCaps |= MOUSE_DEVCAP_MULTI_TOUCH;
+    else
+        pDrv->u32DevCaps &= ~MOUSE_DEVCAP_MULTI_TOUCH;
 
     pDrv->pMouse->sendMouseCapsNotifications();