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

Timestamp:

Mar 14, 2008 5:05:33 PM (17 years ago)

Author:

vboxsync

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

28903

Message:

Additions/x11: use the VideoModeSupported guest request to check whether the host likes resolutions

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp (modified) (2 diffs)
• x11/xgraphics/vboxutils.c (modified) (1 diff)
• x11/xgraphics/vboxvideo.h (modified) (1 diff)
• x11/xgraphics/vboxvideo_13.c (modified) (2 diffs)
• x11/xgraphics/vboxvideo_70.c (modified) (1 diff)

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

@@ -23 +23 @@
 #include <iprt/mem.h>
 #include <iprt/assert.h>
+#include <VBox/log.h>
 
 #include "VBGLR3Internal.h"
@@ -201 +202 @@
     return rc;
 }
+
+/**
+ * Query the host as to whether it likes a specific video mode.
+ *
+ * @returns the result of the query
+ * @param   cx     the width of the mode being queried
+ * @param   cy     the height of the mode being queried
+ * @param   cBits  the bpp of the mode being queried
+ */
+VBGLR3DECL(bool) VbglR3HostLikesVideoMode(uint32_t cx, uint32_t cy,
+                                          uint32_t cBits)
+{
+    bool brc = false;
+    int rc = VINF_SUCCESS;
+    VMMDevVideoModeSupportedRequest req;
+
+    vmmdevInitRequest(&req.header, VMMDevReq_VideoModeSupported);
+    req.width      = cx;
+    req.height     = cy;
+    req.bpp        = cBits;
+    req.fSupported = false;
+    rc = vbglR3GRPerform(&req.header);
+    if (RT_SUCCESS(rc) && RT_SUCCESS(req.header.rc))
+        brc = req.fSupported;
+    else
+        LogRelFunc(("error querying video mode supported status from VMMDev."
+                    "rc = %Vrc, VMMDev rc = %Vrc\n", rc, req.header.rc));
+    return brc;
+}

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

@@ -882 +882 @@
     return FALSE;
 }
+
+
+/**
+ * Query the host as to whether it likes a specific video mode.
+ *
+ * @returns the result of the query
+ * @param   cx     the width of the mode being queried
+ * @param   cy     the height of the mode being queried
+ * @param   cBits  the bpp of the mode being queried
+ */
+Bool
+vboxHostLikesVideoMode(uint32_t cx, uint32_t cy, uint32_t cBits)
+{
+    return VbglR3HostLikesVideoMode(cx, cy, cBits);
+}

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

@@ -171 +171 @@
                                         uint32_t *piDisplay, VBOXPtr pVBox);
 
+extern Bool vboxHostLikesVideoMode(uint32_t cx, uint32_t cy, uint32_t cBits);
+
 #endif /* _VBOXVIDEO_H_ */

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

@@ -346 +346 @@
 vbox_output_mode_valid (xf86OutputPtr output, DisplayModePtr mode)
 {
-    (void) output; (void) mode;
-    return MODE_OK;
+    if (vboxHostLikesVideoMode(mode->HDisplay, mode->VDisplay,
+                               output->scrn->bitsPerPixel))
+        return MODE_OK;
+    else
+        return MODE_BAD;
 }
 
@@ -410 +413 @@
         vbox_output_add_mode(&pModes, NULL, x, y, TRUE);
     }
-    vbox_output_add_mode(&pModes, NULL, 1024, 768, FALSE);
-    vbox_output_add_mode(&pModes, NULL, 800, 600, FALSE);
-    vbox_output_add_mode(&pModes, NULL, 640, 480, FALSE);
     TRACE2;
     return pModes;

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

@@ -504 +504 @@
        all invalid. */
     if (pcHostModeName != NULL)
+    {
         pScrn->display->modes[i] = pcHostModeName;
-    else
-        --i;
-    pScrn->display->modes[i+1] = "1024x768";
-    pScrn->display->modes[i+2] = "800x600";
-    pScrn->display->modes[i+3] = "640x480";
-    pScrn->display->modes[i+4] = NULL;
+        ++i;
+    }
+    if (vboxHostLikesVideoMode(1024, 768, pScrn->bitsPerPixel))
+    {
+        pScrn->display->modes[i] = "1024x768";
+        ++i;
+    }
+    if (vboxHostLikesVideoMode(800, 600, pScrn->bitsPerPixel))
+    {
+        pScrn->display->modes[i] = "800x600";
+        ++i;
+    }
+    /* A mode of last resort */
+    pScrn->display->modes[i] = "640x480";
+    ++i;
+    pScrn->display->modes[i] = NULL;
 
     /* Create a builtin mode for every specified mode. This allows to specify arbitrary