Changeset 22094 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Aug 7, 2009 9:54:52 PM (16 years ago)

Author:

vboxsync

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

50843

Message:

Additions/x11/vboxmouse: don't overwrite mouse status flags we don't change ourselves

File:

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

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

@@ -111 +111 @@
     InputInfoPtr pInfo;
     int rc, xrc;
+    uint32_t fFeatures = 0;
 
     pInfo = device->public.devicePrivate;
@@ -132 +133 @@
             break;
         /* Tell the host that we want absolute co-ordinates */
-        rc = VbglR3SetMouseStatus(  VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
-                                  | VMMDEV_MOUSE_GUEST_USES_VMMDEV);
+        rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
+        if (RT_SUCCESS(rc))
+            rc = VbglR3SetMouseStatus(  fFeatures
+                                      | VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
+                                      | VMMDEV_MOUSE_GUEST_USES_VMMDEV);
         if (!RT_SUCCESS(rc)) {
             xf86Msg(X_ERROR, "%s: Failed to switch guest mouse into absolute mode\n",
@@ -146 +150 @@
     case DEVICE_OFF:
         xf86Msg(X_INFO, "%s: Off.\n", pInfo->name);
+        rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
+        if (RT_SUCCESS(rc))
+            rc = VbglR3SetMouseStatus(  fFeatures
+                                      & ~VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE
+                                      & ~VMMDEV_MOUSE_GUEST_USES_VMMDEV);
         VbglR3SetMouseStatus(0);
         xf86RemoveEnabledDevice(pInfo);