Changeset 27218 in vbox

Timestamp:

Mar 9, 2010 2:55:14 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: Get the pause image out of the frame buffer if the screen id is greater then 0.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineLogic.cpp (modified) (1 diff)
• UIMachineView.cpp (modified) (1 diff)
• UISession.cpp (modified) (2 diffs)

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

@@ -772 +772 @@
             CConsole console = session().GetConsole();
 
-            /* Take the screenshot for debugging purposes and save it */
+            /* Take the screenshot for debugging purposes and save it.
+             * TODO: create png's from all configured monitors if possible. */
             QString strLogFolder = console.GetMachine().GetLogFolder();
             QString strFileName = strLogFolder + "/VBox.png";

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

@@ -975 +975 @@
                 (state != KMachineState_TeleportingPausedVM || m_previousState != KMachineState_Teleporting))
             {
-                /* Take a screen snapshot. Note that TakeScreenShot() always needs a 32bpp image: */
-                QImage shot = QImage(m_pFrameBuffer->width(), m_pFrameBuffer->height(), QImage::Format_RGB32);
-                CDisplay dsp = session().GetConsole().GetDisplay();
-                dsp.TakeScreenShot(shot.bits(), shot.width(), shot.height());
-                /* TakeScreenShot() may fail if, e.g. the Paused notification was delivered
-                 * after the machine execution was resumed. It's not fatal: */
-                if (dsp.isOk())
+                if (screenId() == 0)
                 {
-                    dimImage(shot);
-                    m_pauseShot = QPixmap::fromImage(shot);
-                    /* Fully repaint to pick up m_pauseShot: */
-                    repaint();
+                    /* Take a screen snapshot. Note that TakeScreenShot() always needs a 32bpp image: */
+                    QImage shot = QImage(m_pFrameBuffer->width(), m_pFrameBuffer->height(), QImage::Format_RGB32);
+                    CDisplay dsp = session().GetConsole().GetDisplay();
+                    dsp.TakeScreenShot(shot.bits(), shot.width(), shot.height());
+                    /* TakeScreenShot() may fail if, e.g. the Paused notification was delivered
+                     * after the machine execution was resumed. It's not fatal: */
+                    if (dsp.isOk())
+                    {
+                        dimImage(shot);
+                        m_pauseShot = QPixmap::fromImage(shot);
+                        /* Fully repaint to pick up m_pauseShot: */
+                        repaint();
+                    }
+                }else
+                {
+                    /* For secondary monitors we support 32 bit formats only for now. */
+                    if (   m_pFrameBuffer
+                        && m_pFrameBuffer->pixelFormat() == FramebufferPixelFormat_FOURCC_RGB
+                        && m_pFrameBuffer->bitsPerPixel() == 32)
+                    {
+                        BYTE *pMem;
+                        m_pFrameBuffer->GetAddress(&pMem);
+                        QImage shot = QImage(pMem, m_pFrameBuffer->width(), m_pFrameBuffer->height(), QImage::Format_RGB32);
+                        dimImage(shot);
+                        m_pauseShot = QPixmap::fromImage(shot);
+                        /* Fully repaint to pick up m_pauseShot: */
+                        repaint();
+                    }
+                    else
+                    {
+                        /* If there is no framebuffer or a unsupported format, just create a black image to show. */
+                        QImage shot = QImage(m_pFrameBuffer->width(), m_pFrameBuffer->height(), QImage::Format_RGB32);
+                        shot.fill(0);
+                        m_pauseShot = QPixmap::fromImage(shot);
+                        /* Fully repaint to pick up m_pauseShot: */
+                        repaint();
+                    }
                 }
             }

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

@@ -595 +595 @@
     QMenu *pMenu = m_pMenuPool->createMenu(actionsPool());
 
-    /* Re-init menu pool for the case manu were recreated: */
+    /* Re-init menu pool for the case menu were recreated: */
     reinitMenuPool();
 
@@ -607 +607 @@
     QMenuBar *pMenuBar = m_pMenuPool->createMenuBar(actionsPool());
 
-    /* Re-init menu pool for the case manu were recreated: */
+    /* Re-init menu pool for the case menu were recreated: */
     reinitMenuPool();