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

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

Location:

trunk/src/VBox/Additions/x11

Files:

• VBoxClient/display.cpp (modified) (7 diffs)
• vboxvideo/vboxutils.c (modified) (3 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/display.cpp

@@ -28 +28 @@
 
 #include <X11/Xlib.h>
+#include <X11/cursorfont.h>
 
 #include <iprt/assert.h>
@@ -42 +43 @@
     int rc = VINF_SUCCESS;
     int rcSystem, rcErrno;
+    uint32_t fMouseFeatures = 0;
 
     LogFlowFunc(("\n"));
@@ -56 +58 @@
     }
     if (RT_SUCCESS(rc))
-        rc = VbglR3CtlFilterMask(  VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST
-                                 | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED, 0);
+        rc = VbglR3CtlFilterMask(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, 0);
+    /* Enable support for switching between hardware and software cursors */
+    rc = VbglR3CtlFilterMask(VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED, 0);
+    if (RT_SUCCESS(rc))
+    {
+        rc = VbglR3GetMouseStatus(&fMouseFeatures, NULL, NULL);
+        if (RT_SUCCESS(rc))
+            VbglR3SetMouseStatus(  fMouseFeatures
+                                 & ~VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR);
+    }
     LogFlowFunc(("returning %Rrc\n", rc));
     return rc;
@@ -64 +74 @@
 void cleanupDisplay(void)
 {
+    uint32_t fMouseFeatures = 0;
     LogFlowFunc(("\n"));
     VbglR3CtlFilterMask(0,   VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST
                            | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED);
+    int rc = VbglR3GetMouseStatus(&fMouseFeatures, NULL, NULL);
+    if (RT_SUCCESS(rc))
+        VbglR3SetMouseStatus(  fMouseFeatures
+                             | VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR);
     LogFlowFunc(("returning\n"));
 }
@@ -91 +106 @@
     LogFlowFunc(("\n"));
     uint32_t cx0 = 0, cy0 = 0, cBits0 = 0, iDisplay0 = 0;
+    Display *pDisplay = XOpenDisplay(NULL);
+    if (pDisplay == NULL)
+        return VERR_NOT_FOUND;
+    Cursor hClockCursor = XCreateFontCursor(pDisplay, XC_watch);
+    Cursor hArrowCursor = XCreateFontCursor(pDisplay, XC_left_ptr);
     int rc = RTThreadCreate(NULL, x11ConnectionMonitor, NULL, 0,
                    RTTHREADTYPE_INFREQUENT_POLLER, 0, "X11 monitor");
@@ -99 +119 @@
     {
         uint32_t fEvents = 0, cx = 0, cy = 0, cBits = 0, iDisplay = 0;
-        rc = VbglR3WaitEvent(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST,
+        rc = VbglR3WaitEvent(  VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST
+                             | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED,
                              RT_INDEFINITE_WAIT, &fEvents);
         if (RT_SUCCESS(rc) && (fEvents & VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST))
         {
-            rc = VbglR3GetDisplayChangeRequest(&cx, &cy, &cBits, &iDisplay,
-                                               true);
+            int rc2 = VbglR3GetDisplayChangeRequest(&cx, &cy, &cBits,
+                                                    &iDisplay, true);
             /* Ignore the request if it is stale */
-            if ((cx != cx0) || (cy != cy0) || RT_FAILURE(rc))
+            if ((cx != cx0) || (cy != cy0) || RT_FAILURE(rc2))
             {
                     /* If we are not stopping, sleep for a bit to avoid using up
                         too much CPU while retrying. */
-                    if (RT_FAILURE(rc))
+                    if (RT_FAILURE(rc2))
                         RTThreadYield();
                     else
@@ -119 +140 @@
                     }
             }
+        }
+        if (   RT_SUCCESS(rc)
+            && (fEvents & VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED))
+        {
+            XGrabPointer(pDisplay,
+                         DefaultRootWindow(pDisplay), true, 0, GrabModeAsync,
+                         GrabModeAsync, None, hClockCursor, CurrentTime);
+            XFlush(pDisplay);
+            XGrabPointer(pDisplay,
+                         DefaultRootWindow(pDisplay), true, 0, GrabModeAsync,
+                         GrabModeAsync, None, hArrowCursor, CurrentTime);
+            XFlush(pDisplay);
+            XUngrabPointer(pDisplay, CurrentTime);
+            XFlush(pDisplay);
         }
     }

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);
 }