Changeset 9811

Timestamp:

06/19/08 11:29:12 (6 months ago)

Author:

vboxsync

Message:

Additions/x11: use the guest/host registry to save the last resolution on machine shutdown and to restore it at startup

Files:

• trunk/include/VBox/VBoxGuest.h (modified) (1 diff)
• trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk (modified) (2 diffs)
• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibInfoSvc.cpp (added)
• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp (modified) (2 diffs)
• trunk/src/VBox/Additions/x11/xgraphics/vboxutils.c (modified) (2 diffs)
• trunk/src/VBox/Additions/x11/xgraphics/vboxvideo.h (modified) (1 diff)
• trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c (modified) (5 diffs)
• trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_15.c (modified) (8 diffs)
• trunk/src/VBox/Additions/x11/xgraphics/vboxvideo_70.c (modified) (2 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -1565 +1565 @@
-VBGLR3DECL(int)     VbglR3DisplayChangeWaitEvent(uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits, uint32_t *piDisplay);
-VBGLR3DECL(bool)    VbglR3HostLikesVideoMode(uint32_t cx, uint32_t cy, uint32_t cBits);
+VBGLR3DECL(int)     VbglR3SaveVideoMode(char *pszName, uint32_t cx, uint32_t cy, uint32_t cBits);
+VBGLR3DECL(int)     VbglR3RetrieveVideoMode(char *pszName, uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits);
-/** @}  */
-
+/** @name Information Services
+ * @{ */
+VBGLR3DECL(int)     VbglR3InfoSvcConnect(uint32_t *pu32ClientId);
+VBGLR3DECL(int)     VbglR3InfoSvcDisconnect(uint32_t u32ClientId);
+VBGLR3DECL(int)     VbglR3InfoSvcWriteKey(uint32_t u32ClientId, char *pszKey, char *pszValue);
+VBGLR3DECL(int)     VbglR3InfoSvcReadKey(uint32_t u32ClientId, char *pszKey, char *pcValue, uint32_t cbValue, uint32_t *pcbActual);
+/** @}  */
+
-
-__END_DECLS

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

@@ -88 +88 @@
-        VBoxGuestR3LibDaemonize.cpp \
-        VBoxGuestR3LibGR.cpp \
+        VBoxGuestR3LibInfoSvc.cpp \
-        VBoxGuestR3LibMouse.cpp \
-        VBoxGuestR3LibMisc.cpp \
@@ -117 +118 @@
-        VBoxGuestR3Lib.cpp \
-        VBoxGuestR3LibGR.cpp \
+        VBoxGuestR3LibInfoSvc.cpp \
-        VBoxGuestR3LibMouse.cpp \
-        VBoxGuestR3LibMisc.cpp \

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

@@ -28 +28 @@
-#include <iprt/assert.h>
-#include <VBox/log.h>
+#include <VBox/HostServices/VBoxInfoSvc.h>  /* For Save and RetrieveVideoMode */
-
-#include "VBGLR3Internal.h"
@@ -232 +233 @@
-    return fRc;
-}
+
+/**
+ * Save video mode parameters to the registry.
+ * 
+ * @returns iprt status value
+ * @param   pszName the name to save the mode parameters under
+ * @param   cx      mode width
+ * @param   cy      mode height
+ * @param   cBits   bits per pixel for the mode
+ */
+VBGLR3DECL(int) VbglR3SaveVideoMode(char *pszName, uint32_t cx, uint32_t cy, uint32_t cBits)
+{
+    using namespace svcInfo;
+
+    char pcModeName[KEY_MAX_LEN];
+    char pcModeParms[KEY_MAX_VALUE_LEN];
+    uint32_t u32ClientId = 0;
+    RTStrPrintf(pcModeName, sizeof(pcModeName), "VideoMode/%s", pszName);
+    RTStrPrintf(pcModeParms, sizeof(pcModeParms), "%dx%dx%d", cx, cy, cBits);
+    int rc = VbglR3InfoSvcConnect(&u32ClientId);
+    if (RT_SUCCESS(rc))
+        rc = VbglR3InfoSvcWriteKey(u32ClientId, pcModeName, pcModeParms);
+    if (u32ClientId != 0)
+        VbglR3InfoSvcDisconnect(u32ClientId);  /* Return value ignored, because what can we do anyway? */
+    return rc;
+}
+
+
+/**
+ * Retrieve video mode parameters from the registry.
+ * 
+ * @returns iprt status value
+ * @param   pszName the name under which the mode parameters are saved
+ * @param   pcx     where to store the mode width
+ * @param   pcy     where to store the mode height
+ * @param   pcBits  where to store the bits per pixel for the mode
+ */
+VBGLR3DECL(int) VbglR3RetrieveVideoMode(char *pszName, uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits)
+{
+    using namespace svcInfo;
+
+    char pcModeName[KEY_MAX_LEN];
+    char pcModeParms[KEY_MAX_VALUE_LEN];
+    char *pszNext;
+    uint32_t u32ClientId;
+    uint32_t cx, cy, cBits;
+
+    RTStrPrintf(pcModeName, sizeof(pcModeName), "VideoMode/%s", pszName);
+    int rc = VbglR3InfoSvcConnect(&u32ClientId);
+    if (RT_SUCCESS(rc))
+        rc = VbglR3InfoSvcReadKey(u32ClientId, pcModeName, pcModeParms,
+                                  sizeof(pcModeParms), NULL);
+    if (RT_SUCCESS(rc))
+        /* Extract the width from the string */
+        rc = RTStrToUInt32Ex(pcModeParms, &pszNext, 10, &cx);
+    if (   (VWRN_NUMBER_TOO_BIG == rc)
+        || (VWRN_NEGATIVE_UNSIGNED == rc)
+        || (RT_SUCCESS(rc) && (*pszNext != ',') && (*pszNext != 'x')))
+        rc = VERR_INVALID_PARAMETER;
+    if (RT_SUCCESS(rc))
+    {
+        if ((*pszNext != ',') || (*pszNext != 'x'))
+            ++pszNext;
+        for (;' ' == *pszNext; ++pszNext);
+        rc = RTStrToUInt32Ex(pszNext, &pszNext, 10, &cy);
+    }
+    if (   (VWRN_NUMBER_TOO_BIG == rc)
+        || (VWRN_NEGATIVE_UNSIGNED == rc)
+        || (RT_SUCCESS(rc) && (*pszNext != ',') && (*pszNext != 'x')))
+        rc = VERR_INVALID_PARAMETER;
+    if (RT_SUCCESS(rc))
+    {
+        if ((*pszNext != ',') || (*pszNext != 'x'))
+            ++pszNext;
+        for (;' ' == *pszNext; ++pszNext);
+        rc = RTStrToUInt32Ex(pszNext, &pszNext, 10, &cBits);
+    }
+    if (   (VWRN_NUMBER_TOO_BIG == rc)
+        || (VWRN_NEGATIVE_UNSIGNED == rc)
+        || (VWRN_TRAILING_CHARS == rc))
+        rc = VERR_INVALID_PARAMETER;
+    if (u32ClientId != 0)
+        VbglR3InfoSvcDisconnect(u32ClientId);  /* Return value ignored, because what can we do anyway? */
+    if (RT_SUCCESS(rc))
+    {
+        *pcx = cx;
+        *pcy = cy;
+        *pcBits = cBits;
+    }
+    return rc;
+}

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

