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

Timestamp:

Mar 4, 2010 11:37:52 PM (15 years ago)

Author:

vboxsync

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

58378

Message:

Main/MouseImpl: edge case: do not use VMMDev for mouse reporting if we do not have a relative device

Location:

trunk/src/VBox/Main

Files:

• MouseImpl.cpp (modified) (3 diffs)
• include/MouseImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MouseImpl.cpp

@@ -484 +484 @@
     }
 
-    if (mouseCaps & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
+    if (fVMMDevCanAbs)
     {
         /*
@@ -523 +523 @@
     bool fAbsDev = false;
     bool fRelDev = false;
+    uint32_t u32MouseCaps;
     for (unsigned i = 0; i < MOUSE_MAX_DEVICES; ++i)
         if (mpDrv[i])
@@ -531 +532 @@
                fRelDev = true;
         }
+    if (RT_SUCCESS(getVMMDevMouseCaps(&u32MouseCaps)))
+        fVMMDevCanAbs =    (u32MouseCaps & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
+                        && fRelDev;
+    else
+        fVMMDevCanAbs = false;
     mParent->onMouseCapabilityChange(fAbsDev || fVMMDevCanAbs, fRelDev,
                                      fVMMDevNeedsHostCursor);

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

@@ -105 +105 @@
 
     // for VMMDevInterface
-    void onVMMDevCanAbsChange(bool canAbs)
+    void onVMMDevCanAbsChange(bool)
     {
-        fVMMDevCanAbs = canAbs;
         sendMouseCapsNotifications();
     }