Changeset 9811 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Jun 19, 2008 9:29:12 AM (17 years ago)

Author:

vboxsync

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

32186

Message:

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

Location:

trunk/src/VBox/Additions/x11/xgraphics

Files:

• vboxutils.c (modified) (2 diffs)
• vboxvideo.h (modified) (1 diff)
• vboxvideo_13.c (modified) (5 diffs)
• vboxvideo_15.c (modified) (8 diffs)
• vboxvideo_70.c (modified) (2 diffs)

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

@@ -1002 +1002 @@
 Bool
 vboxGetDisplayChangeRequest(ScrnInfoPtr pScrn, uint32_t *pcx, uint32_t *pcy,
-                            uint32_t *pcBits, uint32_t *piDisplay,
-                            VBOXPtr pVBox)
-{
+                            uint32_t *pcBits, uint32_t *piDisplay)
+{
+    VBOXPtr pVBox = pScrn->driverPrivate;
     TRACE_ENTRY();
     if (!pVBox->useDevice)
@@ -1025 +1025 @@
  */
 Bool
-vboxHostLikesVideoMode(uint32_t cx, uint32_t cy, uint32_t cBits)
-{
-    TRACE_ENTRY();
+vboxHostLikesVideoMode(ScrnInfoPtr pScrn, uint32_t cx, uint32_t cy, uint32_t cBits)
+{
+    VBOXPtr pVBox = pScrn->driverPrivate;
+    TRACE_ENTRY();
+    if (!pVBox->useDevice)
+        return TRUE;  /* If we can't ask the host then we like everything. */
     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,
-                                        uint32_t *piDisplay, VBOXPtr pVBox);
+                                        uint32_t *piDisplay);
 
-extern Bool vboxHostLikesVideoMode(uint32_t cx, uint32_t cy, uint32_t cBits);
+extern Bool vboxHostLikesVideoMode(ScrnInfoPtr pScrn, uint32_t cx, uint32_t cy, uint32_t cBits);
+extern Bool vboxSaveVideoMode(ScrnInfoPtr pScrn, uint32_t cx, uint32_t cy, uint32_t cBits);
+extern Bool vboxRetrieveVideoMode(ScrnInfoPtr pScrn, uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits);
 
 #endif /* _VBOXVIDEO_H_ */

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

@@ -52 +52 @@
  */
 
-/* #define DEBUG_VIDEO 1 */
+#ifdef DEBUG_michael
+# define DEBUG_VIDEO 1
+#endif
 #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);
-    if (   vbox_device_available(VBOXGetRec(output->scrn))
-        && !vboxHostLikesVideoMode(mode->HDisplay, mode->VDisplay,
-                                   output->scrn->bitsPerPixel)
+    if (   vbox_device_available(VBOXGetRec(pScrn))
+        && !vboxHostLikesVideoMode(pScrn, mode->HDisplay,
+                                   mode->VDisplay, pScrn->bitsPerPixel)
        )
         rc = MODE_BAD;
@@ -413 +418 @@
     if (vbox_device_available(pVBox))
     {
-        rc = vboxGetDisplayChangeRequest(pScrn, &x, &y, &bpp, &display, pVBox);
-        /* @todo - check the display number once we support multiple displays. */
+        rc = vboxGetDisplayChangeRequest(pScrn, &x, &y, &bpp, &display);
+        /** @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)
+            TRACE3("Got a display change request for %dx%d\n", x, y);
+        if (!rc || (0 == x) || (0 == y))
+        {
+            rc = vboxRetrieveVideoMode(pScrn, &x, &y, &bpp);
+            if (rc)
+                TRACE3("Retrieved a video mode of %dx%d\n", x, y);
+        }
         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,
-                                               &iDisplay, pVBox)
+                                               &iDisplay)
                 && (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);
-    if (   vbox_device_available(VBOXGetRec(output->scrn))
-        && !vboxHostLikesVideoMode(mode->HDisplay, mode->VDisplay,
-                                   output->scrn->bitsPerPixel)
+    if (   vbox_device_available(VBOXGetRec(pScrn))
+        && !vboxHostLikesVideoMode(pScrn, mode->HDisplay, mode->VDisplay,
+                                   pScrn->bitsPerPixel)
        )
         rc = MODE_BAD;
@@ -447 +451 @@
     if (vbox_device_available(pVBox))
     {
-        rc = vboxGetDisplayChangeRequest(pScrn, &x, &y, &bpp, &display, pVBox);
+        rc = vboxGetDisplayChangeRequest(pScrn, &x, &y, &bpp, &display);
         /* @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,
-                                               &iDisplay, pVBox)
+                                               &iDisplay)
                 && (cBits != 16)
                )

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

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