@@ -1002 +1002 @@
-Bool
-vboxGetDisplayChangeRequest(ScrnInfoPtr pScrn, uint32_t *pcx, uint32_t *pcy,
-,
-
-
+)
+
+
-    TRACE_ENTRY();
-    if (!pVBox->useDevice)
@@ -1025 +1025 @@
- */
-Bool
-
-
-
+
+
+
+
+
+
-    return VbglR3HostLikesVideoMode(cx, cy, cBits);
-}
+
+/**
+ * Save video mode parameters to the registry.
+ * 
+ * @returns iprt status value
+ * @param   pszName the name to save the mode parameters under
+ * @param   cx      mode width
+ * @param   cy      mode height
+ * @param   cBits   bits per pixel for the mode
+ */
+Bool
+vboxSaveVideoMode(ScrnInfoPtr pScrn, uint32_t cx, uint32_t cy, uint32_t cBits)
+{
+    VBOXPtr pVBox = pScrn->driverPrivate;
+    TRACE_ENTRY();
+    if (!pVBox->useDevice)
+        return FALSE;
+    return RT_SUCCESS(VbglR3SaveVideoMode("SavedMode", cx, cy, cBits));
+}
+
+/**
+ * Retrieve video mode parameters from the registry.
+ * 
+ * @returns iprt status value
+ * @param   pszName the name under which the mode parameters are saved
+ * @param   pcx     where to store the mode width
+ * @param   pcy     where to store the mode height
+ * @param   pcBits  where to store the bits per pixel for the mode
+ */
+Bool
+vboxRetrieveVideoMode(ScrnInfoPtr pScrn, uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits)
+{
+    VBOXPtr pVBox = pScrn->driverPrivate;
+    TRACE_ENTRY();
+    if (!pVBox->useDevice)
+        return FALSE;
+    int rc = VbglR3RetrieveVideoMode("SavedMode", pcx, pcy, pcBits);
+    if (RT_SUCCESS(rc))
+        TRACE_LOG("Retrieved a video mode of %dx%dx%d\n", *pcx, *pcy, *pcBits);
+    else
+        TRACE_LOG("Failed to retrieve video mode, error %d\n", rc);
+    return (RT_SUCCESS(rc));
+}

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

