Changeset 51481 in vbox for trunk/src/VBox

Timestamp:

Jun 2, 2014 9:19:31 AM (11 years ago)

Author:

vboxsync

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

94083

Message:

FE/Qt: Runtime UI: Frame-buffer resize and fallback handling cleanup.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2010-2013 Oracle Corporation
+ * Copyright (C) 2010-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -39 +39 @@
 #include "CMachine.h"
 #include "CConsole.h"
+#include "CDisplay.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -74 +75 @@
     m_height = pEvent->height();
 
-    /* Check if we support the pixel format and can use the guest VRAM directly: */
-    bool bRemind = false;
-    bool bFallback = false;
-    ulong bitsPerLine = pEvent->bytesPerLine() * 8;
-    if (pEvent->pixelFormat() == FramebufferPixelFormat_FOURCC_RGB)
-    {
-        QImage::Format format;
-        switch (pEvent->bitsPerPixel())
-        {
-            /* 32-, 8- and 1-bpp are the only depths supported by QImage: */
-            case 32:
-                format = QImage::Format_RGB32;
-                break;
-            case 8:
-                format = QImage::Format_Indexed8;
-                bRemind = true;
-                break;
-            case 1:
-                format = QImage::Format_Mono;
-                bRemind = true;
-                break;
-            default:
-                format = QImage::Format_Invalid;
-                bRemind = true;
-                bFallback = true;
-                break;
-        }
-
-        if (!bFallback)
-        {
-            /* QImage only supports 32-bit aligned scan lines... */
-            Assert((pEvent->bytesPerLine() & 3) == 0);
-            bFallback = ((pEvent->bytesPerLine() & 3) != 0);
-        }
-        if (!bFallback)
-        {
-            /* ...and the scan lines ought to be a whole number of pixels. */
-            Assert((bitsPerLine & (pEvent->bitsPerPixel() - 1)) == 0);
-            bFallback = ((bitsPerLine & (pEvent->bitsPerPixel() - 1)) != 0);
-        }
-        if (!bFallback)
-        {
-            /* Make sure constraints are also passed: */
-            Assert(bitsPerLine / pEvent->bitsPerPixel() >= m_width);
-            bFallback = RT_BOOL(bitsPerLine / pEvent->bitsPerPixel() < m_width);
-        }
-        if (!bFallback)
-        {
-            /* Finally compose image using VRAM directly: */
-            LogRel(("UIFrameBufferQImage::resizeEvent: Resizing to directly use VGA device content..\n"));
-            m_img = QImage((uchar *)pEvent->VRAM(), m_width, m_height, bitsPerLine / 8, format);
-            m_uPixelFormat = FramebufferPixelFormat_FOURCC_RGB;
-        }
+    /* Get the screen bitmap. */
+    if (!m_sourceBitmap.isNull())
+    {
+        BYTE *pAddress = NULL;
+        ULONG ulWidth = 0;
+        ULONG ulHeight = 0;
+        ULONG ulBitsPerPixel = 0;
+        ULONG ulBytesPerLine = 0;
+        ULONG ulPixelFormat = 0;
+
+        m_sourceBitmap.QueryBitmapInfo(pAddress,
+                                       ulWidth,
+                                       ulHeight,
+                                       ulBitsPerPixel,
+                                       ulBytesPerLine,
+                                       ulPixelFormat);
+
+        Assert(ulBitsPerPixel == 32);
+        NOREF(ulPixelFormat);
+
+        LogRel(("UIFrameBufferQImage::resizeEvent: Resizing to directly use VGA device content..\n"));
+        m_img = QImage(pAddress, ulWidth, ulHeight, ulBytesPerLine, QImage::Format_RGB32);
+        m_uPixelFormat = FramebufferPixelFormat_FOURCC_RGB;
+
+        /* Check whether guest color depth differs from the bitmap color depth. */
+        ULONG ulGuestBitsPerPixel = 0;
+        LONG xOrigin = 0;
+        LONG yOrigin = 0;
+        CDisplay display = m_pMachineView->uisession()->session().GetConsole().GetDisplay();
+        display.GetScreenResolution(m_pMachineView->screenId(),
+                                    ulWidth, ulHeight, ulGuestBitsPerPixel, xOrigin, yOrigin);
+
+        /* Remind if requested: */
+        if (    ulGuestBitsPerPixel != ulBitsPerPixel
+            && m_pMachineView->uisession()->isGuestAdditionsActive())
+            popupCenter().remindAboutWrongColorDepth(m_pMachineView->machineWindow(),
+                                                     ulGuestBitsPerPixel, ulBitsPerPixel);
+        else
+            popupCenter().forgetAboutWrongColorDepth(m_pMachineView->machineWindow());
     }
     else
-        bFallback = true;
-
-    /* Fallback if requested: */
-    if (bFallback)
     {
         LogRel(("UIFrameBufferQImage::resizeEvent: Resizing to FALLBACK buffer due to format is invalid..\n"));
         goFallback();
     }
-
-    /* Remind if requested: */
-    if (bRemind && m_pMachineView->uisession()->isGuestAdditionsActive())
-        popupCenter().remindAboutWrongColorDepth(m_pMachineView->machineWindow(),
-                                                      pEvent->bitsPerPixel(), 32);
-    else
-        popupCenter().forgetAboutWrongColorDepth(m_pMachineView->machineWindow());
 
     /* Enable screen updates: */
@@ -391 +367 @@
 {
     /* We calling for fallback when we:
-     * 1. don't support either the pixel format or the color depth;
+     * 1. Display did not provide the source bitmap;
      * 2. or the machine is in the state which breaks link between
      *    the framebuffer and the actual video-memory: */
-    if (!m_sourceBitmap.isNull())
-    {
-        BYTE *pAddress = NULL;
-        ULONG ulWidth = 0;
-        ULONG ulHeight = 0;
-        ULONG ulBitsPerPixel = 0;
-        ULONG ulBytesPerLine = 0;
-        ULONG ulPixelFormat = 0;
-
-        m_sourceBitmap.QueryBitmapInfo(pAddress,
-                                       ulWidth,
-                                       ulHeight,
-                                       ulBitsPerPixel,
-                                       ulBytesPerLine,
-                                       ulPixelFormat);
-
-        m_img = QImage(pAddress, ulWidth, ulHeight, ulBytesPerLine, QImage::Format_RGB32);
-        m_uPixelFormat = FramebufferPixelFormat_FOURCC_RGB;
-    }
-}
-
+    m_img = QImage(m_width, m_height, QImage::Format_RGB32);
+    m_img.fill(0);
+    m_uPixelFormat = FramebufferPixelFormat_FOURCC_RGB;
+}
+