Changeset 6458 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jan 23, 2008 6:23:24 AM (17 years ago)

Author:

vboxsync

Message:

Additions (VBoxGuestLib): Updated the seamless and fullscreen code in the R3 library

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxGuestR3LibMisc.cpp (modified) (1 diff)
• VBoxGuestR3LibSeamless.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

@@ -103 +103 @@
         VBoxGuestR3LibMouse.cpp \
         VBoxGuestR3LibMisc.cpp \
+        VBoxGuestR3LibSeamless.cpp \
         VBoxGuestR3LibTime.cpp \
 

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

@@ -81 +81 @@
 }
 
+/**
+ * Query the last display change request.
+ *
+ * @returns iprt status value
+ * @retval xres     horizontal pixel resolution (0 = do not change)
+ * @retval yres     vertical pixel resolution (0 = do not change)
+ * @retval bpp      bits per pixel (0 = do not change)
+ * @param  eventAck Flag that the request is an acknowlegement for the
+ *                  VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST.
+ *                  Values:
+ *                      0                                   - just querying,
+ *                      VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST - event acknowledged.
+ * @param  display  0 for primary display, 1 for the first secondary, etc.
+ */
+VBGLR3DECL(int) VbglR3GetDisplayChangeRequest(uint32_t *px, uint32_t *py, uint32_t *pbpp,
+                                              uint32_t eventAck, uint32_t display)
+{
+    VMMDevDisplayChangeRequest2 Req;
+    vmmdevInitRequest(&Req.header, VMMDevReq_GetDisplayChangeRequest2);
+    Req.xres = 0;
+    Req.yres = 0;
+    Req.bpp = 0;
+    Req.eventAck = eventAck;
+    Req.display = display;
+    int rc = vbglR3GRPerform(&Req.header);
+    if (RT_SUCCESS(rc))
+    {
+        *px = Req.xres;
+        *py = Req.yres;
+        *pbpp = Req.bpp;
+    }
+    return rc;
+}

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

@@ -27 +27 @@
 #include <VBox/log.h>
 
-
-/* Move this to a header { */
-
-extern int vbglR3DoIOCtl(unsigned iFunction, void *pvData, size_t cbData);
-
-/* } */
+#include "VBGLR3Internal.h"
 
 /**
@@ -51 +46 @@
     vmmdevInitRequest(&vmmreqGuestCaps.header, VMMDevReq_ReportGuestCapabilities);
     vmmreqGuestCaps.caps = fState ? VMMDEV_GUEST_SUPPORTS_SEAMLESS : 0;
-    rc = VbglR3GRPerform(&vmmreqGuestCaps.header);
+    rc = vbglR3GRPerform(&vmmreqGuestCaps.header);
 #ifdef DEBUG
     if (RT_SUCCESS(rc))
@@ -87 +82 @@
             vmmdevInitRequest(&seamlessChangeRequest.header, VMMDevReq_GetSeamlessChangeRequest);
             seamlessChangeRequest.eventAck = VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST;
-            rc = VbglR3GRPerform(&seamlessChangeRequest.header);
+            rc = vbglR3GRPerform(&seamlessChangeRequest.header);
             if (RT_SUCCESS(rc))
             {
@@ -107 +102 @@
  * @param   pRects list of visible rectangles on the guest display
  *
- * @todo A scatter-gather version of VbglR3GRPerform would be nice, so that we don't have
+ * @todo A scatter-gather version of vbglR3GRPerform would be nice, so that we don't have
  *       to copy our rectangle and header data into a single structure and perform an
  *       additional allocation.
@@ -118 +113 @@
     if (0 == cRects)
         return VINF_SUCCESS;
-    rc = VbglR3GRAlloc((VMMDevRequestHeader **)&req,
+    rc = vbglR3GRAlloc((VMMDevRequestHeader **)&req,
                        sizeof(VMMDevVideoSetVisibleRegion) + (cRects - 1) * sizeof(RTRECT),
                        VMMDevReq_VideoSetVisibleRegion);
@@ -125 +120 @@
         req->cRect = cRects;
         memcpy(&req->Rect, pRects, cRects * sizeof(RTRECT));
-        rc = VbglR3GRPerform(&req->header);
-        VbglR3GRFree(&req->header);
+        rc = vbglR3GRPerform(&req->header);
+        vbglR3GRFree(&req->header);
         if (RT_SUCCESS(rc))
         {