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

Timestamp:

May 28, 2014 9:12:15 AM (11 years ago)

Author:

vboxsync

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

93991

Message:

Main,Frontends: IDisplay provides the guest screen bitmap to frontends.

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (4 diffs)
• UIFrameBuffer.h (modified) (5 diffs)
• UIFrameBufferQImage.cpp (modified) (4 diffs)
• UIMachineView.cpp (modified) (5 diffs)
• UIMachineView.h (modified) (1 diff)
• UISession.cpp (modified) (1 diff)

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

@@ -33 +33 @@
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+
+#include "CConsole.h"
+#include "CDisplay.h"
 
 #if defined (Q_OS_WIN32)
@@ -282 +285 @@
 
     /* Confirm RequestResize: */
+    return S_OK;
+}
+
+void UIFrameBuffer::notifyChange(ULONG aScreenId)
+{
+    /* Disable screen updates. */
+    lock();
+
+    if (mpPendingSourceBitmap.isNull())
+    {
+        /* Do nothing. Change event already processed. */
+        LogRelFlow(("notifyChange: already processed.\n"));
+        unlock();
+        return;
+    }
+
+    /* Disable screen updates. */
+    mfUpdates = false;
+
+    /* Release the current bitmap and keep the pending one. */
+    mpSourceBitmap = mpPendingSourceBitmap;
+    mpPendingSourceBitmap = 0;
+
+    unlock();
+
+    BYTE *pAddress = NULL;
+    ULONG ulWidth = 0;
+    ULONG ulHeight = 0;
+    ULONG ulBitsPerPixel = 0;
+    ULONG ulBytesPerLine = 0;
+    ULONG ulPixelFormat = 0;
+
+    mpSourceBitmap.QueryBitmapInfo(pAddress,
+                                   ulWidth,
+                                   ulHeight,
+                                   ulBitsPerPixel,
+                                   ulBytesPerLine,
+                                   ulPixelFormat);
+
+    UIResizeEvent e(FramebufferPixelFormat_Opaque, pAddress,
+                    ulBitsPerPixel, ulBytesPerLine, ulWidth, ulHeight);
+    resizeEvent(&e);
+}
+
+STDMETHODIMP UIFrameBuffer::NotifyChange(ULONG aScreenId,
+                                         ULONG aXOrigin,
+                                         ULONG aYOrigin,
+                                         ULONG aWidth,
+                                         ULONG aHeight)
+{
+    LogRelFlow(("NotifyChange: %d %d,%d %dx%d\n",
+                aScreenId, aXOrigin, aYOrigin, aWidth, aHeight));
+
+    /* Obtain the new screen bitmap. */
+    lock();
+
+    /* Make sure frame-buffer is used: @todo still required? */
+    if (m_fIsMarkedAsUnused)
+    {
+        LogRelFlow(("UIFrameBuffer::NotifyChange: Ignored!\n"));
+        unlock();
+        return E_FAIL;
+    }
+
+    /* Save the new bitmap. */
+    mpPendingSourceBitmap = 0;
+    m_pMachineView->session().GetConsole().GetDisplay().QuerySourceBitmap(aScreenId, mpPendingSourceBitmap);
+
+    unlock();
+
+    /* Widget resize is NOT thread-safe and *probably* never will be,
+     * We have to notify machine-view with the async-signal to perform resize operation. */
+    LogRelFlow(("UIFrameBuffer::NotifyChange: Sending to async-handler...\n"));
+    emit sigNotifyChange(aScreenId, aWidth, aHeight);
+
+    RTThreadYield();
+
     return S_OK;
 }
@@ -606 +686 @@
             m_pMachineView, SLOT(sltHandleRequestResize(int, uchar*, int, int, int, int)),
             Qt::QueuedConnection);
+    connect(this, SIGNAL(sigNotifyChange(ulong, int, int)),
+            m_pMachineView, SLOT(sltHandleNotifyChange(ulong, int, int)),
+            Qt::QueuedConnection);
     connect(this, SIGNAL(sigNotifyUpdate(int, int, int, int)),
             m_pMachineView, SLOT(sltHandleNotifyUpdate(int, int, int, int)),
@@ -621 +704 @@
     disconnect(this, SIGNAL(sigRequestResize(int, uchar*, int, int, int, int)),
                m_pMachineView, SLOT(sltHandleRequestResize(int, uchar*, int, int, int, int)));
+    disconnect(this, SIGNAL(sigNotifyChange(ulong, int, int)),
+               m_pMachineView, SLOT(sltHandleNotifyChange(ulong, int, int)));
     disconnect(this, SIGNAL(sigNotifyUpdate(int, int, int, int)),
                m_pMachineView, SLOT(sltHandleNotifyUpdate(int, int, int, int)));

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

@@ -28 +28 @@
 /* COM includes: */
 #include "CFramebuffer.h"
+#include "CDisplaySourceBitmap.h"
 
 /* Other VBox includes: */
@@ -96 +97 @@
                           int iBitsPerPixel, int iBytesPerLine,
                           int iWidth, int iHeight);
