Changeset 35633 in vbox for trunk/src/VBox

Timestamp:

Jan 19, 2011 4:02:24 PM (14 years ago)

Author:

vboxsync

Message:

Main/Display: multimonitor enable/disable screen fixes.

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -763 +763 @@
         }
 
+        /* @todo Merge these two 'if's within one 'if (!pFBInfo->pFramebuffer.isNull())' */
         if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN && !pFBInfo->pFramebuffer.isNull())
         {
@@ -774 +775 @@
             pFBInfo->fDefaultFormat = (usesGuestVRAM == FALSE);
 
+            /* If the primary framebuffer is disabled, tell the VGA device to not to copy
+             * pixels from VRAM to the framebuffer.
+             */
             if (pFBInfo->fDisabled)
                 mpDrv->pUpPort->pfnSetRenderVRAM (mpDrv->pUpPort, false);
@@ -779 +783 @@
                 mpDrv->pUpPort->pfnSetRenderVRAM (mpDrv->pUpPort,
                                                   pFBInfo->fDefaultFormat);
+
+            /* If the screen resize was because of disabling, tell framebuffer to repaint.
+             * The framebuffer if now in default format so it will not use guest VRAM
+             * and will show usually black image which is there after framebuffer resize.
+             */
+            if (pFBInfo->fDisabled)
+                pFBInfo->pFramebuffer->NotifyUpdate(0, 0, mpDrv->IConnector.cx, mpDrv->IConnector.cy);
         }
         else if (!pFBInfo->pFramebuffer.isNull())
@@ -786 +797 @@
 
             pFBInfo->fDefaultFormat = (usesGuestVRAM == FALSE);
+
+            /* If the screen resize was because of disabling, tell framebuffer to repaint.
+             * The framebuffer if now in default format so it will not use guest VRAM
+             * and will show usually black image which is there after framebuffer resize.
+             */
+            if (pFBInfo->fDisabled)
+                pFBInfo->pFramebuffer->NotifyUpdate(0, 0, pFBInfo->w, pFBInfo->h);
         }
         LogFlow(("[%d]: default format %d\n", uScreenId, pFBInfo->fDefaultFormat));
@@ -3044 +3062 @@
                 continue;
             }
-            /* Continue with normal processing because the status here is ResizeStatus_Void. */
-            if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
-            {
-                /* Repaint the display because VM continued to run during the framebuffer resize. */
-                if (!pFBInfo->pFramebuffer.isNull())
-                {
-                    pDisplay->vbvaLock();
-                    pDrv->pUpPort->pfnUpdateDisplayAll(pDrv->pUpPort);
-                    pDisplay->vbvaUnlock();
-                }
-            }
+            /* Continue with normal processing because the status here is ResizeStatus_Void.
+             * Repaint all displays because VM continued to run during the framebuffer resize.
+             */
+            pDisplay->InvalidateAndUpdateEMT(pDisplay);
         }
         else if (u32ResizeStatus == ResizeStatus_InProgress)
@@ -3738 +3749 @@
     }
 
+    bool fResize = pFBInfo->fDisabled; /* If display was disabled, do a resize, because the framebuffer was changed. */
+
     if (pFBInfo->fDisabled)
     {
@@ -3757 +3770 @@
      * The guest uses this VBVAResize call for both.
      */
-    bool fResize =    pFBInfo->u16BitsPerPixel != pScreen->u16BitsPerPixel
-                   || pFBInfo->pu8FramebufferVRAM != (uint8_t *)pvVRAM + pScreen->u32StartOffset
-                   || pFBInfo->u32LineSize != pScreen->u32LineSize
-                   || pFBInfo->w != pScreen->u32Width
-                   || pFBInfo->h != pScreen->u32Height;
+    fResize =    fResize
+              || pFBInfo->u16BitsPerPixel != pScreen->u16BitsPerPixel
+              || pFBInfo->pu8FramebufferVRAM != (uint8_t *)pvVRAM + pScreen->u32StartOffset
+              || pFBInfo->u32LineSize != pScreen->u32LineSize
+              || pFBInfo->w != pScreen->u32Width
+              || pFBInfo->h != pScreen->u32Height;
 
     bool fNewOrigin =    pFBInfo->xOrigin != pScreen->i32OriginX