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

Timestamp:

Jul 31, 2009 11:33:06 AM (15 years ago)

Author:

vboxsync

Message:

Additions/x11 and common: simplify requests for getting video mode hints and introduce a generic wait event request

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp (modified) (1 diff)
• common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp (modified) (3 diffs)
• x11/VBoxClient/autoresize.cpp (modified) (3 diffs)
• x11/vboxvideo/vboxutils.c (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp

@@ -28 +28 @@
 
 #include "VBGLR3Internal.h"
+
+
+/**
+ * Wait for the host to signal one or several of a set of events and return the
+ * events signalled.  The events will only be delivered by the host if they
+ * have been enabled previously using @a VbglR3CtlFilterMask.  If one or
+ * several of the events have already been signalled but not yet waited for,
+ * this function will return immediately and return those events.
+ *
+ * @returns iprt status code
+ * @param   fMask       the events we want to wait for, or-ed together
+ * @param   u32Timeout  how long to wait before giving up and returning.  Use
+ *                      RT_INDEFINITE_WAIT to wait until we are interrupted or
+ *                      one of the events is signalled.
+ * @param   pfEvents    where to store the events signalled
+ */
+VBGLR3DECL(int) VbglR3WaitEvent(uint32_t fMask, uint32_t u32Timeout,
+                                uint32_t *pfEvents)
+{
+    LogFlowFunc(("fMask=0x%x, u32Timeout=%u, pfEvents=%p\n", fMask, u32Timeout,
+                 pfEvents));
+    AssertReturn((fMask & ~VMMDEV_EVENT_VALID_EVENT_MASK) == 0,
+                 VERR_INVALID_PARAMETER);
+    /* Does pfEvents == NULL make sense? */
+    AssertReturn(VALID_PTR(pfEvents) || pfEvents == NULL,
+                 VERR_INVALID_POINTER);
+
+    VBoxGuestWaitEventInfo waitEvent;
+    int rc;
+
+    waitEvent.u32TimeoutIn = u32Timeout;
+    waitEvent.u32EventMaskIn = fMask;
+    waitEvent.u32Result = VBOXGUEST_WAITEVENT_ERROR;
+    waitEvent.u32EventFlagsOut = 0;
+    rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent));
+    if (RT_SUCCESS(rc) && (pfEvents) != NULL)
+        *pfEvents = waitEvent.u32EventFlagsOut;
+    LogFlowFunc(("rc=%Rrc, waitEvent.u32EventFlagsOut=0x%x\n", rc,
+                 waitEvent.u32EventFlagsOut));
+    return rc;
+}
 
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp

@@ -120 +120 @@
 
 /**
- * Query the last display change request.
+ * Query the last display change request sent from the host to the guest.
  *
  * @returns iprt status value
- * @param   pcx         Where to store the horizontal pixel resolution (0 = do not change).
- * @param   pcy         Where to store the vertical pixel resolution (0 = do not change).
- * @param   pcBits      Where to store the bits per pixel (0 = do not change).
- * @param   iDisplay    Where to store the display number the request was for - 0 for the
- *                      primary display, 1 for the first secondary, etc.
- */
-VBGLR3DECL(int) VbglR3GetLastDisplayChangeRequest(uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits, uint32_t *piDisplay)
+ * @param   pcx         Where to store the horizontal pixel resolution
+ *                      requested (a value of zero means do not change).
+ * @param   pcy         Where to store the vertical pixel resolution
+ *                      requested (a value of zero means do not change).
+ * @param   pcBits      Where to store the bits per pixel requested (a value
+ *                      of zero means do not change).
+ * @param   iDisplay    Where to store the display number the request was for
+ *                      - 0 for the primary display, 1 for the first
+ *                      secondary display, etc.
+ * @param   fAck        whether or not to acknowlege the newest request sent by
+ *                      the host.  If this is set, the function will return the
+ *                      most recent host request, otherwise it will return the
+ *                      last request to be acknowleged.
+ *                      
+ */
+VBGLR3DECL(int) VbglR3GetDisplayChangeRequest(uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits, uint32_t *piDisplay, bool fAck)
 {
     VMMDevDisplayChangeRequest2 Req = { { 0 } };
@@ -139 +148 @@
     AssertPtrReturn(piDisplay, VERR_INVALID_PARAMETER);
 #endif
-vmmdevInitRequest(&Req.header, VMMDevReq_GetDisplayChangeRequest2);
+    vmmdevInitRequest(&Req.header, VMMDevReq_GetDisplayChangeRequest2);
+    if (fAck)
+        Req.eventAck = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
     int rc = vbglR3GRPerform(&Req.header);
     if (RT_SUCCESS(rc))
@@ -153 +164 @@
 }
 