+    void sigNotifyChange(ulong uScreenId, int iWidth, int iHeight);
     void sigNotifyUpdate(int iX, int iY, int iWidth, int iHeight);
     void sigSetVisibleRegion(QRegion region);
@@ -150 +152 @@
                               ULONG uWidth, ULONG uHeight,
                               BOOL *pbFinished);
+    STDMETHOD(NotifyChange)(ULONG aScreenId,
+                            ULONG aXOrigin,
+                            ULONG aYOrigin,
+                            ULONG aWidth,
+                            ULONG aHeight);
 
     STDMETHOD(NotifyUpdate) (ULONG uX, ULONG uY, ULONG uWidth, ULONG uHeight);
@@ -196 +203 @@
     virtual void paintEvent(QPaintEvent *pEvent) = 0;
     virtual void applyVisibleRegion(const QRegion &region);
+
+    void notifyChange(ulong uScreenId);
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -230 +239 @@
     bool m_fIsMarkedAsUnused;
     bool m_fIsAutoEnabled;
+
+    CDisplaySourceBitmap mpSourceBitmap;
+    CDisplaySourceBitmap mpPendingSourceBitmap;
+    bool mfUpdates;
 
     /* To avoid a seamless flicker,

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

@@ -145 +145 @@
     else
         popupCenter().forgetAboutWrongColorDepth(m_pMachineView->machineWindow());
+    lock();
+    mfUpdates = true;
+    unlock();
 }
 
@@ -161 +164 @@
     if (!m_pMachineView)
         return;
+        
+    lock();
+    if (!mfUpdates)
+    {
+       unlock();
+       return;
+    }
 
     /* If the machine is NOT in 'running', 'paused' or 'saving' state,
@@ -203 +213 @@
             break;
     }
+    unlock();
 }
 
@@ -376 +387 @@
      * 2. or the machine is in the state which breaks link between
      *    the framebuffer and the actual video-memory: */
-    m_img = QImage(m_width, m_height, QImage::Format_RGB32);
-    m_img.fill(0);
-    m_uPixelFormat = FramebufferPixelFormat_FOURCC_RGB;
-    m_bUsesGuestVRAM = false;
-}
-
+    if (!mpSourceBitmap.isNull())
+    {
+        BYTE *pAddress = NULL;
+        ULONG ulWidth = 0;
+        ULONG ulHeight = 0;
+        ULONG ulBitsPerPixel = 0;
+        ULONG ulBytesPerLine = 0;
+        ULONG ulPixelFormat = 0;
+
+        mpSourceBitmap.QueryBitmapInfo(pAddress,
+                                       ulWidth,
+                                       ulHeight,
+                                       ulBitsPerPixel,
+                                       ulBytesPerLine,
+                                       ulPixelFormat);
+
+        m_img = QImage(pAddress, ulWidth, ulHeight, ulBytesPerLine, QImage::Format_RGB32);
+        m_uPixelFormat = FramebufferPixelFormat_FOURCC_RGB;
+        m_bUsesGuestVRAM = true;
+    }
+}
+

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

@@ -276 +276 @@
     }
 
-    /* Report to the VM thread that we finished resizing: */
-    session().GetConsole().GetDisplay().ResizeCompleted(screenId());
-
     /* Emit a signal about guest was resized: */
     emit resizeHintDone();
@@ -288 +285 @@
                 (unsigned long)m_uScreenId, iPixelFormat,
                 iBitsPerPixel, iBytesPerLine, iWidth, iHeight));
