Changeset 49013 in vbox

Timestamp:

Oct 9, 2013 3:49:57 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Strict guest normalization on desktop resize; Native MacOS X display reconfiguration callback handling.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (2 diffs)
• UIMachineLogic.h (modified) (1 diff)
• UIMachineWindow.cpp (modified) (1 diff)
• UIMachineWindow.h (modified) (1 diff)
• UISession.cpp (modified) (6 diffs)
• UISession.h (modified) (4 diffs)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (3 diffs)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (2 diffs)
• seamless/UIMachineLogicSeamless.cpp (modified) (3 diffs)
• seamless/UIMachineWindowSeamless.cpp (modified) (2 diffs)

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

@@ -544 +544 @@
 }
 
-void UIMachineLogic::sltHostScreenResized(int /*iHostScreenNumber*/)
-{
+void UIMachineLogic::sltHostScreenGeometryChanged()
+{
+    LogRelFlow(("UIMachineLogic: Host-screen geometry changed.\n"));
+
     /* Deliver event to all machine-windows: */
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
-        pMachineWindow->handleScreenResize();
+        pMachineWindow->handleScreenGeometryChange();
 }
 
@@ -718 +720 @@
             this, SLOT(sltGuestMonitorChange(KGuestMonitorChangedEventType, ulong, QRect)));
 
-    /* Host-screen-change updater: */
+    /* Host-screen-change updaters: */
     connect(uisession(), SIGNAL(sigHostScreenCountChanged(int)),
             this, SLOT(sltHostScreenCountChanged(int)));
-
-    /* Host-screen-resize updaters: */
-    connect(uisession(), SIGNAL(sigHostScreenFullGeometryResized(int)),
-            this, SLOT(sltHostScreenResized(int)));
-    connect(uisession(), SIGNAL(sigHostScreenAvailableGeometryResized(int)),
-            this, SLOT(sltHostScreenResized(int)));
+    connect(uisession(), SIGNAL(sigHostScreenGeometryChanged()),
+            this, SLOT(sltHostScreenGeometryChanged()));
 }
 

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

@@ -113 +113 @@
     /* Qt callback handler: */
     virtual void sltHostScreenCountChanged(int cHostScreenCount);
-    virtual void sltHostScreenResized(int iHostScreenNumber);
+    virtual void sltHostScreenGeometryChanged();
 
 protected:

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

@@ -439 +439 @@
 }
 
-void UIMachineWindow::handleScreenResize()
+void UIMachineWindow::handleScreenGeometryChange()
 {
     showInNecessaryMode();

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

@@ -111 +111 @@
     /* Visibility stuff: */
     void handleScreenCountChange();
-    void handleScreenResize();
+    void handleScreenGeometryChange();
 
     /* Update stuff: */

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

@@ -22 +22 @@
 #include <QDesktopWidget>
 #include <QWidget>
+#ifdef Q_WS_MAC
+# include <QTimer>
+#endif /* Q_WS_MAC */
 
 /* GUI includes: */
@@ -41 +44 @@
 # include "VBoxFBOverlay.h"
 #endif /* VBOX_WITH_VIDEOHWACCEL */
+#ifdef Q_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif /* Q_WS_MAC */
 
 #ifdef Q_WS_X11
@@ -72 +78 @@
 #include "CSnapshot.h"
 #include "CMedium.h"
+
+#ifdef Q_WS_MAC
+/**
+ * Application Services: Core Graphics: Display reconfiguration callback.
+ *
+ * Notifies about @a display configuration change.
+ * Corresponding change described by CoreGraphics @a flags.
+ * UISession::sltHandleHostScreenGeometryChange() is called through @a pHandlerObject to handle this callback.
+ *
+ * @note Last argument (@a pHandlerObject) must always be valid pointer to UISession object.
+ */
+void cgDisplayReconfigurationCallback(CGDirectDisplayID display, CGDisplayChangeSummaryFlags flags, void *pHandlerObject)
+{
+    /* Handle 'mode-set' case: */
+    if (flags & kCGDisplaySetModeFlag)
+    {
+        /* Which resolution we received? */
+        size_t iWid = CGDisplayPixelsWide(display);
+        size_t iHig = CGDisplayPixelsHigh(display);
+        LogRelFlow(("UISession::cgDisplayReconfigurationCallback: Display mode changed to: %dx%d.\n", (int)iWid, (int)iHig));
+
+        /* Ask receiver to handle our callback, can't believe I'm using r_c here... */
+        UISession *pReceiver = reinterpret_cast<UISession*>(pHandlerObject);
+        QTimer::singleShot(0, pReceiver, SLOT(sltHandleHostScreenGeometryChange()));
+    }
+}
+#endif /* Q_WS_MAC */
 
 UISession::UISession(UIMachine *pMachine, CSession &sessionReference)
@@ -787 +820 @@
 }
 
