Changeset 38648 in vbox for trunk/src/VBox/Additions/x11/vboxmouse

Timestamp:

Sep 5, 2011 9:53:44 PM (13 years ago)

Author:

vboxsync

Message:

Additions/common and X11: more VBOXGUEST_IOCTL_SET_MOUSE_STATUS adjustments

Location:

trunk/src/VBox/Additions/x11/vboxmouse

Files:

• VBoxUtils.c (modified) (2 diffs)
• VBoxUtils_68.c (modified) (3 diffs)

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

@@ -49 +49 @@
     }
 
-    rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
-    if (RT_SUCCESS(rc))
-        rc = VbglR3SetMouseStatus(  fFeatures
-                                  | VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE);
+    rc = VbglR3SetMouseStatus(VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE);
     if (RT_FAILURE(rc))
     {
@@ -98 +95 @@
 int VBoxMouseFini(void)
 {
-    if (gDeviceOpenFailed)
-        return VINF_SUCCESS;
-    uint32_t fFeatures;
-    int rc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
-    if (RT_SUCCESS(rc))
-        rc = VbglR3SetMouseStatus(  fFeatures
-                                  & ~VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE);
     VbglR3Term();
-    return rc;
+    return VINF_SUCCESS;
 }

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

@@ -90 +90 @@
 int VBoxMouseInit(void)
 {
-    VMMDevReqMouseStatus req;
+    uint32_t fFeatures;
 
     /* return immediately if already initialized */
@@ -115 +115 @@
 
     /* tell the host that we want absolute coordinates */
-    vmmdevInitRequest((VMMDevRequestHeader*)&req, VMMDevReq_SetMouseStatus);
-    req.mouseFeatures = VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR;
-    req.pointerXPos = 0;
-    req.pointerYPos = 0;
+    fFeatures = VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE;
 /** @todo r=bird: Michael, I thought we decided a long time ago that all these should be replaced by VbglR3. I assume this is just a leftover... */
-    if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0)
+    if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_SET_MOUSE_STATUS, &fFeatures)
+        < 0)
     {
         ErrorF("Error sending mouse pointer capabilities to VMM! rc = %d (%s)\n",
@@ -175 +173 @@
     if (g_vboxguestHandle < 0)
         return 0;
-    /* tell VMM that we no longer support absolute mouse handling */
-    vmmdevInitRequest((VMMDevRequestHeader*)&req, VMMDevReq_SetMouseStatus);
-    req.mouseFeatures = 0;
-    req.pointerXPos = 0;
-    req.pointerYPos = 0;
-/** @todo r=bird: Michael, ditto. */
-    if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0)
-    {
-        ErrorF("ioctl to vboxguest module failed, rc = %d (%s)\n",
-               errno, strerror(errno));
-    }
-
+    /* Tell VMM that we no longer support absolute mouse handling - done
+     * automatically when we close the handle. */
     free(g_vmmreqMouseStatus);
     g_vmmreqMouseStatus = NULL;