@@ -189 +189 @@
-extern Bool vboxGetDisplayChangeRequest(ScrnInfoPtr pScrn, uint32_t *pcx,
-                                        uint32_t *pcy, uint32_t *pcBits,
-, VBOXPtr pVBox
+
-
-
+
+
+
-
-#endif /* _VBOXVIDEO_H_ */

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

@@ -52 +52 @@
- */
-
-
+
+
+
-#ifdef DEBUG_VIDEO
-
@@ -300 +302 @@
-    VBOXSetMode(crtc->scrn, adjusted_mode);
-    VBOXAdjustFrame(crtc->scrn->scrnIndex, x, y, 0);
+    vboxSaveVideoMode(crtc->scrn, adjusted_mode->HDisplay,
+                      adjusted_mode->VDisplay, crtc->scrn->bitsPerPixel);
-}
-
@@ -345 +349 @@
-vbox_output_mode_valid (xf86OutputPtr output, DisplayModePtr mode)
-{
+    ScrnInfoPtr pScrn = output->scrn;
-    int rc = MODE_OK;
-    TRACE3("HDisplay=%d, VDisplay=%d\n", mode->HDisplay, mode->VDisplay);
-output->s
-mode->HDisplay, mode->V
-output->s
+pS
+pScrn, mode->H
+mode->VDisplay, pS
-       )
-        rc = MODE_BAD;
@@ -413 +418 @@
-    if (vbox_device_available(pVBox))
-    {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        if (rc && (0 != x) && (0 != y)) {
-            /* We prefer a slightly smaller size to a slightly larger one */
@@ -720 +735 @@
-            /* We only support 16 and 24 bits depth (i.e. 16 and 32bpp) */
-            if (   vboxGetDisplayChangeRequest(pScrn, &cx, &cy, &cBits,
-, pVBox
+
-                && (cBits != 16)
-               )

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

@@ -117 +117 @@
-static const OptionInfoRec * VBOXAvailableOptions(int chipid, int busid);
-static void VBOXIdentify(int flags);
+#ifndef PCIACCESS
-static Bool VBOXProbe(DriverPtr drv, int flags);
-ifdef PCIACCESS
+else
-static Bool VBOXPciProbe(DriverPtr drv, int entity_num,
-     struct pci_device *dev, intptr_t match_data);
@@ -334 +335 @@
-    VBOXSetMode(crtc->scrn, adjusted_mode);
-    VBOXAdjustFrame(crtc->scrn->scrnIndex, x, y, 0);
+    vboxSaveVideoMode(crtc->scrn, adjusted_mode->HDisplay,
+                      adjusted_mode->VDisplay, crtc->scrn->bitsPerPixel);
-}
-
@@ -379 +382 @@
-vbox_output_mode_valid (xf86OutputPtr output, DisplayModePtr mode)
-{
+    ScrnInfoPtr pScrn = output->scrn;
-    int rc = MODE_OK;
-    TRACE3("HDisplay=%d, VDisplay=%d\n", mode->HDisplay, mode->VDisplay);
-output->s
-
-output->s
+pS
+pScrn, 
+pS
-       )
-        rc = MODE_BAD;
@@ -447 +451 @@
-    if (vbox_device_available(pVBox))
-    {
-, pVBox
+
-        /* @todo - check the display number once we support multiple displays. */
+        /* If we don't find a display request, see if we have a saved hint
+         * from a previous session. */
+        if (!rc || (0 == x) || (0 == y))
+            rc = vboxRetrieveVideoMode(pScrn, &x, &y, &bpp);
-        if (rc && (0 != x) && (0 != y)) {
-            /* We prefer a slightly smaller size to a slightly larger one */
@@ -636 +644 @@
-#endif
-
+#ifndef PCIACCESS
-static Bool
-VBOXProbe(DriverPtr drv, int flags)
@@ -651 +660 @@
-        return (FALSE);
-
-#ifndef PCIACCESS
-    /* PCI BUS */
-    if (xf86GetPciVideoInfo()) {
@@ -690 +698 @@
-        }
-    }
+
+    xfree(devSections);
+
+    return (foundScreen);
+}
-#endif
-
-    xfree(devSections);
-
-    return (foundScreen);
-}
-
-/*
@@ -804 +812 @@
-            /* We only support 16 and 24 bits depth (i.e. 16 and 32bpp) */
-            if (   vboxGetDisplayChangeRequest(pScrn, &cx, &cy, &cBits,
-, pVBox
+
-                && (cBits != 16)
-               )

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

@@ -470 +470 @@
-        uint32_t cx = 0, cy = 0, iDisplay = 0, cBits = 24;
-
-
-
+
-        {
-            /* We only support 16 and 24 bits depth (i.e. 16 and 32bpp) */
@@ -515 +514 @@
-        ++i;
-    }
-
+pScrn, 
-    {
-        pScrn->display->modes[i] = "1024x768";
-        ++i;
-    }
-
+pScrn, 
-    {
-        pScrn->display->modes[i] = "800x600";