Changeset 28099 in vbox

Timestamp:

Apr 8, 2010 3:35:40 PM (15 years ago)

Author:

vboxsync

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

59815

Message:

Devices/VMMDev: inform the guest if we have an absolute pointing device

Location:

trunk

Files:

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

trunk/include/VBox/VMMDev.h

@@ -276 +276 @@
 #define VMMDEV_MOUSE_GUEST_MASK \
       (VMMDEV_MOUSE_NOTIFY_HOST_MASK | VMMDEV_MOUSE_GUEST_USES_VMMDEV)
+/** The mask of host capability changes for which notification events should
+ * be sent */
+#define VMMDEV_MOUSE_NOTIFY_GUEST_MASK \
+      VMMDEV_MOUSE_HOST_CAN_ABSOLUTE
+/** The mask of all capabilities which the host can legitimately change */
+#define VMMDEV_MOUSE_HOST_MASK \
+      (  VMMDEV_MOUSE_NOTIFY_GUEST_MASK \
+       | VMMDEV_MOUSE_HOST_CANNOT_HWPOINTER \
+       | VMMDEV_MOUSE_HOST_RECHECKS_NEEDS_HOST_CURSOR \
+       | VMMDEV_MOUSE_HOST_HAS_ABS_DEV)
 /** @} */
 

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

@@ -2005 +2005 @@
     PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
 
-    bool bCapsChanged = ((capabilities & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE)
-                         != (pThis->mouseCapabilities & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE));
-
-    Log(("vmmdevSetMouseCapabilities: bCapsChanged %d\n", bCapsChanged));
-
-    if (capabilities & VMMDEV_MOUSE_HOST_CANNOT_HWPOINTER)
-        pThis->mouseCapabilities |= VMMDEV_MOUSE_HOST_CANNOT_HWPOINTER;
-    else
-        pThis->mouseCapabilities &= ~VMMDEV_MOUSE_HOST_CANNOT_HWPOINTER;
-
-    if (capabilities & VMMDEV_MOUSE_HOST_CAN_ABSOLUTE)
-        pThis->mouseCapabilities |= VMMDEV_MOUSE_HOST_CAN_ABSOLUTE;
-    else
-        pThis->mouseCapabilities &= ~VMMDEV_MOUSE_HOST_CAN_ABSOLUTE;
-
-    if (bCapsChanged)
+    bool bNotify = (   (capabilities & VMMDEV_MOUSE_NOTIFY_GUEST_MASK)
+                    != (pThis->mouseCapabilities & VMMDEV_MOUSE_NOTIFY_GUEST_MASK));
+
+    Log(("vmmdevSetMouseCapabilities: bNotify %d\n", bNotify));
+
+    pThis->mouseCapabilities &= ~VMMDEV_MOUSE_HOST_MASK;
+    pThis->mouseCapabilities |= (capabilities & VMMDEV_MOUSE_HOST_MASK);
+    if (bNotify)
         VMMDevNotifyGuest (pThis, VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED);