Changeset 20224 in vbox for trunk/src/VBox/Main/DisplayImpl.cpp

Timestamp:

Jun 3, 2009 9:16:39 AM (16 years ago)

Author:

vboxsync

Message:

Main/Display: Fixes for multiple screens. Don't update the screen while at least one framebuffer is resized. Call pfnUpdateDisplay() only once.

File:

• trunk/src/VBox/Main/DisplayImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -571 +571 @@
     pFramebuffer->Lock();
 
-    checkCoordBounds (&x, &y, &w, &h, mpDrv->Connector.cx, mpDrv->Connector.cy);
+    if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
+        checkCoordBounds (&x, &y, &w, &h, mpDrv->Connector.cx, mpDrv->Connector.cy);
+    else
+        checkCoordBounds (&x, &y, &w, &h, maFramebuffers[uScreenId].w,
+                                          maFramebuffers[uScreenId].h);
 
     if (w != 0 && h != 0)
@@ -673 +677 @@
         //@todo pfnUpdateDisplayRect must take the vram offset parameter for the framebuffer
         prgn->pPort->pfnUpdateDisplayRect (prgn->pPort, phdr->x, phdr->y, phdr->w, phdr->h);
-        prgn->pDisplay->handleDisplayUpdate (phdr->x, phdr->y, phdr->w, phdr->h);
+        prgn->pDisplay->handleDisplayUpdate (phdr->x + pFBInfo->xOrigin,
+                                             phdr->y + pFBInfo->yOrigin, phdr->w, phdr->h);
     }
 
@@ -690 +695 @@
         //@todo pfnUpdateDisplayRect must take the vram offset parameter for the framebuffer
         prgn->pPort->pfnUpdateDisplayRect (prgn->pPort, pFBInfo->dirtyRect.xLeft, pFBInfo->dirtyRect.yTop, w, h);
-        prgn->pDisplay->handleDisplayUpdate (pFBInfo->dirtyRect.xLeft, pFBInfo->dirtyRect.yTop, w, h);
+        prgn->pDisplay->handleDisplayUpdate (pFBInfo->dirtyRect.xLeft + pFBInfo->xOrigin,
+                                             pFBInfo->dirtyRect.yTop + pFBInfo->yOrigin, w, h);
     }
 }
@@ -1948 +1954 @@
 
     Display *pDisplay = pDrv->pDisplay;
-
+    bool fNoUpdate = false; /* Do not update the display if any of the framebuffers is being resized. */
     unsigned uScreenId;
+
     for (uScreenId = 0; uScreenId < pDisplay->mcMonitors; uScreenId++)
     {
@@ -1962 +1969 @@
         {
             LogFlowFunc (("ResizeStatus_UpdateDisplayData %d\n", uScreenId));
+            fNoUpdate = true; /* Always set it here, because pfnUpdateDisplayAll can cause a new resize. */
             /* The framebuffer was resized and display data need to be updated. */
             pDisplay->handleResizeCompletedEMT ();
@@ -1976 +1984 @@
                     pDrv->pUpPort->pfnUpdateDisplayAll(pDrv->pUpPort);
             }
-            /* Ignore the refresh for the screen to replay the logic. */
-            continue;
         }
         else if (u32ResizeStatus == ResizeStatus_InProgress)
@@ -1983 +1989 @@
             /* The framebuffer is being resized. Do not call the VGA device back. Immediately return. */
             LogFlowFunc (("ResizeStatus_InProcess\n"));
+            fNoUpdate = true;
             continue;
         }
-
-        if (pFBInfo->pFramebuffer.isNull())
-        {
-            /*
-             *  Do nothing in the "black hole" mode to avoid copying guest
-             *  video memory to the frame buffer
+    }
+
+    if (!fNoUpdate)
+    {
+        if (pDisplay->mfPendingVideoAccelEnable)
+        {
+            /* Acceleration was enabled while machine was not yet running
+             * due to restoring from saved state. Update entire display and
+             * actually enable acceleration.
              */
+            Assert(pDisplay->mpPendingVbvaMemory);
+
+            /* Acceleration can not be yet enabled.*/
+            Assert(pDisplay->mpVbvaMemory == NULL);
+            Assert(!pDisplay->mfVideoAccelEnabled);
+
+            if (pDisplay->mfMachineRunning)
+            {
+                pDisplay->VideoAccelEnable (pDisplay->mfPendingVideoAccelEnable,
+                                            pDisplay->mpPendingVbvaMemory);
+
+                /* Reset the pending state. */
+                pDisplay->mfPendingVideoAccelEnable = false;
+                pDisplay->mpPendingVbvaMemory = NULL;
+            }
         }
         else
         {
-            if (pDisplay->mfPendingVideoAccelEnable)
+            Assert(pDisplay->mpPendingVbvaMemory == NULL);
+
+            if (pDisplay->mfVideoAccelEnabled)
             {
-                /* Acceleration was enabled while machine was not yet running
-                 * due to restoring from saved state. Update entire display and
-                 * actually enable acceleration.
-                 */
-                Assert(pDisplay->mpPendingVbvaMemory);
-
-                /* Acceleration can not be yet enabled.*/
-                Assert(pDisplay->mpVbvaMemory == NULL);
-                Assert(!pDisplay->mfVideoAccelEnabled);
-
-                if (pDisplay->mfMachineRunning)
-                {
-                    pDisplay->VideoAccelEnable (pDisplay->mfPendingVideoAccelEnable,
-                                                pDisplay->mpPendingVbvaMemory);
-
-                    /* Reset the pending state. */
-                    pDisplay->mfPendingVideoAccelEnable = false;
-                    pDisplay->mpPendingVbvaMemory = NULL;
-                }
+                Assert(pDisplay->mpVbvaMemory);
+                pDisplay->VideoAccelFlush ();
             }
             else
             {
-                Assert(pDisplay->mpPendingVbvaMemory == NULL);
-
-                if (pDisplay->mfVideoAccelEnabled)
-                {
-                    Assert(pDisplay->mpVbvaMemory);
-                    pDisplay->VideoAccelFlush ();
-                }
-                else
+                DISPLAYFBINFO *pFBInfo = &pDisplay->maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN];
+                if (!pFBInfo->pFramebuffer.isNull())
                 {
                     Assert(pDrv->Connector.pu8Data);
+                    Assert(pFBInfo->u32ResizeStatus == ResizeStatus_Void);
                     pDrv->pUpPort->pfnUpdateDisplay(pDrv->pUpPort);
                 }
             }
+
             /* Inform the VRDP server that the current display update sequence is
              * completed. At this moment the framebuffer memory contains a definite
@@ -2038 +2044 @@
              * fullscreen updates for new clients.
              */
-            if (pFBInfo->u32ResizeStatus == ResizeStatus_Void)
+            for (uScreenId = 0; uScreenId < pDisplay->mcMonitors; uScreenId++)
             {
-                Assert (pDisplay->mParent && pDisplay->mParent->consoleVRDPServer());
-                pDisplay->mParent->consoleVRDPServer()->SendUpdate (uScreenId, NULL, 0);
+                DISPLAYFBINFO *pFBInfo = &pDisplay->maFramebuffers[uScreenId];
+
+                if (!pFBInfo->pFramebuffer.isNull() && pFBInfo->u32ResizeStatus == ResizeStatus_Void)
+                {
+                    Assert (pDisplay->mParent && pDisplay->mParent->consoleVRDPServer());
+                    pDisplay->mParent->consoleVRDPServer()->SendUpdate (uScreenId, NULL, 0);
+                }
             }
         }