Changeset 21923 in vbox for trunk/src/VBox/Additions/x11/vboxvideo

Timestamp:

Jul 31, 2009 8:01:47 PM (15 years ago)

Author:

vboxsync

Message:

Additions/x11: made VBoxClient responsible for switching between software and hardware cursors and removed a hack from vboxvideo

File:

• trunk/src/VBox/Additions/x11/vboxvideo/vboxutils.c (modified) (3 diffs)

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

@@ -399 +399 @@
     Bool rc = TRUE;
     int vrc;
+    uint32_t fMouseFeatures = 0;
 
     TRACE_ENTRY();
@@ -411 +412 @@
     }
     pVBox->useDevice = rc;
+    /* We can't switch to a software cursor at will without help from
+     * VBoxClient.  So tell that to the host and wait for VBoxClient to
+     * change this. */
+    vrc = VbglR3GetMouseStatus(&fMouseFeatures, NULL, NULL);
+    if (RT_SUCCESS(vrc))
+        VbglR3SetMouseStatus(  fMouseFeatures
+                             | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR);
     return rc;
 }
@@ -531 +539 @@
 }
 
-/**
- * This function is called to set the position of the hardware cursor.
- * Since we already know the position (exactly where the host pointer is),
- * we only use this function to poll for whether we need to switch from a
- * hardware to a software cursor (that is, whether the user has disabled
- * pointer integration).  Sadly this doesn't work the other way round,
- * as the server updates the software cursor itself without notifying us.
- */
+
 static void
 vbox_set_cursor_position(ScrnInfoPtr pScrn, int x, int y)
 {
-    VBOXPtr pVBox = pScrn->driverPrivate;
-
-    if (pVBox->accessEnabled && !vbox_host_uses_hwcursor(pScrn))
-    {
-        /* This triggers a cursor image reload, and before reloading, the X
-         * server will check whether we can "handle" the new cursor "in
-         * hardware".  We can use this check to force a switch to a software
-         * cursor if we need to do so. */
-        pScrn->EnableDisableFBAccess(pScrn->scrnIndex, FALSE);
-        pScrn->EnableDisableFBAccess(pScrn->scrnIndex, TRUE);
-    }
+    /* Nothing to do here, as we are telling the guest where the mouse is,
+     * not vice versa. */
+    NOREF(pScrn);
+    NOREF(x);
+    NOREF(y);
 }