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

Timestamp:

Aug 7, 2009 9:56:35 PM (16 years ago)

Author:

vboxsync

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

50844

Message:

Additions/x11/vboxmouse: don't overwrite mouse status flags we don't change ourselves (X.Org 7.0 to 1.4)

File:

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

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

@@ -47 +47 @@
 {
     int rc;
+    uint32_t fFeatures = 0;
     if (gDeviceOpenFailed)
         return 1;
@@ -57 +58 @@
     }
 
-    rc = VbglR3SetMouseStatus(VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE /* | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR */);
+    rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
+    if (RT_SUCCESS(rc))
+        rc = VbglR3SetMouseStatus(  fFeatures
+                                  | VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE);
     if (RT_FAILURE(rc))
     {
@@ -105 +109 @@
     if (gDeviceOpenFailed)
         return VINF_SUCCESS;
-    int rc = VbglR3SetMouseStatus(0);
+    uint32_t fFeatures;
+    int rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
+    if (RT_SUCCESS(rc))
+        rc = VbglR3SetMouseStatus(  fFeatures
+                                  & ~VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE);
     VbglR3Term();
     return rc;