Changeset 22096 in vbox

Timestamp:

Aug 7, 2009 10:27:55 PM (16 years ago)

Author:

vboxsync

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

50845

Message:

Devices/VMMDev: simplify and complete mouse status requests

Location:

trunk

Files:

• include/VBox/VMMDev.h (modified) (1 diff)
• src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (3 diffs)

trunk/include/VBox/VMMDev.h

@@ -257 +257 @@
 /** The guest can read VMMDev events to find out about pointer movement */
 #define VMMDEV_MOUSE_GUEST_USES_VMMDEV                      RT_BIT(4)
+/** The mask of all VMMDEV_MOUSE_* flags */
+#define VMMDEV_MOUSE_MASK                                   UINT32_C(0x0000001f)
+/** The mask of guest capability changes for which notification events should
+ * be sent */
+#define VMMDEV_MOUSE_NOTIFY_HOST_MASK \
+      (VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR)
+/** The mask of all capabilities which the guest can legitimately change */
+#define VMMDEV_MOUSE_GUEST_MASK \
+      (VMMDEV_MOUSE_NOTIFY_HOST_MASK | VMMDEV_MOUSE_GUEST_USES_VMMDEV)
 /** @} */
 

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -600 +600 @@
             {
                 VMMDevReqMouseStatus *mouseStatus = (VMMDevReqMouseStatus*)pRequestHeader;
-                mouseStatus->mouseFeatures = 0;
-                if (pThis->mouseCapabilities & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE)
-                {
-                    mouseStatus->mouseFeatures |= VMMDEV_MOUSE_HOST_CAN_ABSOLUTE;
-                }
-                if (pThis->mouseCapabilities & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
-                {
-                    mouseStatus->mouseFeatures |= VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE;
-                }
-                if (pThis->mouseCapabilities & VMMDEV_MOUSE_HOST_CANNOT_HWPOINTER)
-                {
-                    mouseStatus->mouseFeatures |= VMMDEV_MOUSE_HOST_CANNOT_HWPOINTER;
-                }
+                mouseStatus->mouseFeatures =   pThis->mouseCapabilities
+                                             & VMMDEV_MOUSE_MASK;
                 mouseStatus->pointerXPos = pThis->mouseXAbs;
                 mouseStatus->pointerYPos = pThis->mouseYAbs;
-                Log2(("returning mouse status: features = %d, absX = %d, absY = %d\n", mouseStatus->mouseFeatures,
-                      mouseStatus->pointerXPos, mouseStatus->pointerYPos));
+                LogRel2(("%s: VMMDevReq_GetMouseStatus: features = 0x%x, absX = %d, absY = %d\n",
+                                __PRETTY_FUNCTION__,
+                                mouseStatus->mouseFeatures,
+                                mouseStatus->pointerXPos,
+                                mouseStatus->pointerYPos));
                 pRequestHeader->rc = VINF_SUCCESS;
             }
@@ -635 +627 @@
             else
             {
-                bool bCapsChanged = false;
-
-                VMMDevReqMouseStatus *mouseStatus = (VMMDevReqMouseStatus*)pRequestHeader;
-
-                /* check if the guest wants absolute coordinates */
-                if (mouseStatus->mouseFeatures & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
-                {
-                    /* set the capability flag and the changed flag if it's actually a change */
-                    if (!(pThis->mouseCapabilities & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE))
-                    {
-                        pThis->mouseCapabilities |= VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE;
-                        bCapsChanged = true;
-                        LogRel(("Guest requests mouse pointer integration\n"));
-                    }
-                } else
-                {
-                    if (pThis->mouseCapabilities & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
-                    {
-                        pThis->mouseCapabilities &= ~VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE;
-                        bCapsChanged = true;
-                        LogRel(("Guest disables mouse pointer integration\n"));
-                    }
-                }
-                if (mouseStatus->mouseFeatures & VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR)
-                    pThis->mouseCapabilities |= VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR;
-                else
-                    pThis->mouseCapabilities &= ~VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR;
-                if (mouseStatus->mouseFeatures & VMMDEV_MOUSE_GUEST_USES_VMMDEV)
-                    pThis->mouseCapabilities |= VMMDEV_MOUSE_GUEST_USES_VMMDEV;
-                else
-                    pThis->mouseCapabilities &= ~VMMDEV_MOUSE_GUEST_USES_VMMDEV;
+                bool fNotify = false;
+
+                uint32_t fFeatures =
+                    ((VMMDevReqMouseStatus*)pRequestHeader)->mouseFeatures;
+
+                LogRelFlowFunc(("VMMDevReqMouseStatus: mouseFeatures = 0x%x\n",
+                                fFeatures));
+
+                if (   (fFeatures & VMMDEV_MOUSE_NOTIFY_HOST_MASK)
+                    != (  pThis->mouseCapabilities
+                        & VMMDEV_MOUSE_NOTIFY_HOST_MASK))
+                    fNotify = true;
+                pThis->mouseCapabilities &= ~VMMDEV_MOUSE_GUEST_MASK;
+                pThis->mouseCapabilities |=
+                    (fFeatures & VMMDEV_MOUSE_GUEST_MASK);
+                LogRelFlowFunc(("VMMDevReq_SetMouseStatus: new host capabilities: 0x%x\n",
+                                pThis->mouseCapabilities));
 
                 /*
                  * Notify connector if something has changed
                  */
-                if (bCapsChanged)
-                {
-                    Log(("VMMDevReq_SetMouseStatus: capabilities changed (%x), informing connector\n", pThis->mouseCapabilities));
+                if (fNotify)
+                {
+                    LogRelFlowFunc(("VMMDevReq_SetMouseStatus: notifying connector\n"));
                     pThis->pDrv->pfnUpdateMouseCapabilities(pThis->pDrv, pThis->mouseCapabilities);
                 }
@@ -1050 +1028 @@
 
                 pCtlMaskRequest = (VMMDevCtlGuestFilterMask *)pRequestHeader;
-                /* The HGCM events are enabled by the VMMDev device automatically when any
-                 * HGCM command is issued. The guest then can not disable these events.
+                LogRelFlowFunc(("VMMDevCtlGuestFilterMask: or mask: 0x%x, not mask: 0x%x\n",
+                                pCtlMaskRequest->u32OrMask,
+                                pCtlMaskRequest->u32NotMask));
+                /* HGCM event notification is enabled by the VMMDev device
+                 * automatically when any HGCM command is issued.  The guest
+                 * cannot disable these notifications.
                  */
                 vmmdevCtlGuestFilterMask_EMT (pThis,