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

Timestamp:

May 28, 2013 9:13:16 AM (12 years ago)

Author:

vboxsync

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

86040

Message:

FE/Qt: 6749: Runtime UI: Frame-buffer interface: Using signal instead of event for NotifyUpdate stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/globals/UIDefs.h (modified) (1 diff)
• src/runtime/UIFrameBuffer.cpp (modified) (3 diffs)
• src/runtime/UIFrameBuffer.h (modified) (2 diffs)
• src/runtime/UIMachineView.cpp (modified) (2 diffs)
• src/runtime/UIMachineView.h (modified) (1 diff)
• src/runtime/scale/UIMachineViewScale.cpp (modified) (2 diffs)
• src/runtime/scale/UIMachineViewScale.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -296 +296 @@
         src/runtime/UIActionPoolRuntime.h \
         src/runtime/UIConsoleEventHandler.h \
+        src/runtime/UIFrameBuffer.h \
         src/runtime/UIIndicatorsPool.h \
         src/runtime/UIKeyboardHandler.h \

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h

@@ -69 +69 @@
     {
           ResizeEventType = QEvent::User + 101
-        , RepaintEventType
         , SetRegionEventType
         , ModifierKeyChangeEventType

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

@@ -47 +47 @@
 #endif
 {
+    /* Assign mahine-view: */
     AssertMsg(m_pMachineView, ("UIMachineView must not be null\n"));
     m_WinId = (m_pMachineView && m_pMachineView->viewport()) ? (LONG64)m_pMachineView->viewport()->winId() : 0;
+
+    /* Connect NotifyUpdate handler: */
+    if (m_pMachineView)
+        connect(this, SIGNAL(sigNotifyUpdate(int, int, int, int)),
+                m_pMachineView, SLOT(sltHandleNotifyUpdate(int, int, int, int)),
+                Qt::QueuedConnection);
+
+    /* Initialize critical-section: */
     int rc = RTCritSectInit(&m_critSect);
     AssertRC(rc);
@@ -177 +186 @@
 }
 
-/* This method is called on EMT from under this object's lock! */
 STDMETHODIMP UIFrameBuffer::NotifyUpdate(ULONG uX, ULONG uY, ULONG uW, ULONG uH)
 {
+    /* See comment in setView(): */
+    lock();
+
     /* QWidget::update() is NOT thread safe and seems never will be,
-     * So we have to post an async event to perform update operation.
-     * Later the event will be replaced by the corresponding signal stuff: */
-    lock(); /* See comment in setView(). */
-    if (m_pMachineView)
-        QApplication::postEvent(m_pMachineView, new UIRepaintEvent(uX, uY, uW, uH));
-    unlock();
-
+     * 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);
+
+    /* Unlock thread finally: */
+    unlock();
+
+    /* Confirm NotifyUpdate: */
     return S_OK;
 }
@@ -309 +321 @@
      * so I will do it anyway. */
     lock();
+
+    /* Disconnect NotifyUpdate handler: */
+    if (m_pMachineView)
+        disconnect(this, SIGNAL(sigNotifyUpdate(int, int, int, int)),
+                   m_pMachineView, SLOT(sltHandleNotifyUpdate(int, int, int, int)));
+
+    /* Reassign machine-view: */
     m_pMachineView = pView;
     m_WinId = (m_pMachineView && m_pMachineView->viewport()) ? (LONG64)m_pMachineView->viewport()->winId() : 0;
-    unlock();
-}
+
+    /* Connect NotifyUpdate handler: */
+    if (m_pMachineView)
+        connect(this, SIGNAL(sigNotifyUpdate(int, int, int, int)),
+                m_pMachineView, SLOT(sltHandleNotifyUpdate(int, int, int, int)),
+                Qt::QueuedConnection);
+
+    /* Unlock thread finally: */
+    unlock();
+}

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

@@ -67 +67 @@
 
 /**
- *  Frame buffer repaint event.
- */
-class UIRepaintEvent : public QEvent
-{
-public:
-
-    UIRepaintEvent(int iX, int iY, int iW, int iH)
-        : QEvent((QEvent::Type)RepaintEventType)
-        , m_iX(iX), m_iY(iY), m_iW(iW), m_iH(iH) {}
-    int x() { return m_iX; }
-    int y() { return m_iY; }
-    int width() { return m_iW; }
-    int height() { return m_iH; }
-
-private:
-
-    int m_iX, m_iY, m_iW, m_iH;
-};
-
-/**
  *  Frame buffer set region event.
  */
@@ -124 +104 @@
  *  See IFramebuffer documentation for more info.
  */
