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

Timestamp:

Mar 2, 2010 9:46:36 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: fixes for fs after the initial mm support

Location:

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

Files:

• UIMachineLogicFullscreen.cpp (modified) (9 diffs)
• UIMachineLogicFullscreen.h (modified) (1 diff)
• UIMachineViewFullscreen.cpp (modified) (2 diffs)
• UIMachineWindowFullscreen.cpp (modified) (2 diffs)

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

@@ -57 +57 @@
 
     /* Prepare machine window: */
-    prepareMachineWindow();
+    prepareMachineWindows();
 
     /* Initialization: */
@@ -136 +136 @@
 }
 
-void UIMachineLogicFullscreen::prepareMachineWindow()
-{
-    /* Do not prepare window if its ready: */
-    if (mainMachineWindow())
+void UIMachineLogicFullscreen::prepareMachineWindows()
+{
+    /* Get monitor count: */
+    ulong uMonitorCount = session().GetMachine().GetMonitorCount();
+
+    /* Do not create window(s) if created already: */
+    if ((ulong)machineWindows().size() == uMonitorCount)
         return;
+
+    /* List should not be filled partially: */
+    AssertMsg(machineWindows().size() == 0, ("Windows list is filled partially, something broken!\n"));
 
 #ifdef Q_WS_MAC
@@ -148 +154 @@
 #endif /* Q_WS_MAC */
 
-    /* Create machine window: */
-    addMachineWindow(UIMachineWindow::create(this, visualStateType()));
+    /* Create machine window(s): */
+    for (ulong uScreenId = 0; uScreenId < uMonitorCount; ++ uScreenId)
+        addMachineWindow(UIMachineWindow::create(this, visualStateType(), uScreenId));
+    /* Order machine window(s): */
+    for (ulong uScreenId = uMonitorCount; uScreenId > 0; -- uScreenId)
+        machineWindows()[uScreenId - 1]->machineWindow()->raise();
+
+    /* Notify others about machine window(s) created: */
+    setMachineWindowsCreated(true);
 
     /* If we are not started yet: */
@@ -165 +178 @@
         if (uisession()->isFirstTimeStarted())
         {
-            UIFirstRunWzd wzd(mainMachineWindow()->machineWindow(), machine);
+            UIFirstRunWzd wzd(defaultMachineWindow()->machineWindow(), machine);
             wzd.exec();
         }
@@ -172 +185 @@
         CProgress progress = vboxGlobal().isStartPausedEnabled() || vboxGlobal().isDebuggerAutoShowEnabled() ?
                              console.PowerUpPaused() : console.PowerUp();
-        /* Check for an immediate failure */
+
+#if 0 // TODO: Check immediate failure!
+        /* Check for an immediate failure: */
         if (!console.isOk())
         {
             vboxProblem().cannotStartMachine(console);
-            mainMachineWindow()->machineWindow()->close();
+            machineWindowWrapper()->machineWindow()->close();
             return;
         }
@@ -182 +197 @@
         /* Disable auto-closure because we want to have a chance to show the error dialog on startup failure: */
         setPreventAutoClose(true);
+#endif
 
         /* Show "Starting/Restoring" progress dialog: */
         if (uisession()->isSaved())
-            vboxProblem().showModalProgressDialog(progress, machine.GetName(), mainMachineWindow()->machineWindow(), 0);
+            vboxProblem().showModalProgressDialog(progress, machine.GetName(), defaultMachineWindow()->machineWindow(), 0);
         else
-            vboxProblem().showModalProgressDialog(progress, machine.GetName(), mainMachineWindow()->machineWindow());
-
+            vboxProblem().showModalProgressDialog(progress, machine.GetName(), defaultMachineWindow()->machineWindow());
+
+#if 0 // TODO: Check immediate failure!
         /* Check for an progress failure */
         if (progress.GetResultCode() != 0)
         {
             vboxProblem().cannotStartMachine(progress);
-            mainMachineWindow()->machineWindow()->close();
+            machineWindowWrapper()->machineWindow()->close();
             return;
         }
-
-        /* Process pending events: */
-        qApp->processEvents();
 
         /* Enable auto-closure again: */
@@ -206 +220 @@
         if (uisession()->isTurnedOff())
         {
-            mainMachineWindow()->machineWindow()->close();
+            machineWindowWrapper()->machineWindow()->close();
             return;
         }
+#endif
 
 #if 0 // TODO: Rework debugger logic!
@@ -228 +243 @@
 
             if (!vboxGlobal().isStartPausedEnabled())
-                mainMachineWindow()->machineView()->pause (false);
+                machineWindowWrapper()->machineView()->pause (false);
         }
 # endif
@@ -243 +258 @@
 {
     /* Do not cleanup machine window if it is not present: */
-    if (!mainMachineWindow())
+    if (!isMachineWindowsCreated())
         return;
 
     /* Cleanup machine window: */
-    UIMachineWindow::destroy(mainMachineWindow());
-}
-
+    foreach (UIMachineWindow *pMachineWindow, machineWindows())
+        UIMachineWindow::destroy(pMachineWindow);
+}
+

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

@@ -53 +53 @@
     /* Prepare helpers: */
     void prepareActionConnections();
-    void prepareMachineWindow();
+    void prepareMachineWindows();
     void prepareRequiredFeatures();
 

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

@@ -126 +126 @@
 
             /* Send new size-hint to the guest: */
-            session().GetConsole().GetDisplay().SetVideoModeHint(newSize.width(), newSize.height(), 0, 0);
+            session().GetConsole().GetDisplay().SetVideoModeHint(newSize.width(), newSize.height(), 0, screenId());
         }
         /* We had requested resize now, rejecting accident requests: */
@@ -331 +331 @@
 
             /* Report to the VM thread that we finished resizing */
-            session().GetConsole().GetDisplay().ResizeCompleted(0);
+            session().GetConsole().GetDisplay().ResizeCompleted(screenId());
 
             setMachineWindowResizeIgnored(oldIgnoreMainwndResize);

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

@@ -284 +284 @@
 #endif
                                            , machineLogic()->visualStateType()
-                                           , 0 /* Pass a primary screen id (0) for now! */);
+                                           , m_uScreenId);
 
     /* Add machine view into layout: */
@@ -335 +335 @@
 #endif/* !Q_WS_MAC */
 
+//    m_pMachineView->normalizeGeometry(true);
+//    ((UIMachineViewFullscreen*)m_pMachineView)->sltPerformGuestResize(maximumSize());
+//    show();
+
     QRect r = geometry();
     /* Load global settings: */