Changeset 35612 in vbox

Timestamp:

Jan 18, 2011 2:34:31 PM (14 years ago)

Author:

vboxsync

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

69509

Message:

Main/Display: make sure that we do not try to update a disabled screen, and revert the 640x480 disabled resolution for now

File:

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

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

@@ -774 +774 @@
             pFBInfo->fDefaultFormat = (usesGuestVRAM == FALSE);
 
-            mpDrv->pUpPort->pfnSetRenderVRAM (mpDrv->pUpPort, pFBInfo->fDefaultFormat);
+            if (pFBInfo->fDisabled)
+                mpDrv->pUpPort->pfnSetRenderVRAM (mpDrv->pUpPort, false);
+            else
+                mpDrv->pUpPort->pfnSetRenderVRAM (mpDrv->pUpPort,
+                                                  pFBInfo->fDefaultFormat);
         }
         else if (!pFBInfo->pFramebuffer.isNull())
@@ -919 +923 @@
 
     // if there is no framebuffer, this call is not interesting
-    if (pFramebuffer == NULL)
+    if (   pFramebuffer == NULL
+        || maFramebuffers[uScreenId].fDisabled)
         return;
 
@@ -964 +969 @@
     if (!mpDrv)
         return;
-    /* If VBVA is not in use then maFramebuffers will be zeroed out and this
+    /* If VBVA is not in use then this flag will not be set and this
      * will still work as it should. */
-    if (!(maFramebuffers[0].flags & VBVA_SCREEN_F_DISABLED))
+    if (!(maFramebuffers[0].fDisabled))
     {
         x2 = mpDrv->IConnector.cx + (int32_t)maFramebuffers[0].xOrigin;
@@ -973 +978 @@
     for (unsigned i = 1; i < mcMonitors; ++i)
     {
-        if (!(maFramebuffers[i].flags & VBVA_SCREEN_F_DISABLED))
+        if (!(maFramebuffers[i].fDisabled))
         {
             x1 = RT_MIN(x1, maFramebuffers[i].xOrigin);
@@ -2542 +2547 @@
                  */
                 if (   pFBInfo->fDefaultFormat
-                    && !(pFBInfo->flags & VBVA_SCREEN_F_DISABLED))
+                    && !(pFBInfo->fDisabled))
                 {
                     address = NULL;
@@ -2667 +2672 @@
         {
             if (   !pFBInfo->pFramebuffer.isNull()
-                && !(pFBInfo->flags & VBVA_SCREEN_F_DISABLED))
+                && !(pFBInfo->fDisabled))
             {
                 /* Render complete VRAM screen to the framebuffer.
@@ -2836 +2841 @@
     IFramebuffer *pFramebuffer = maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer;
 
-    if (   pFramebuffer
-        && !(  maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].flags
-             & VBVA_SCREEN_F_DISABLED))
+    if (pFramebuffer)
     {
         HRESULT rc;
@@ -3595 +3598 @@
         {
             /* Make sure that framebuffer contains the same image as the guest VRAM. */
-            if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN && !pFBInfo->pFramebuffer.isNull())
+            if (   uScreenId == VBOX_VIDEO_PRIMARY_SCREEN
+                && !pFBInfo->pFramebuffer.isNull()
+                && !pFBInfo->fDisabled)
             {
                 pDrv->pUpPort->pfnUpdateDisplayRect (pDrv->pUpPort, pCmd->x, pCmd->y, pCmd->w, pCmd->h);
             }
             else if (   !pFBInfo->pFramebuffer.isNull()
-                     && !(pFBInfo->flags & VBVA_SCREEN_F_DISABLED))
+                     && !(pFBInfo->fDisabled))
             {
                 /* Render VRAM content to the framebuffer. */
@@ -3723 +3728 @@
         pThis->handleDisplayResize(pScreen->u32ViewIndex, 0,
                                    (uint8_t *)NULL,
-                                   0, 640, 480, pScreen->u16Flags);
+                                   pScreen->u32LineSize, pScreen->u32Width,
+                                   pScreen->u32Height, pScreen->u16Flags);
 
         fireGuestMonitorChangedEvent(pThis->mParent->getEventSource(),