-class UIFrameBuffer : VBOX_SCRIPTABLE_IMPL(IFramebuffer)
+class UIFrameBuffer : public QObject, VBOX_SCRIPTABLE_IMPL(IFramebuffer)
 {
+    Q_OBJECT;
+
+signals:
+
+    /* Notifiers: EMT<->GUI interthread stuff: */
+    void sigNotifyUpdate(int iX, int iY, int iW, int iH);
+
 public:
 

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

@@ -203 +203 @@
     QString strKey = makeExtraDataKeyPerMonitor(GUI_LastGuestSizeHintWasFullscreen);
     machine.SetExtraData(strKey, isFullscreenOrSeamless() ? "true" : "");
+}
+
+void UIMachineView::sltHandleNotifyUpdate(int iX, int iY, int iW, int iH)
+{
+    /* Update corresponding viewport part: */
+    viewport()->update(iX - contentsX(), iY - contentsY(), iW, iH);
 }
 
@@ -916 +922 @@
     switch (pEvent->type())
     {
-        case RepaintEventType:
-        {
-            UIRepaintEvent *pPaintEvent = static_cast<UIRepaintEvent*>(pEvent);
-            viewport()->update(pPaintEvent->x() - contentsX(), pPaintEvent->y() - contentsY(),
-                                pPaintEvent->width(), pPaintEvent->height());
-            return true;
-        }
-
 #ifdef Q_WS_MAC
         /* Event posted OnShowWindow: */

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

@@ -91 +91 @@
     /* Slot to perform guest resize: */
     void sltPerformGuestResize(const QSize &aSize = QSize());
+
+    /* Handler: Frame-buffer NotifyUpdate stuff: */
+    virtual void sltHandleNotifyUpdate(int iX, int iY, int iW, int iH);
 
     /* Watch dog for desktop resizes: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

@@ -137 +137 @@
 }
 
+void UIMachineViewScale::sltHandleNotifyUpdate(int iX, int iY, int iW, int iH)
+{
+    /* Initialize variables for scale mode: */
+    QSize scaledSize = frameBuffer()->scaledSize();
+    double xRatio = (double)scaledSize.width() / frameBuffer()->width();
+    double yRatio = (double)scaledSize.height() / frameBuffer()->height();
+    AssertMsg(contentsX() == 0, ("This can't be, else notify Dsen!\n"));
+    AssertMsg(contentsY() == 0, ("This can't be, else notify Dsen!\n"));
+
+    /* Update corresponding viewport part,
+     * But make sure we update always a bigger rectangle than requested to
+     * catch all rounding errors. (use 1 time the ratio factor and
+     * round down on top/left, but round up for the width/height) */
+    viewport()->update((int)(iX * xRatio) - ((int)xRatio) - 1,
+                       (int)(iY * yRatio) - ((int)yRatio) - 1,
+                       (int)(iW * xRatio) + ((int)xRatio + 2) * 2,
+                       (int)(iH * yRatio) + ((int)yRatio + 2) * 2);
+}
+
 bool UIMachineViewScale::event(QEvent *pEvent)
 {
@@ -172 +191 @@
         }
 
-        case RepaintEventType:
-        {
-            UIRepaintEvent *pPaintEvent = static_cast<UIRepaintEvent*>(pEvent);
-            QSize scaledSize = frameBuffer()->scaledSize();
-            double xRatio = (double)scaledSize.width() / frameBuffer()->width();
-            double yRatio = (double)scaledSize.height() / frameBuffer()->height();
-            AssertMsg(contentsX() == 0, ("This can't be, else notify Dsen!\n"));
-            AssertMsg(contentsY() == 0, ("This can't be, else notify Dsen!\n"));
-
-            /* Make sure we update always a bigger rectangle than requested to
-             * catch all rounding errors. (use 1 time the ratio factor and
-             * round down on top/left, but round up for the width/height) */
-            viewport()->update((int)(pPaintEvent->x() * xRatio) - ((int)xRatio) - 1,
-                               (int)(pPaintEvent->y() * yRatio) - ((int)yRatio) - 1,
-                               (int)(pPaintEvent->width() * xRatio) + ((int)xRatio + 2) * 2,
-                               (int)(pPaintEvent->height() * yRatio) + ((int)yRatio + 2) * 2);
-            pEvent->accept();
-            return true;
-        }
-
-        default:
+         default:
             break;
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.h

@@ -49 +49 @@
     void sltPerformGuestScale();
 
+    /* Handler: Frame-buffer NotifyUpdate stuff: */
+    void sltHandleNotifyUpdate(int iX, int iY, int iW, int iH);
+
 private: