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

Timestamp:

Mar 4, 2010 9:44:59 PM (15 years ago)

Author:

vboxsync

Message:

Devices, Main: add support for multiple pointing devices and let the guest choose which to use

Location:

trunk/src/VBox/Main

Files:

• MouseImpl.cpp (modified) (18 diffs)
• include/MouseImpl.h (modified) (6 diffs)

trunk/src/VBox/Main/MouseImpl.cpp

@@ -31 +31 @@
 #include <VBox/VMMDev.h>
 
+/** @name Mouse device capabilities bitfield
+ * @{ */
+enum
+{
+    /** The mouse device can do relative reporting */
+    MOUSE_DEVCAP_RELATIVE = 1,
+    /** The mouse device can do absolute reporting */
+    MOUSE_DEVCAP_ABSOLUTE = 2
+};
+/** @} */
+
 /**
  * Mouse driver instance data.
  */
-typedef struct DRVMAINMOUSE
+struct DRVMAINMOUSE
 {
     /** Pointer to the mouse object. */
@@ -44 +55 @@
     /** Our mouse connector interface. */
     PDMIMOUSECONNECTOR          IConnector;
-} DRVMAINMOUSE, *PDRVMAINMOUSE;
+    /** The capabilities of this device. */
+    uint32_t                    u32DevCaps;
+};
 
 
@@ -54 +67 @@
 HRESULT Mouse::FinalConstruct()
 {
-    mpDrv = NULL;
-    uDevCaps = MOUSE_DEVCAP_RELATIVE;
+    RT_ZERO(mpDrv);
     fVMMDevCanAbs = false;
     fVMMDevNeedsHostCursor = false;
@@ -116 +128 @@
         return;
 
-    if (mpDrv)
-        mpDrv->pMouse = NULL;
-    mpDrv = NULL;
+    for (unsigned i = 0; i < MOUSE_MAX_DEVICES; ++i)
+    {
+        if (mpDrv[i])
+            mpDrv[i]->pMouse = NULL;
+        mpDrv[i] = NULL;
+    }
 
 #ifdef VBOXBFE_WITHOUT_COM
@@ -170 +185 @@
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    CHECK_CONSOLE_DRV (mpDrv);
-
-    if (uDevCaps & MOUSE_DEVCAP_ABSOLUTE)
-        *absoluteSupported = TRUE;
-    else
-        *absoluteSupported = fVMMDevCanAbs;
-
+    bool fAbs = false;
+
+    if (fVMMDevCanAbs)
+        fAbs = TRUE;
+
+    for (unsigned i = 0; i < MOUSE_MAX_DEVICES; ++i)
+        if (mpDrv[i] && (mpDrv[i]->u32DevCaps & MOUSE_DEVCAP_ABSOLUTE))
+            fAbs = TRUE;
+
+    *absoluteSupported = fAbs;
     return S_OK;
 }
@@ -197 +214 @@
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    CHECK_CONSOLE_DRV (mpDrv);
-
-    if (uDevCaps & MOUSE_DEVCAP_RELATIVE)
-        *relativeSupported = TRUE;
-
+    bool fRel = false;
+
+    for (unsigned i = 0; i < MOUSE_MAX_DEVICES; ++i)
+        if (mpDrv[i] && (mpDrv[i]->u32DevCaps & MOUSE_DEVCAP_RELATIVE))
+            fRel = TRUE;
+
+    *relativeSupported = fRel;
     return S_OK;
 }
@@ -221 +239 @@
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    CHECK_CONSOLE_DRV (mpDrv);
 
     *pfNeedsHostCursor = fVMMDevNeedsHostCursor;
