Changeset 35547 in vbox for trunk/src

Timestamp:

Jan 13, 2011 4:20:08 PM (14 years ago)

Author:

vboxsync

Message:

Main/Display: disabled screens should be black

File:

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

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

@@ -2519 +2519 @@
                  * it to update. And for default format, render the guest VRAM to framebuffer.
                  */
-                if (pFBInfo->fDefaultFormat)
+                if (   pFBInfo->fDefaultFormat
+                    && !(pFBInfo->flags & VBVA_SCREEN_F_DISABLED))
                 {
                     address = NULL;
@@ -2643 +2644 @@
         else
         {
-            if (!pFBInfo->pFramebuffer.isNull())
+            if (   !pFBInfo->pFramebuffer.isNull()
+                && !(pFBInfo->flags & VBVA_SCREEN_F_DISABLED))
             {
                 /* Render complete VRAM screen to the framebuffer.
@@ -2812 +2814 @@
     IFramebuffer *pFramebuffer = maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].pFramebuffer;
 
-    if (pFramebuffer)
+    if (   pFramebuffer
+        && !(  maFramebuffers[VBOX_VIDEO_PRIMARY_SCREEN].flags
+             & VBVA_SCREEN_F_DISABLED))
     {
         HRESULT rc;
@@ -3573 +3577 @@
                 pDrv->pUpPort->pfnUpdateDisplayRect (pDrv->pUpPort, pCmd->x, pCmd->y, pCmd->w, pCmd->h);
             }
-            else if (!pFBInfo->pFramebuffer.isNull())
+            else if (   !pFBInfo->pFramebuffer.isNull()
+                     && !(pFBInfo->flags & VBVA_SCREEN_F_DISABLED))
             {
                 /* Render VRAM content to the framebuffer. */
@@ -3696 +3701 @@
         pThis->handleDisplayResize(pScreen->u32ViewIndex, 0,
                                    (uint8_t *)NULL,
-                                   0, pFBInfo->w, pFBInfo->h, pScreen->u16Flags);
+                                   0, 640, 480, pScreen->u16Flags);
 
         fireGuestMonitorChangedEvent(pThis->mParent->getEventSource(),