Changeset 54054 in vbox

Timestamp:

Jan 30, 2015 6:53:32 PM (10 years ago)

Author:

vboxsync

Message:

Main and Additions/x11: remove VMMDEV_MOUSE_HOST_HAS_ABS_DEV (leaving the place-holder in the API of course) as it is not very useful.

Location:

trunk/src/VBox

Files:

• Additions/x11/vboxvideo/getmode.c (modified) (1 diff)
• Main/src-client/MouseImpl.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/vboxvideo/getmode.c

@@ -252 +252 @@
 static void updateUseHardwareCursor(VBOXPtr pVBox, uint32_t fCursorCapabilities)
 {
-    bool fGuestCanReportAbsolutePosition = false;
-    bool fHostWishesToReportAbsolutePosition = false;
-
-    if (   (fCursorCapabilities & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE)
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 5
-            /* As of this version (server 1.6) all major Linux releases
-             * are known to handle USB tablets correctly. */
-        || (fCursorCapabilities & VMMDEV_MOUSE_HOST_HAS_ABS_DEV)
-#endif
-        )
-        fGuestCanReportAbsolutePosition = true;
     if (   !(fCursorCapabilities & VMMDEV_MOUSE_HOST_CANNOT_HWPOINTER)
         && (fCursorCapabilities & VMMDEV_MOUSE_HOST_WANTS_ABSOLUTE))
-        fHostWishesToReportAbsolutePosition = true;
-    pVBox->fUseHardwareCursor = fGuestCanReportAbsolutePosition && fHostWishesToReportAbsolutePosition;
+        pVBox->fUseHardwareCursor = true;
+    else
+        pVBox->fUseHardwareCursor = false;
 }
 

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

@@ -1131 +1131 @@
 void Mouse::i_sendMouseCapsNotifications(void)
 {
-    bool fAbsDev, fRelDev, fMTDev, fCanAbs, fNeedsHostCursor;
+    bool fRelDev, fMTDev, fCanAbs, fNeedsHostCursor;
 
     {
         AutoReadLock aLock(this COMMA_LOCKVAL_SRC_POS);
 
-        i_getDeviceCaps(&fAbsDev, &fRelDev, &fMTDev);
+        i_getDeviceCaps(NULL, &fRelDev, &fMTDev);
         fCanAbs = i_supportsAbs();
         fNeedsHostCursor = i_guestNeedsHostCursor();
     }
-    if (fAbsDev)
-        i_updateVMMDevMouseCaps(VMMDEV_MOUSE_HOST_HAS_ABS_DEV, 0);
-    else
-        i_updateVMMDevMouseCaps(0, VMMDEV_MOUSE_HOST_HAS_ABS_DEV);
-    /** @todo this call takes the Console lock in order to update the cached
-     * callback data atomically.  However I can't see any sign that the cached
-     * data is ever used again. */
     mParent->i_onMouseCapabilityChange(fCanAbs, fRelDev, fMTDev, fNeedsHostCursor);
 }