Changeset 52189 in vbox

Timestamp:

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

Author:

vboxsync

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

95246

Message:

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

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp (modified) (4 diffs)
• src/VBox/Additions/x11/VBoxClient/display.cpp (modified) (4 diffs)

trunk/include/VBox/VBoxGuestLib.h

@@ -485 +485 @@
                                                     bool *pfEnabled, bool fAck);
 VBGLR3DECL(bool)    VbglR3HostLikesVideoMode(uint32_t cx, uint32_t cy, uint32_t cBits);
+VBGLR3DECL(int)     VbglR3VideoModeGetHighestSavedScreen(unsigned *pcScreen);
 VBGLR3DECL(int)     VbglR3SaveVideoMode(unsigned cScreen, unsigned cx,
                                         unsigned cy, unsigned cBits, unsigned x,

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

@@ -778 +778 @@
 VBGLR3DECL(void) VbglR3GuestPropEnumFree(PVBGLR3GUESTPROPENUM pHandle)
 {
+    if (!pHandle)
+        return;
     RTMemFree(pHandle->pchBuf);
     RTMemFree(pHandle);

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

@@ -278 +278 @@
 
 /**
+ * Get the highest screen number for which there is a saved video mode or "0"
+ * if there are no saved modes.
+ *
+ * @returns iprt status value
+ * @param   pcScreen   where to store the virtual screen number
+ */
+VBGLR3DECL(int) VbglR3VideoModeGetHighestSavedScreen(unsigned *pcScreen)
+{
+#if defined(VBOX_WITH_GUEST_PROPS)
+    using namespace guestProp;
+
+    int rc, rc2 = VERR_UNRESOLVED_ERROR;
+    uint32_t u32ClientId = 0;
+    const char *pszPattern = VIDEO_PROP_PREFIX"*";
+    PVBGLR3GUESTPROPENUM pHandle = NULL;
+    const char *pszName;
+    unsigned cHighestScreen = 0;
+
+    AssertPtrReturn(pcScreen, VERR_INVALID_POINTER);
+    rc = VbglR3GuestPropConnect(&u32ClientId);
+    if (RT_SUCCESS(rc))
+        rc = VbglR3GuestPropEnum(u32ClientId, &pszPattern, 1, &pHandle,
+                                 &pszName, NULL, NULL, NULL);
+    if (u32ClientId != 0)
+        rc2 = VbglR3GuestPropDisconnect(u32ClientId);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
+    while (pszName != NULL && RT_SUCCESS(rc))
+    {
+        uint32_t cScreen;
+
+        rc = RTStrToUInt32Full(pszName + sizeof(VIDEO_PROP_PREFIX) - 1, 10,
+                               &cScreen);
+        if (RT_SUCCESS(rc))  /* There may be similar properties with text. */
+            cHighestScreen = RT_MAX(cHighestScreen, cScreen);
+        rc = VbglR3GuestPropEnumNext(pHandle, &pszName, NULL, NULL, NULL);
+    }
+    VbglR3GuestPropEnumFree(pHandle);
+    if (RT_SUCCESS(rc))
+        *pcScreen = cHighestScreen;
+    return rc;
+#else /* !VBOX_WITH_GUEST_PROPS */
+    return VERR_NOT_IMPLEMENTED;
+#endif /* !VBOX_WITH_GUEST_PROPS */
+}
+
+/**
  * Save video mode parameters to the guest property store.
  *
@@ -299 +346 @@
     char szModeParms[MAX_VALUE_LEN];
     uint32_t u32ClientId = 0;
-    unsigned cx2, cy2, cBits2, x2, y2;
+    unsigned cx2, cy2, cBits2, x2, y2, cHighestScreen, cHighestScreen2;
     bool fEnabled2;
-
+    int rc, rc2 = VERR_UNRESOLVED_ERROR;
+
+    rc = VbglR3VideoModeGetHighestSavedScreen(&cHighestScreen);
     RTStrPrintf(szModeName, sizeof(szModeName), VIDEO_PROP_PREFIX"%u", cScreen);
     RTStrPrintf(szModeParms, sizeof(szModeParms), "%ux%ux%u,%ux%u,%u", cx, cy,
                 cBits, x, y, (unsigned) fEnabled);
-    int rc = VbglR3GuestPropConnect(&u32ClientId);
+    if (RT_SUCCESS(rc))
+        rc = VbglR3GuestPropConnect(&u32ClientId);
     if (RT_SUCCESS(rc))
         rc = VbglR3GuestPropWriteValue(u32ClientId, szModeName, szModeParms);
     if (u32ClientId != 0)
-        VbglR3GuestPropDisconnect(u32ClientId);  /* Return value ignored, because what can we do anyway? */
+        rc2 = VbglR3GuestPropDisconnect(u32ClientId);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
+    /* Sanity check 1.  We do not try to make allowance for someone else
+     * changing saved settings at the same time as us. */
     if (RT_SUCCESS(rc))
     {
@@ -319 +373 @@
             rc = VERR_WRITE_ERROR;
     }
+    /* Sanity check 2.  Same comment. */
+    if (RT_SUCCESS(rc))
+        rc = VbglR3VideoModeGetHighestSavedScreen(&cHighestScreen2);
+    if (RT_SUCCESS(rc))
+        if (cHighestScreen2 != RT_MAX(cHighestScreen, cScreen))
+            rc = VERR_INTERNAL_ERROR;
     return rc;
 #else /* !VBOX_WITH_GUEST_PROPS */
@@ -358 +418 @@
     int cMatches;
     unsigned cx, cy, cBits, x, y, fEnabled;
+    int rc, rc2 = VERR_UNRESOLVED_ERROR;
 
     /** @todo add a VbglR3GuestPropReadValueF/FV that does the RTStrPrintf for you. */
     RTStrPrintf(szModeName, sizeof(szModeName), VIDEO_PROP_PREFIX"%u", cScreen);
-    int rc = VbglR3GuestPropConnect(&u32ClientId);
+    rc = VbglR3GuestPropConnect(&u32ClientId);
     if (RT_SUCCESS(rc))
         rc = VbglR3GuestPropReadValue(u32ClientId, szModeName, szModeParms,
                                       sizeof(szModeParms), NULL);
     if (u32ClientId != 0)
-        VbglR3GuestPropDisconnect(u32ClientId);  /* Return value ignored, because what can we do anyway? */
+        rc2 = VbglR3GuestPropDisconnect(u32ClientId);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
 
 /*

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)
             {