Changeset 98840 in vbox for trunk

Timestamp:

Mar 6, 2023 3:13:04 PM (2 years ago)

Author:

vboxsync

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

156163

Message:

FE/Qt: bugref:10322: Runtime UI: A bit of cleanup for UIFrameBuffer related stuff.

Location:

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

Files:

• UIMachine.h (modified) (1 diff)
• UIMachineView.cpp (modified) (3 diffs)
• UISession.cpp (modified) (2 diffs)
• seamless/UIMachineViewSeamless.cpp (modified) (1 diff)

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

@@ -169 +169 @@
     UISession *uisession() const { return m_pSession; }
     /** Returns machine-logic instance. */
-    UIMachineLogic* machineLogic() const { return m_pMachineLogic; }
+    UIMachineLogic *machineLogic() const { return m_pMachineLogic; }
     /** Returns active machine-window reference (if possible). */
     QWidget* activeWindow() const;

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

@@ -1194 +1194 @@
     UIFrameBuffer *pFrameBuffer = uisession()->frameBuffer(screenId());
 
-    /* If we do: */
-    if (pFrameBuffer)
-    {
-        /* Assign it's view: */
-        pFrameBuffer->setView(this);
-        /* Mark frame-buffer as used again: */
-        LogRelFlow(("GUI: UIMachineView::prepareFrameBuffer: Restart EMT callbacks accepting for screen: %d\n", screenId()));
-        pFrameBuffer->setMarkAsUnused(false);
-        /* And remember our choice: */
-        m_pFrameBuffer = pFrameBuffer;
-    }
     /* If we do not: */
-    else
-    {
+    if (!pFrameBuffer)
+    {
+        LogRelFlow(("GUI: UIMachineView::prepareFrameBuffer: Start EMT callbacks accepting for screen: %d\n", screenId()));
         /* Create new frame-buffer: */
         m_pFrameBuffer = new UIFrameBuffer;
         /* Init it's view: */
         m_pFrameBuffer->init(this);
-        LogRelFlow(("GUI: UIMachineView::prepareFrameBuffer: Start EMT callbacks accepting for screen: %d\n", screenId()));
         /* Apply machine-view scale-factor: */
         applyMachineViewScaleFactor();
         /* Associate uisession with frame-buffer finally: */
         uisession()->setFrameBuffer(screenId(), frameBuffer());
+    }
+    /* If we do: */
+    else
+    {
+        LogRelFlow(("GUI: UIMachineView::prepareFrameBuffer: Restart EMT callbacks accepting for screen: %d\n", screenId()));
+        /* Assign it's view: */
+        pFrameBuffer->setView(this);
+        /* Mark frame-buffer as used again: */
+        pFrameBuffer->setMarkAsUnused(false);
+        /* And remember our choice: */
+        m_pFrameBuffer = pFrameBuffer;
     }
 
@@ -1369 +1369 @@
 void UIMachineView::cleanupFrameBuffer()
 {
-    /* Make sure framebuffer assigned at all: */
+    /* Make sure framebuffer still present: */
     if (!frameBuffer())
         return;
@@ -1390 +1390 @@
 
     /* Detach framebuffer from view: */
-    frameBuffer()->setView(NULL);
+    frameBuffer()->setView(0);
 }
 

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

@@ -1412 +1412 @@
 UIFrameBuffer *UISession::frameBuffer(ulong uScreenId) const
 {
-    Assert(uScreenId < (ulong)m_frameBufferVector.size());
     return m_frameBufferVector.value((int)uScreenId, 0);
 }
@@ -2497 +2496 @@
 void UISession::prepareFramebuffers()
 {
-    /* Each framebuffer will be really prepared on first UIMachineView creation;
-     * For now we should just create an empty frame-buffer vector to fill later. */
-    ulong cMonitorCount = 0;
-    acquireMonitorCount(cMonitorCount);
-    m_frameBufferVector.resize(cMonitorCount);
+    /* Acquire guest-screen count: */
+    ulong cGuestScreenCount = 0;
+    acquireMonitorCount(cGuestScreenCount);
+    m_frameBufferVector.resize(cGuestScreenCount);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -72 +72 @@
 {
     /* Apply new seamless-region: */
-    m_pFrameBuffer->handleSetVisibleRegion(region);
+    frameBuffer()->handleSetVisibleRegion(region);
 }