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

Timestamp:

Jun 3, 2013 12:24:48 PM (12 years ago)

Author:

vboxsync

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

86173

Message:

FE/Qt: 6749: Frame-buffer interface cleanup/rework (part 3).

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (6 diffs)
• UIFrameBuffer.h (modified) (6 diffs)
• UIMachineView.cpp (modified) (1 diff)
• UISession.cpp (modified) (1 diff)

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

@@ -42 +42 @@
     : m_pMachineView(pMachineView)
     , m_width(0), m_height(0)
-    , m_fIsDeleted(false)
-#if defined (Q_OS_WIN32)
+    , m_fIsScheduledToDelete(false)
+#ifdef Q_OS_WIN
     , m_iRefCnt(0)
-#endif
+#endif /* Q_OS_WIN */
 {
     /* Assign mahine-view: */
@@ -64 +64 @@
 UIFrameBuffer::~UIFrameBuffer()
 {
+    /* Deinitialize critical-section: */
     RTCritSectDelete(&m_critSect);
+
+    /* Disconnect NotifyUpdate handler: */
+    if (m_pMachineView)
+        disconnect(this, SIGNAL(sigNotifyUpdate(int, int, int, int)),
+                   m_pMachineView, SLOT(sltHandleNotifyUpdate(int, int, int, int)));
 }
 
@@ -166 +172 @@
                                           BOOL *pbFinished)
 {
-    if (m_fIsDeleted)
+    /* Make sure frame-buffer is not yet scheduled for removal: */
+    if (m_fIsScheduledToDelete)
         return E_FAIL;
 
+    /* Currently screen ID is not used: */
     NOREF(uScreenId);
+
+    /* Mark request as not-yet-finished: */
     *pbFinished = FALSE;
-    lock(); /* See comment in setView(). */
+
+    /* See comment in setView(): */
+    lock();
+
+    /* Widget resize is NOT thread safe and never will be,
+     * We have to notify the machine-view with the async event to perform resize operation,
+     * later it will be replaced with signal stuff. */
     if (m_pMachineView)
         QApplication::postEvent(m_pMachineView,
@@ -178 +194 @@
                                                   uWidth, uHeight));
     else
-        /* Report to the VM thread that we finished resizing and rely on the
+        /* Mark request as finished.
+         * It is required to report to the VM thread that we finished resizing and rely on the
          * synchronisation when the new view is attached. */
         *pbFinished = TRUE;
-    unlock();
-
-    return S_OK;
-}
-
-STDMETHODIMP UIFrameBuffer::NotifyUpdate(ULONG uX, ULONG uY, ULONG uW, ULONG uH)
-{
+
+    /* Unlock thread finally: */
+    unlock();
+
+    /* Confirm RequestResize: */
+    return S_OK;
+}
+
+STDMETHODIMP UIFrameBuffer::NotifyUpdate(ULONG uX, ULONG uY, ULONG uWidth, ULONG uHeight)
+{
+    /* Make sure frame-buffer is not yet scheduled for removal: */
+    if (m_fIsScheduledToDelete)
+        return E_FAIL;
+
     /* See comment in setView(): */
     lock();
@@ -194 +218 @@
      * So we have to notify the machine-view with the async signal to perform update operation. */
     if (m_pMachineView)
-        emit sigNotifyUpdate(uX, uY, uW, uH);
+        emit sigNotifyUpdate(uX, uY, uWidth, uHeight);
 
     /* Unlock thread finally: */
@@ -346 +370 @@
     unlock();
 }
+

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

@@ -118 +118 @@
     virtual ~UIFrameBuffer();
 
-    void setDeleted(bool fIsDeleted) { m_fIsDeleted = fIsDeleted; }
+    void setScheduledToDelete(bool fIsScheduledToDelete) { m_fIsScheduledToDelete = fIsScheduledToDelete; }
 
     NS_DECL_ISUPPORTS
 
-#if defined (Q_OS_WIN32)
+#ifdef Q_OS_WIN
     STDMETHOD_(ULONG, AddRef)()
     {
@@ -135 +135 @@
         return cnt;
     }
-#endif
+#endif /* Q_OS_WIN */
 
     VBOX_SCRIPTABLE_DISPATCH_IMPL(IFramebuffer)
@@ -159 +159 @@
                               BOOL *pbFinished);
 
-    STDMETHOD(NotifyUpdate) (ULONG uX, ULONG uY, ULONG uW, ULONG uH);
+    STDMETHOD(NotifyUpdate) (ULONG uX, ULONG uY, ULONG uWidth, ULONG uHeight);
 
     STDMETHOD(VideoModeSupported) (ULONG uWidth, ULONG uHeight, ULONG uBPP,
@@ -214 +214 @@
 
     virtual void viewportScrolled(int /* iX */, int /* iY */) {}
-#endif
+#endif /* VBOX_WITH_VIDEOHWACCEL */
 
     virtual void setView(UIMachineView * pView);
@@ -226 +226 @@
     QSize m_scaledSize;
     int64_t m_WinId;
-    bool m_fIsDeleted;
+    bool m_fIsScheduledToDelete;
 
     /* To avoid a seamless flicker,
@@ -241 +241 @@
     QRegion m_asyncVisibleRegion;
 
-#if defined (Q_OS_WIN32)
 private:
 
+#ifdef Q_OS_WIN
     long m_iRefCnt;
-#endif
+#endif /* Q_OS_WIN */
 };
 

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

@@ -530 +530 @@
         {
             /* Warn framebuffer about its no more necessary: */
-            m_pFrameBuffer->setDeleted(true);
+            m_pFrameBuffer->setScheduledToDelete(true);
             /* Detach framebuffer from Display: */
             CDisplay display = session().GetConsole().GetDisplay();

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

@@ -957 +957 @@
         {
             /* Warn framebuffer about its no more necessary: */
-            pFb->setDeleted(true);
+            pFb->setScheduledToDelete(true);
             /* Detach framebuffer from Display: */
             CDisplay display = session().GetConsole().GetDisplay();