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

Timestamp:

May 29, 2014 11:56:56 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Frame-buffer NotifyChange event handling cleanup.

Location:

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

Files:

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

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

@@ -49 +49 @@
     , m_fIsMarkedAsUnused(false)
     , m_fIsAutoEnabled(false)
+    , m_fIsUpdatesAllowed(true)
 #ifdef Q_OS_WIN
     , m_iRefCnt(0)
@@ -288 +289 @@
 }
 
-void UIFrameBuffer::notifyChange(ULONG aScreenId)
-{
-    /* Disable screen updates. */
+void UIFrameBuffer::notifyChange()
+{
+    /* Lock access to frame-buffer: */
     lock();
 
-    if (mpPendingSourceBitmap.isNull())
-    {
-        /* Do nothing. Change event already processed. */
-        LogRelFlow(("notifyChange: already processed.\n"));
+    /* If there is NO pending source bitmap: */
+    if (m_pendingSourceBitmap.isNull())
+    {
+        /* Do nothing, change-event already processed: */
+        LogRelFlow(("UIFrameBuffer::notifyChange: Already processed.\n"));
+        /* Unlock access to frame-buffer: */
         unlock();
+        /* Return immediately: */
         return;
     }
 
-    /* Disable screen updates. */
-    mfUpdates = false;
-
-    /* Release the current bitmap and keep the pending one. */
-    mpSourceBitmap = mpPendingSourceBitmap;
-    mpPendingSourceBitmap = 0;
-
+    /* Disable screen updates: */
+    m_fIsUpdatesAllowed = false;
+
+    /* Release the current bitmap and keep the pending one: */
+    m_sourceBitmap = m_pendingSourceBitmap;
+    m_pendingSourceBitmap = 0;
+
+    /* Unlock access to frame-buffer: */
     unlock();
 
+    /* Acquire source bitmap: */
     BYTE *pAddress = NULL;
     ULONG ulWidth = 0;
@@ -316 +322 @@
     ULONG ulBytesPerLine = 0;
     ULONG ulPixelFormat = 0;
-
-    mpSourceBitmap.QueryBitmapInfo(pAddress,
+    m_sourceBitmap.QueryBitmapInfo(pAddress,
                                    ulWidth,
                                    ulHeight,
@@ -324 +329 @@
                                    ulPixelFormat);
 
+    /* Perform frame-buffer resize: */
     UIResizeEvent e(FramebufferPixelFormat_Opaque, pAddress,
                     ulBitsPerPixel, ulBytesPerLine, ulWidth, ulHeight);
@@ -329 +335 @@
 }
 
-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. */
+/**
+ * EMT callback: Informs about source bitmap change.
+ * @param uScreenId Guest screen number.
+ * @param uX        Horizontal origin of the update rectangle, in pixels.
+ * @param uY        Vertical origin of the update rectangle, in pixels.
+ * @param uWidth    Width of the guest display, in pixels.
+ * @param uHeight   Height of the guest display, in pixels.
+ * @note  Any EMT callback is subsequent. No any other EMT callback can be called until this one processed.
+ * @note  Calls to this and #setMarkAsUnused method are synchronized between calling threads (from GUI side).
+ */
+STDMETHODIMP UIFrameBuffer::NotifyChange(ULONG uScreenId,
+                                         ULONG uX,
+                                         ULONG uY,
+                                         ULONG uWidth,
+                                         ULONG uHeight)
+{
+    /* Lock access to frame-buffer: */
     lock();
 
-    /* Make sure frame-buffer is used: @todo still required? */
+    /* Make sure frame-buffer is used: */
     if (m_fIsMarkedAsUnused)
     {
-        LogRelFlow(("UIFrameBuffer::NotifyChange: Ignored!\n"));
+        LogRel(("UIFrameBuffer::NotifyChange: Screen=%lu, Origin=%lux%lu, Size=%lux%lu, Ignored!\n",
+                (unsigned long)uScreenId,
+                (unsigned long)uX, (unsigned long)uY,
+                (unsigned long)uWidth, (unsigned long)uHeight));
+
+        /* Unlock access to frame-buffer: */
         unlock();
+
+        /* Ignore NotifyChange: */
         return E_FAIL;
     }
 
-    /* Save the new bitmap. */
-    mpPendingSourceBitmap = 0;
-    m_pMachineView->session().GetConsole().GetDisplay().QuerySourceBitmap(aScreenId, mpPendingSourceBitmap);
-
-    unlock();
+    /* Acquire new pending bitmap: */
+    m_pendingSourceBitmap = 0;
+    m_pMachineView->session().GetConsole().GetDisplay().QuerySourceBitmap(uScreenId, m_pendingSourceBitmap);
 
     /* 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);
-
+    LogRel(("UIFrameBuffer::NotifyChange: Screen=%lu, Origin=%lux%lu, Size=%lux%lu, Sending to async-handler..\n",
+            (unsigned long)uScreenId,
+            (unsigned long)uX, (unsigned long)uY,
+            (unsigned long)uWidth, (unsigned long)uHeight));
+    emit sigNotifyChange(uScreenId, uWidth, uHeight);
+
+    /* Unlock access to frame-buffer: */
+    unlock();
+
+    /* Give up control token to other thread: */
     RTThreadYield();
 
+    /* Confirm NotifyChange: */
     return S_OK;
 }

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

@@ -152 +152 @@
                               ULONG uWidth, ULONG uHeight,
                               BOOL *pbFinished);
-    STDMETHOD(NotifyChange)(ULONG aScreenId,
-                            ULONG aXOrigin,
-                            ULONG aYOrigin,
-                            ULONG aWidth,
-                            ULONG aHeight);
+    STDMETHOD(NotifyChange)(ULONG uScreenId,
+                            ULONG uX,
+                            ULONG uY,
+                            ULONG uWidth,
+                            ULONG uHeight);
 
     STDMETHOD(NotifyUpdate) (ULONG uX, ULONG uY, ULONG uWidth, ULONG uHeight);
@@ -204 +204 @@
     virtual void applyVisibleRegion(const QRegion &region);
 
-    void notifyChange(ULONG uScreenId);
+    void notifyChange();
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -240 +240 @@
     bool m_fIsAutoEnabled;
 
-    CDisplaySourceBitmap mpSourceBitmap;
-    CDisplaySourceBitmap mpPendingSourceBitmap;
-    bool mfUpdates;
+    /** Source bitmap from IDisplay. */
+    CDisplaySourceBitmap m_sourceBitmap;
+    /** Source bitmap from IDisplay acquired but not yet applied. */
+    CDisplaySourceBitmap m_pendingSourceBitmap;
+    /** Reflects whether screen-updates allowed. */
+    bool m_fIsUpdatesAllowed;
 
     /* To avoid a seamless flicker,

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

@@ -145 +145 @@
     else
         popupCenter().forgetAboutWrongColorDepth(m_pMachineView->machineWindow());
+
+    /* Enable screen updates: */
     lock();
-    mfUpdates = true;
+    m_fIsUpdatesAllowed = true;
     unlock();
 }
@@ -164 +166 @@
     if (!m_pMachineView)
         return;
-        
+
+    /* Lock access to frame-buffer: */
     lock();
-    if (!mfUpdates)
-    {
-       unlock();
-       return;
+
+    /* But if updates disabled: */
+    if (!m_fIsUpdatesAllowed)
+    {
+        /* Unlock access to frame-buffer: */
+        unlock();
+        /* And return immediately: */
+        return;
     }
 
@@ -213 +220 @@
             break;
     }
+
+    /* Unlock access to frame-buffer: */
     unlock();
 }
@@ -387 +396 @@
      * 2. or the machine is in the state which breaks link between
      *    the framebuffer and the actual video-memory: */
-    if (!mpSourceBitmap.isNull())
+    if (!m_sourceBitmap.isNull())
     {
         BYTE *pAddress = NULL;
@@ -396 +405 @@
         ULONG ulPixelFormat = 0;
 
-        mpSourceBitmap.QueryBitmapInfo(pAddress,
+        m_sourceBitmap.QueryBitmapInfo(pAddress,
                                        ulWidth,
                                        ulHeight,

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

@@ -307 +307 @@
 
         /* Perform frame-buffer mode-change: */
-        frameBuffer()->notifyChange(uScreenId);
+        frameBuffer()->notifyChange();
 
         /* Scale-mode doesn't need this.. */