Changeset 82664 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Jan 8, 2020 9:30:36 AM (5 years ago)

Author:

vboxsync

Message:

VMSVGA/X11: bugref:9637. Some improvements for resizing.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display-svga.cpp (modified) (1 diff)

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

@@ -215 +215 @@
         if (cDisplaysOut > VMW_MAX_HEADS)
             VBClLogFatalError("Display change request contained, rc=%Rrc\n", rc);
-        for (i = 0, cHeads = 0; i < cDisplaysOut && i < VMW_MAX_HEADS; ++i)
+        if (cDisplaysOut > 0)
         {
-            if (!(aDisplays[i].fDisplayFlags & VMMDEV_DISPLAY_DISABLED))
+            cHeads = 0;
+            for (i = 0; i < cDisplaysOut && i < VMW_MAX_HEADS; ++i)
             {
-                if ((i == 0) || (aDisplays[i].fDisplayFlags & VMMDEV_DISPLAY_ORIGIN))
+                if (!(aDisplays[i].fDisplayFlags & VMMDEV_DISPLAY_DISABLED))
                 {
-                    aRects[cHeads].x = aDisplays[i].xOrigin;
-                    aRects[cHeads].y = aDisplays[i].yOrigin;
-                } else {
-                    aRects[cHeads].x = aRects[cHeads - 1].x + aRects[cHeads - 1].w;
-                    aRects[cHeads].y = aRects[cHeads - 1].y;
+                    if ((i == 0) || (aDisplays[i].fDisplayFlags & VMMDEV_DISPLAY_ORIGIN))
+                    {
+                        aRects[cHeads].x = aDisplays[i].xOrigin;
+                        aRects[cHeads].y = aDisplays[i].yOrigin;
+                    } else {
+                        aRects[cHeads].x = aRects[cHeads - 1].x + aRects[cHeads - 1].w;
+                        aRects[cHeads].y = aRects[cHeads - 1].y;
+                    }
+                    aRects[cHeads].w = aDisplays[i].cx;
+                    aRects[cHeads].h = aDisplays[i].cy;
+                    ++cHeads;
                 }
-                aRects[cHeads].w = aDisplays[i].cx;
-                aRects[cHeads].h = aDisplays[i].cy;
-                ++cHeads;
             }
+            for (i = 0; i < cHeads; ++i)
+                printf("Head %u: %dx%d, (%d, %d)\n", i, (int)aRects[i].w, (int)aRects[i].h,
+                       (int)aRects[i].x, (int)aRects[i].y);
+            drmSendHints(&drmContext, aRects, cHeads);
         }
-        for (i = 0; i < cHeads; ++i)
-            printf("Head %u: %dx%d, (%d, %d)\n", i, (int)aRects[i].w, (int)aRects[i].h,
-                   (int)aRects[i].x, (int)aRects[i].y);
-        drmSendHints(&drmContext, aRects, cHeads);
-        rc = VbglR3WaitEvent(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, RT_INDEFINITE_WAIT, &events);
+        do
+        {
+            rc = VbglR3WaitEvent(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, RT_INDEFINITE_WAIT, &events);
+        } while (rc == VERR_INTERRUPTED);
         if (RT_FAILURE(rc))
             VBClLogFatalError("Failure waiting for event, rc=%Rrc\n", rc);