Changeset 47103 in vbox for trunk/src/VBox

Timestamp:

Jul 11, 2013 3:52:27 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Popup-center: Process Notify3DEvent frame-buffer callback.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIPopupCenter.cpp (modified) (2 diffs)
• globals/UIPopupCenter.h (modified) (2 diffs)
• runtime/UIFrameBuffer.cpp (modified) (3 diffs)
• runtime/UIFrameBuffer.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (3 diffs)
• runtime/UIMachineLogic.h (modified) (2 diffs)
• runtime/UIMachineView.cpp (modified) (1 diff)
• runtime/UIMachineView.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.cpp

@@ -272 +272 @@
     pPopupStack->hide();
     unassignPopupStackParent(pPopupStack, pParent);
+}
+
+void UIPopupCenter::raisePopupStack(QWidget *pParent)
+{
+    /* Make sure passed parent is valid: */
+    if (!pParent)
+    {
+        AssertMsgFailed(("Passed parent is NULL"));
+        return;
+    }
+
+    /* Do we have a stack for passed parent? */
+    const QString strPopupStackID(popupStackID(pParent));
+    if (!m_stacks.contains(strPopupStackID))
+        return;
+
+    /* Just raise, its:
+     * useful for Win host,
+     * do not work on Mac host and
+     * need to check for x11/KDE still. */
+    UIPopupStack *pPopupStack = m_stacks[strPopupStackID];
+    pPopupStack->raise();
 }
 
@@ -346 +368 @@
 }
 
+void UIPopupCenter::sltRaisePopupStack()
+{
+    raisePopupStack(vboxGlobal().activeMachineWindow());
+}
+
 void UIPopupCenter::sltRemovePopupStack()
 {

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

@@ -111 +111 @@
     void sltShowPopupStack();
     void sltHidePopupStack();
+    void sltRaisePopupStack();
     void sltRemovePopupStack();
 
@@ -133 +134 @@
     void showPopupStack(QWidget *pParent);
     void hidePopupStack(QWidget *pParent);
+    void raisePopupStack(QWidget *pParent);
     void assignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent);
     void unassignPopupStackParent(UIPopupStack *pPopupStack, QWidget *pParent);

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

@@ -347 +347 @@
     {
         case VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_WINDOW:
+        {
             if (pReserved)
                 return E_INVALIDARG;
 
-            /* @todo: submit asynchronous event to GUI thread */
-            return E_NOTIMPL;
+            /* Notify GUI about 3D event: */
+            emit sigNotify3DEvent();
+
+            return S_OK;
+        }
         default:
             return E_INVALIDARG;
@@ -423 +427 @@
             m_pMachineView, SLOT(sltHandleSetVisibleRegion(QRegion)),
             Qt::QueuedConnection);
+    connect(this, SIGNAL(sigNotify3DEvent()),
+            m_pMachineView, SLOT(sltNotify3DEvent()),
+            Qt::QueuedConnection);
 }
 
@@ -433 +440 @@
     disconnect(this, SIGNAL(sigSetVisibleRegion(QRegion)),
                m_pMachineView, SLOT(sltHandleSetVisibleRegion(QRegion)));
-}
-
+    disconnect(this, SIGNAL(sigNotify3DEvent()),
+               m_pMachineView, SLOT(sltNotify3DEvent()));
+}
+

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

@@ -99 +99 @@
     void sigNotifyUpdate(int iX, int iY, int iWidth, int iHeight);
     void sigSetVisibleRegion(QRegion region);
+    void sigNotify3DEvent();
 
 public:

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

@@ -351 +351 @@
 }
 
+void UIMachineLogic::notifyAbout3DEvent()
+{
+    /* Notify listener about 3D event: */
+    emit sigNotify3DEvent();
+}
+
 void UIMachineLogic::sltMachineStateChanged()
 {
@@ -539 +545 @@
     connect(this, SIGNAL(sigMachineWindowsDestroyed()),
             &popupCenter(), SLOT(sltHidePopupStack()));
+    connect(this, SIGNAL(sigNotify3DEvent()),
+            &popupCenter(), SLOT(sltRaisePopupStack()));
 }
 
@@ -548 +556 @@
     disconnect(this, SIGNAL(sigMachineWindowsDestroyed()),
                &popupCenter(), SLOT(sltHidePopupStack()));
+    disconnect(this, SIGNAL(sigNotify3DEvent()),
+               &popupCenter(), SLOT(sltRaisePopupStack()));
 }
 

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

@@ -58 +58 @@
     void sigMachineWindowsCreated();
     void sigMachineWindowsDestroyed();
+    void sigNotify3DEvent();
 
 public:
@@ -99 +100 @@
     void shutdown();
     void powerOff(bool fDiscardingState);
+
+    /* API: 3D event stuff: */
+    void notifyAbout3DEvent();
 
 protected slots:

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

@@ -289 +289 @@
     /* Used only in seamless-mode. */
     Q_UNUSED(region);
+}
+
+void UIMachineView::sltNotify3DEvent()
+{
+    machineLogic()->notifyAbout3DEvent();
 }
 

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

@@ -102 +102 @@
     /* Handler: Frame-buffer SetVisibleRegion stuff: */
     virtual void sltHandleSetVisibleRegion(QRegion region);
+
+    /* Handler: Frame-buffer Notify3DEvent stuff: */
+    virtual void sltNotify3DEvent();
 
     /* Watch dog for desktop resizes: */