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

Timestamp:

Aug 7, 2009 8:17:53 PM (15 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo_13: merge back vboxvideo_15 parts of r32186: Additions/x11: use the guest/host registry to save the last resolution on machine shutdown and to restore it at startup

File:

• trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_13.c (modified) (7 diffs)

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

@@ -55 +55 @@
 # define DEBUG_VIDEO 1
 #endif
+
 #ifdef DEBUG_VIDEO
 
@@ -116 +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);
@@ -387 +389 @@
     if (   !(mode->type & M_T_USERDEF)
         && vbox_device_available(VBOXGetRec(pScrn))
-        && !vboxHostLikesVideoMode(pScrn, mode->HDisplay,
-                                   mode->VDisplay, pScrn->bitsPerPixel)
+        && !vboxHostLikesVideoMode(pScrn, mode->HDisplay, mode->VDisplay,
+                                   pScrn->bitsPerPixel)
        )
         rc = MODE_BAD;
@@ -458 +460 @@
         uint32_t x, y, bpp, display;
         rc = vboxGetDisplayChangeRequest(pScrn, &x, &y, &bpp, &display);
-        /** @todo - check the display number once we support multiple displays. */
+        /* @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 */
@@ -666 +662 @@
 #endif
 
+#ifndef PCIACCESS
 static Bool
 VBOXProbe(DriverPtr drv, int flags)
@@ -681 +678 @@
         return (FALSE);
 
-#ifndef PCIACCESS
     /* PCI BUS */
     if (xf86GetPciVideoInfo()) {
@@ -720 +716 @@
         }
     }
+
+    xfree(devSections);
+
+    return (foundScreen);
+}
 #endif
-
-    xfree(devSections);
-
-    return (foundScreen);
-}
 
 /*