+void UISession::sltHandleHostScreenGeometryChange()
+{
+    LogRelFlow(("UISession: Host-screen geometry changed.\n"));
+
+    /* Notify current machine-logic: */
+    emit sigHostScreenGeometryChanged();
+}
+
 void UISession::sltAdditionsChange()
 {
@@ -878 +919 @@
             this, SIGNAL(sigHostScreenCountChanged(int)));
 
+    /* Install Qt reconfiguration callbacks: */
     connect(QApplication::desktop(), SIGNAL(resized(int)),
-            this, SIGNAL(sigHostScreenFullGeometryResized(int)));
+            this, SLOT(sltHandleHostScreenGeometryChange()));
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)),
-            this, SIGNAL(sigHostScreenAvailableGeometryResized(int)));
+            this, SLOT(sltHandleHostScreenGeometryChange()));
+
+#ifdef Q_WS_MAC
+    /* Install display reconfiguration callback: */
+    CGDisplayRegisterReconfigurationCallback(cgDisplayReconfigurationCallback, this);
+#endif /* Q_WS_MAC */
 }
 
@@ -1015 +1062 @@
     /* Destroy console event-handler: */
     UIConsoleEventHandler::destroy();
+}
+
+void UISession::cleanupConnections()
+{
+#ifdef Q_WS_MAC
+    /* Remove display reconfiguration callback: */
+    CGDisplayRemoveReconfigurationCallback(cgDisplayReconfigurationCallback, this);
+#endif /* Q_WS_MAC */
 }
 

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

@@ -158 +158 @@
     void setSeamlessModeRequested(bool fIsSeamlessModeRequested) { m_fIsSeamlessModeRequested = fIsSeamlessModeRequested; }
     void setAutoCaptureDisabled(bool fIsAutoCaptureDisabled) { m_fIsAutoCaptureDisabled = fIsAutoCaptureDisabled; }
+    void forgetPreviousMachineState() { m_machineStatePrevious = m_machineState; }
 
     /* Keyboard setters: */
@@ -207 +208 @@
     void sigGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo);
 
-    /* Qt callback signal: */
+    /* Notifiers: Qt callback stuff: */
     void sigHostScreenCountChanged(int cHostScreenCount);
-    void sigHostScreenFullGeometryResized(int iHostScreenNumber);
-    void sigHostScreenAvailableGeometryResized(int iHostScreenNumber);
+    void sigHostScreenGeometryChanged();
 
     /* Session signals: */
@@ -234 +234 @@
     void sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo);
 
+    /* Handler: Host callback stuff: */
+    void sltHandleHostScreenGeometryChange();
+
 private:
 
@@ -253 +256 @@
     //void cleanupScreens() {}
     void cleanupConsoleEventHandlers();