+}
+
+void UIMachineView::sltHandleNotifyChange(ulong uScreenId, int iWidth, int iHeight)
+{
+    LogRelFlow(("UIMachineView::HandleNotifyChange: Screen=%d, Size=%dx%d.\n",
+                (unsigned long)m_uScreenId, iWidth, iHeight));
+
+    // TODO: Move to appropriate place!
+    /* Some situations require frame-buffer resize-events to be ignored at all,
+     * leaving machine-window, machine-view and frame-buffer sizes preserved: */
+    if (uisession()->isGuestResizeIgnored())
+        return;
+
+    /* If machine-window is visible: */
+    if (uisession()->isScreenVisible(m_uScreenId))
+    {
+        // TODO: Move to appropriate place!
+        /* Adjust 'scale' mode for current machine-view size: */
+        if (visualStateType() == UIVisualStateType_Scale)
+            frameBuffer()->setScaledSize(size());
+
+        /* Perform frame-buffer mode-change: */
+        frameBuffer()->notifyChange(uScreenId);
+
+        /* Scale-mode doesn't need this.. */
+        if (visualStateType() != UIVisualStateType_Scale)
+        {
+            /* Adjust maximum-size restriction for machine-view: */
+            setMaximumSize(sizeHint());
+
+            /* Disable the resize hint override hack: */
+            m_sizeHintOverride = QSize(-1, -1);
+
+            /* Force machine-window update own layout: */
+            QCoreApplication::sendPostedEvents(0, QEvent::LayoutRequest);
+
+            /* Update machine-view sliders: */
+            updateSliders();
+
+            /* By some reason Win host forgets to update machine-window central-widget
+             * after main-layout was updated, let's do it for all the hosts: */
+            machineWindow()->centralWidget()->update();
+
+            /* Normalize machine-window geometry: */
+            if (visualStateType() == UIVisualStateType_Normal)
+                machineWindow()->normalizeGeometry(true /* adjust position */);
+        }
+
+#ifdef Q_WS_MAC
+        /* Update MacOS X dock icon size: */
+        machineLogic()->updateDockIconSize(screenId(), iWidth, iHeight);
+#endif /* Q_WS_MAC */
+    }
+
+    /* Emit a signal about guest was resized: */
+    emit resizeHintDone();
+
+    LogRelFlow(("UIMachineView::ResizeHandled: Screen=%d, Size=%dx%d.\n",
+                (unsigned long)m_uScreenId, iWidth, iHeight));
 }
 
@@ -354 +410 @@
                     /* Ask for full guest display update (it will also update
                      * the viewport through IFramebuffer::NotifyUpdate): */
-                    if (m_previousState == KMachineState_Paused ||
-                        m_previousState == KMachineState_TeleportingPausedVM)
-                    {
-                        CDisplay dsp = session().GetConsole().GetDisplay();
-                        dsp.InvalidateAndUpdate();
-                    }
+                    CDisplay dsp = session().GetConsole().GetDisplay();
+                    dsp.InvalidateAndUpdate();
                 }
             }
@@ -497 +549 @@
         Assert(!display.isNull());
         CFramebuffer fb(NULL);
-        LONG XOrigin, YOrigin;
         /* Check if the framebuffer is already assigned;
          * in this case we do not need to re-assign it neither do we need to AddRef. */
-        display.GetFramebuffer(m_uScreenId, fb, XOrigin, YOrigin);
+        display.QueryFramebuffer(m_uScreenId, fb);
         if (fb.raw() != m_pFrameBuffer) /* <-this will evaluate to true iff no framebuffer is yet assigned */
         {
             m_pFrameBuffer->AddRef();
         }
-        /* Always perform SetFramebuffer to ensure 3D gets notified: */
-        display.SetFramebuffer(m_uScreenId, CFramebuffer(m_pFrameBuffer));
+        /* Always perform AttachFramebuffer to ensure 3D gets notified: */
+        if (!fb.isNull())
+            display.DetachFramebuffer(m_uScreenId);
+        display.AttachFramebuffer(m_uScreenId, CFramebuffer(m_pFrameBuffer));
     }
 
@@ -629 +682 @@
     /* Temporarily detach the framebuffer from IDisplay before detaching
      * from view in order to respect the thread synchonisation logic (see UIFrameBuffer.h).
-     * Note: VBOX_WITH_CROGL additionally requires us to call SetFramebuffer
+     * Note: VBOX_WITH_CROGL additionally requires us to call DetachFramebuffer
      * to ensure 3D gets notified of view being destroyed... */
     CDisplay display = session().GetConsole().GetDisplay();
-    display.SetFramebuffer(m_uScreenId, CFramebuffer(NULL));
+    display.DetachFramebuffer(m_uScreenId);
 
     /* Detach framebuffer from view: */

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

@@ -97 +97 @@
                                 int iBitsPerPixel, int iBytesPerLine,
                                 int iWidth, int iHeight);
+
+    /* Handler: Frame-buffer NotifyChange stuff: */
+    virtual void sltHandleNotifyChange(ulong uScreenId, int iWidth, int iHeight);
 
     /* Handler: Frame-buffer NotifyUpdate stuff: */

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

@@ -1230 +1230 @@
             /* Detach framebuffer from Display: */
             CDisplay display = session().GetConsole().GetDisplay();
-            display.SetFramebuffer(i, CFramebuffer(NULL));
+            display.DetachFramebuffer(i);
             /* Release framebuffer reference: */
             pFb->Release();