Changeset 54100 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 6, 2015 3:00:48 PM (10 years ago)

Author:

vboxsync

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

98066

Message:

FE/Qt: Runtime UI: UIFrameBuffer refactoring for 6278 and 3635 (step 1).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.h (modified) (1 diff)
• runtime/UIFrameBuffer.cpp (modified) (9 diffs)
• runtime/UIFrameBuffer.h (modified) (1 diff)
• runtime/UIMachineView.cpp (modified) (7 diffs)
• runtime/seamless/UIMachineViewSeamless.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h

@@ -1906 +1906 @@
     }
 
-    void resizeEvent(int iWidth, int iHeight)
-    {
-        UIFrameBuffer::resizeEvent(iWidth, iHeight);
+    void performResize(int iWidth, int iHeight)
+    {
+        UIFrameBuffer::performResize(iWidth, iHeight);
         mOverlay.onResizeEventPostprocess(VBoxFBSizeInfo(this),
                 QPoint(mpView->contentsX(), mpView->contentsY()));

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

@@ -93 +93 @@
 
     /* Resize frame-buffer to default size: */
-    resizeEvent(640, 480);
+    performResize(640, 480);
 
 #ifdef Q_OS_WIN
@@ -571 +571 @@
 }
 
-void UIFrameBuffer::notifyChange(int iWidth, int iHeight)
-{
-    LogRel(("UIFrameBuffer::notifyChange: Size=%dx%d\n", iWidth, iHeight));
+void UIFrameBuffer::handleNotifyChange(int iWidth, int iHeight)
+{
+    LogRel(("UIFrameBuffer::handleNotifyChange: Size=%dx%d\n", iWidth, iHeight));
 
     /* Make sure machine-view is assigned: */
@@ -585 +585 @@
     {
         /* Do nothing, change-event already processed: */
-        LogRel2(("UIFrameBuffer::notifyChange: Already processed.\n"));
+        LogRel2(("UIFrameBuffer::handleNotifyChange: Already processed.\n"));
         /* Unlock access to frame-buffer: */
         unlock();
@@ -600 +600 @@
 
     /* Perform frame-buffer resize: */
-    resizeEvent(iWidth, iHeight);
-}
-
-void UIFrameBuffer::resizeEvent(int iWidth, int iHeight)
-{
-    LogRel(("UIFrameBuffer::resizeEvent: Size=%dx%d\n", iWidth, iHeight));
+    performResize(iWidth, iHeight);
+}
+
+void UIFrameBuffer::handlePaintEvent(QPaintEvent *pEvent)
+{
+    LogRel2(("UIFrameBuffer::handlePaintEvent: Origin=%lux%lu, Size=%dx%d\n",
+             pEvent->rect().x(), pEvent->rect().y(),
+             pEvent->rect().width(), pEvent->rect().height()));
+
+    /* On mode switch the enqueued paint-event may still come
+     * while the machine-view is already null (before the new machine-view set),
+     * ignore paint-event in that case. */
+    if (!m_pMachineView)
+        return;
+
+    /* Lock access to frame-buffer: */
+    lock();
+
+    /* But if updates disabled: */
+    if (!m_fUpdatesAllowed)
+    {
+        /* Unlock access to frame-buffer: */
+        unlock();
+        /* And return immediately: */
+        return;
+    }
+
+    /* Depending on visual-state type: */
+    switch (m_pMachineView->machineLogic()->visualStateType())
+    {
+        case UIVisualStateType_Seamless:
+            paintSeamless(pEvent);
+            break;
+        default:
+            paintDefault(pEvent);
+            break;
+    }
+
+    /* Unlock access to frame-buffer: */
+    unlock();
+}
+
+void UIFrameBuffer::handleSetVisibleRegion(const QRegion &region)
+{
+    /* Make sure async visible-region has changed: */
+    if (m_asyncVisibleRegion == region)
+        return;
+
+    /* We are accounting async visible-regions one-by-one
+     * to keep corresponding viewport area always updated! */
+    if (!m_asyncVisibleRegion.isEmpty())
+        m_pMachineView->viewport()->update(m_asyncVisibleRegion - region);
+
+    /* Remember last visible region: */
+    m_asyncVisibleRegion = region;
+
+#ifdef VBOX_WITH_MASKED_SEAMLESS
+    /* We have to use async visible-region to apply to [Q]Widget [set]Mask: */
+    m_pMachineView->machineWindow()->setMask(m_asyncVisibleRegion);
+#endif /* VBOX_WITH_MASKED_SEAMLESS */
+}
+
+void UIFrameBuffer::performResize(int iWidth, int iHeight)
+{
+    LogRel(("UIFrameBuffer::performResize: Size=%dx%d\n", iWidth, iHeight));
 
     /* Make sure machine-view is assigned: */
@@ -623 +682 @@
     if (m_sourceBitmap.isNull())
     {
-        LogRel(("UIFrameBuffer::resizeEvent: "
+        LogRel(("UIFrameBuffer::performResize: "
                 "Using FALLBACK buffer due to source-bitmap is not provided..\n"));
 
@@ -637 +696 @@
     else
     {
-        LogRel(("UIFrameBuffer::resizeEvent: "
+        LogRel(("UIFrameBuffer::performResize: "
                 "Directly using source-bitmap content\n"));
 
@@ -667 +726 @@
         LONG yOrigin = 0;
         KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
-        CDisplay display = m_pMachineView->uisession()->session().GetConsole().GetDisplay();
+        CDisplay display = m_pMachineView->uisession()->display();
         display.GetScreenResolution(m_pMachineView->screenId(),
                                     ulWidth, ulHeight, ulGuestBitsPerPixel, xOrigin, yOrigin, monitorStatus);
@@ -695 +754 @@
 
         /* And send async-signal to update asynchronous one: */
-        LogRel2(("UIFrameBuffer::resizeEvent: Rectangle count=%lu, Sending to async-handler\n",
+        LogRel2(("UIFrameBuffer::performResize: Rectangle count=%lu, Sending to async-handler\n",
                  (unsigned long)m_syncVisibleRegion.rectCount()));
         emit sigSetVisibleRegion(m_syncVisibleRegion);
@@ -705 +764 @@
     if (m_pMachineView->machineLogic()->visualStateType() != UIVisualStateType_Scale)
         setScaledSize(scaleFactor() == 1.0 ? QSize() : QSize((int)(m_iWidth * scaleFactor()), (int)(m_iHeight * scaleFactor())));
-}
-
-void UIFrameBuffer::paintEvent(QPaintEvent *pEvent)
-{
-    LogRel2(("UIFrameBuffer::paintEvent: Origin=%lux%lu, Size=%dx%d\n",
-             pEvent->rect().x(), pEvent->rect().y(),
-             pEvent->rect().width(), pEvent->rect().height()));
-
-    /* On mode switch the enqueued paint-event may still come
-     * while the machine-view is already null (before the new machine-view set),
-     * ignore paint-event in that case. */
-    if (!m_pMachineView)
-        return;
-
-    /* Lock access to frame-buffer: */
-    lock();
-
-    /* But if updates disabled: */
-    if (!m_fUpdatesAllowed)
-    {
-        /* Unlock access to frame-buffer: */
-        unlock();
-        /* And return immediately: */
-        return;
-    }
-
-    /* Depending on visual-state type: */
-    switch (m_pMachineView->machineLogic()->visualStateType())
-    {
-        case UIVisualStateType_Seamless:
-            paintSeamless(pEvent);
-            break;
-        default:
-            paintDefault(pEvent);
-            break;
-    }
-
-    /* Unlock access to frame-buffer: */
-    unlock();
-}
-
-void UIFrameBuffer::applyVisibleRegion(const QRegion &region)
-{
-    /* Make sure async visible-region has changed: */
-    if (m_asyncVisibleRegion == region)
-        return;
-
-    /* We are accounting async visible-regions one-by-one
-     * to keep corresponding viewport area always updated! */
-    if (!m_asyncVisibleRegion.isEmpty())
-        m_pMachineView->viewport()->update(m_asyncVisibleRegion - region);
-
-    /* Remember last visible region: */
-    m_asyncVisibleRegion = region;
-
-#ifdef VBOX_WITH_MASKED_SEAMLESS
-    /* We have to use async visible-region to apply to [Q]Widget [set]Mask: */
-    m_pMachineView->machineWindow()->setMask(m_asyncVisibleRegion);
-#endif /* VBOX_WITH_MASKED_SEAMLESS */
 }
 

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

@@ -200 +200 @@
 
     /** Handles frame-buffer notify-change-event. */
-    virtual void notifyChange(int iWidth, int iHeight);
-    /** Handles frame-buffer resize-event. */
-    virtual void resizeEvent(int iWidth, int iHeight);
+    virtual void handleNotifyChange(int iWidth, int iHeight);
     /** Handles frame-buffer paint-event. */
-    virtual void paintEvent(QPaintEvent *pEvent);
-    /** Handles frame-buffer apply-visible-region-event. */
-    virtual void applyVisibleRegion(const QRegion &region);
+    virtual void handlePaintEvent(QPaintEvent *pEvent);
+    /** Handles frame-buffer set-visible-region-event. */
+    virtual void handleSetVisibleRegion(const QRegion &region);
+
+    /** Performs frame-buffer resizing. */
+    virtual void performResize(int iWidth, int iHeight);
 
 #ifdef VBOX_WITH_VIDEOHWACCEL

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

@@ -218 +218 @@
 void UIMachineView::sltHandleNotifyChange(int iWidth, int iHeight)
 {
-    LogRelFlow(("UIMachineView::HandleNotifyChange: Screen=%d, Size=%dx%d.\n",
-                (unsigned long)m_uScreenId, iWidth, iHeight));
+    LogRel(("UIMachineView::sltHandleNotifyChange: Screen=%d, Size=%dx%d.\n",
+            (unsigned long)m_uScreenId, iWidth, iHeight));
 
     // TODO: Move to appropriate place!
@@ -242 +242 @@
 
         /* Perform frame-buffer mode-change: */
-        frameBuffer()->notifyChange(iWidth, iHeight);
+        frameBuffer()->handleNotifyChange(iWidth, iHeight);
 
         /* Scale-mode doesn't need this.. */
@@ -281 +281 @@
     display().InvalidateAndUpdateScreen(m_uScreenId);
 
-    LogRelFlow(("UIMachineView::ResizeHandled: Screen=%d, Size=%dx%d.\n",
+    LogRelFlow(("UIMachineView::sltHandleNotifyChange: Complete for Screen=%d, Size=%dx%d.\n",
                 (unsigned long)m_uScreenId, iWidth, iHeight));
 }
@@ -364 +364 @@
     /* Adjust frame-buffer, machine-window and guest-screen size if necessary: */
     sltHandleNotifyChange(frameBuffer()->width(), frameBuffer()->height());
-    frameBuffer()->resizeEvent(frameBuffer()->width(), frameBuffer()->height());
+    frameBuffer()->performResize(frameBuffer()->width(), frameBuffer()->height());
     machineWindow()->normalizeGeometry(true /* adjust position */);
     adjustGuestScreenSize();
@@ -385 +385 @@
     /* Adjust frame-buffer, machine-window and guest-screen size if necessary: */
     sltHandleNotifyChange(frameBuffer()->width(), frameBuffer()->height());
-    frameBuffer()->resizeEvent(frameBuffer()->width(), frameBuffer()->height());
+    frameBuffer()->performResize(frameBuffer()->width(), frameBuffer()->height());
     machineWindow()->normalizeGeometry(true /* adjust position */);
     adjustGuestScreenSize();
@@ -600 +600 @@
         /* If we have a valid size, resize the framebuffer. */
         if (size.width() > 0 && size.height() > 0)
-            frameBuffer()->resizeEvent(size.width(), size.height());
+            frameBuffer()->performResize(size.width(), size.height());
     }
 }
@@ -1280 +1280 @@
     /* Delegate the paint function to the UIFrameBuffer interface: */
     if (m_pFrameBuffer)
-        m_pFrameBuffer->paintEvent(pPaintEvent);
+        m_pFrameBuffer->handlePaintEvent(pPaintEvent);
 #ifdef Q_WS_MAC
     /* Update the dock icon if we are in the running state: */

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

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