-    //void cleanupConnections() {}
+    void cleanupConnections();
 
     /* Update helpers: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -97 +97 @@
     if (uisession()->isRunning() && uisession()->wasPaused())
     {
+        LogRelFlow(("UIMachineLogicFullscreen: "
+                    "Machine-state changed from 'paused' to 'running': "
+                    "Updating screen-layout...\n"));
+
+        /* Make sure further code will be called just once: */
+        uisession()->forgetPreviousMachineState();
         /* We should rebuild screen-layout: */
         m_pScreenLayout->rebuild();
         /* We should update machine-windows sizes: */
         foreach (UIMachineWindow *pMachineWindow, machineWindows())
-            pMachineWindow->handleScreenResize();
+            pMachineWindow->handleScreenGeometryChange();
     }
 }
@@ -119 +125 @@
 void UIMachineLogicFullscreen::sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo)
 {
-    LogRelFlow(("UIMachineLogicFullscreen::GuestScreenCountChanged.\n"));
+    LogRelFlow(("UIMachineLogicFullscreen: Guest-screen count changed.\n"));
 
     /* Update multi-screen layout before any window update: */
@@ -132 +138 @@
 void UIMachineLogicFullscreen::sltHostScreenCountChanged(int cScreenCount)
 {
-    LogRelFlow(("UIMachineLogicFullscreen::HostScreenCountChanged.\n"));
+    LogRelFlow(("UIMachineLogicFullscreen: Host-screen count changed.\n"));
 
     /* Update multi-screen layout before any window update: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -29 +29 @@
 #include "UIMachineLogicFullscreen.h"
 #include "UIMachineWindowFullscreen.h"
+#include "UIMachineView.h"
 #include "UIMachineDefs.h"
 #include "UIMiniToolBar.h"
@@ -164 +165 @@
     /* Resize to the appropriate size: */
     resize(workingArea.size());
+    /* Adjust guest if necessary: */
+    machineView()->normalizeGeometry(false);
     /* Move mini-toolbar into appropriate place: */
     if (m_pMiniToolBar)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp

@@ -109 +109 @@
     if (uisession()->isRunning() && uisession()->wasPaused())
     {
+        LogRelFlow(("UIMachineLogicSeamless: "
+                    "Machine-state changed from 'paused' to 'running': "
+                    "Updating screen-layout...\n"));
+
+        /* Make sure further code will be called just once: */
+        uisession()->forgetPreviousMachineState();
         /* We should rebuild screen-layout: */
         m_pScreenLayout->rebuild();
         /* We should update machine-windows sizes: */
         foreach (UIMachineWindow *pMachineWindow, machineWindows())
-            pMachineWindow->handleScreenResize();
+            pMachineWindow->handleScreenGeometryChange();
     }
 }
@@ -119 +125 @@
 void UIMachineLogicSeamless::sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo)
 {
-    LogRelFlow(("UIMachineLogicSeamless::GuestScreenCountChanged.\n"));
+    LogRelFlow(("UIMachineLogicSeamless: Guest-screen count changed.\n"));
 
     /* Update multi-screen layout before any window update: */
@@ -132 +138 @@
 void UIMachineLogicSeamless::sltHostScreenCountChanged(int cScreenCount)
 {
-    LogRelFlow(("UIMachineLogicSeamless::HostScreenCountChanged.\n"));
+    LogRelFlow(("UIMachineLogicSeamless: Host-screen count changed.\n"));
 
     /* Update multi-screen layout before any window update: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -29 +29 @@
 #include "UIMachineLogicSeamless.h"
 #include "UIMachineWindowSeamless.h"
-#include "UIMachineViewSeamless.h"
+#include "UIMachineView.h"
 #ifndef Q_WS_MAC
 # include "UIMachineDefs.h"
@@ -197 +197 @@
     /* Resize to the appropriate size: */
     resize(workingArea.size());
+    /* Adjust guest if necessary: */
+    machineView()->normalizeGeometry(false);
 #ifndef Q_WS_MAC
     /* Move mini-toolbar into appropriate place: */