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

Timestamp:

Sep 29, 2009 8:47:35 PM (16 years ago)

Author:

vboxsync

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

52996

Message:

Additions/x11/vboxvideo: use a software mouse cursor if the virtual resolution is greater than the actual resolution for XFree86 as well

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• vboxutils_68.c (modified) (2 diffs)
• vboxvideo_68.c (modified) (1 diff)
• vboxvideo_68.h (modified) (1 diff)

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

@@ -140 +140 @@
     VMMDevReqMouseStatus req;
 
-    int vrc = vmmdevInitRequest ((VMMDevRequestHeader*)&req, VMMDevReq_GetMouseStatus);
-    if (RT_FAILURE (vrc))
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-            "Unable to determine whether the virtual machine supports mouse pointer integration - request initialization failed with return code %d\n", rc);
-#ifdef RT_OS_LINUX
-    if (   RT_SUCCESS(vrc)
-        && (ioctl(pVBox->vbox_fd, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0))
-#else
-# error port me!
-#endif
-    {
-        vrc = VERR_FILE_IO_ERROR;
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-            "Unable to determine whether the virtual machine supports mouse pointer integration - request system call failed: %s.\n",
-            strerror(errno));
-    }
-    if (   RT_SUCCESS(rc)
-        && !(req.mouseFeatures & VMMDEV_MOUSE_HOST_CANNOT_HWPOINTER)
-        && (req.mouseFeatures & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE))
-            rc = TRUE;
+    /* We may want to force the use of a software cursor.  Currently this is
+     * needed if the guest uses a large virtual resolution, as in this case
+     * the host and guest tend to disagree about the pointer location. */
+    if (pVBox->forceSWCursor)
+        rc = FALSE;
+    else
+    {
+        int vrc = vmmdevInitRequest ((VMMDevRequestHeader*)&req, VMMDevReq_GetMouseStatus);
+        if (RT_FAILURE (vrc))
+            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                "Unable to determine whether the virtual machine supports mouse pointer integration - request initialization failed with return code %d\n", rc);
+    #ifdef RT_OS_LINUX
+        if (   RT_SUCCESS(vrc)
+            && (ioctl(pVBox->vbox_fd, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0))
+    #else
+    # error port me!
+    #endif
+        {
+            vrc = VERR_FILE_IO_ERROR;
+            xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                "Unable to determine whether the virtual machine supports mouse pointer integration - request system call failed: %s.\n",
+                strerror(errno));
+        }
+        if (   RT_SUCCESS(rc)
+            && !(req.mouseFeatures & VMMDEV_MOUSE_HOST_CANNOT_HWPOINTER)
+            && (req.mouseFeatures & VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE))
+                rc = TRUE;
+    }
     return rc;
 }
@@ -861 +869 @@
 #endif
 
+    /* Hide the host cursor before we initialise if we wish to use a
+     * software cursor. */
+    if (pVBox->forceSWCursor)
+        vbox_vmm_hide_cursor(pScrn, pVBox);
     rc = xf86InitCursor (pScreen, pCurs);
     if (rc == TRUE)

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

@@ -803 +803 @@
     }
     pVBox = VBOXGetRec(pScrn);
+    /* We force a software cursor if the guests virtual resolution is different
+     * to it's actual resolution, as in this case host and guest will disagree
+     * about the pointer position. */
+    if (   (pScrn->virtualX - xRes >= 8)
+        || (pScrn->virtualY - pMode->VDisplay >= 8))
+        pVBox->forceSWCursor = TRUE;
+    else
+        pVBox->forceSWCursor = FALSE;
+
     pScrn->vtSema = TRUE;
     /* Disable linear framebuffer mode before making changes to the resolution. */

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_68.h

@@ -154 +154 @@
     Bool useVbva;
     int viewportX, viewportY;
+    Bool forceSWCursor;
     VMMDevVideoAccelFlush *reqf;
     VMMDevVideoAccelEnable *reqe;