Changeset 52189 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/display.cpp

Timestamp:

Jul 25, 2014 2:09:02 PM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: make remembering screen size between sessions work for multiple monitors, second series.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/display.cpp

@@ -219 +219 @@
 static void runDisplay(struct x11State *pState)
 {
-    int status, rc, i;
+    int status, rc;
+    unsigned i, cScreens;
     char szCommand[256];
     Cursor hClockCursor = XCreateFontCursor(pState->pDisplay, XC_watch);
@@ -225 +226 @@
 
     LogRelFlowFunc(("\n"));
-    /** @todo fix this not to use a hard-coded value. */
-    for (i = 0; i < 64; ++i)
+    rc = VbglR3VideoModeGetHighestSavedScreen(&cScreens);
+    if (RT_FAILURE(rc))
+        FatalError(("Failed to get the number of saved screen modes, rc=%Rrc\n",
+                    rc));
+    for (i = 0; i < RT_MAX(cScreens + 1, 8); ++i)
     {
         unsigned cx = 0, cy = 0, cBPP = 0, x = 0, y = 0;
@@ -233 +237 @@
         rc = VbglR3RetrieveVideoMode(i, &cx, &cy, &cBPP, &x, &y,
                                      &fEnabled);
+        if (RT_SUCCESS(rc) && i > cScreens) /* Sanity */
+            FatalError(("Internal error retrieving the number of saved screen modes.\n"));
         if (RT_SUCCESS(rc))
             setModeX11(pState, cx, cy, cBPP, i, x, y, fEnabled,
@@ -298 +304 @@
             rc = VbglR3SeamlessGetLastEvent(&Mode);
             if (RT_FAILURE(rc))
-                FatalError(("Failed to save size hint, rc=%Rrc\n", rc));
+                FatalError(("Failed to check seamless mode, rc=%Rrc\n", rc));
             if (Mode == VMMDev_Seamless_Disabled)
             {