-/**
- * Wait for a display change request event from the host.  These events must have been
- * activated previously using VbglR3CtlFilterMask.
- *
- * @returns IPRT status value
- * @param   pcx       On success, where to return the requested display width.
- *                    0 means no change.
- * @param   pcy       On success, where to return the requested display height.
- *                    0 means no change.
- * @param   pcBits    On success, where to return the requested bits per pixel.
- *                    0 means no change.
- * @param   piDisplay On success, where to return the index of the display to be changed.
- */
-VBGLR3DECL(int) VbglR3DisplayChangeWaitEvent(uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits, uint32_t *piDisplay)
-{
-    VBoxGuestWaitEventInfo waitEvent;
-    int rc;
-
-#ifndef VBOX_VBGLR3_XFREE86
-    AssertPtrReturn(pcx, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pcy, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pcBits, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(piDisplay, VERR_INVALID_PARAMETER);
-#endif
-    waitEvent.u32TimeoutIn = RT_INDEFINITE_WAIT;
-    waitEvent.u32EventMaskIn = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
-    waitEvent.u32Result = VBOXGUEST_WAITEVENT_ERROR;
-    waitEvent.u32EventFlagsOut = 0;
-    rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent));
-    if (RT_SUCCESS(rc))
-    {
-        /* did we get the right event? */
-        if (waitEvent.u32EventFlagsOut & VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST)
-        {
-            VMMDevDisplayChangeRequest2 Req = { { 0 } };
-            vmmdevInitRequest(&Req.header, VMMDevReq_GetDisplayChangeRequest2);
-            Req.eventAck = VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
-            int rc = vbglR3GRPerform(&Req.header);
-            if (RT_SUCCESS(rc))
-                rc = Req.header.rc;
-            if (RT_SUCCESS(rc))
-            {
-                *pcx = Req.xres;
-                *pcy = Req.yres;
-                *pcBits = Req.bpp;
-                *piDisplay = Req.display;
-            }
-        }
-        else
-            rc = VERR_TRY_AGAIN;
-    }
-    return rc;
-}
 
 /**

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

@@ -56 +56 @@
     }
     if (RT_SUCCESS(rc))
-        rc = VbglR3CtlFilterMask(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, 0);
+        rc = VbglR3CtlFilterMask(  VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST
+                                 | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED, 0);
     LogFlowFunc(("returning %Rrc\n", rc));
     return rc;
@@ -64 +65 @@
 {
     LogFlowFunc(("\n"));
-    VbglR3CtlFilterMask(0, VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST);
+    VbglR3CtlFilterMask(0,   VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST
+                           | VMMDEV_EVENT_MOUSE_CAPABILITIES_CHANGED);
     LogFlowFunc(("returning\n"));
 }
@@ -93 +95 @@
     if (RT_FAILURE(rc))
         return rc;
-    VbglR3GetLastDisplayChangeRequest(&cx0, &cy0, &cBits0, &iDisplay0);
+    VbglR3GetDisplayChangeRequest(&cx0, &cy0, &cBits0, &iDisplay0, false);
     while (true)
     {
-        uint32_t cx = 0, cy = 0, cBits = 0, iDisplay = 0;
-        rc = VbglR3DisplayChangeWaitEvent(&cx, &cy, &cBits, &iDisplay);
-        /* Ignore the request if it is stale */
-        if ((cx != cx0) || (cy != cy0) || RT_FAILURE(rc))
+        uint32_t fEvents = 0, cx = 0, cy = 0, cBits = 0, iDisplay = 0;
+        rc = VbglR3WaitEvent(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST,
+                             RT_INDEFINITE_WAIT, &fEvents);
+        if (RT_SUCCESS(rc) && (fEvents & VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST))
         {
-                /* If we are not stopping, sleep for a bit to avoid using up too
-                    much CPU while retrying. */
-                if (RT_FAILURE(rc))
-                    RTThreadYield();
-                else
-                    system("VBoxRandR");
+            rc = VbglR3GetDisplayChangeRequest(&cx, &cy, &cBits, &iDisplay,
+                                               true);
+            /* Ignore the request if it is stale */
+            if ((cx != cx0) || (cy != cy0) || RT_FAILURE(rc))
+            {
+                    /* If we are not stopping, sleep for a bit to avoid using up
+                        too much CPU while retrying. */
+                    if (RT_FAILURE(rc))
+                        RTThreadYield();
+                    else
+                    {
+                        system("VBoxRandR");
+                    cx0 = cx;
+                    cy0 = cy;
+                    }
+            }
         }
-        /* We do not want to ignore any further requests. */
-        cx0 = 0;
-        cy0 = 0;
     }
     LogFlowFunc(("returning VINF_SUCCESS\n"));

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

@@ -998 +998 @@
     if (!pVBox->useDevice)
         return FALSE;
-    int rc = VbglR3GetLastDisplayChangeRequest(pcx, pcy, pcBits, piDisplay);
+    int rc = VbglR3GetDisplayChangeRequest(pcx, pcy, pcBits, piDisplay, false);
     if (RT_SUCCESS(rc))
         return TRUE;