@@ -258 +274 @@
     if (dx || dy || dz || dw || fButtons != mLastButtons)
     {
-        PPDMIMOUSEPORT pUpPort = mpDrv->pUpPort;
+        PPDMIMOUSEPORT pUpPort = NULL;
+        for (unsigned i = 0; !pUpPort && i < MOUSE_MAX_DEVICES; ++i)
+        {
+            if (mpDrv[i] && (mpDrv[i]->u32DevCaps & MOUSE_DEVCAP_RELATIVE))
+                pUpPort = mpDrv[i]->pUpPort;
+        }
+        if (!pUpPort)
+            return S_OK;        
+
         int vrc = pUpPort->pfnPutEvent(pUpPort, dx, dy, dz, dw, fButtons);
 
@@ -279 +303 @@
                                     int32_t dz, int32_t dw, uint32_t fButtons)
 {
-    if (   mouseXAbs != mLastAbsX
-        || mouseYAbs != mLastAbsY
-        || dz
-        || dw
-        || fButtons != mLastButtons)
-    {
-        int vrc = mpDrv->pUpPort->pfnPutEventAbs(mpDrv->pUpPort, mouseXAbs,
-                                                 mouseYAbs, dz, dw, fButtons);
+    if (   mouseXAbs != mLastAbsX || mouseYAbs != mLastAbsY
+        || dz || dw || fButtons != mLastButtons)
+    {
+        PPDMIMOUSEPORT pUpPort = NULL;
+        for (unsigned i = 0; !pUpPort && i < MOUSE_MAX_DEVICES; ++i)
+        {
+            if (mpDrv[i] && (mpDrv[i]->u32DevCaps & MOUSE_DEVCAP_ABSOLUTE))
+                pUpPort = mpDrv[i]->pUpPort;
+        }
+        if (!pUpPort)
+            return S_OK;        
+
+        int vrc = pUpPort->pfnPutEventAbs(pUpPort, mouseXAbs, mouseYAbs, dz,
+                                          dw, fButtons);
         if (RT_FAILURE(vrc))
             setError(VBOX_E_IPRT_ERROR,
@@ -340 +370 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    CHECK_CONSOLE_DRV (mpDrv);
-
     LogRel3(("%s: dx=%d, dy=%d, dz=%d, dw=%d\n", __PRETTY_FUNCTION__,
              dx, dy, dz, dw));
-    if (!(uDevCaps & MOUSE_DEVCAP_ABSOLUTE))
-    {
-        /*
-         * This method being called implies that the host no
-         * longer wants to use absolute coordinates. If the VMM
-         * device isn't aware of that yet, tell it.
-         */
-        uint32_t mouseCaps;
-        rc = getVMMDevMouseCaps(&mouseCaps);
-        ComAssertComRCRet(rc, rc);
-
-        if (mouseCaps & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE)
-            setVMMDevMouseCaps(uHostCaps);
+    /*
+     * This method being called implies that the host no
+     * longer wants to use absolute coordinates. If the VMM
+     * device isn't aware of that yet, tell it.
+     */
+    if (uHostCaps & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE)
+    {
+        uHostCaps &= ~VMMDEV_MOUSE_HOST_CAN_ABSOLUTE;
+        setVMMDevMouseCaps(uHostCaps);
     }
 
@@ -427 +451 @@
              __PRETTY_FUNCTION__, x, y, dz, dw, buttonState));
 
-    CHECK_CONSOLE_DRV(mpDrv);
-
     uint32_t mouseXAbs;
     HRESULT rc = convertDisplayWidth(x, &mouseXAbs);
@@ -434 +456 @@
     /**
      * @todo multi-monitor Windows guests expect this to be unbounded.
-     * Fix for the rest.
+     * Understand the issues involved and fix for the rest.
      */
     /* if (mouseXAbs > 0xffff)
@@ -447 +469 @@
     uint32_t fButtons = mouseButtonsToPDM(buttonState);
 
-    /* Older guest additions rely on a small phony movement event on the
-     * PS/2 device to notice absolute events. */
-    bool fNeedsJiggle = false;
-
-    if (uDevCaps & MOUSE_DEVCAP_ABSOLUTE)
-        rc = reportAbsEventToMouseDev(mouseXAbs, mouseYAbs, dz, dw, fButtons);
-    else
-    {
-        uint32_t mouseCaps;
-        rc = getVMMDevMouseCaps(&mouseCaps);
-        ComAssertComRCRet(rc, rc);
-
-        /*
-         * This method being called implies that the host wants
-         * to use absolute coordinates. If the VMM device isn't
-         * aware of that yet, tell it.
-         */
-        if (!(mouseCaps & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE))
-            setVMMDevMouseCaps(uHostCaps | VMMDEV_MOUSE_HOST_CAN_ABSOLUTE);
-
+    uint32_t mouseCaps;
+    rc = getVMMDevMouseCaps(&mouseCaps);
+    ComAssertComRCRet(rc, rc);
+
+    /*
+     * This method being called implies that the host wants
+     * to use absolute coordinates. If the VMM device isn't
+     * aware of that yet, tell it.
+     */
+    if (!(mouseCaps & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE))
+    {
+        uHostCaps |= VMMDEV_MOUSE_HOST_CAN_ABSOLUTE;
+        setVMMDevMouseCaps(uHostCaps);
+    }
+
+    if (mouseCaps & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
+    {
         /*
          * Send the absolute mouse position to the VMM device.
          */
         rc = reportAbsEventToVMMDev(mouseXAbs, mouseYAbs);
-        fNeedsJiggle = !(mouseCaps & VMMDEV_MOUSE_GUEST_USES_VMMDEV);
-    }
-    ComAssertComRCRet(rc, rc);
-
-    mLastAbsX = mouseXAbs;
-    mLastAbsY = mouseYAbs;
-
-    if (!(uDevCaps & MOUSE_DEVCAP_ABSOLUTE))
-    {
-        /* We may need to send a relative event for button information or to
-         * wake the guest up to the changed absolute co-ordinates.
-         * If the event is a pure wake up one, we make sure it contains some
-         * (possibly phony) event data to make sure it isn't just discarded on
-         * the way. */
+        /* We may need to send an additional event for button information or
+         * to wake up older guests to the changed absolute co-ordinates.  If
+         * the event is a pure wake up one, we make sure it contains some
+         * (possibly phony) event data to make sure it isn't just discarded
+         * on the way. */
+        bool fNeedsJiggle = !(mouseCaps & VMMDEV_MOUSE_GUEST_USES_VMMDEV);
         if (fNeedsJiggle || fButtons != mLastButtons || dz || dw)
         {
@@ -492 +503 @@
         }
     }
+    else
+        rc = reportAbsEventToMouseDev(mouseXAbs, mouseYAbs, dz, dw, fButtons);
+
+    ComAssertComRCRet(rc, rc);
+
+    mLastAbsX = mouseXAbs;
+    mLastAbsY = mouseYAbs;
+
     mLastButtons = fButtons;
     return rc;
@@ -500 +519 @@
 
 
-void Mouse::sendMouseCapsCallback(void)
-{
-    bool fAbsSupported =   uDevCaps & MOUSE_DEVCAP_ABSOLUTE
-                         ? true : fVMMDevCanAbs;
-    mParent->onMouseCapabilityChange(fAbsSupported, uDevCaps & MOUSE_DEVCAP_RELATIVE, fVMMDevNeedsHostCursor);
+void Mouse::sendMouseCapsNotifications(void)
+{
+    bool fAbsDev = false;
+    bool fRelDev = false;
+    for (unsigned i = 0; i < MOUSE_MAX_DEVICES; ++i)
+        if (mpDrv[i])
+        {
+           if (mpDrv[i]->u32DevCaps & MOUSE_DEVCAP_ABSOLUTE)
+               fAbsDev = true;
+           if (mpDrv[i]->u32DevCaps & MOUSE_DEVCAP_RELATIVE)
+               fRelDev = true;
+        }
+    mParent->onMouseCapabilityChange(fAbsDev || fVMMDevCanAbs, fRelDev,
+                                     fVMMDevNeedsHostCursor);
+    /** @todo if this gets called during device initialisation we get an
+     * error due to VMMDev not being initialised yet.  This is currently
+     * worked around in DevPS2 (which doesn't need the capability anyway of
+     * course), but it seems to me that Main should be initialised before
+     * the devices are. */
+    if (fAbsDev && !(uHostCaps & VMMDEV_MOUSE_HOST_HAS_ABS_DEV))
+        uHostCaps |= VMMDEV_MOUSE_HOST_HAS_ABS_DEV;
+    if (!fAbsDev && (uHostCaps & VMMDEV_MOUSE_HOST_HAS_ABS_DEV))
+        uHostCaps &= ~VMMDEV_MOUSE_HOST_HAS_ABS_DEV;
+    setVMMDevMouseCaps(uHostCaps);
 }
 
@@ -515 +553 @@
     PDRVMAINMOUSE pDrv = RT_FROM_MEMBER(pInterface, DRVMAINMOUSE, IConnector);
     if (fRel)
-        pDrv->pMouse->uDevCaps |= MOUSE_DEVCAP_RELATIVE;
+        pDrv->u32DevCaps |= MOUSE_DEVCAP_RELATIVE;
     else
-        pDrv->pMouse->uDevCaps &= ~MOUSE_DEVCAP_RELATIVE;
+        pDrv->u32DevCaps &= ~MOUSE_DEVCAP_RELATIVE;
     if (fAbs)
-        pDrv->pMouse->uDevCaps |= MOUSE_DEVCAP_ABSOLUTE;
+        pDrv->u32DevCaps |= MOUSE_DEVCAP_ABSOLUTE;
     else
-        pDrv->pMouse->uDevCaps &= ~MOUSE_DEVCAP_ABSOLUTE;
-
-    pDrv->pMouse->sendMouseCapsCallback();
+        pDrv->u32DevCaps &= ~MOUSE_DEVCAP_ABSOLUTE;
+
+    pDrv->pMouse->sendMouseCapsNotifications();
 }
 
@@ -556 +594 @@
     {
         AutoWriteLock mouseLock(pData->pMouse COMMA_LOCKVAL_SRC_POS);
-        pData->pMouse->mpDrv = NULL;
+        RT_ZERO(pData->pMouse->mpDrv);
     }
 }
@@ -609 +647 @@
     }
     pData->pMouse = (Mouse *)pv;        /** @todo Check this cast! */
-    pData->pMouse->mpDrv = pData;
+    unsigned cDev;
+    for (cDev = 0; cDev < MOUSE_MAX_DEVICES; ++cDev)
+        if (!pData->pMouse->mpDrv[cDev])
+        {
+            pData->pMouse->mpDrv[cDev] = pData;
+            break;
+        }
+    if (cDev == MOUSE_MAX_DEVICES)
+        return VERR_NO_MORE_HANDLES;
 
     return VINF_SUCCESS;

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

@@ -28 +28 @@
 #include <VBox/pdmdrv.h>
 
+/** Maximum number of devices supported */
+enum { MOUSE_MAX_DEVICES = 3 };
+/** Mouse driver instance data. */
+typedef struct DRVMAINMOUSE DRVMAINMOUSE, *PDRVMAINMOUSE;
+
 /** Simple mouse event class. */
 class MouseEvent
@@ -45 +50 @@
 // template instantiation
 typedef ConsoleEventBuffer<MouseEvent> MouseEventBuffer;
-
-enum
-{
-    MOUSE_DEVCAP_RELATIVE = 1,
-    MOUSE_DEVCAP_ABSOLUTE = 2
-};
 
 class ATL_NO_VTABLE Mouse :
@@ -109 +108 @@
     {
         fVMMDevCanAbs = canAbs;
-        sendMouseCapsCallback();
+        sendMouseCapsNotifications();
     }
 
@@ -115 +114 @@
     {
         fVMMDevNeedsHostCursor = needsHost;
-        sendMouseCapsCallback();
+        sendMouseCapsNotifications();
     }
 
@@ -135 +134 @@
     int convertDisplayHeight(LONG y, uint32_t *pcY);
     
-    void sendMouseCapsCallback(void);
+    void sendMouseCapsNotifications(void);
 
 #ifdef VBOXBFE_WITHOUT_COM
@@ -143 +142 @@
 #endif
     /** Pointer to the associated mouse driver. */
-    struct DRVMAINMOUSE    *mpDrv;
+    struct DRVMAINMOUSE    *mpDrv[MOUSE_MAX_DEVICES];
 
     LONG uHostCaps;
-    LONG uDevCaps;
     bool fVMMDevCanAbs;
     bool fVMMDevNeedsHostCursor;