Changeset 98548 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 13, 2023 3:06:38 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Reworking CDisplay wrapper usage step-by-step; This one is about CDisplay::TakeScreenShotToArray/TakeScreenShot stuff.

Location:

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

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (1 diff)
• UIMachineLogic.cpp (modified) (3 diffs)
• UIMachineLogic.h (modified) (2 diffs)
• UISession.cpp (modified) (1 diff)
• UISession.h (modified) (1 diff)

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

@@ -454 +454 @@
                                              xOrigin, yOrigin, uWidth, uHeight,
                                              uBitsPerPixel);
+}
+
+bool UIMachine::acquireScreenShot(ulong uScreenId, ulong uWidth, ulong uHeight, KBitmapFormat enmFormat, uchar *pBits)
+{
+    return uisession()->acquireScreenShot(uScreenId, uWidth, uHeight, enmFormat, pBits);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -289 +289 @@
                                   long &xOrigin, long &yOrigin, ulong &uWidth, ulong &uHeight,
                                   ulong &uBitsPerPixel);
+        /** Acquires screen-shot for guest-screen with passed uScreenId. */
+        bool acquireScreenShot(ulong uScreenId, ulong uWidth, ulong uHeight, KBitmapFormat enmFormat, uchar *pBits);
     /** @} */
 

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

@@ -88 +88 @@
 #include "CAudioAdapter.h"
 #include "CAudioSettings.h"
-#include "CDisplay.h"
 #include "CEmulatedUSB.h"
 #include "CGraphicsAdapter.h"
@@ -297 +296 @@
 {
     return uisession()->console();
-}
-
-CDisplay& UIMachineLogic::display() const
-{
-    return uisession()->display();
 }
 
@@ -3135 +3129 @@
         uMaxHeight  = RT_MAX(uMaxHeight, uHeight);
         QImage shot = QImage(uWidth, uHeight, QImage::Format_RGB32);
-        /* For separate process: */
-        if (uiCommon().isSeparateProcess())
-        {
-            /* Take screen-data to array first: */
-            const QVector<BYTE> screenData = display().TakeScreenShotToArray(uScreenIndex, shot.width(), shot.height(), KBitmapFormat_BGR0);
-            /* And copy that data to screen-shot if it is Ok: */
-            if (display().isOk() && !screenData.isEmpty())
-                memcpy(shot.bits(), screenData.data(), shot.width() * shot.height() * 4);
-        }
-        /* For the same process: */
-        else
-        {
-            /* Take the screen-shot directly: */
-            display().TakeScreenShot(uScreenIndex, shot.bits(), shot.width(), shot.height(), KBitmapFormat_BGR0);
-        }
+        uimachine()->acquireScreenShot(uScreenIndex, shot.width(), shot.height(), KBitmapFormat_BGR0, shot.bits());
         images << shot;
     }

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

@@ -57 +57 @@
 class CMachine;
 class CConsole;
-class CDisplay;
 class CGuest;
 class CMouse;
@@ -123 +122 @@
     /** Returns the session's console reference. */
     CConsole& console() const;
-    /** Returns the console's display reference. */
-    CDisplay& display() const;
     /** Returns the console's guest reference. */
     CGuest& guest() const;

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

@@ -452 +452 @@
     uHeight = uGuestHeight;
     uBitsPerPixel = uGuestBitsPerPixel;
+    return fSuccess;
+}
+
+bool UISession::acquireScreenShot(ulong uScreenId, ulong uWidth, ulong uHeight, KBitmapFormat enmFormat, uchar *pBits)
+{
+    CDisplay comDisplay = display();
+    bool fSuccess = false;
+    /* For separate process: */
+    if (uiCommon().isSeparateProcess())
+    {
+        /* Take screen-data to array first: */
+        const QVector<BYTE> screenData = comDisplay.TakeScreenShotToArray(uScreenId, uWidth, uHeight, enmFormat);
+        fSuccess = comDisplay.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotAcquireDisplayParameter(comDisplay);
+        else
+        {
+            /* And copy that data to screen-shot if it is Ok: */
+            if (!screenData.isEmpty())
+                memcpy(pBits, screenData.data(), uWidth * uHeight * 4);
+        }
+    }
+    /* For the same process: */
+    else
+    {
+        /* Take the screen-shot directly: */
+        comDisplay.TakeScreenShot(uScreenId, pBits, uWidth, uHeight, enmFormat);
+        fSuccess = comDisplay.isOk();
+        if (!fSuccess)
+            UINotificationMessage::cannotAcquireDisplayParameter(comDisplay);
+    }
     return fSuccess;
 }

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

@@ -307 +307 @@
                                   long &xOrigin, long &yOrigin, ulong &uWidth, ulong &uHeight,
                                   ulong &uBitsPerPixel);
+        /** Acquires screen-shot for guest-screen with passed uScreenId. */
+        bool acquireScreenShot(ulong uScreenId, ulong uWidth, ulong uHeight, KBitmapFormat enmFormat, uchar *pBits);
     /** @} */