Changeset 9016 in vbox for trunk/src/VBox/Additions/x11/xgraphics/vboxutils.c

Timestamp:

May 21, 2008 1:29:06 PM (17 years ago)

Author:

vboxsync

Message:

Additions/x11: keep the cursor visible when we disable mouse integration

File:

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

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

@@ -437 +437 @@
 vbox_set_cursor_position(ScrnInfoPtr pScrn, int x, int y)
 {
-    /* VBOXPtr pVBox = pScrn->driverPrivate; */
-
-    /* TRACE_ENTRY(); */
-
+    VBOXPtr pVBox = pScrn->driverPrivate;
+    int vrc;
+    uint32_t fFeatures;
+
+    TRACE_ENTRY();
+    /* Check whether we are using the hardware cursor or not, and whether this
+       has changed since the last time we checked. */
+    vrc = VbglR3GetMouseStatus(&fFeatures, NULL, NULL);
+    if (!!(fFeatures & VBOXGUEST_MOUSE_HOST_CAN_ABSOLUTE) != pVBox->usingHWCursor)
+    {
+        pVBox->usingHWCursor = !!(fFeatures & VBOXGUEST_MOUSE_HOST_CAN_ABSOLUTE);
+        /* This triggers a cursor image reload */
+        if (pVBox->accessEnabled)
+        {
+            pScrn->EnableDisableFBAccess(pScrn->scrnIndex, FALSE);
+            pScrn->EnableDisableFBAccess(pScrn->scrnIndex, TRUE);
+        }
+    }
+    
     /* don't disable the mouse cursor if we go out of our visible area
      * since the mouse cursor is drawn by the host anyway */
@@ -753 +768 @@
     if (!pVBox->useDevice)
         return FALSE;
+    /* Initially assume we are using a hardware cursor, but this is
+       updated every time the mouse moves anyway. */
+    pVBox->usingHWCursor = TRUE;
     pVBox->pCurs = pCurs = xf86CreateCursorInfoRec();
     if (!pCurs)