Changeset 44827 in vbox for trunk

Timestamp:

Feb 26, 2013 12:22:04 PM (12 years ago)

Author:

vboxsync

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

83964

Message:

FE/Qt: Multi-screen support: Moving guest-display enable/disable logic into the appropriate place.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (2 diffs)
• UIMachineLogic.h (modified) (3 diffs)
• UIMachineWindow.cpp (modified) (4 diffs)
• UIMachineWindow.h (modified) (3 diffs)

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

@@ -436 +436 @@
 #endif /* Q_WS_MAC */
 
+void UIMachineLogic::sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect)
+{
+    /* Ignore KGuestMonitorChangedEventType_NewOrigin change event: */
+    if (changeType == KGuestMonitorChangedEventType_NewOrigin)
+        return;
+    /* Ignore KGuestMonitorChangedEventType_Disabled event if there is only one window visible: */
+    AssertMsg(uisession()->countOfVisibleWindows() > 0, ("All machine windows are hidden!"));
+    if (   changeType == KGuestMonitorChangedEventType_Disabled
+        && uisession()->countOfVisibleWindows() == 1
+        && uisession()->isScreenVisible(uScreenId))
+        return;
+
+    /* Process KGuestMonitorChangedEventType_Enabled change event: */
+    if (   !uisession()->isScreenVisible(uScreenId)
+        && changeType == KGuestMonitorChangedEventType_Enabled)
+        uisession()->setScreenVisible(uScreenId, true);
+    /* Process KGuestMonitorChangedEventType_Disabled change event: */
+    else if (   uisession()->isScreenVisible(uScreenId)
+             && changeType == KGuestMonitorChangedEventType_Disabled)
+        uisession()->setScreenVisible(uScreenId, false);
+
+    /* Deliver event to corresponding machine-window: */
+    if (uScreenId < (ulong)machineWindows().size())
+        machineWindows()[uScreenId]->handleGuestMonitorChange();
+}
+
 UIMachineLogic::UIMachineLogic(QObject *pParent, UISession *pSession, UIVisualStateType visualStateType)
     : QIWithRetranslateUI3<QObject>(pParent)
@@ -563 +589 @@
     connect(uisession(), SIGNAL(sigShowWindows()), this, SLOT(sltShowWindows()));
 #endif /* Q_WS_MAC */
+
+    /* Guest monitor-change updater: */
+    connect(uisession(), SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)),
+            this, SLOT(sltGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)));
 }
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26 +26 @@
 # include <VBox/dbggui.h>
 #endif /* VBOX_WITH_DEBUGGER_GUI */
+
+/* COM includes: */
+#include "COMEnums.h"
 
 /* Forward declarations: */
@@ -94 +97 @@
     virtual void sltShowWindows();
 #endif /* RT_OS_DARWIN */
+    virtual void sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo);
 
 protected:

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -159 +159 @@
     /* Update window-title: */
     updateAppearanceOf(UIVisualElement_WindowTitle);
-}
-
-void UIMachineWindow::sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect /* screenGeo */)
-{
-    /* Ignore change events for other screens: */
-    if (uScreenId != m_uScreenId)
-        return;
-    /* Ignore KGuestMonitorChangedEventType_NewOrigin change event: */
-    if (changeType == KGuestMonitorChangedEventType_NewOrigin)
-        return;
-    /* Ignore KGuestMonitorChangedEventType_Disabled event if there is only one window visible: */
-    AssertMsg(uisession()->countOfVisibleWindows() > 0, ("All machine windows are hidden!"));
-    if ((changeType == KGuestMonitorChangedEventType_Disabled) &&
-        (uisession()->countOfVisibleWindows() == 1))
-        return;
-
-    /* Process KGuestMonitorChangedEventType_Enabled change event: */
-    if (isHidden() && changeType == KGuestMonitorChangedEventType_Enabled)
-        uisession()->setScreenVisible(m_uScreenId, true);
-    /* Process KGuestMonitorChangedEventType_Disabled change event: */
-    else if (!isHidden() && changeType == KGuestMonitorChangedEventType_Disabled)
-        uisession()->setScreenVisible(m_uScreenId, false);
-
-    /* Update screen visibility status: */
-    showInNecessaryMode();
 }
 
@@ -557 +532 @@
     /* Machine state-change updater: */
     connect(uisession(), SIGNAL(sigMachineStateChange()), this, SLOT(sltMachineStateChanged()));
-
-    /* Guest monitor-change updater: */
-    connect(uisession(), SIGNAL(sigGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)),
-            this, SLOT(sltGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)));
 }
 
@@ -632 +603 @@
     UIMachineView::destroy(m_pMachineView);
     m_pMachineView = 0;
+}
+
+void UIMachineWindow::handleGuestMonitorChange()
+{
+    showInNecessaryMode();
 }
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -66 +66 @@
     /* Session event-handlers: */
     virtual void sltMachineStateChanged();
-    virtual void sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo);
 
 protected:
@@ -105 +104 @@
     virtual void cleanupSessionConnections() {}
 
+    /* Visibility stuff: */
+    void handleGuestMonitorChange();
+
     /* Update stuff: */
     virtual void updateAppearanceOf(int iElement);