Changeset 57345 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 14, 2015 9:58:20 AM (9 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxmouse: co-ordinate the VMMDev mouse status with the in-process video driver.

File:

• trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse.c (modified) (2 diffs)

trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse.c

@@ -186 +186 @@
             break;
         /* Tell the host that we want absolute co-ordinates */
-        rc = VbglR3SetMouseStatus(  VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
-                                  | VMMDEV_MOUSE_NEW_PROTOCOL);
+        rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
+        fFeatures &= VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR;
+        if (RT_SUCCESS(rc))
+            rc = VbglR3SetMouseStatus(  fFeatures
+                                      | VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
+                                      | VMMDEV_MOUSE_NEW_PROTOCOL);
         if (!RT_SUCCESS(rc)) {
             xf86Msg(X_ERROR, "%s: Failed to switch guest mouse into absolute mode\n",
@@ -201 +205 @@
         xf86Msg(X_INFO, "%s: Off.\n", pInfo->name);
         rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
+        fFeatures &= VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR;
         if (RT_SUCCESS(rc))
             rc = VbglR3SetMouseStatus(  fFeatures